X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/cd13cc342b5d034fbba2c56c5d361ee804de1b21..11e1ee53bbd5fcce304c491a3bb0b1641cdef4f2:/src/dolphinview.cpp diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 85bc21c77..214047450 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -64,6 +64,7 @@ #include "settings/dolphinsettings.h" #include "viewproperties.h" #include "zoomlevelinfo.h" +#include "dolphindetailsviewexpander.h" /** * Helper function for sorting items with qSort() in @@ -94,6 +95,7 @@ DolphinView::DolphinView(QWidget* parent, m_selectionChangedTimer(0), m_rootUrl(), m_activeItemUrl(), + m_restoredContentsPosition(), m_createdItemUrl(), m_selectedItems(), m_newFileNames() @@ -134,8 +136,8 @@ DolphinView::DolphinView(QWidget* parent, this, SLOT(clearHoverInformation())); KDirLister* dirLister = m_viewAccessor.dirLister(); - connect(dirLister, SIGNAL(redirection(KUrl, KUrl)), - this, SIGNAL(redirection(KUrl, KUrl))); + connect(dirLister, SIGNAL(redirection(KUrl,KUrl)), + this, SLOT(slotRedirection(KUrl,KUrl))); connect(dirLister, SIGNAL(completed()), this, SLOT(slotDirListerCompleted())); connect(dirLister, SIGNAL(refreshItems(const QList>&)), @@ -154,7 +156,7 @@ DolphinView::DolphinView(QWidget* parent, this, SLOT(emitSelectionChangedSignal())); applyViewProperties(); - m_topLayout->addWidget(m_viewAccessor.itemView()); + m_topLayout->addWidget(m_viewAccessor.layoutTarget()); } DolphinView::~DolphinView() @@ -220,6 +222,10 @@ void DolphinView::setMode(Mode mode) const int oldZoomLevel = m_controller->zoomLevel(); m_mode = mode; + // remember the currently selected items, so that they will + // be restored after reloading the directory + m_selectedItems = selectedItems(); + deleteView(); const KUrl viewPropsUrl = rootUrl(); @@ -246,9 +252,7 @@ void DolphinView::setMode(Mode mode) emit modeChanged(); updateZoomLevel(oldZoomLevel); - if (m_showPreview) { - loadDirectory(viewPropsUrl); - } + loadDirectory(viewPropsUrl); } DolphinView::Mode DolphinView::mode() const @@ -283,54 +287,29 @@ bool DolphinView::supportsCategorizedSorting() const return m_viewAccessor.supportsCategorizedSorting(); } -void DolphinView::selectAll() -{ - QAbstractItemView* view = m_viewAccessor.itemView(); - // TODO: there seems to be a bug in QAbstractItemView::selectAll(); if - // the Ctrl-key is pressed (e. g. for Ctrl+A), selectAll() inverts the - // selection instead of selecting all items. This is bypassed for KDE 4.0 - // by invoking clearSelection() first. - view->clearSelection(); - view->selectAll(); -} - -void DolphinView::invertSelection() -{ - QItemSelectionModel* selectionModel = m_viewAccessor.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 m_viewAccessor.itemView()->selectionModel()->hasSelection(); + const QAbstractItemView* view = m_viewAccessor.itemView(); + return (view != 0) && view->selectionModel()->hasSelection(); } -void DolphinView::clearSelection() +void DolphinView::markUrlsAsSelected(const QList& urls) { - QItemSelectionModel* selModel = m_viewAccessor.itemView()->selectionModel(); - const QModelIndex currentIndex = selModel->currentIndex(); - selModel->setCurrentIndex(currentIndex, QItemSelectionModel::Current | - QItemSelectionModel::Clear); - m_selectedItems.clear(); + foreach (const KUrl& url, urls) { + KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + m_selectedItems.append(item); + } } KFileItemList DolphinView::selectedItems() const { + KFileItemList itemList; const QAbstractItemView* view = m_viewAccessor.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)); + if (view == 0) { + return itemList; + } const QItemSelection selection = m_viewAccessor.proxyModel()->mapSelectionToSource(view->selectionModel()->selection()); - KFileItemList itemList; const QModelIndexList indexList = selection.indexes(); foreach (const QModelIndex &index, indexList) { @@ -355,23 +334,17 @@ KUrl::List DolphinView::selectedUrls() const int DolphinView::selectedItemsCount() const { - return m_viewAccessor.itemView()->selectionModel()->selectedIndexes().count(); -} - -void DolphinView::setContentsPosition(int x, int y) -{ - QAbstractItemView* view = m_viewAccessor.itemView(); - view->horizontalScrollBar()->setValue(x); - view->verticalScrollBar()->setValue(y); + const QAbstractItemView* view = m_viewAccessor.itemView(); + if (view == 0) { + return 0; + } - m_loadingDirectory = false; + return view->selectionModel()->selectedIndexes().count(); } -QPoint DolphinView::contentsPosition() const +QItemSelectionModel* DolphinView::selectionModel() const { - const int x = m_viewAccessor.itemView()->horizontalScrollBar()->value(); - const int y = m_viewAccessor.itemView()->verticalScrollBar()->value(); - return QPoint(x, y); + return m_viewAccessor.itemView()->selectionModel(); } void DolphinView::setZoomLevel(int level) @@ -450,8 +423,16 @@ KFileItemDelegate::InformationList DolphinView::additionalInfo() const void DolphinView::reload() { + QByteArray viewState; + QDataStream saveStream(&viewState, QIODevice::WriteOnly); + saveState(saveStream); + m_selectedItems= selectedItems(); + setUrl(url()); loadDirectory(url(), true); + + QDataStream restoreStream(viewState); + restoreState(restoreStream); } void DolphinView::refresh() @@ -470,26 +451,6 @@ void DolphinView::refresh() updateZoomLevel(oldZoomLevel); } -void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl) -{ - Q_UNUSED(rootUrl); // TODO: remove after columnview-cleanup has been finished - - if (m_controller->url() == url) { - return; - } - - 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(); - - emit startedPathLoading(url); -} - void DolphinView::setNameFilter(const QString& nameFilter) { m_controller->setNameFilter(nameFilter); @@ -540,7 +501,7 @@ QString DolphinView::statusBarText() const if (folderCount + fileCount == 1) { // if only one item is selected, show the filename - const QString name = list.first().name(); + const QString name = list.first().text(); text = (folderCount == 1) ? i18nc("@info:status", "%1 selected", name) : i18nc("@info:status", "%1 selected (%2)", name, KIO::convertSize(totalFileSize)); @@ -575,29 +536,45 @@ QList DolphinView::versionControlActions(const KFileItemList& items) c void DolphinView::setUrl(const KUrl& url) { + if (m_controller->url() == url) { + return; + } + m_newFileNames.clear(); - updateView(url, KUrl()); + + 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(); + + emit startedPathLoading(url); } -void DolphinView::changeSelection(const KFileItemList& selection) +void DolphinView::selectAll() { - clearSelection(); - if (selection.isEmpty()) { - return; - } - const KUrl& baseUrl = url(); - KUrl url; - QItemSelection newSelection; - foreach(const KFileItem& item, selection) { - url = item.url().upUrl(); - if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) { - QModelIndex index = m_viewAccessor.proxyModel()->mapFromSource(m_viewAccessor.dirModel()->indexForItem(item)); - newSelection.select(index, index); - } - } - m_viewAccessor.itemView()->selectionModel()->select(newSelection, - QItemSelectionModel::ClearAndSelect - | QItemSelectionModel::Current); + m_viewAccessor.itemView()->selectAll(); +} + +void DolphinView::invertSelection() +{ + QItemSelectionModel* selectionModel = m_viewAccessor.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); +} + +void DolphinView::clearSelection() +{ + m_viewAccessor.itemView()->clearSelection(); } void DolphinView::renameSelectedItems() @@ -624,7 +601,7 @@ void DolphinView::renameSelectedItems() return; } delete dialog; - + // the selection would be invalid after renaming the items, so just clear // it before clearSelection(); @@ -827,20 +804,6 @@ void DolphinView::mouseReleaseEvent(QMouseEvent* event) setActive(true); } -void DolphinView::wheelEvent(QWheelEvent* event) -{ - if (event->modifiers() & Qt::ControlModifier) { - const int delta = event->delta(); - const int level = zoomLevel(); - if (delta > 0) { - setZoomLevel(level + 1); - } else if (delta < 0) { - setZoomLevel(level - 1); - } - event->accept(); - } -} - bool DolphinView::eventFilter(QObject* watched, QEvent* event) { switch (event->type()) { @@ -866,6 +829,24 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event) } break; + case QEvent::Wheel: + if (watched == m_viewAccessor.itemView()->viewport()) { + // Ctrl+wheel events should cause icon zooming, but not if the left mouse button is pressed + // (the user is probably trying to scroll during a selection in that case) + QWheelEvent* wheelEvent = static_cast(event); + if (wheelEvent->modifiers() & Qt::ControlModifier && !(wheelEvent->buttons() & Qt::LeftButton)) { + const int delta = wheelEvent->delta(); + const int level = zoomLevel(); + if (delta > 0) { + setZoomLevel(level + 1); + } else if (delta < 0) { + setZoomLevel(level - 1); + } + return true; + } + } + break; + default: break; } @@ -895,11 +876,16 @@ void DolphinView::triggerItem(const KFileItem& item) emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart } -void DolphinView::emitDelayedSelectionChangedSignal() +void DolphinView::slotSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected) { - // Invoke emitSelectionChangedSignal() with a delay of 300 ms. This assures - // that fast selection changes don't result in expensive operations to - // collect all file items for the signal (see DolphinView::selectedItems()). + const int count = selectedItemsCount(); + const bool selectionStateChanged = ((count > 0) && (selected.count() == count)) || + ((count == 0) && !deselected.isEmpty()); + + // If nothing has been selected before and something got selected (or if something + // was selected before and now nothing is selected) the selectionChangedSignal must + // be emitted asynchronously as fast as possible to update the edit-actions. + m_selectionChangedTimer->setInterval(selectionStateChanged ? 0 : 300); m_selectionChangedTimer->start(); } @@ -1041,6 +1027,8 @@ bool DolphinView::isTabsForFilesEnabled() const 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; } @@ -1049,6 +1037,55 @@ bool DolphinView::itemsExpandable() const return m_viewAccessor.itemsExpandable(); } +void DolphinView::restoreState(QDataStream& stream) +{ + // current item + stream >> m_activeItemUrl; + + // view position + stream >> m_restoredContentsPosition; + + // expanded folders (only relevant for the details view - will be ignored by the view in other view modes) + QSet urlsToExpand; + stream >> urlsToExpand; + const DolphinDetailsViewExpander* expander = m_viewAccessor.setExpandedUrls(urlsToExpand); + if (expander != 0) { + m_expanderActive = true; + connect (expander, SIGNAL(completed()), this, SLOT(slotLoadingCompleted())); + } + else { + m_expanderActive = false; + } +} + +void DolphinView::saveState(QDataStream& stream) +{ + // current item + KFileItem currentItem; + const QAbstractItemView* view = m_viewAccessor.itemView(); + + if (view != 0) { + const QModelIndex proxyIndex = view->currentIndex(); + const QModelIndex dirModelIndex = m_viewAccessor.proxyModel()->mapToSource(proxyIndex); + currentItem = m_viewAccessor.dirModel()->itemForIndex(dirModelIndex); + } + + KUrl currentUrl; + if (!currentItem.isNull()) { + currentUrl = currentItem.url(); + } + + stream << currentUrl; + + // view position + const int x = view->horizontalScrollBar()->value(); + const int y = view->verticalScrollBar()->value(); + stream << QPoint(x, y); + + // expanded folders (only relevant for the details view - the set will be empty in other view modes) + stream << m_viewAccessor.expandedUrls(); +} + void DolphinView::observeCreatedItem(const KUrl& url) { m_createdItemUrl = url; @@ -1069,22 +1106,6 @@ void DolphinView::selectAndScrollToCreatedItem() m_createdItemUrl = KUrl(); } -void DolphinView::restoreSelection() -{ - disconnect(m_viewAccessor.dirLister(), SIGNAL(completed()), this, SLOT(restoreSelection())); - changeSelection(m_selectedItems); -} - -void DolphinView::emitContentsMoved() -{ - // only emit the contents moved signal if no directory loading is ongoing - // (this would reset the contents position always to (0, 0)) - if (!m_loadingDirectory) { - const QPoint pos(contentsPosition()); - emit contentsMoved(pos.x(), pos.y()); - } -} - void DolphinView::showHoverInformation(const KFileItem& item) { emit requestItemInfo(item); @@ -1112,19 +1133,8 @@ void DolphinView::slotRequestUrlChange(const KUrl& url) void DolphinView::slotDirListerCompleted() { - if (!m_activeItemUrl.isEmpty()) { - // assure that the current item remains visible - const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_activeItemUrl); - if (dirIndex.isValid()) { - const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex); - QAbstractItemView* view = m_viewAccessor.itemView(); - const bool clearSelection = !hasSelection(); - view->setCurrentIndex(proxyIndex); - if (clearSelection) { - view->clearSelection(); - } - m_activeItemUrl.clear(); - } + if (!m_expanderActive) { + slotLoadingCompleted(); } if (!m_newFileNames.isEmpty()) { @@ -1146,6 +1156,48 @@ void DolphinView::slotDirListerCompleted() } } +void DolphinView::slotLoadingCompleted() +{ + m_expanderActive = false; + m_loadingDirectory = false; + + if (!m_activeItemUrl.isEmpty()) { + // assure that the current item remains visible + const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_activeItemUrl); + if (dirIndex.isValid()) { + const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex); + QAbstractItemView* view = m_viewAccessor.itemView(); + const bool clearSelection = !hasSelection(); + view->setCurrentIndex(proxyIndex); + if (clearSelection) { + view->clearSelection(); + } + m_activeItemUrl.clear(); + } + } + + if (!m_selectedItems.isEmpty()) { + const KUrl& baseUrl = url(); + KUrl url; + QItemSelection newSelection; + foreach(const KFileItem& item, m_selectedItems) { + url = item.url().upUrl(); + if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) { + QModelIndex index = m_viewAccessor.proxyModel()->mapFromSource(m_viewAccessor.dirModel()->indexForItem(item)); + newSelection.select(index, index); + } + } + m_viewAccessor.itemView()->selectionModel()->select(newSelection, + QItemSelectionModel::ClearAndSelect + | QItemSelectionModel::Current); + m_selectedItems.clear(); + } + + // Restore the contents position. This has to be done using a Qt::QueuedConnection + // because the view might not be in its final state yet. + QMetaObject::invokeMethod(this, "restoreContentsPosition", Qt::QueuedConnection); +} + void DolphinView::slotRefreshItems() { if (m_assureVisibleCurrentIndex) { @@ -1167,13 +1219,18 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload) } m_loadingDirectory = true; + m_expanderActive = false; - if (reload) { - m_selectedItems = selectedItems(); - connect(m_viewAccessor.dirLister(), SIGNAL(completed()), this, SLOT(restoreSelection())); - } + KDirLister* dirLister = m_viewAccessor.dirLister(); + dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags); - m_viewAccessor.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() @@ -1260,6 +1317,7 @@ void DolphinView::applyViewProperties() void DolphinView::createView() { deleteView(); + Q_ASSERT(m_viewAccessor.itemView() == 0); m_viewAccessor.createView(this, m_controller, m_mode); @@ -1269,8 +1327,6 @@ void DolphinView::createView() view->viewport()->installEventFilter(this); m_controller->setItemView(view); - connect(m_controller, SIGNAL(selectionChanged()), - this, SLOT(emitDelayedSelectionChangedSignal())); // 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 @@ -1281,11 +1337,8 @@ void DolphinView::createView() m_selectionModel = view->selectionModel(); } m_selectionModel->setParent(this); - - connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(emitContentsMoved())); - connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(emitContentsMoved())); + connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), + this, SLOT(slotSelectionChanged(const QItemSelection&, const QItemSelection&))); setFocusProxy(m_viewAccessor.layoutTarget()); m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget()); @@ -1305,6 +1358,7 @@ void DolphinView::deleteView() m_topLayout->removeWidget(view); view->close(); + // disconnect all signal/slots disconnect(view); m_controller->disconnect(view); view->disconnect(); @@ -1416,8 +1470,9 @@ void DolphinView::ViewAccessor::deleteView() m_iconsView = 0; m_detailsView = 0; - if (m_columnsContainer) + if (m_columnsContainer != 0) { m_columnsContainer->deleteLater(); + } m_columnsContainer = 0; } @@ -1427,6 +1482,11 @@ 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 @@ -1464,6 +1524,11 @@ 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; @@ -1474,6 +1539,27 @@ bool DolphinView::ViewAccessor::itemsExpandable() const return (m_detailsView != 0) && m_detailsView->itemsExpandable(); } + +QSet DolphinView::ViewAccessor::expandedUrls() const +{ + if (m_detailsView != 0) { + return m_detailsView->expandedUrls(); + } + + return QSet(); +} + +const DolphinDetailsViewExpander* DolphinView::ViewAccessor::setExpandedUrls(const QSet& urlsToExpand) +{ + if ((m_detailsView != 0) && m_detailsView->itemsExpandable() && !urlsToExpand.isEmpty()) { + m_detailsViewExpander = new DolphinDetailsViewExpander(m_detailsView, urlsToExpand); + return m_detailsViewExpander; + } + else { + return 0; + } +} + bool DolphinView::ViewAccessor::reloadOnAdditionalInfoChange() const { // the details view requires no reloading of the directory, as it maps @@ -1499,4 +1585,26 @@ KDirLister* DolphinView::ViewAccessor::dirLister() const return dirModel()->dirLister(); } +void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) +{ + emit redirection(oldUrl, newUrl); + m_controller->redirectToUrl(newUrl); // #186947 +} + +void DolphinView::restoreContentsPosition() +{ + if (!m_restoredContentsPosition.isNull()) { + const int x = m_restoredContentsPosition.x(); + const int y = m_restoredContentsPosition.y(); + m_restoredContentsPosition = QPoint(); + + QAbstractItemView* view = m_viewAccessor.itemView(); + Q_ASSERT(view != 0); + view->horizontalScrollBar()->setValue(x); + view->verticalScrollBar()->setValue(y); + + m_loadingDirectory = false; + } +} + #include "dolphinview.moc"