X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/dd70012499c6b7b421a9f9cdc7d3e362f6e0ed94..0f4ecd1c61631bcd8fb050f4d8af5c49e78bbeee:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index d33dfa2a8..41bee6972 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -19,6 +19,8 @@ ***************************************************************************/ #include "dolphinview.h" +#include +#include #include #include @@ -27,27 +29,27 @@ #include #include #include +#include -#include +#include #include #include -#include #include #include +#include #include -#include #include #include #include #include #include +#include "dolphinmodel.h" #include "dolphincolumnview.h" #include "dolphincontroller.h" #include "dolphinsortfilterproxymodel.h" #include "dolphindetailsview.h" #include "dolphiniconsview.h" -#include "dolphinitemcategorizer.h" #include "renamedialog.h" #include "viewproperties.h" #include "dolphinsettings.h" @@ -56,22 +58,22 @@ DolphinView::DolphinView(QWidget* parent, const KUrl& url, KDirLister* dirLister, - KDirModel* dirModel, - DolphinSortFilterProxyModel* proxyModel, - Mode mode, - bool showHiddenFiles) : + DolphinModel* dolphinModel, + DolphinSortFilterProxyModel* proxyModel) : QWidget(parent), m_active(true), - m_blockContentsMovedSignal(false), - m_initializeColumnView(false), - m_mode(mode), + m_showPreview(false), + m_loadingDirectory(false), + m_storedCategorizedSorting(false), + m_mode(DolphinView::IconsView), m_topLayout(0), m_controller(0), m_iconsView(0), m_detailsView(0), m_columnView(0), m_fileItemDelegate(0), - m_dirModel(dirModel), + m_selectionModel(0), + m_dolphinModel(dolphinModel), m_dirLister(dirLister), m_proxyModel(proxyModel) { @@ -84,8 +86,6 @@ DolphinView::DolphinView(QWidget* parent, connect(clipboard, SIGNAL(dataChanged()), this, SLOT(updateCutItems())); - connect(m_dirLister, SIGNAL(completed()), - this, SLOT(restoreContentsPos())); connect(m_dirLister, SIGNAL(completed()), this, SLOT(updateCutItems())); connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)), @@ -93,24 +93,36 @@ DolphinView::DolphinView(QWidget* parent, m_controller = new DolphinController(this); m_controller->setUrl(url); + + // Receiver of the DolphinView signal 'urlChanged()' don't need + // to care whether the internal controller changed the URL already or whether + // the controller just requested an URL change and will be updated later. + // In both cases the URL has been changed: + connect(m_controller, SIGNAL(urlChanged(const KUrl&)), + this, SIGNAL(urlChanged(const KUrl&))); + connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)), + this, SIGNAL(urlChanged(const KUrl&))); + connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)), this, SLOT(openContextMenu(const QPoint&))); - connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const QModelIndex&, QWidget*)), - this, SLOT(dropUrls(const KUrl::List&, const QModelIndex&, QWidget*))); + connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&, const KFileItem&)), + this, SLOT(dropUrls(const KUrl::List&, const KUrl&, const KFileItem&))); connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)), this, SLOT(updateSorting(DolphinView::Sorting))); connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)), this, SLOT(updateSortOrder(Qt::SortOrder))); - connect(m_controller, SIGNAL(itemTriggered(const QModelIndex&)), - this, SLOT(triggerItem(const QModelIndex&))); + connect(m_controller, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)), + this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&))); + connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)), + this, SLOT(triggerItem(const KFileItem&))); connect(m_controller, SIGNAL(activated()), this, SLOT(activate())); - connect(m_controller, SIGNAL(itemEntered(const QModelIndex&)), - this, SLOT(showHoverInformation(const QModelIndex&))); + connect(m_controller, SIGNAL(itemEntered(const KFileItem&)), + this, SLOT(showHoverInformation(const KFileItem&))); connect(m_controller, SIGNAL(viewportEntered()), this, SLOT(clearHoverInformation())); - createView(); + applyViewProperties(url); m_topLayout->addWidget(itemView()); } @@ -125,7 +137,7 @@ const KUrl& DolphinView::url() const KUrl DolphinView::rootUrl() const { - return isColumnViewActive() ? m_dirLister->url() : url(); + return isColumnViewActive() ? m_columnView->rootUrl() : url(); } void DolphinView::setActive(bool active) @@ -136,12 +148,15 @@ void DolphinView::setActive(bool active) m_active = active; - QColor color = KGlobalSettings::baseColor(); + QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color(); if (active) { + // TODO: emitting urlChanged() is a hack, as the URL hasn't really changed. It + // bypasses the problem when having a split view and changing the active view to + // update the some URL dependent states. A nicer approach should be no big deal... emit urlChanged(url()); emit selectionChanged(selectedItems()); } else { - color.setAlpha(0); + color.setAlpha(150); } QWidget* viewport = itemView()->viewport(); @@ -154,6 +169,8 @@ void DolphinView::setActive(bool active) if (active) { emit activated(); } + + m_controller->indicateActivationChange(active); } bool DolphinView::isActive() const @@ -174,16 +191,36 @@ void DolphinView::setMode(Mode mode) // to go back to the root URL of the column view automatically. // Otherwise there it would not be possible to turn off the column view // without focusing the first column. - // TODO: reactivate again after DolphinView/DolphinViewController split works - //setUrl(m_dirLister->url()); - //m_controller->setUrl(m_dirLister->url()); + const KUrl root = rootUrl(); + setUrl(root); + m_controller->setUrl(root); } - ViewProperties props(url()); - props.setViewMode(m_mode); + deleteView(); + // It is important to read the view properties _after_ deleting the view, + // as e. g. the detail view might adjust the additional information properties + // after getting closed: + const KUrl viewPropsUrl = viewPropertiesUrl(); + ViewProperties props(viewPropsUrl); + props.setViewMode(m_mode); createView(); - startDirLister(url()); + + // the file item delegate has been recreated, apply the current + // additional information manually + const KFileItemDelegate::InformationList infoList = props.additionalInfo(); + m_fileItemDelegate->setShowInformation(infoList); + emit additionalInfoChanged(infoList); + + // Not all view modes support categorized sorting. Adjust the sorting model + // if changing the view mode results in a change of the categorized sorting + // capabilities. + m_storedCategorizedSorting = props.categorizedSorting(); + const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting(); + if (categorized != m_proxyModel->isCategorizedModel()) { + m_proxyModel->setCategorizedModel(categorized); + emit categorizedSortingChanged(); + } emit modeChanged(); } @@ -195,18 +232,24 @@ DolphinView::Mode DolphinView::mode() const void DolphinView::setShowPreview(bool show) { - ViewProperties props(url()); + if (m_showPreview == show) { + return; + } + + const KUrl viewPropsUrl = viewPropertiesUrl(); + ViewProperties props(viewPropsUrl); props.setShowPreview(show); - m_controller->setShowPreview(show); + m_showPreview = show; + emit showPreviewChanged(); - startDirLister(url(), true); + loadDirectory(viewPropsUrl, true); } bool DolphinView::showPreview() const { - return m_controller->showPreview(); + return m_showPreview; } void DolphinView::setShowHiddenFiles(bool show) @@ -215,13 +258,14 @@ void DolphinView::setShowHiddenFiles(bool show) return; } - ViewProperties props(url()); + const KUrl viewPropsUrl = viewPropertiesUrl(); + ViewProperties props(viewPropsUrl); props.setShowHiddenFiles(show); m_dirLister->setShowingDotFiles(show); emit showHiddenFilesChanged(); - startDirLister(url(), true); + loadDirectory(viewPropsUrl, true); } bool DolphinView::showHiddenFiles() const @@ -231,35 +275,34 @@ bool DolphinView::showHiddenFiles() const void DolphinView::setCategorizedSorting(bool categorized) { - if (!supportsCategorizedSorting() || (categorized == categorizedSorting())) { + if (categorized == categorizedSorting()) { return; } - Q_ASSERT(m_iconsView != 0); - if (categorized) { - Q_ASSERT(m_iconsView->itemCategorizer() == 0); - m_iconsView->setItemCategorizer(new DolphinItemCategorizer()); - } else { - KItemCategorizer* categorizer = m_iconsView->itemCategorizer(); - m_iconsView->setItemCategorizer(0); - delete categorizer; - } + // setCategorizedSorting(true) may only get invoked + // if the view supports categorized sorting + Q_ASSERT(!categorized || supportsCategorizedSorting()); - ViewProperties props(url()); + ViewProperties props(viewPropertiesUrl()); props.setCategorizedSorting(categorized); props.save(); + m_storedCategorizedSorting = categorized; + m_proxyModel->setCategorizedModel(categorized); + emit categorizedSortingChanged(); } bool DolphinView::categorizedSorting() const { - if (!supportsCategorizedSorting()) { - return false; - } - - Q_ASSERT(m_iconsView != 0); - return m_iconsView->itemCategorizer() != 0; + // If all view modes would support categorized sorting, returning + // m_proxyModel->isCategorizedModel() would be the way to go. As + // currently only the icons view supports caterized sorting, we remember + // the stored view properties state in m_storedCategorizedSorting and + // return this state. The application takes care to disable the corresponding + // checkbox by checking DolphinView::supportsCategorizedSorting() to indicate + // that this setting is not applied to the current view mode. + return m_storedCategorizedSorting; } bool DolphinView::supportsCategorizedSorting() const @@ -269,22 +312,97 @@ bool DolphinView::supportsCategorizedSorting() const void DolphinView::selectAll() { - selectAll(QItemSelectionModel::Select); + itemView()->selectAll(); } void DolphinView::invertSelection() { - selectAll(QItemSelectionModel::Toggle); + if (isColumnViewActive()) { + // QAbstractItemView does not offer a virtual method invertSelection() + // as counterpart to QAbstractItemView::selectAll(). This makes it + // necessary to delegate the inverting of the selection to the + // column view, as only the selection of the active column should + // get inverted. + m_columnView->invertSelection(); + } else { + 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); + + const QItemSelection selection(topLeft, bottomRight); + selectionModel->select(selection, QItemSelectionModel::Toggle); + } +} + +bool DolphinView::hasSelection() const +{ + return itemView()->selectionModel()->hasSelection(); +} + +void DolphinView::clearSelection() +{ + itemView()->selectionModel()->clear(); +} + +KFileItemList DolphinView::selectedItems() const +{ + const QAbstractItemView* view = itemView(); + + // Our view has a selection, we will map them back to the DolphinModel + // and then fill the KFileItemList. + Q_ASSERT((view != 0) && (view->selectionModel() != 0)); + + const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection()); + KFileItemList itemList; + + const QModelIndexList indexList = selection.indexes(); + foreach (QModelIndex index, indexList) { + KFileItem item = m_dolphinModel->itemForIndex(index); + if (!item.isNull()) { + itemList.append(item); + } + } + + return itemList; +} + +KUrl::List DolphinView::selectedUrls() const +{ + KUrl::List urls; + const KFileItemList list = selectedItems(); + foreach (KFileItem item, list) { + urls.append(item.url()); + } + return urls; +} + +KFileItem DolphinView::fileItem(const QModelIndex& index) const +{ + const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index); + return m_dolphinModel->itemForIndex(dolphinModelIndex); } -int DolphinView::contentsX() const +void DolphinView::setContentsPosition(int x, int y) { - return itemView()->horizontalScrollBar()->value(); + QAbstractItemView* view = itemView(); + + // the ColumnView takes care itself for the horizontal scrolling + if (!isColumnViewActive()) { + view->horizontalScrollBar()->setValue(x); + } + view->verticalScrollBar()->setValue(y); + + m_loadingDirectory = false; } -int DolphinView::contentsY() const +QPoint DolphinView::contentsPosition() const { - return itemView()->verticalScrollBar()->value(); + const int x = itemView()->horizontalScrollBar()->value(); + const int y = itemView()->verticalScrollBar()->value(); + return QPoint(x, y); } void DolphinView::zoomIn() @@ -331,110 +449,107 @@ Qt::SortOrder DolphinView::sortOrder() const return m_proxyModel->sortOrder(); } -void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info) +void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info) { - ViewProperties props(url()); + const KUrl viewPropsUrl = viewPropertiesUrl(); + ViewProperties props(viewPropsUrl); props.setAdditionalInfo(info); - - m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation); - m_fileItemDelegate->setAdditionalInformation(info); + m_fileItemDelegate->setShowInformation(info); emit additionalInfoChanged(info); - startDirLister(url(), true); -} -KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const -{ - return m_fileItemDelegate->additionalInformation(); + if (itemView() != m_detailsView) { + // the details view requires no reloading of the directory, as it maps + // the file item delegate info to its columns internally + loadDirectory(viewPropsUrl, true); + } } -bool DolphinView::hasSelection() const +KFileItemDelegate::InformationList DolphinView::additionalInfo() const { - return itemView()->selectionModel()->hasSelection(); + return m_fileItemDelegate->showInformation(); } -void DolphinView::clearSelection() +void DolphinView::reload() { - itemView()->selectionModel()->clear(); + setUrl(url()); + loadDirectory(url(), true); } -KFileItemList DolphinView::selectedItems() const +void DolphinView::refresh() { - const QAbstractItemView* view = itemView(); + const bool oldActivationState = m_active; + m_active = true; - // Our view has a selection, we will map them back to the DirModel - // and then fill the KFileItemList. - Q_ASSERT((view != 0) && (view->selectionModel() != 0)); + createView(); + applyViewProperties(m_controller->url()); + reload(); - const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection()); - KFileItemList itemList; + setActive(oldActivationState); +} - const QModelIndexList indexList = selection.indexes(); - QModelIndexList::const_iterator end = indexList.end(); - for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) { - Q_ASSERT((*it).isValid()); +void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl) +{ + if (m_controller->url() == url) { + return; + } - KFileItem* item = m_dirModel->itemForIndex(*it); - if (item != 0) { - itemList.append(item); + m_controller->setUrl(url); // emits urlChanged, which we forward + + if (!rootUrl.isEmpty() && rootUrl.isParentOf(url)) { + applyViewProperties(rootUrl); + loadDirectory(rootUrl); + if (itemView() == m_columnView) { + m_columnView->setRootUrl(rootUrl); + m_columnView->showColumn(url); } + } else { + applyViewProperties(url); + loadDirectory(url); } - return itemList; + emit startedPathLoading(url); } -KUrl::List DolphinView::selectedUrls() const +void DolphinView::setNameFilter(const QString& nameFilter) { - KUrl::List urls; + m_proxyModel->setFilterRegExp(nameFilter); - const KFileItemList list = selectedItems(); - KFileItemList::const_iterator it = list.begin(); - const KFileItemList::const_iterator end = list.end(); - while (it != end) { - KFileItem* item = *it; - urls.append(item->url()); - ++it; + if (isColumnViewActive()) { + // adjusting the directory lister is not enough in the case of the + // column view, as each column has its own directory lister internally... + m_columnView->setNameFilter(nameFilter); } - - return urls; } -KFileItem* DolphinView::fileItem(const QModelIndex index) const +void DolphinView::calculateItemCount(int& fileCount, int& folderCount) { - const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index); - return m_dirModel->itemForIndex(dirModelIndex); -} - -void DolphinView::reload() -{ - setUrl(url()); - startDirLister(url(), true); + foreach (KFileItem item, m_dirLister->items()) { + if (item.isDir()) { + ++folderCount; + } else { + ++fileCount; + } + } } -void DolphinView::refresh() +void DolphinView::setUrl(const KUrl& url) { - createView(); - reload(); + updateView(url, KUrl()); } void DolphinView::mouseReleaseEvent(QMouseEvent* event) { QWidget::mouseReleaseEvent(event); - setActive(true);; + setActive(true); } void DolphinView::activate() { setActive(true); } -void DolphinView::triggerItem(const QModelIndex& index) +void DolphinView::triggerItem(const KFileItem& item) { - if (!isValidNameIndex(index)) { - clearSelection(); - showHoverInformation(index); - return; - } - const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers(); if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) { // items are selected by the user, hence don't trigger the @@ -442,57 +557,17 @@ void DolphinView::triggerItem(const QModelIndex& index) return; } - KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index)); - if (item == 0) { + if (item.isNull()) { return; } - // 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(item->localPath()); - KUrl url; - if (localPath.isEmpty()) { - url = item->url(); - } else { - url = localPath; - } - - if (item->isDir()) { - setUrl(url); - } else if (item->isFile()) { - // allow to browse through ZIP and tar files - KMimeType::Ptr mime = item->mimeTypePtr(); - if (mime->is("application/zip")) { - url.setProtocol("zip"); - setUrl(url); - } else if (mime->is("application/x-tar") || - mime->is("application/x-tarz") || - mime->is("application/x-bzip-compressed-tar") || - mime->is("application/x-compressed-tar") || - mime->is("application/x-tzo")) { - url.setProtocol("tar"); - setUrl(url); - } else { - item->run(); - } - } else { - item->run(); - } + emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart } void DolphinView::generatePreviews(const KFileItemList& items) { - if (m_controller->showPreview()) { - - // Must turn QList to QList... - QList itemsToPreview; - foreach( KFileItem* it, items ) - itemsToPreview.append( *it ); - - KIO::PreviewJob* job = KIO::filePreview(itemsToPreview, 128); + if (m_controller->dolphinView()->showPreview()) { + KIO::PreviewJob* job = KIO::filePreview(items, 128); connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), this, SLOT(showPreview(const KFileItem&, const QPixmap&))); } @@ -507,141 +582,84 @@ void DolphinView::showPreview(const KFileItem& item, const QPixmap& pixmap) return; } - const QModelIndex idx = m_dirModel->indexForItem(item); + const QModelIndex idx = m_dolphinModel->indexForItem(item); if (idx.isValid() && (idx.column() == 0)) { const QMimeData* mimeData = QApplication::clipboard()->mimeData(); if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) { KIconEffect iconEffect; - const QPixmap cutPixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState); - m_dirModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole); + const QPixmap cutPixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState); + m_dolphinModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole); } else { - m_dirModel->setData(idx, QIcon(pixmap), Qt::DecorationRole); + m_dolphinModel->setData(idx, QIcon(pixmap), Qt::DecorationRole); } } } -void DolphinView::restoreContentsPos() -{ - m_blockContentsMovedSignal = false; - if (!url().isEmpty()) { - QAbstractItemView* view = itemView(); - // TODO #1: view->setCurrentItem(m_urlNavigator->currentFileName()); - // TODO #2: temporary deactivated due to DolphinView/DolphinViewController split - //QPoint pos = m_urlNavigator->savedPosition(); - QPoint pos(0, 0); - view->horizontalScrollBar()->setValue(pos.x()); - view->verticalScrollBar()->setValue(pos.y()); - } -} - void DolphinView::emitSelectionChangedSignal() { emit selectionChanged(DolphinView::selectedItems()); } -void DolphinView::startDirLister(const KUrl& url, bool reload) +void DolphinView::loadDirectory(const KUrl& url, bool reload) { if (!url.isValid()) { - // TODO: temporary deactivated due to DolphinView/DolphinViewController split - - //const QString location(url.pathOrUrl()); - //if (location.isEmpty()) { - // m_statusBar->setMessage(i18n("The location is empty."), DolphinStatusBar::Error); - //} else { - // m_statusBar->setMessage(i18n("The location '%1' is invalid.", location), - // DolphinStatusBar::Error); - //} + const QString location(url.pathOrUrl()); + if (location.isEmpty()) { + emit errorMessage(i18nc("@info:status", "The location is empty.")); + } else { + emit errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location)); + } return; } - // Only show the directory loading progress if the status bar does - // not contain another progress information. This means that - // the directory loading progress information has the lowest priority. - - // TODO: temporary deactivated due to DolphinView/DolphinViewController split - //const QString progressText(m_statusBar->progressText()); - //m_showProgress = progressText.isEmpty() || - // (progressText == i18n("Loading folder...")); - //if (m_showProgress) { - // m_statusBar->setProgressText(i18n("Loading folder...")); - // m_statusBar->setProgress(0); - //} - m_cutItemsCache.clear(); - m_blockContentsMovedSignal = true; - m_dirLister->stop(); + m_loadingDirectory = true; - bool openDir = true; - bool keepOldDirs = isColumnViewActive() && !m_initializeColumnView; - m_initializeColumnView = false; + m_dirLister->stop(); + m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags); - if (keepOldDirs) { + if (isColumnViewActive()) { + // adjusting the directory lister is not enough in the case of the + // column view, as each column has its own directory lister internally... if (reload) { - keepOldDirs = false; - - const KUrl& dirListerUrl = m_dirLister->url(); - if (dirListerUrl.isValid()) { - const KUrl::List dirs = m_dirLister->directories(); - KUrl url; - foreach(url, dirs) { - m_dirLister->updateDirectory(url); - } - openDir = false; - } - } else if (m_dirLister->directories().contains(url)) { - // The dir lister contains the directory already, so - // KDirLister::openUrl() may not been invoked twice. - m_dirLister->updateDirectory(url); - openDir = false; + m_columnView->reload(); } else { - const KUrl& dirListerUrl = m_dirLister->url(); - if ((dirListerUrl == url) || !m_dirLister->url().isParentOf(url)) { - // The current URL is not a child of the dir lister - // URL. This may happen when e. g. a bookmark has been selected - // and hence the view must be reset. - keepOldDirs = false; - } + m_columnView->showColumn(url); } } +} - if (openDir) { - m_dirLister->openUrl(url, keepOldDirs, reload); +KUrl DolphinView::viewPropertiesUrl() const +{ + if (isColumnViewActive()) { + return m_dirLister->url(); } + + return url(); } -void DolphinView::setUrl(const KUrl& url) +void DolphinView::applyViewProperties(const KUrl& url) { - if (m_controller->url() == url) { + if (isColumnViewActive() && rootUrl().isParentOf(url)) { + // The column view is active, hence don't apply the view properties + // of sub directories (represented by columns) to the view. The + // view always represents the properties of the first column. return; } - m_controller->setUrl(url); - const ViewProperties props(url); const Mode mode = props.viewMode(); - bool changeMode = (m_mode != mode); - if (changeMode && isColumnViewActive()) { - // The column view is active. Only change the - // mode if the current URL is no child of the column view. - if (m_dirLister->url().isParentOf(url)) { - changeMode = false; - } - } - - if (changeMode) { + if (m_mode != mode) { m_mode = mode; createView(); emit modeChanged(); - - if (m_mode == ColumnView) { - // The mode has been changed to the Column View. When starting the dir - // lister with DolphinView::startDirLister() it is important to give a - // hint that the dir lister may not keep the current directory - // although this is the default for showing a hierarchy. - m_initializeColumnView = true; - } } + if (itemView() == 0) { + createView(); + } + Q_ASSERT(itemView() != 0); + Q_ASSERT(m_fileItemDelegate != 0); const bool showHiddenFiles = props.showHiddenFiles(); if (showHiddenFiles != m_dirLister->showingDotFiles()) { @@ -649,19 +667,10 @@ void DolphinView::setUrl(const KUrl& url) emit showHiddenFilesChanged(); } - const bool categorized = props.categorizedSorting(); - if (categorized != categorizedSorting()) { - if (supportsCategorizedSorting()) { - Q_ASSERT(m_iconsView != 0); - if (categorized) { - Q_ASSERT(m_iconsView->itemCategorizer() == 0); - m_iconsView->setItemCategorizer(new DolphinItemCategorizer()); - } else { - KItemCategorizer* categorizer = m_iconsView->itemCategorizer(); - m_iconsView->setItemCategorizer(0); - delete categorizer; - } - } + m_storedCategorizedSorting = props.categorizedSorting(); + const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting(); + if (categorized != m_proxyModel->isCategorizedModel()) { + m_proxyModel->setCategorizedModel(categorized); emit categorizedSortingChanged(); } @@ -677,24 +686,17 @@ void DolphinView::setUrl(const KUrl& url) emit sortOrderChanged(sortOrder); } - KFileItemDelegate::AdditionalInformation info = props.additionalInfo(); - if (info != m_fileItemDelegate->additionalInformation()) { - m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation); - m_fileItemDelegate->setAdditionalInformation(info); + KFileItemDelegate::InformationList info = props.additionalInfo(); + if (info != m_fileItemDelegate->showInformation()) { + m_fileItemDelegate->setShowInformation(info); emit additionalInfoChanged(info); } const bool showPreview = props.showPreview(); - if (showPreview != m_controller->showPreview()) { - m_controller->setShowPreview(showPreview); + if (showPreview != m_showPreview) { + m_showPreview = showPreview; emit showPreviewChanged(); } - - startDirLister(url); - emit urlChanged(url); - - // TODO: temporary deactivated due to DolphinView/DolphinViewController split - //m_statusBar->clear(); } void DolphinView::changeSelection(const KFileItemList& selection) @@ -706,10 +708,10 @@ void DolphinView::changeSelection(const KFileItemList& selection) const KUrl& baseUrl = url(); KUrl url; QItemSelection new_selection; - foreach(KFileItem* item, selection) { - url = item->url().upUrl(); + foreach(const KFileItem& item, selection) { + url = item.url().upUrl(); if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) { - QModelIndex index = m_proxyModel->mapFromSource(m_dirModel->indexForItem(*item)); + QModelIndex index = m_proxyModel->mapFromSource(m_dolphinModel->indexForItem(item)); new_selection.select(index, index); } } @@ -720,10 +722,10 @@ void DolphinView::changeSelection(const KFileItemList& selection) void DolphinView::openContextMenu(const QPoint& pos) { - KFileItem* item = 0; + KFileItem item; const QModelIndex index = itemView()->indexAt(pos); - if (isValidNameIndex(index)) { + if (index.isValid() && (index.column() == DolphinModel::Name)) { item = fileItem(index); } @@ -731,28 +733,15 @@ void DolphinView::openContextMenu(const QPoint& pos) } void DolphinView::dropUrls(const KUrl::List& urls, - const QModelIndex& index, - QWidget* source) -{ - KFileItem* directory = 0; - if (isValidNameIndex(index)) { - KFileItem* item = fileItem(index); - Q_ASSERT(item != 0); - if (item->isDir()) { - // the URLs are dropped above a directory - directory = item; - } - } - - if ((directory == 0) && (source == itemView())) { - // The dropping is done into the same viewport where - // the dragging has been started. Just ignore this... - return; + const KUrl& destPath, + const KFileItem& destItem) +{ + const KUrl& destination = !destItem.isNull() && destItem.isDir() ? + destItem.url() : destPath; + const KUrl sourceDir = KUrl(urls.first().directory()); + if (sourceDir != destination) { + dropUrls(urls, destination); } - - const KUrl& destination = (directory == 0) ? - url() : directory->url(); - dropUrls(urls, destination); } void DolphinView::dropUrls(const KUrl::List& urls, @@ -763,7 +752,7 @@ void DolphinView::dropUrls(const KUrl::List& urls, void DolphinView::updateSorting(DolphinView::Sorting sorting) { - ViewProperties props(url()); + ViewProperties props(viewPropertiesUrl()); props.setSorting(sorting); m_proxyModel->setSorting(sorting); @@ -773,7 +762,7 @@ void DolphinView::updateSorting(DolphinView::Sorting sorting) void DolphinView::updateSortOrder(Qt::SortOrder order) { - ViewProperties props(url()); + ViewProperties props(viewPropertiesUrl()); props.setSortOrder(order); m_proxyModel->setSortOrder(order); @@ -781,10 +770,28 @@ void DolphinView::updateSortOrder(Qt::SortOrder order) emit sortOrderChanged(order); } +void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info) +{ + ViewProperties props(viewPropertiesUrl()); + props.setAdditionalInfo(info); + props.save(); + + m_fileItemDelegate->setShowInformation(info); + + emit additionalInfoChanged(info); + +} + void DolphinView::emitContentsMoved() { - if (!m_blockContentsMovedSignal) { - emit contentsMoved(contentsX(), contentsY()); + // only emit the contents moved signal if: + // - no directory loading is ongoing (this would reset the contents position + // always to (0, 0)) + // - if the Column View is active: the column view does an automatic + // positioning during the loading operation, which must be remembered + if (!m_loadingDirectory || isColumnViewActive()) { + const QPoint pos(contentsPosition()); + emit contentsMoved(pos.x(), pos.y()); } } @@ -795,9 +802,9 @@ void DolphinView::updateCutItems() QList::const_iterator it = m_cutItemsCache.begin(); QList::const_iterator end = m_cutItemsCache.end(); while (it != end) { - const QModelIndex index = m_dirModel->indexForUrl((*it).url); + const QModelIndex index = m_dolphinModel->indexForUrl((*it).url); if (index.isValid()) { - m_dirModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole); + m_dolphinModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole); } ++it; } @@ -807,54 +814,35 @@ void DolphinView::updateCutItems() applyCutItemEffect(); } -void DolphinView::showHoverInformation(const QModelIndex& index) +void DolphinView::showHoverInformation(const KFileItem& item) { if (hasSelection()) { return; } - const KFileItem* item = fileItem(index); - if (item != 0) { - emit requestItemInfo(item->url()); - } + emit requestItemInfo(item); } void DolphinView::clearHoverInformation() { - emit requestItemInfo(KUrl()); + emit requestItemInfo(KFileItem()); } void DolphinView::createView() { - // delete current view - QAbstractItemView* view = itemView(); - if (view != 0) { - m_topLayout->removeWidget(view); - view->close(); - if (view == m_iconsView) { - KItemCategorizer* categorizer = m_iconsView->itemCategorizer(); - m_iconsView->setItemCategorizer(0); - delete categorizer; - } - view->deleteLater(); - view = 0; - m_iconsView = 0; - m_detailsView = 0; - m_columnView = 0; - m_fileItemDelegate = 0; - } - + deleteView(); Q_ASSERT(m_iconsView == 0); Q_ASSERT(m_detailsView == 0); Q_ASSERT(m_columnView == 0); - // ... and recreate it representing the current mode + QAbstractItemView* view = 0; switch (m_mode) { - case IconsView: + case IconsView: { m_iconsView = new DolphinIconsView(this, m_controller); view = m_iconsView; break; + } case DetailsView: m_detailsView = new DolphinDetailsView(this, m_controller); @@ -873,9 +861,16 @@ void DolphinView::createView() view->setItemDelegate(m_fileItemDelegate); view->setModel(m_proxyModel); + if(m_selectionModel) + view->setSelectionModel(m_selectionModel); + else + m_selectionModel = view->selectionModel(); + + m_selectionModel->setParent(this); //Reparent the selection model. We do not want it to be deleted when we delete the model + view->setSelectionMode(QAbstractItemView::ExtendedSelection); - new KMimeTypeResolver(view, m_dirModel); + new KMimeTypeResolver(view, m_dolphinModel); m_topLayout->insertWidget(1, view); connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), @@ -886,17 +881,19 @@ void DolphinView::createView() this, SLOT(emitContentsMoved())); } -void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags) +void DolphinView::deleteView() { - 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* view = itemView(); + if (view != 0) { + m_topLayout->removeWidget(view); + view->close(); + view->deleteLater(); + view = 0; + m_iconsView = 0; + m_detailsView = 0; + m_columnView = 0; + m_fileItemDelegate = 0; + } } QAbstractItemView* DolphinView::itemView() const @@ -910,11 +907,6 @@ QAbstractItemView* DolphinView::itemView() const return m_iconsView; } -bool DolphinView::isValidNameIndex(const QModelIndex& index) const -{ - return index.isValid() && (index.column() == KDirModel::Name); -} - bool DolphinView::isCutItem(const KFileItem& item) const { const QMimeData* mimeData = QApplication::clipboard()->mimeData(); @@ -944,30 +936,286 @@ void DolphinView::applyCutItemEffect() KFileItemList::const_iterator it = items.begin(); const KFileItemList::const_iterator end = items.end(); while (it != end) { - KFileItem* item = *it; - if (isCutItem(*item)) { - const QModelIndex index = m_dirModel->indexForItem(*item); - const KFileItem* item = m_dirModel->itemForIndex(index); - const QVariant value = m_dirModel->data(index, Qt::DecorationRole); - if ((value.type() == QVariant::Icon) && (item != 0)) { + const KFileItem item = *it; + if (isCutItem(item)) { + const QModelIndex index = m_dolphinModel->indexForItem(item); + const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole); + if (value.type() == QVariant::Icon) { const QIcon icon(qvariant_cast(value)); QPixmap pixmap = icon.pixmap(128, 128); // remember current pixmap for the item to be able // to restore it when other items get cut CutItem cutItem; - cutItem.url = item->url(); + cutItem.url = item.url(); cutItem.pixmap = pixmap; m_cutItemsCache.append(cutItem); // apply icon effect to the cut item KIconEffect iconEffect; - pixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState); - m_dirModel->setData(index, QIcon(pixmap), Qt::DecorationRole); + pixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState); + m_dolphinModel->setData(index, QIcon(pixmap), Qt::DecorationRole); } } ++it; } } +KToggleAction* DolphinView::iconsModeAction(KActionCollection* actionCollection) +{ + KToggleAction* iconsView = actionCollection->add("icons"); + iconsView->setText(i18nc("@action:inmenu View Mode", "Icons")); + iconsView->setShortcut(Qt::CTRL | Qt::Key_1); + iconsView->setIcon(KIcon("fileview-icon")); + iconsView->setData(QVariant::fromValue(IconsView)); + return iconsView; +} + +KToggleAction* DolphinView::detailsModeAction(KActionCollection* actionCollection) +{ + KToggleAction* detailsView = actionCollection->add("details"); + detailsView->setText(i18nc("@action:inmenu View Mode", "Details")); + detailsView->setShortcut(Qt::CTRL | Qt::Key_2); + detailsView->setIcon(KIcon("fileview-detailed")); + detailsView->setData(QVariant::fromValue(DetailsView)); + return detailsView; +} + +KToggleAction* DolphinView::columnsModeAction(KActionCollection* actionCollection) +{ + KToggleAction* columnView = actionCollection->add("columns"); + columnView->setText(i18nc("@action:inmenu View Mode", "Columns")); + columnView->setShortcut(Qt::CTRL | Qt::Key_3); + columnView->setIcon(KIcon("fileview-column")); + columnView->setData(QVariant::fromValue(ColumnView)); + return columnView; +} + +QString DolphinView::currentViewModeActionName() const +{ + switch (m_mode) { + case DolphinView::IconsView: + return "icons"; + case DolphinView::DetailsView: + return "details"; + case DolphinView::ColumnView: + return "columns"; + } + return QString(); // can't happen +} + +void DolphinView::renameSelectedItems() +{ + const KFileItemList items = selectedItems(); + if (items.count() > 1) { + // More than one item has been selected for renaming. Open + // a rename dialog and rename all items afterwards. + RenameDialog dialog(this, items); + if (dialog.exec() == QDialog::Rejected) { + return; + } + + const QString newName = dialog.newName(); + if (newName.isEmpty()) { + emit errorMessage(dialog.errorString()); + } else { + // TODO: check how this can be integrated into KonqFileUndoManager/KonqOperations + // as one operation instead of n rename operations like it is done now... + Q_ASSERT(newName.contains('#')); + + // iterate through all selected items and rename them... + const int replaceIndex = newName.indexOf('#'); + Q_ASSERT(replaceIndex >= 0); + int index = 1; + + KFileItemList::const_iterator it = items.begin(); + const KFileItemList::const_iterator end = items.end(); + while (it != end) { + const KUrl& oldUrl = (*it).url(); + QString number; + number.setNum(index++); + + QString name(newName); + name.replace(replaceIndex, 1, number); + + if (oldUrl.fileName() != name) { + KUrl newUrl = oldUrl; + newUrl.setFileName(name); + KonqOperations::rename(this, oldUrl, newUrl); + emit doingOperation(KonqFileUndoManager::RENAME); + } + ++it; + } + } + } else { + // Only one item has been selected for renaming. Use the custom + // renaming mechanism from the views. + Q_ASSERT(items.count() == 1); + + // TODO: Think about using KFileItemDelegate as soon as it supports editing. + // Currently the RenameDialog is used, but I'm not sure whether inline renaming + // is a benefit for the user at all -> let's wait for some input first... + RenameDialog dialog(this, items); + if (dialog.exec() == QDialog::Rejected) { + return; + } + + const QString& newName = dialog.newName(); + if (newName.isEmpty()) { + emit errorMessage(dialog.errorString()); + } else { + const KUrl& oldUrl = items.first().url(); + KUrl newUrl = oldUrl; + newUrl.setFileName(newName); + KonqOperations::rename(this, oldUrl, newUrl); + emit doingOperation(KonqFileUndoManager::RENAME); + } + } +} + +void DolphinView::trashSelectedItems() +{ + emit doingOperation(KonqFileUndoManager::TRASH); + KonqOperations::del(this, KonqOperations::TRASH, selectedUrls()); +} + +void DolphinView::deleteSelectedItems() +{ + const KUrl::List list = selectedUrls(); + const bool del = KonqOperations::askDeleteConfirmation(list, + KonqOperations::DEL, + KonqOperations::DEFAULT_CONFIRMATION, + this); + + if (del) { + KIO::Job* job = KIO::del(list); + connect(job, SIGNAL(result(KJob*)), + this, SLOT(slotDeleteFileFinished(KJob*))); + } +} + +void DolphinView::slotDeleteFileFinished(KJob* job) +{ + if (job->error() == 0) { + emit operationCompletedMessage(i18nc("@info:status", "Delete operation completed.")); + } else { + emit errorMessage(job->errorString()); + } +} + +void DolphinView::cutSelectedItems() +{ + QMimeData* mimeData = new QMimeData(); + const KUrl::List kdeUrls = selectedUrls(); + const KUrl::List mostLocalUrls; + KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true); + QApplication::clipboard()->setMimeData(mimeData); +} + +void DolphinView::copySelectedItems() +{ + QMimeData* mimeData = new QMimeData(); + const KUrl::List kdeUrls = selectedUrls(); + const KUrl::List mostLocalUrls; + KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false); + QApplication::clipboard()->setMimeData(mimeData); +} + +void DolphinView::paste() +{ + QClipboard* clipboard = QApplication::clipboard(); + const QMimeData* mimeData = clipboard->mimeData(); + + const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData); + + // per default the pasting is done into the current Url of the view + KUrl destUrl(url()); + + // check whether the pasting should be done into a selected directory + const KUrl::List selectedUrls = this->selectedUrls(); + if (selectedUrls.count() == 1) { + const KFileItem fileItem(S_IFDIR, + KFileItem::Unknown, + selectedUrls.first(), + true); + if (fileItem.isDir()) { + // only one item is selected which is a directory, hence paste + // into this directory + destUrl = selectedUrls.first(); + } + } + + if (KonqMimeData::decodeIsCutSelection(mimeData)) { + KonqOperations::copy(this, KonqOperations::MOVE, sourceUrls, destUrl); + emit doingOperation(KonqFileUndoManager::MOVE); + clipboard->clear(); + } else { + KonqOperations::copy(this, KonqOperations::COPY, sourceUrls, destUrl); + emit doingOperation(KonqFileUndoManager::COPY); + } +} + +QPair DolphinView::pasteInfo() const +{ + QPair ret; + QClipboard* clipboard = QApplication::clipboard(); + const QMimeData* mimeData = clipboard->mimeData(); + + KUrl::List urls = KUrl::List::fromMimeData(mimeData); + if (!urls.isEmpty()) { + ret.first = true; + ret.second = i18ncp("@action:inmenu", "Paste One File", "Paste %1 Files", urls.count()); + } else { + ret.first = false; + ret.second = i18nc("@action:inmenu", "Paste"); + } + + if (ret.first) { + const KUrl::List urls = selectedUrls(); + const uint count = urls.count(); + if (count > 1) { + // pasting should not be allowed when more than one file + // is selected + ret.first = false; + } else if (count == 1) { + // Only one file is selected. Pasting is only allowed if this + // file is a directory. + // TODO: this doesn't work with remote protocols; instead we need a + // m_activeViewContainer->selectedFileItems() to get the real KFileItems + const KFileItem fileItem(S_IFDIR, + KFileItem::Unknown, + urls.first(), + true); + ret.first = fileItem.isDir(); + } + } + return ret; +} + +KAction* DolphinView::createRenameAction(KActionCollection* collection) +{ + KAction* rename = collection->addAction("rename"); + rename->setText(i18nc("@action:inmenu File", "Rename...")); + rename->setShortcut(Qt::Key_F2); + return rename; +} + +KAction* DolphinView::createMoveToTrashAction(KActionCollection* collection) +{ + KAction* moveToTrash = collection->addAction("move_to_trash"); + moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash")); + moveToTrash->setIcon(KIcon("user-trash")); + moveToTrash->setShortcut(QKeySequence::Delete); + return moveToTrash; +} + +KAction* DolphinView::createDeleteAction(KActionCollection* collection) +{ + KAction* deleteAction = collection->addAction("delete"); + deleteAction->setIcon(KIcon("edit-delete")); + deleteAction->setText(i18nc("@action:inmenu File", "Delete")); + deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete); + return deleteAction; +} + #include "dolphinview.moc"