X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d8669c68e40a6571dfcbdf38e3281a4aeb8c2be6..a376e4d43e7b621f6fe22ca010be25ec90e4ff61:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 9a647af4d..bf92b34f4 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -20,33 +20,35 @@ #include "dolphinview.h" +#include + #include -#include +#include // TODO #include #include #include #include #include -#include #include #include -#include +#include #include -#include +#include +#include -#include "urlnavigator.h" #include "dolphinstatusbar.h" #include "dolphinmainwindow.h" #include "dolphindirlister.h" -#include "viewproperties.h" +#include "dolphinsortfilterproxymodel.h" #include "dolphindetailsview.h" #include "dolphiniconsview.h" #include "dolphincontextmenu.h" -#include "undomanager.h" -#include "renamedialog.h" -#include "progressindicator.h" #include "filterbar.h" +#include "progressindicator.h" +#include "renamedialog.h" +#include "urlnavigator.h" +#include "viewproperties.h" DolphinView::DolphinView(DolphinMainWindow *mainWindow, QWidget *parent, @@ -57,12 +59,19 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow, m_refreshing(false), m_showProgress(false), m_mode(mode), - m_mainWindow(mainWindow), - m_statusBar(0), m_iconSize(0), m_folderCount(0), m_fileCount(0), - m_filterBar(0) + m_mainWindow(mainWindow), + m_topLayout(0), + m_urlNavigator(0), + m_iconsView(0), + m_detailsView(0), + m_filterBar(0), + m_statusBar(0), + m_dirModel(0), + m_dirLister(0), + m_proxyModel(0) { hide(); setFocusPolicy(Qt::StrongFocus); @@ -80,6 +89,8 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow, m_dirLister->setAutoUpdate(true); m_dirLister->setMainWindow(this); m_dirLister->setShowingDotFiles(showHiddenFiles); + m_dirLister->setDelayedMimeTypes(true); + connect(m_dirLister, SIGNAL(clear()), this, SLOT(slotClear())); connect(m_dirLister, SIGNAL(percent(int)), @@ -93,18 +104,14 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow, connect(m_dirLister, SIGNAL(errorMessage(const QString&)), this, SLOT(slotErrorMessage(const QString&))); - m_iconsView = new DolphinIconsView(this); - applyModeToView(); + m_dirModel = new KDirModel(); + m_dirModel->setDirLister(m_dirLister); + m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory); - KDirModel* model = new KDirModel(); - model->setDirLister(m_dirLister); - m_iconsView->setModel(model); + m_proxyModel = new DolphinSortFilterProxyModel(this); + m_proxyModel->setSourceModel(m_dirModel); - KFileItemDelegate* delegate = new KFileItemDelegate(this); - m_iconsView->setItemDelegate(delegate); - - m_dirLister->setDelayedMimeTypes(true); - new KMimeTypeResolver(m_iconsView, model); + createView(); m_iconSize = K3Icon::SizeMedium; @@ -116,16 +123,11 @@ DolphinView::DolphinView(DolphinMainWindow *mainWindow, this, SLOT(closeFilterBar())); m_topLayout->addWidget(m_urlNavigator); - m_topLayout->addWidget(m_iconsView); + m_topLayout->addWidget(itemView()); m_topLayout->addWidget(m_filterBar); m_topLayout->addWidget(m_statusBar); - connect(m_iconsView, SIGNAL(clicked(const QModelIndex&)), - this, SLOT(triggerItem(const QModelIndex&))); - connect(m_iconsView->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), - this, SLOT(emitSelectionChangedSignal())); - - startDirLister(m_urlNavigator->url()); + loadDirectory(m_urlNavigator->url()); } DolphinView::~DolphinView() @@ -165,7 +167,7 @@ void DolphinView::setMode(Mode mode) ViewProperties props(m_urlNavigator->url()); props.setViewMode(m_mode); - applyModeToView(); + createView(); startDirLister(m_urlNavigator->url()); emit modeChanged(); @@ -176,14 +178,30 @@ DolphinView::Mode DolphinView::mode() const return m_mode; } -void DolphinView::setShowHiddenFilesEnabled(bool show) +void DolphinView::setShowPreview(bool show) +{ + ViewProperties props(m_urlNavigator->url()); + props.setShowPreview(show); + + // TODO: wait until previews are possible with KFileItemDelegate + + emit showPreviewChanged(); +} + +bool DolphinView::showPreview() const +{ + // TODO: wait until previews are possible with KFileItemDelegate + return true; +} + +void DolphinView::setShowHiddenFiles(bool show) { if (m_dirLister->showingDotFiles() == show) { return; } ViewProperties props(m_urlNavigator->url()); - props.setShowHiddenFilesEnabled(show); + props.setShowHiddenFiles(show); props.save(); m_dirLister->setShowingDotFiles(show); @@ -193,19 +211,11 @@ void DolphinView::setShowHiddenFilesEnabled(bool show) reload(); } -bool DolphinView::isShowHiddenFilesEnabled() const +bool DolphinView::showHiddenFiles() const { return m_dirLister->showingDotFiles(); } -void DolphinView::setViewProperties(const ViewProperties& props) -{ - setMode(props.viewMode()); - setSorting(props.sorting()); - setSortOrder(props.sortOrder()); - setShowHiddenFilesEnabled(props.isShowHiddenFilesEnabled()); -} - void DolphinView::renameSelectedItems() { const KUrl::List urls = selectedUrls(); @@ -224,8 +234,10 @@ void DolphinView::renameSelectedItems() DolphinStatusBar::Error); } else { - UndoManager& undoMan = UndoManager::instance(); - undoMan.beginMacro(); + // TODO: check how this can be integrated into KonqUndoManager/KonqOperations + + //UndoManager& undoMan = UndoManager::instance(); + //undoMan.beginMacro(); assert(newName.contains('#')); @@ -259,8 +271,8 @@ void DolphinView::renameSelectedItems() else if (KIO::NetAccess::file_move(source, dest)) { // TODO: From the users point of view he executed one 'rename n files' operation, // but internally we store it as n 'rename 1 file' operations for the undo mechanism. - DolphinCommand command(DolphinCommand::Rename, source, dest); - undoMan.addCommand(command); + //DolphinCommand command(DolphinCommand::Rename, source, dest); + //undoMan.addCommand(command); } } @@ -269,7 +281,7 @@ void DolphinView::renameSelectedItems() delete progressIndicator; progressIndicator = 0; - undoMan.endMacro(); + //undoMan.endMacro(); } } else { @@ -302,12 +314,12 @@ void DolphinView::renameSelectedItems() void DolphinView::selectAll() { - //fileView()->selectAll(); + selectAll(QItemSelectionModel::Select); } void DolphinView::invertSelection() { - //fileView()->invertSelection(); + selectAll(QItemSelectionModel::Toggle); } DolphinStatusBar* DolphinView::statusBar() const @@ -392,61 +404,35 @@ bool DolphinView::isZoomOutPossible() const void DolphinView::setSorting(Sorting sorting) { if (sorting != this->sorting()) { - /*KFileView* view = fileView(); - int spec = view->sorting() & ~QDir::Name & ~QDir::Size & ~QDir::Time & ~QDir::Unsorted; - - switch (sorting) { - case SortByName: spec = spec | QDir::Name; break; - case SortBySize: spec = spec | QDir::Size; break; - case SortByDate: spec = spec | QDir::Time; break; - default: break; - } - ViewProperties props(url()); props.setSorting(sorting); - view->setSorting(static_cast(spec)); + m_proxyModel->setSorting(sorting); - emit signalSortingChanged(sorting);*/ + emit sortingChanged(sorting); } } DolphinView::Sorting DolphinView::sorting() const { - /*const QDir::SortFlags spec = fileView()->sorting(); - - if (spec & QDir::Time) { - return SortByDate; - } - - if (spec & QDir::Size) { - return SortBySize; - }*/ - - return SortByName; + return m_proxyModel->sorting(); } void DolphinView::setSortOrder(Qt::SortOrder order) { if (sortOrder() != order) { - /*KFileView* view = fileView(); - int sorting = view->sorting(); - sorting = (order == Qt::Ascending) ? (sorting & ~QDir::Reversed) : - (sorting | QDir::Reversed); - ViewProperties props(url()); props.setSortOrder(order); - view->setSorting(static_cast(sorting)); + m_proxyModel->setSortOrder(order); - emit signalSortOrderChanged(order);*/ + emit sortOrderChanged(order); } } Qt::SortOrder DolphinView::sortOrder() const { - //return fileView()->isReversed() ? Qt::Descending : Qt::Ascending; - return Qt::Descending; + return m_proxyModel->sortOrder(); } void DolphinView::goBack() @@ -481,27 +467,31 @@ const Q3ValueList DolphinView::urlHistory(int& index) bool DolphinView::hasSelection() const { - return m_iconsView->selectionModel()->hasSelection(); + return itemView()->selectionModel()->hasSelection(); } KFileItemList DolphinView::selectedItems() const { - QItemSelectionModel* selModel = m_iconsView->selectionModel(); - assert(selModel != 0); + const QAbstractItemView* view = itemView(); + // Our view has a selection, we will map them back to the DirModel + // and then fill the KFileItemList. + assert((view != 0) && (view->selectionModel() != 0)); + + const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection()); KFileItemList itemList; - if (selModel->hasSelection()) { - KDirModel* dirModel = static_cast(m_iconsView->model()); - const QModelIndexList indexList = selModel->selectedIndexes(); - - QModelIndexList::const_iterator end = indexList.end(); - for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) { - KFileItem* item = dirModel->itemForIndex(*it); - if (item != 0) { - itemList.append(item); - } + + const QModelIndexList indexList = selection.indexes(); + QModelIndexList::const_iterator end = indexList.end(); + for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) { + assert((*it).isValid()); + + KFileItem* item = m_dirModel->itemForIndex(*it); + if (item != 0) { + itemList.append(item); } } + return itemList; } @@ -549,11 +539,11 @@ void DolphinView::rename(const KUrl& source, const QString& newName) if (destExists) { // the destination already exists, hence ask the user // how to proceed... - KIO::RenameDlg renameDialog(this, - i18n("File Already Exists"), - source.path(), - dest.path(), - KIO::M_OVERWRITE); + KIO::RenameDialog renameDialog(this, + i18n("File Already Exists"), + source.path(), + dest.path(), + KIO::M_OVERWRITE); switch (renameDialog.exec()) { case KIO::R_OVERWRITE: // the destination should be overwritten @@ -579,15 +569,15 @@ void DolphinView::rename(const KUrl& source, const QString& newName) ok = KIO::NetAccess::file_move(source, dest); } + const QString destFileName = dest.fileName(); if (ok) { - m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.",source.fileName(), dest.fileName()), + m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.",source.fileName(), destFileName), DolphinStatusBar::OperationCompleted); - DolphinCommand command(DolphinCommand::Rename, source, dest); - UndoManager::instance().addCommand(command); + KonqOperations::rename(this, source, destFileName); } else { - m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.",source.fileName(), dest.fileName()), + m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.",source.fileName(), destFileName), DolphinStatusBar::Error); reload(); } @@ -633,38 +623,41 @@ DolphinMainWindow* DolphinView::mainWindow() const void DolphinView::loadDirectory(const KUrl& url) { const ViewProperties props(url); - setMode(props.viewMode()); - const bool showHiddenFiles = props.isShowHiddenFilesEnabled(); - setShowHiddenFilesEnabled(showHiddenFiles); - m_dirLister->setShowingDotFiles(showHiddenFiles); + const Mode mode = props.viewMode(); + if (m_mode != mode) { + m_mode = mode; + createView(); + emit modeChanged(); + } - setSorting(props.sorting()); - setSortOrder(props.sortOrder()); + const bool showHiddenFiles = props.showHiddenFiles(); + if (showHiddenFiles != m_dirLister->showingDotFiles()) { + m_dirLister->setShowingDotFiles(showHiddenFiles); + emit showHiddenFilesChanged(); + } - startDirLister(url); - emit urlChanged(url); -} + const DolphinView::Sorting sorting = props.sorting(); + if (sorting != m_proxyModel->sorting()) { + m_proxyModel->setSorting(sorting); + emit sortingChanged(sorting); + } -void DolphinView::triggerIconsViewItem(Q3IconViewItem* item) -{ - /* KDE4-TODO: - const Qt::ButtonState keyboardState = KApplication::keyboardMouseState(); - const bool isSelectionActive = ((keyboardState & Qt::ShiftModifier) > 0) || - ((keyboardState & Qt::ControlModifier) > 0);*/ - const bool isSelectionActive = false; - if ((item != 0) && !isSelectionActive) { - // Updating the Url must be done outside the scope of this slot, - // as iconview items will get deleted. - QTimer::singleShot(0, this, SLOT(updateUrl())); - mainWindow()->setActiveView(this); + const Qt::SortOrder sortOrder = props.sortOrder(); + if (sortOrder != m_proxyModel->sortOrder()) { + m_proxyModel->setSortOrder(sortOrder); + emit sortOrderChanged(sortOrder); } + + // TODO: handle previews (props.showPreview()) + + startDirLister(url); + emit urlChanged(url); } void DolphinView::triggerItem(const QModelIndex& index) { - KDirModel* dirModel = static_cast(m_iconsView->model()); - KFileItem* item = dirModel->itemForIndex(index); + KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index)); if (item == 0) { return; } @@ -692,35 +685,6 @@ void DolphinView::triggerItem(const QModelIndex& index) } } -void DolphinView::updateUrl() -{ - //KFileView* fileView = (m_iconsView != 0) ? static_cast(m_iconsView) : - // static_cast(m_iconsView); - - KFileItem* fileItem = 0; // TODO: fileView->currentFileItem(); - if (fileItem == 0) { - return; - } - - if (fileItem->isDir()) { - // Prefer the local path over the Url. This assures that the - // volume space information is correct. Assuming that the Url is media:/sda1, - // and the local path is /windows/C: For the Url the space info is related - // to the root partition (and hence wrong) and for the local path the space - // info is related to the windows partition (-> correct). - const QString localPath(fileItem->localPath()); - if (localPath.isEmpty()) { - setUrl(fileItem->url()); - } - else { - setUrl(KUrl(localPath)); - } - } - else { - fileItem->run(); - } -} - void DolphinView::slotPercent(int percent) { if (m_showProgress) { @@ -832,23 +796,6 @@ void DolphinView::slotContentsMoving(int x, int y) } } -/*KFileView* DolphinView::fileView() const -{ - return (m_mode == DetailsView) ? static_cast(m_iconsView) : - static_cast(m_iconsView); -}*/ - -Q3ScrollView* DolphinView::scrollView() const -{ - return 0; //(m_mode == DetailsView) ? static_cast(m_iconsView) : - // static_cast(m_iconsView); -} - -ItemEffectsManager* DolphinView::itemEffectsManager() const -{ - return 0; -} - void DolphinView::startDirLister(const KUrl& url, bool reload) { if (!url.isValid()) { @@ -1013,45 +960,102 @@ void DolphinView::slotChangeNameFilter(const QString& nameFilter) adjustedFilter.insert(0, '*'); adjustedFilter.append('*'); + // Use the ProxyModel to filter: + // This code is #ifdefed as setNameFilter behaves + // slightly different than the QSortFilterProxyModel + // as it will not remove directories. I will ask + // our beloved usability experts for input + // -- z. +#if 0 m_dirLister->setNameFilter(adjustedFilter); m_dirLister->emitChanges(); - - // TODO: this is a workaround for QIconView: the item position - // stay as they are by filtering, only an inserting of an item - // results to an automatic adjusting of the item position. In Qt4/KDE4 - // this workaround should get obsolete due to Interview. - /*KFileView* view = fileView(); - if (view == m_iconsView) { - KFileItem* first = view->firstFileItem(); - if (first != 0) { - view->removeItem(first); - view->insertItem(first); - } - }*/ +#else + m_proxyModel->setFilterRegExp( nameFilter ); +#endif } -void DolphinView::applyModeToView() +void DolphinView::createView() { - //m_iconsView->setAlternatingRowColors(true); - m_iconsView->setSelectionMode(QAbstractItemView::ExtendedSelection); + // delete current view + QAbstractItemView* view = itemView(); + if (view != 0) { + m_topLayout->remove(view); + view->close(); + view->deleteLater(); + m_iconsView = 0; + m_detailsView = 0; + } + + assert(m_iconsView == 0); + assert(m_detailsView == 0); - // TODO: the following code just tries to test some QListView capabilities + // ... and recreate it representing the current mode switch (m_mode) { case IconsView: + m_iconsView = new DolphinIconsView(this); m_iconsView->setViewMode(QListView::IconMode); - m_iconsView->setGridSize(QSize(128, 64)); + m_iconsView->setSpacing(32); + view = m_iconsView; + // TODO: read out view settings break; case DetailsView: - m_iconsView->setViewMode(QListView::ListMode); - m_iconsView->setGridSize(QSize(256, 24)); + m_detailsView = new DolphinDetailsView(this); + view = m_detailsView; + // TODO: read out view settings break; + } - case PreviewsView: - m_iconsView->setViewMode(QListView::IconMode); - m_iconsView->setGridSize(QSize(128, 128)); - break; + view->setModel(m_proxyModel); + + view->setSelectionMode(QAbstractItemView::ExtendedSelection); + + KFileItemDelegate* delegate = new KFileItemDelegate(this); + delegate->setAdditionalInformation(KFileItemDelegate::FriendlyMimeType); + view->setItemDelegate(delegate); + + new KMimeTypeResolver(view, m_dirModel); + + connect(view, SIGNAL(clicked(const QModelIndex&)), + this, SLOT(triggerItem(const QModelIndex&))); + connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), + this, SLOT(emitSelectionChangedSignal())); + + m_topLayout->insertWidget(1, view); +} + +int DolphinView::columnIndex(Sorting sorting) const +{ + int index = 0; + switch (sorting) { + case SortByName: index = KDirModel::Name; break; + case SortBySize: index = KDirModel::Size; break; + case SortByDate: index = KDirModel::ModifiedTime; break; + default: assert(false); + } + return index; +} + +void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags) +{ + QItemSelectionModel* selectionModel = itemView()->selectionModel(); + const QAbstractItemModel* itemModel = selectionModel->model(); + + const QModelIndex topLeft = itemModel->index(0, 0); + const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1, + itemModel->columnCount() - 1); + + QItemSelection selection(topLeft, bottomRight); + selectionModel->select(selection, flags); +} + +QAbstractItemView* DolphinView::itemView() const +{ + assert((m_iconsView == 0) || (m_detailsView == 0)); + if (m_detailsView != 0) { + return m_detailsView; } + return m_iconsView; } #include "dolphinview.moc"