X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/428b3d17e74e00e72bbf7c0048fd9809402690fa..d3496b12310d9fec0e52e537c341e87fcaa2f8b5:/src/views/dolphinview.cpp diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index e6207c90c..4ab16e052 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2009 by Peter Penz * + * Copyright (C) 2006-2009 by Peter Penz * * Copyright (C) 2006 by Gregor Kališnik * * * * This program is free software; you can redistribute it and/or modify * @@ -29,25 +29,27 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include +#include +#include #include "additionalinfoaccessor.h" +#include "dolphindirlister.h" #include "dolphinmodel.h" #include "dolphincolumnviewcontainer.h" #include "dolphinviewcontroller.h" @@ -66,9 +68,7 @@ #include "zoomlevelinfo.h" #include "dolphindetailsviewexpander.h" -DolphinView::DolphinView(QWidget* parent, - const KUrl& url, - DolphinSortFilterProxyModel* proxyModel) : +DolphinView::DolphinView(const KUrl& url, QWidget* parent) : QWidget(parent), m_active(true), m_showPreview(false), @@ -76,11 +76,13 @@ DolphinView::DolphinView(QWidget* parent, m_tabsForFiles(false), m_isContextMenuOpen(false), m_assureVisibleCurrentIndex(false), + m_expanderActive(false), + m_isFolderWritable(true), m_mode(DolphinView::IconsView), m_topLayout(0), m_dolphinViewController(0), m_viewModeController(0), - m_viewAccessor(proxyModel), + m_viewAccessor(), m_selectionChangedTimer(0), m_activeItemUrl(), m_restoredContentsPosition(), @@ -123,15 +125,7 @@ DolphinView::DolphinView(QWidget* parent, 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)), - this, SLOT(slotRedirection(KUrl,KUrl))); - connect(dirLister, SIGNAL(completed()), - this, SLOT(slotDirListerCompleted())); - connect(dirLister, SIGNAL(refreshItems(const QList>&)), - this, SLOT(slotRefreshItems())); + this, SLOT(slotUrlChangeRequested(KUrl))); // When a new item has been created by the "Create New..." menu, the item should // get selected and it must be assured that the item will get visible. As the @@ -177,9 +171,7 @@ void DolphinView::setActive(bool active) m_active = active; QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color(); - if (active) { - emitSelectionChangedSignal(); - } else { + if (!active) { color.setAlpha(150); } @@ -193,6 +185,8 @@ void DolphinView::setActive(bool active) if (active) { m_viewAccessor.itemView()->setFocus(); emit activated(); + emitSelectionChangedSignal(); + emit writeStateChanged(m_isFolderWritable); } m_viewModeController->indicateActivationChange(active); @@ -216,6 +210,7 @@ void DolphinView::setMode(Mode mode) // be restored after reloading the directory m_selectedItems = selectedItems(); + const bool hasFocus = m_viewAccessor.itemView()->hasFocus(); deleteView(); const KUrl viewPropsUrl = rootUrl(); @@ -223,6 +218,10 @@ void DolphinView::setMode(Mode mode) props.setViewMode(m_mode); createView(); + if (hasFocus) { + m_viewAccessor.itemView()->setFocus(); + } + // the file item delegate has been recreated, apply the current // additional information manually const KFileItemDelegate::InformationList infoList = props.additionalInfo(); @@ -277,6 +276,11 @@ bool DolphinView::supportsCategorizedSorting() const return m_viewAccessor.supportsCategorizedSorting(); } +KFileItem DolphinView::rootItem() const +{ + return m_viewAccessor.dirLister()->rootItem(); +} + KFileItemList DolphinView::items() const { return m_viewAccessor.dirLister()->items(); @@ -286,7 +290,7 @@ KFileItemList DolphinView::selectedItems() const { KFileItemList itemList; const QAbstractItemView* view = m_viewAccessor.itemView(); - if (view == 0) { + if (!view) { return itemList; } @@ -306,7 +310,7 @@ KFileItemList DolphinView::selectedItems() const int DolphinView::selectedItemsCount() const { const QAbstractItemView* view = m_viewAccessor.itemView(); - if (view == 0) { + if (!view) { return 0; } @@ -442,6 +446,11 @@ void DolphinView::setNameFilter(const QString& nameFilter) m_viewModeController->setNameFilter(nameFilter); } +QString DolphinView::nameFilter() const +{ + return m_viewModeController->nameFilter(); +} + void DolphinView::calculateItemCount(int& fileCount, int& folderCount, KIO::filesize_t& totalFileSize) const @@ -526,30 +535,25 @@ void DolphinView::setUrl(const KUrl& url) return; } - // The selection model might change in the case of the column view. Disconnect - // from the current selection model and reconnect later after the URL switch. const bool hadSelection = hasSelection(); - QAbstractItemView* view = m_viewAccessor.itemView(); - disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), - this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); + + // The selection model and directory lister might change in the case of the column view: + disconnectViewAccessor(); m_newFileNames.clear(); m_viewModeController->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); + // Reconnect to the (probably) new selection model and directory lister + connectViewAccessor(); + loadDirectory(url); - // Reconnect to the (probably) new selection model - view = m_viewAccessor.itemView(); - connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), - this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); if (hadSelection || hasSelection()) { emitSelectionChangedSignal(); } @@ -562,15 +566,23 @@ void DolphinView::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); + // Implementation note: Using selectionModel->select(selection, QItemSelectionModel::Toggle) does not + // work, as QItemSelectionModel::hasSelection() provides invalid values in this case. This might be a Qt-issue - + // when changing the implementation with an updated Qt-version don't forget to run the Dolphin-unit-tests that + // verify this usecase. + const KFileItemList selItems = selectedItems(); + clearSelection(); + + QItemSelection invertedSelection; + foreach (const KFileItem& item, items()) { + if (!selItems.contains(item)) { + const QModelIndex index = m_viewAccessor.proxyModel()->mapFromSource(m_viewAccessor.dirModel()->indexForItem(item)); + invertedSelection.select(index, index); + } + } - const QItemSelection selection(topLeft, bottomRight); - selectionModel->select(selection, QItemSelectionModel::Toggle); + QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel(); + selectionModel->select(invertedSelection, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Current); } void DolphinView::clearSelection() @@ -874,7 +886,7 @@ void DolphinView::updateAdditionalInfoActions(KActionCollection* collection) foreach (const KFileItemDelegate::Information& info, infoKeys) { const QString name = infoAccessor.actionCollectionName(info, AdditionalInfoAccessor::AdditionalInfoType); QAction* action = collection->action(name); - Q_ASSERT(action != 0); + Q_ASSERT(action); action->setEnabled(enable); action->setChecked(checkedInfo.contains(info)); } @@ -917,7 +929,7 @@ void DolphinView::restoreState(QDataStream& stream) QSet urlsToExpand; stream >> urlsToExpand; const DolphinDetailsViewExpander* expander = m_viewAccessor.setExpandedUrls(urlsToExpand); - if (expander != 0) { + if (expander) { m_expanderActive = true; connect (expander, SIGNAL(completed()), this, SLOT(slotLoadingCompleted())); } @@ -932,7 +944,7 @@ void DolphinView::saveState(QDataStream& stream) KFileItem currentItem; const QAbstractItemView* view = m_viewAccessor.itemView(); - if (view != 0) { + if (view) { const QModelIndex proxyIndex = view->currentIndex(); const QModelIndex dirModelIndex = m_viewAccessor.proxyModel()->mapToSource(proxyIndex); currentItem = m_viewAccessor.dirModel()->itemForIndex(dirModelIndex); @@ -960,7 +972,7 @@ void DolphinView::saveState(QDataStream& stream) bool DolphinView::hasSelection() const { const QAbstractItemView* view = m_viewAccessor.itemView(); - return (view != 0) && view->selectionModel()->hasSelection(); + return view && view->selectionModel()->hasSelection(); } void DolphinView::observeCreatedItem(const KUrl& url) @@ -983,6 +995,34 @@ void DolphinView::selectAndScrollToCreatedItem() m_createdItemUrl = KUrl(); } +void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) +{ + if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash)) { + emit redirection(oldUrl, newUrl); + m_viewModeController->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); + view->horizontalScrollBar()->setValue(x); + view->verticalScrollBar()->setValue(y); + } +} + +void DolphinView::slotUrlChangeRequested(const KUrl& url) +{ + m_viewModeController->setUrl(url); + updateWritableState(); +} + void DolphinView::showHoverInformation(const KFileItem& item) { emit requestItemInfo(item); @@ -1002,6 +1042,18 @@ void DolphinView::slotDeleteFileFinished(KJob* job) } } +void DolphinView::slotDirListerStarted(const KUrl& url) +{ + // Disable the writestate temporary until it can be determined in a fast way + // in DolphinView::slotDirListerCompleted() + if (m_isFolderWritable) { + m_isFolderWritable = false; + emit writeStateChanged(m_isFolderWritable); + } + + emit startedPathLoading(url); +} + void DolphinView::slotDirListerCompleted() { if (!m_expanderActive) { @@ -1026,6 +1078,8 @@ void DolphinView::slotDirListerCompleted() m_newFileNames.clear(); } + + updateWritableState(); } void DolphinView::slotLoadingCompleted() @@ -1054,7 +1108,7 @@ void DolphinView::slotLoadingCompleted() 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)); + const QModelIndex index = m_viewAccessor.proxyModel()->mapFromSource(m_viewAccessor.dirModel()->indexForItem(item)); newSelection.select(index, index); } } @@ -1109,12 +1163,12 @@ void DolphinView::applyViewProperties() updateZoomLevel(oldZoomLevel); } - if (m_viewAccessor.itemView() == 0) { + if (!m_viewAccessor.itemView()) { createView(); } - Q_ASSERT(m_viewAccessor.itemView() != 0); - Q_ASSERT(m_viewAccessor.itemDelegate() != 0); + Q_ASSERT(m_viewAccessor.itemView()); + Q_ASSERT(m_viewAccessor.itemDelegate()); const bool showHiddenFiles = props.showHiddenFiles(); if (showHiddenFiles != m_viewAccessor.dirLister()->showingDotFiles()) { @@ -1170,12 +1224,12 @@ void DolphinView::createView() { deleteView(); - Q_ASSERT(m_viewAccessor.itemView() == 0); - Q_ASSERT(m_dolphinViewController->itemView() == 0); + Q_ASSERT(!m_viewAccessor.itemView()); + Q_ASSERT(!m_dolphinViewController->itemView()); m_viewAccessor.createView(this, m_dolphinViewController, m_viewModeController, m_mode); QAbstractItemView* view = m_viewAccessor.itemView(); - Q_ASSERT(view != 0); + Q_ASSERT(view); view->installEventFilter(this); view->viewport()->installEventFilter(this); @@ -1184,8 +1238,7 @@ void DolphinView::createView() const int zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(view->iconSize()); m_viewModeController->setZoomLevel(zoomLevel); - connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), - this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); + connectViewAccessor(); setFocusProxy(m_viewAccessor.layoutTarget()); m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget()); @@ -1194,21 +1247,20 @@ void DolphinView::createView() void DolphinView::deleteView() { QAbstractItemView* view = m_viewAccessor.itemView(); - Q_ASSERT((m_dolphinViewController->itemView() == 0) || (m_dolphinViewController->itemView() == view)); + Q_ASSERT(!m_dolphinViewController->itemView() || (m_dolphinViewController->itemView() == view)); m_dolphinViewController->setItemView(0); - if (view != 0) { - if (view->selectionModel() != 0) { - disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), - this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); - } + if (view) { + disconnectViewAccessor(); - // It's important to set the keyboard focus to the parent - // before deleting the view: Otherwise when having a split - // view the other view will get the focus and will request - // an activation (see DolphinView::eventFilter()). - setFocusProxy(0); - setFocus(); + if (hasFocus()) { + // It's important to set the keyboard focus to the parent + // before deleting the view: Otherwise when having a split + // view the other view will get the focus and will request + // an activation (see DolphinView::eventFilter()). + setFocusProxy(0); + setFocus(); + } m_viewModeController->disconnect(view); @@ -1251,7 +1303,7 @@ KUrl::List DolphinView::simplifiedSelectedUrls() const QMimeData* DolphinView::selectionMimeData() const { const QAbstractItemView* view = m_viewAccessor.itemView(); - Q_ASSERT((view != 0) && (view->selectionModel() != 0)); + Q_ASSERT((view) && (view->selectionModel())); const QItemSelection selection = m_viewAccessor.proxyModel()->mapSelectionToSource(view->selectionModel()->selection()); return m_viewAccessor.dirModel()->mimeData(selection.indexes()); } @@ -1288,18 +1340,95 @@ QItemSelection DolphinView::childrenMatchingPattern(const QModelIndex& parent, c return matchingIndexes; } -DolphinView::ViewAccessor::ViewAccessor(DolphinSortFilterProxyModel* proxyModel) : +void DolphinView::connectViewAccessor() +{ + KDirLister* dirLister = m_viewAccessor.dirLister(); + connect(dirLister, SIGNAL(redirection(KUrl,KUrl)), this, SLOT(slotRedirection(KUrl,KUrl))); + connect(dirLister, SIGNAL(started(KUrl)), this, SLOT(slotDirListerStarted(KUrl))); + connect(dirLister, SIGNAL(completed()), this, SLOT(slotDirListerCompleted())); + connect(dirLister, SIGNAL(refreshItems(const QList>&)), + this, SLOT(slotRefreshItems())); + + connect(dirLister, SIGNAL(clear()), this, SIGNAL(itemCountChanged())); + connect(dirLister, SIGNAL(newItems(KFileItemList)), this, SIGNAL(itemCountChanged())); + connect(dirLister, SIGNAL(infoMessage(const QString&)), this, SIGNAL(infoMessage(const QString&))); + connect(dirLister, SIGNAL(errorMessage(const QString&)), this, SIGNAL(infoMessage(const QString&))); + connect(dirLister, SIGNAL(percent(int)), this, SIGNAL(pathLoadingProgress(int))); + connect(dirLister, SIGNAL(urlIsFileError(const KUrl&)), this, SIGNAL(urlIsFileError(const KUrl&))); + connect(dirLister, SIGNAL(itemsDeleted(const KFileItemList&)), this, SIGNAL(itemCountChanged())); + + QAbstractItemView* view = m_viewAccessor.itemView(); + connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); +} + +void DolphinView::disconnectViewAccessor() +{ + KDirLister* dirLister = m_viewAccessor.dirLister(); + disconnect(dirLister, SIGNAL(redirection(KUrl,KUrl)), this, SLOT(slotRedirection(KUrl,KUrl))); + disconnect(dirLister, SIGNAL(started(KUrl)), this, SLOT(slotDirListerStarted(KUrl))); + disconnect(dirLister, SIGNAL(completed()), this, SLOT(slotDirListerCompleted())); + disconnect(dirLister, SIGNAL(refreshItems(const QList>&)), + this, SLOT(slotRefreshItems())); + + disconnect(dirLister, SIGNAL(clear()), this, SIGNAL(itemCountChanged())); + disconnect(dirLister, SIGNAL(newItems(KFileItemList)), this, SIGNAL(itemCountChanged())); + disconnect(dirLister, SIGNAL(infoMessage(const QString&)), this, SIGNAL(infoMessage(const QString&))); + disconnect(dirLister, SIGNAL(errorMessage(const QString&)), this, SIGNAL(errorMessage(const QString&))); + disconnect(dirLister, SIGNAL(percent(int)), this, SIGNAL(pathLoadingProgress(int))); + disconnect(dirLister, SIGNAL(urlIsFileError(const KUrl&)), this, SIGNAL(urlIsFileError(const KUrl&))); + disconnect(dirLister, SIGNAL(itemsDeleted(const KFileItemList&)), this, SIGNAL(itemCountChanged())); + + QAbstractItemView* view = m_viewAccessor.itemView(); + disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); +} + +void DolphinView::updateWritableState() +{ + const bool wasFolderWritable = m_isFolderWritable; + m_isFolderWritable = true; + + const KFileItem item = m_viewAccessor.dirLister()->rootItem(); + if (!item.isNull()) { + KFileItemListProperties capabilities(KFileItemList() << item); + m_isFolderWritable = capabilities.supportsWriting(); + } + if (m_isFolderWritable != wasFolderWritable) { + emit writeStateChanged(m_isFolderWritable); + } +} + +DolphinView::ViewAccessor::ViewAccessor() : m_rootUrl(), m_iconsView(0), m_detailsView(0), m_columnsContainer(0), - m_proxyModel(proxyModel), + m_dolphinModel(0), + m_proxyModel(0), m_dragSource(0) { + DolphinDirLister* dirLister = new DolphinDirLister(); + dirLister->setAutoUpdate(true); + dirLister->setDelayedMimeTypes(true); + + m_dolphinModel = new DolphinModel(); + m_dolphinModel->setDirLister(dirLister); // m_dolphinModel takes ownership of dirLister + m_dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory); + + m_proxyModel = new DolphinSortFilterProxyModel(); + m_proxyModel->setSourceModel(m_dolphinModel); + m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive); } DolphinView::ViewAccessor::~ViewAccessor() { + delete m_proxyModel; + m_proxyModel = 0; + + delete m_dolphinModel; + m_dolphinModel = 0; + delete m_dragSource; m_dragSource = 0; } @@ -1309,7 +1438,7 @@ void DolphinView::ViewAccessor::createView(QWidget* parent, const ViewModeController* viewModeController, Mode mode) { - Q_ASSERT(itemView() == 0); + Q_ASSERT(!itemView()); switch (mode) { case IconsView: @@ -1345,14 +1474,14 @@ void DolphinView::ViewAccessor::createView(QWidget* parent, void DolphinView::ViewAccessor::deleteView() { - if (m_columnsContainer != 0) { + if (m_columnsContainer) { m_columnsContainer->close(); m_columnsContainer->disconnect(); m_columnsContainer->deleteLater(); m_columnsContainer = 0; } else { QAbstractItemView* view = itemView(); - if (view != 0) { + if (view) { view->close(); view->disconnect(); @@ -1361,7 +1490,7 @@ void DolphinView::ViewAccessor::deleteView() // during drag operations" is used). Deleting the view // during an ongoing drag operation is not allowed, so // this will postponed. - if (m_dragSource != 0) { + if (m_dragSource) { // the old stored view is obviously not the drag source anymore m_dragSource->deleteLater(); m_dragSource = 0; @@ -1381,22 +1510,22 @@ void DolphinView::ViewAccessor::deleteView() void DolphinView::ViewAccessor::prepareUrlChange(const KUrl& url) { - if (m_columnsContainer != 0) { + if (m_columnsContainer) { m_columnsContainer->showColumn(url); } } QAbstractItemView* DolphinView::ViewAccessor::itemView() const { - if (m_iconsView != 0) { + if (m_iconsView) { return m_iconsView; } - if (m_detailsView != 0) { + if (m_detailsView) { return m_detailsView; } - if (m_columnsContainer != 0) { + if (m_columnsContainer) { return m_columnsContainer->activeColumn(); } @@ -1410,7 +1539,7 @@ KFileItemDelegate* DolphinView::ViewAccessor::itemDelegate() const QWidget* DolphinView::ViewAccessor::layoutTarget() const { - if (m_columnsContainer != 0) { + if (m_columnsContainer) { return m_columnsContainer; } return itemView(); @@ -1423,7 +1552,7 @@ void DolphinView::ViewAccessor::setRootUrl(const KUrl& rootUrl) KUrl DolphinView::ViewAccessor::rootUrl() const { - return (m_columnsContainer != 0) ? m_columnsContainer->rootUrl() : m_rootUrl; + return m_columnsContainer ? m_columnsContainer->rootUrl() : m_rootUrl; } bool DolphinView::ViewAccessor::supportsCategorizedSorting() const @@ -1433,12 +1562,12 @@ bool DolphinView::ViewAccessor::supportsCategorizedSorting() const bool DolphinView::ViewAccessor::itemsExpandable() const { - return (m_detailsView != 0) && m_detailsView->itemsExpandable(); + return m_detailsView && m_detailsView->itemsExpandable(); } QSet DolphinView::ViewAccessor::expandedUrls() const { - if (m_detailsView != 0) { + if (m_detailsView) { return m_detailsView->expandedUrls(); } @@ -1447,7 +1576,7 @@ QSet DolphinView::ViewAccessor::expandedUrls() const const DolphinDetailsViewExpander* DolphinView::ViewAccessor::setExpandedUrls(const QSet& urlsToExpand) { - if ((m_detailsView != 0) && m_detailsView->itemsExpandable() && !urlsToExpand.isEmpty()) { + if (m_detailsView && m_detailsView->itemsExpandable() && !urlsToExpand.isEmpty()) { // Check if another expander is already active and stop it if necessary. if(!m_detailsViewExpander.isNull()) { m_detailsViewExpander->stop(); @@ -1475,7 +1604,7 @@ DolphinModel* DolphinView::ViewAccessor::dirModel() const DolphinSortFilterProxyModel* DolphinView::ViewAccessor::proxyModel() const { - if (m_columnsContainer != 0) { + if (m_columnsContainer) { return static_cast(m_columnsContainer->activeColumn()->model()); } return m_proxyModel; @@ -1486,26 +1615,4 @@ KDirLister* DolphinView::ViewAccessor::dirLister() const return dirModel()->dirLister(); } -void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl) -{ - if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash)) { - emit redirection(oldUrl, newUrl); - m_viewModeController->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); - } -} - #include "dolphinview.moc"