X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e5eae108ca4511be9dae5f8bb4a4e1fbb0d89c7a..873bcbc7b7bffa20c0de588ee5bde7dcbb717235:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 214047450..e73766d24 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -49,9 +49,10 @@ #include #include +#include "additionalinfoaccessor.h" #include "dolphinmodel.h" #include "dolphincolumnviewcontainer.h" -#include "dolphincontroller.h" +#include "dolphinviewcontroller.h" #include "dolphindetailsview.h" #include "dolphinfileitemdelegate.h" #include "dolphinnewmenuobserver.h" @@ -62,6 +63,7 @@ #include "draganddrophelper.h" #include "renamedialog.h" #include "settings/dolphinsettings.h" +#include "viewmodecontroller.h" #include "viewproperties.h" #include "zoomlevelinfo.h" #include "dolphindetailsviewexpander.h" @@ -81,7 +83,6 @@ DolphinView::DolphinView(QWidget* parent, QWidget(parent), m_active(true), m_showPreview(false), - m_loadingDirectory(false), m_storedCategorizedSorting(false), m_tabsForFiles(false), m_isContextMenuOpen(false), @@ -89,7 +90,8 @@ DolphinView::DolphinView(QWidget* parent, m_assureVisibleCurrentIndex(false), m_mode(DolphinView::IconsView), m_topLayout(0), - m_controller(0), + m_dolphinViewController(0), + m_viewModeController(0), m_viewAccessor(proxyModel), m_selectionModel(0), m_selectionChangedTimer(0), @@ -104,36 +106,38 @@ DolphinView::DolphinView(QWidget* parent, m_topLayout->setSpacing(0); m_topLayout->setMargin(0); - m_controller = new DolphinController(this); - m_controller->setUrl(url); + m_dolphinViewController = new DolphinViewController(this); - connect(m_controller, SIGNAL(urlChanged(const KUrl&)), + m_viewModeController = new ViewModeController(this); + m_viewModeController->setUrl(url); + + connect(m_viewModeController, SIGNAL(urlChanged(const KUrl&)), this, SIGNAL(urlChanged(const KUrl&))); - connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)), - this, SLOT(slotRequestUrlChange(const KUrl&))); - connect(m_controller, SIGNAL(requestContextMenu(const QPoint&, const QList&)), + connect(m_dolphinViewController, SIGNAL(requestContextMenu(const QPoint&, const QList&)), this, SLOT(openContextMenu(const QPoint&, const QList&))); - connect(m_controller, SIGNAL(urlsDropped(const KFileItem&, const KUrl&, QDropEvent*)), + connect(m_dolphinViewController, SIGNAL(urlsDropped(const KFileItem&, const KUrl&, QDropEvent*)), this, SLOT(dropUrls(const KFileItem&, const KUrl&, QDropEvent*))); - connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)), + connect(m_dolphinViewController, SIGNAL(sortingChanged(DolphinView::Sorting)), this, SLOT(updateSorting(DolphinView::Sorting))); - connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)), + connect(m_dolphinViewController, SIGNAL(sortOrderChanged(Qt::SortOrder)), this, SLOT(updateSortOrder(Qt::SortOrder))); - connect(m_controller, SIGNAL(sortFoldersFirstChanged(bool)), + connect(m_dolphinViewController, SIGNAL(sortFoldersFirstChanged(bool)), this, SLOT(updateSortFoldersFirst(bool))); - connect(m_controller, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)), + connect(m_dolphinViewController, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)), this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&))); - connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)), + connect(m_dolphinViewController, SIGNAL(itemTriggered(const KFileItem&)), this, SLOT(triggerItem(const KFileItem&))); - connect(m_controller, SIGNAL(tabRequested(const KUrl&)), + connect(m_dolphinViewController, SIGNAL(tabRequested(const KUrl&)), this, SIGNAL(tabRequested(const KUrl&))); - connect(m_controller, SIGNAL(activated()), + connect(m_dolphinViewController, SIGNAL(activated()), this, SLOT(activate())); - connect(m_controller, SIGNAL(itemEntered(const KFileItem&)), + connect(m_dolphinViewController, SIGNAL(itemEntered(const KFileItem&)), this, SLOT(showHoverInformation(const KFileItem&))); - connect(m_controller, SIGNAL(viewportEntered()), + connect(m_dolphinViewController, SIGNAL(viewportEntered()), this, SLOT(clearHoverInformation())); + connect(m_dolphinViewController, SIGNAL(urlChangeRequested(KUrl)), + m_viewModeController, SLOT(setUrl(KUrl))); KDirLister* dirLister = m_viewAccessor.dirLister(); connect(dirLister, SIGNAL(redirection(KUrl,KUrl)), @@ -163,9 +167,9 @@ DolphinView::~DolphinView() { } -const KUrl& DolphinView::url() const +KUrl DolphinView::url() const { - return m_controller->url(); + return m_viewModeController->url(); } KUrl DolphinView::rootUrl() const @@ -205,7 +209,7 @@ void DolphinView::setActive(bool active) emit activated(); } - m_controller->indicateActivationChange(active); + m_viewModeController->indicateActivationChange(active); } bool DolphinView::isActive() const @@ -219,7 +223,7 @@ void DolphinView::setMode(Mode mode) return; // the wished mode is already set } - const int oldZoomLevel = m_controller->zoomLevel(); + const int oldZoomLevel = m_viewModeController->zoomLevel(); m_mode = mode; // remember the currently selected items, so that they will @@ -356,14 +360,14 @@ void DolphinView::setZoomLevel(int level) } if (level != zoomLevel()) { - m_controller->setZoomLevel(level); + m_viewModeController->setZoomLevel(level); emit zoomLevelChanged(level); } } int DolphinView::zoomLevel() const { - return m_controller->zoomLevel(); + return m_viewModeController->zoomLevel(); } void DolphinView::setSorting(Sorting sorting) @@ -440,7 +444,7 @@ void DolphinView::refresh() m_ignoreViewProperties = false; const bool oldActivationState = m_active; - const int oldZoomLevel = m_controller->zoomLevel(); + const int oldZoomLevel = m_viewModeController->zoomLevel(); m_active = true; createView(); @@ -453,7 +457,7 @@ void DolphinView::refresh() void DolphinView::setNameFilter(const QString& nameFilter) { - m_controller->setNameFilter(nameFilter); + m_viewModeController->setNameFilter(nameFilter); } void DolphinView::calculateItemCount(int& fileCount, @@ -531,27 +535,35 @@ QString DolphinView::statusBarText() const QList DolphinView::versionControlActions(const KFileItemList& items) const { - return m_controller->versionControlActions(items); + return m_dolphinViewController->versionControlActions(items); } void DolphinView::setUrl(const KUrl& url) { - if (m_controller->url() == url) { - return; - } + if (m_viewModeController->url() != url) { + m_newFileNames.clear(); - m_newFileNames.clear(); + m_viewModeController->setUrl(url); // emits urlChanged, which we forward + m_viewAccessor.prepareUrlChange(url); + applyViewProperties(); + loadDirectory(url); - m_controller->setUrl(url); // emits urlChanged, which we forward - m_viewAccessor.prepareUrlChange(url); - applyViewProperties(); - loadDirectory(url); + // When changing the URL there is no need to keep the version + // data of the previous URL. + m_viewAccessor.dirModel()->clearVersionData(); - // When changing the URL there is no need to keep the version - // data of the previous URL. - m_viewAccessor.dirModel()->clearVersionData(); + emit startedPathLoading(url); + } - emit startedPathLoading(url); + // the selection model might have changed in the case of a column view + QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel(); + if (m_selectionModel != selectionModel) { + disconnect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); + m_selectionModel = selectionModel; + connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); + } } void DolphinView::selectAll() @@ -721,7 +733,7 @@ void DolphinView::setShowPreview(bool show) props.setShowPreview(show); m_showPreview = show; - const int oldZoomLevel = m_controller->zoomLevel(); + const int oldZoomLevel = m_viewModeController->zoomLevel(); emit showPreviewChanged(); // Enabling or disabling the preview might change the icon size of the view. @@ -809,7 +821,7 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event) switch (event->type()) { case QEvent::FocusIn: if (watched == m_viewAccessor.itemView()) { - m_controller->requestActivation(); + m_dolphinViewController->requestActivation(); } break; @@ -960,53 +972,20 @@ void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& void DolphinView::updateAdditionalInfoActions(KActionCollection* collection) { + const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance(); + + const KFileItemDelegate::InformationList checkedInfos = m_viewAccessor.itemDelegate()->showInformation(); + const KFileItemDelegate::InformationList infos = infoAccessor.keys(); + const bool enable = (m_mode == DolphinView::DetailsView) || (m_mode == DolphinView::IconsView); - QAction* showSizeInfo = collection->action("show_size_info"); - QAction* showDateInfo = collection->action("show_date_info"); - QAction* showPermissionsInfo = collection->action("show_permissions_info"); - QAction* showOwnerInfo = collection->action("show_owner_info"); - QAction* showGroupInfo = collection->action("show_group_info"); - QAction* showMimeInfo = collection->action("show_mime_info"); - - showSizeInfo->setChecked(false); - showDateInfo->setChecked(false); - showPermissionsInfo->setChecked(false); - showOwnerInfo->setChecked(false); - showGroupInfo->setChecked(false); - showMimeInfo->setChecked(false); - - showSizeInfo->setEnabled(enable); - showDateInfo->setEnabled(enable); - showPermissionsInfo->setEnabled(enable); - showOwnerInfo->setEnabled(enable); - showGroupInfo->setEnabled(enable); - showMimeInfo->setEnabled(enable); - - foreach (KFileItemDelegate::Information info, m_viewAccessor.itemDelegate()->showInformation()) { - switch (info) { - case KFileItemDelegate::Size: - showSizeInfo->setChecked(true); - break; - case KFileItemDelegate::ModificationTime: - showDateInfo->setChecked(true); - break; - case KFileItemDelegate::Permissions: - showPermissionsInfo->setChecked(true); - break; - case KFileItemDelegate::Owner: - showOwnerInfo->setChecked(true); - break; - case KFileItemDelegate::OwnerAndGroup: - showGroupInfo->setChecked(true); - break; - case KFileItemDelegate::FriendlyMimeType: - showMimeInfo->setChecked(true); - break; - default: - break; - } + foreach (const KFileItemDelegate::Information& info, infos) { + const QString name = infoAccessor.actionCollectionName(info, AdditionalInfoAccessor::AdditionalInfoType); + QAction* action = collection->action(name); + Q_ASSERT(action != 0); + action->setEnabled(enable); + action->setChecked(checkedInfos.contains(info)); } } @@ -1025,13 +1004,6 @@ bool DolphinView::isTabsForFilesEnabled() const return m_tabsForFiles; } -void DolphinView::activateItem(const KUrl& url) -{ - // TODO: If DolphinViewContainer uses DolphinView::restoreState(...) to restore the - // view state in KDE 4.5, this function can be removed. - m_activeItemUrl = url; -} - bool DolphinView::itemsExpandable() const { return m_viewAccessor.itemsExpandable(); @@ -1125,12 +1097,6 @@ void DolphinView::slotDeleteFileFinished(KJob* job) } } -void DolphinView::slotRequestUrlChange(const KUrl& url) -{ - emit requestUrlChange(url); - m_controller->setUrl(url); -} - void DolphinView::slotDirListerCompleted() { if (!m_expanderActive) { @@ -1139,7 +1105,8 @@ void DolphinView::slotDirListerCompleted() if (!m_newFileNames.isEmpty()) { // select all newly added items created by a paste operation or - // a drag & drop operation + // a drag & drop operation, and clear the previous selection + m_viewAccessor.itemView()->clearSelection(); const int rowCount = m_viewAccessor.proxyModel()->rowCount(); QItemSelection selection; for (int row = 0; row < rowCount; ++row) { @@ -1159,7 +1126,6 @@ void DolphinView::slotDirListerCompleted() void DolphinView::slotLoadingCompleted() { m_expanderActive = false; - m_loadingDirectory = false; if (!m_activeItemUrl.isEmpty()) { // assure that the current item remains visible @@ -1218,19 +1184,8 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload) return; } - m_loadingDirectory = true; - m_expanderActive = false; - KDirLister* dirLister = m_viewAccessor.dirLister(); dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags); - - KDirLister* rootDirLister = m_viewAccessor.rootDirLister(); - if (dirLister != rootDirLister) { - // In the case of the column view the root directory lister can be different. Assure - // that it gets synchronized (clients from DolphinView are not aware that internally - // different directory listers are used). - rootDirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags); - } } void DolphinView::applyViewProperties() @@ -1243,7 +1198,7 @@ void DolphinView::applyViewProperties() const Mode mode = props.viewMode(); if (m_mode != mode) { - const int oldZoomLevel = m_controller->zoomLevel(); + const int oldZoomLevel = m_viewModeController->zoomLevel(); m_mode = mode; createView(); @@ -1297,7 +1252,7 @@ void DolphinView::applyViewProperties() const bool showPreview = props.showPreview(); if (showPreview != m_showPreview) { m_showPreview = showPreview; - const int oldZoomLevel = m_controller->zoomLevel(); + const int oldZoomLevel = m_viewModeController->zoomLevel(); emit showPreviewChanged(); // Enabling or disabling the preview might change the icon size of the view. @@ -1319,14 +1274,14 @@ void DolphinView::createView() deleteView(); Q_ASSERT(m_viewAccessor.itemView() == 0); - m_viewAccessor.createView(this, m_controller, m_mode); + m_viewAccessor.createView(this, m_dolphinViewController, m_viewModeController, m_mode); QAbstractItemView* view = m_viewAccessor.itemView(); Q_ASSERT(view != 0); view->installEventFilter(this); view->viewport()->installEventFilter(this); - m_controller->setItemView(view); + m_dolphinViewController->setItemView(view); // When changing the view mode, the selection is lost due to reinstantiating // a new item view with a custom selection model. Pass the ownership of the @@ -1337,8 +1292,8 @@ void DolphinView::createView() m_selectionModel = view->selectionModel(); } m_selectionModel->setParent(this); - connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), - this, SLOT(slotSelectionChanged(const QItemSelection&, const QItemSelection&))); + connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); setFocusProxy(m_viewAccessor.layoutTarget()); m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget()); @@ -1360,7 +1315,7 @@ void DolphinView::deleteView() // disconnect all signal/slots disconnect(view); - m_controller->disconnect(view); + m_viewModeController->disconnect(view); view->disconnect(); m_viewAccessor.deleteView(); @@ -1377,7 +1332,7 @@ void DolphinView::updateZoomLevel(int oldZoomLevel) { const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize()); if (oldZoomLevel != newZoomLevel) { - m_controller->setZoomLevel(newZoomLevel); + m_viewModeController->setZoomLevel(newZoomLevel); emit zoomLevelChanged(newZoomLevel); } } @@ -1423,22 +1378,31 @@ DolphinView::ViewAccessor::~ViewAccessor() } void DolphinView::ViewAccessor::createView(QWidget* parent, - DolphinController* controller, + DolphinViewController* dolphinViewController, + const ViewModeController* viewModeController, Mode mode) { Q_ASSERT(itemView() == 0); switch (mode) { case IconsView: - m_iconsView = new DolphinIconsView(parent, controller, m_proxyModel); + m_iconsView = new DolphinIconsView(parent, + dolphinViewController, + viewModeController, + m_proxyModel); break; case DetailsView: - m_detailsView = new DolphinDetailsView(parent, controller, m_proxyModel); + m_detailsView = new DolphinDetailsView(parent, + dolphinViewController, + viewModeController, + m_proxyModel); break; case ColumnView: - m_columnsContainer = new DolphinColumnViewContainer(parent, controller); + m_columnsContainer = new DolphinColumnViewContainer(parent, + dolphinViewController, + viewModeController); break; default: @@ -1482,11 +1446,6 @@ void DolphinView::ViewAccessor::prepareUrlChange(const KUrl& url) if (m_columnsContainer != 0) { m_columnsContainer->showColumn(url); } - - if(!m_detailsViewExpander.isNull()) { - // stop expanding items in the current folder - m_detailsViewExpander->stop(); - } } QAbstractItemView* DolphinView::ViewAccessor::itemView() const @@ -1524,11 +1483,6 @@ KUrl DolphinView::ViewAccessor::rootUrl() const return (m_columnsContainer != 0) ? m_columnsContainer->rootUrl() : KUrl(); } -KDirLister* DolphinView::ViewAccessor::rootDirLister() const -{ - return static_cast(m_proxyModel->sourceModel())->dirLister(); -} - bool DolphinView::ViewAccessor::supportsCategorizedSorting() const { return m_iconsView != 0; @@ -1552,6 +1506,11 @@ QSet DolphinView::ViewAccessor::expandedUrls() const const DolphinDetailsViewExpander* DolphinView::ViewAccessor::setExpandedUrls(const QSet& urlsToExpand) { if ((m_detailsView != 0) && m_detailsView->itemsExpandable() && !urlsToExpand.isEmpty()) { + // Check if another expander is already active and stop it if necessary. + if(!m_detailsViewExpander.isNull()) { + m_detailsViewExpander->stop(); + } + m_detailsViewExpander = new DolphinDetailsViewExpander(m_detailsView, urlsToExpand); return m_detailsViewExpander; } @@ -1587,8 +1546,10 @@ KDirLister* DolphinView::ViewAccessor::dirLister() const void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) { - emit redirection(oldUrl, newUrl); - m_controller->redirectToUrl(newUrl); // #186947 + if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash)) { + emit redirection(oldUrl, newUrl); + m_controller->redirectToUrl(newUrl); // #186947 + } } void DolphinView::restoreContentsPosition() @@ -1602,8 +1563,6 @@ void DolphinView::restoreContentsPosition() Q_ASSERT(view != 0); view->horizontalScrollBar()->setValue(x); view->verticalScrollBar()->setValue(y); - - m_loadingDirectory = false; } }