Get back names, and use "using" keyword to keep GCC silent on "method foo on base...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 696caa04e2114d4ec30b944df62c34dec16d42e5..c5f6c91d391e4dd01f54c30d61bdcf461709b742 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006-2009 by Peter Penz <peter.penz@gmx.at>             *

  *   Copyright (C) 2006 by Gregor Kališnik <gregor@podnapisi.net>          *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   Copyright (C) 2006 by Gregor Kališnik <gregor@podnapisi.net>          *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -20,6 +20,7 @@
 
 #include "dolphinview.h"
 
 
 #include "dolphinview.h"
 

+#include <QAbstractItemView>

 #include <QApplication>
 #include <QClipboard>
 #include <QKeyEvent>
 #include <QApplication>
 #include <QClipboard>
 #include <QKeyEvent>


@@ -31,7 +32,6 @@
 #include <kactioncollection.h>
 #include <kcolorscheme.h>
 #include <kdirlister.h>
 #include <kactioncollection.h>
 #include <kcolorscheme.h>
 #include <kdirlister.h>

-#include <kfilepreviewgenerator.h>

 #include <kiconeffect.h>
 #include <kfileitem.h>
 #include <klocale.h>
 #include <kiconeffect.h>
 #include <kfileitem.h>
 #include <klocale.h>


@@ -50,7 +50,7 @@
 #include <kurl.h>
 
 #include "dolphinmodel.h"
 #include <kurl.h>
 
 #include "dolphinmodel.h"

-#include "dolphincolumnview.h"
+#include "dolphincolumnviewcontainer.h"

 #include "dolphincontroller.h"
 #include "dolphindetailsview.h"
 #include "dolphinfileitemdelegate.h"
 #include "dolphincontroller.h"
 #include "dolphindetailsview.h"
 #include "dolphinfileitemdelegate.h"


@@ -60,12 +60,11 @@
 #include "dolphiniconsview.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
 #include "dolphiniconsview.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"

-#include "folderexpander.h"

 #include "renamedialog.h"
 #include "renamedialog.h"

-#include "tooltips/tooltipmanager.h"

 #include "settings/dolphinsettings.h"
 #include "viewproperties.h"
 #include "zoomlevelinfo.h"
 #include "settings/dolphinsettings.h"
 #include "viewproperties.h"
 #include "zoomlevelinfo.h"

+#include "dolphindetailsviewexpander.h"

 
 /**
  * Helper function for sorting items with qSort() in
 
 /**
  * Helper function for sorting items with qSort() in


@@ -78,13 +77,10 @@ bool lessThan(const KFileItem& item1, const KFileItem& item2)
 
 DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,
 
 DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,

-                         KDirLister* dirLister,
-                         DolphinModel* dolphinModel,

                          DolphinSortFilterProxyModel* proxyModel) :
     QWidget(parent),
     m_active(true),
     m_showPreview(false),
                          DolphinSortFilterProxyModel* proxyModel) :
     QWidget(parent),
     m_active(true),
     m_showPreview(false),

-    m_loadingDirectory(false),

     m_storedCategorizedSorting(false),
     m_tabsForFiles(false),
     m_isContextMenuOpen(false),
     m_storedCategorizedSorting(false),
     m_tabsForFiles(false),
     m_isContextMenuOpen(false),


@@ -93,20 +89,15 @@ DolphinView::DolphinView(QWidget* parent,
     m_mode(DolphinView::IconsView),
     m_topLayout(0),
     m_controller(0),
     m_mode(DolphinView::IconsView),
     m_topLayout(0),
     m_controller(0),

-    m_iconsView(0),
-    m_detailsView(0),
-    m_columnView(0),
-    m_fileItemDelegate(0),
+    m_viewAccessor(proxyModel),

     m_selectionModel(0),
     m_selectionModel(0),

-    m_dolphinModel(dolphinModel),
-    m_dirLister(dirLister),
-    m_proxyModel(proxyModel),
-    m_previewGenerator(0),
-    m_toolTipManager(0),
+    m_selectionChangedTimer(0),

     m_rootUrl(),
     m_rootUrl(),

-    m_currentItemUrl(),
+    m_activeItemUrl(),
+    m_restoredContentsPosition(),

     m_createdItemUrl(),
     m_createdItemUrl(),

-    m_expandedDragSource(0)
+    m_selectedItems(),
+    m_newFileNames()

 {
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
 {
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);


@@ -117,8 +108,6 @@ DolphinView::DolphinView(QWidget* parent,
 
     connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
             this, SIGNAL(urlChanged(const KUrl&)));
 
     connect(m_controller, 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<QAction*>&)),
             this, SLOT(openContextMenu(const QPoint&, const QList<QAction*>&)));
 
     connect(m_controller, SIGNAL(requestContextMenu(const QPoint&, const QList<QAction*>&)),
             this, SLOT(openContextMenu(const QPoint&, const QList<QAction*>&)));


@@ -128,6 +117,8 @@ DolphinView::DolphinView(QWidget* parent,
             this, SLOT(updateSorting(DolphinView::Sorting)));
     connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(updateSortOrder(Qt::SortOrder)));
             this, SLOT(updateSorting(DolphinView::Sorting)));
     connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(updateSortOrder(Qt::SortOrder)));

+    connect(m_controller, SIGNAL(sortFoldersFirstChanged(bool)),
+            this, SLOT(updateSortFoldersFirst(bool)));

     connect(m_controller, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
             this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&)));
     connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)),
     connect(m_controller, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
             this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&)));
     connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)),


@@ -141,11 +132,12 @@ DolphinView::DolphinView(QWidget* parent,
     connect(m_controller, SIGNAL(viewportEntered()),
             this, SLOT(clearHoverInformation()));
 
     connect(m_controller, SIGNAL(viewportEntered()),
             this, SLOT(clearHoverInformation()));
 

-    connect(m_dirLister, SIGNAL(redirection(KUrl, KUrl)),
-            this, SIGNAL(redirection(KUrl, KUrl)));
-    connect(m_dirLister, SIGNAL(completed()),
-            this, SLOT(restoreCurrentItem()));
-    connect(m_dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),
+    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<QPair<KFileItem,KFileItem>>&)),

             this, SLOT(slotRefreshItems()));
 
     // When a new item has been created by the "Create New..." menu, the item should
             this, SLOT(slotRefreshItems()));
 
     // When a new item has been created by the "Create New..." menu, the item should


@@ -154,14 +146,18 @@ DolphinView::DolphinView(QWidget* parent,
     connect(&DolphinNewMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
             this, SLOT(observeCreatedItem(const KUrl&)));
 
     connect(&DolphinNewMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
             this, SLOT(observeCreatedItem(const KUrl&)));
 

-    applyViewProperties(url);
-    m_topLayout->addWidget(itemView());
+    m_selectionChangedTimer = new QTimer(this);
+    m_selectionChangedTimer->setSingleShot(true);
+    m_selectionChangedTimer->setInterval(300);
+    connect(m_selectionChangedTimer, SIGNAL(timeout()),
+            this, SLOT(emitSelectionChangedSignal()));
+
+    applyViewProperties();
+    m_topLayout->addWidget(m_viewAccessor.layoutTarget());

 }
 
 DolphinView::~DolphinView()
 {
 }
 
 DolphinView::~DolphinView()
 {

-    delete m_expandedDragSource;
-    m_expandedDragSource = 0;

 }
 
 const KUrl& DolphinView::url() const
 }
 
 const KUrl& DolphinView::url() const


@@ -171,7 +167,12 @@ const KUrl& DolphinView::url() const
 
 KUrl DolphinView::rootUrl() const
 {
 
 KUrl DolphinView::rootUrl() const
 {

-    return isColumnViewActive() ? m_columnView->rootUrl() : url();
+    const KUrl viewUrl = url();
+    const KUrl root = m_viewAccessor.rootUrl();
+    if (root.isEmpty() || !root.isParentOf(viewUrl)) {
+        return viewUrl;
+    }
+    return root;

 }
 
 void DolphinView::setActive(bool active)
 }
 
 void DolphinView::setActive(bool active)


@@ -184,16 +185,12 @@ void DolphinView::setActive(bool active)
 
     QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
     if (active) {
 
     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());
+        emitSelectionChangedSignal();

     } else {
         color.setAlpha(150);
     }
 
     } else {
         color.setAlpha(150);
     }
 

-    QWidget* viewport = itemView()->viewport();
+    QWidget* viewport = m_viewAccessor.itemView()->viewport();

     QPalette palette;
     palette.setColor(viewport->backgroundRole(), color);
     viewport->setPalette(palette);
     QPalette palette;
     palette.setColor(viewport->backgroundRole(), color);
     viewport->setPalette(palette);


@@ -201,7 +198,7 @@ void DolphinView::setActive(bool active)
     update();
 
     if (active) {
     update();
 
     if (active) {

-        itemView()->setFocus();
+        m_viewAccessor.itemView()->setFocus();

         emit activated();
     }
 
         emit activated();
     }
 


@@ -222,9 +219,13 @@ void DolphinView::setMode(Mode mode)
     const int oldZoomLevel = m_controller->zoomLevel();
     m_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();
 
     deleteView();
 

-    const KUrl viewPropsUrl = viewPropertiesUrl();
+    const KUrl viewPropsUrl = rootUrl();

     ViewProperties props(viewPropsUrl);
     props.setViewMode(m_mode);
     createView();
     ViewProperties props(viewPropsUrl);
     props.setViewMode(m_mode);
     createView();


@@ -232,7 +233,7 @@ void DolphinView::setMode(Mode mode)
     // the file item delegate has been recreated, apply the current
     // additional information manually
     const KFileItemDelegate::InformationList infoList = props.additionalInfo();
     // the file item delegate has been recreated, apply the current
     // additional information manually
     const KFileItemDelegate::InformationList infoList = props.additionalInfo();

-    m_fileItemDelegate->setShowInformation(infoList);
+    m_viewAccessor.itemDelegate()->setShowInformation(infoList);

     emit additionalInfoChanged();
 
     // Not all view modes support categorized sorting. Adjust the sorting model
     emit additionalInfoChanged();
 
     // Not all view modes support categorized sorting. Adjust the sorting model


@@ -240,17 +241,15 @@ void DolphinView::setMode(Mode mode)
     // capabilities.
     m_storedCategorizedSorting = props.categorizedSorting();
     const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
     // capabilities.
     m_storedCategorizedSorting = props.categorizedSorting();
     const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();

-    if (categorized != m_proxyModel->isCategorizedModel()) {
-        m_proxyModel->setCategorizedModel(categorized);
+    if (categorized != m_viewAccessor.proxyModel()->isCategorizedModel()) {
+        m_viewAccessor.proxyModel()->setCategorizedModel(categorized);

         emit categorizedSortingChanged();
     }
 
     emit modeChanged();
 
     updateZoomLevel(oldZoomLevel);
         emit categorizedSortingChanged();
     }
 
     emit modeChanged();
 
     updateZoomLevel(oldZoomLevel);

-    if (m_showPreview) {
-        loadDirectory(viewPropsUrl);
-    }
+    loadDirectory(viewPropsUrl);

 }
 
 DolphinView::Mode DolphinView::mode() const
 }
 
 DolphinView::Mode DolphinView::mode() const


@@ -265,13 +264,13 @@ bool DolphinView::showPreview() const
 
 bool DolphinView::showHiddenFiles() const
 {
 
 bool DolphinView::showHiddenFiles() const
 {

-    return m_dirLister->showingDotFiles();
+    return m_viewAccessor.dirLister()->showingDotFiles();

 }
 
 bool DolphinView::categorizedSorting() const
 {
     // If all view modes would support categorized sorting, returning
 }
 
 bool DolphinView::categorizedSorting() const
 {
     // If all view modes would support categorized sorting, returning

-    // m_proxyModel->isCategorizedModel() would be the way to go. As
+    // m_viewAccessor.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
     // 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


@@ -282,73 +281,36 @@ bool DolphinView::categorizedSorting() const
 
 bool DolphinView::supportsCategorizedSorting() const
 {
 
 bool DolphinView::supportsCategorizedSorting() const
 {

-    return m_iconsView != 0;
-}
-
-void DolphinView::selectAll()
-{
-    QAbstractItemView* view = 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()
-{
-    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);
-    }
+    return m_viewAccessor.supportsCategorizedSorting();

 }
 
 bool DolphinView::hasSelection() const
 {
 }
 
 bool DolphinView::hasSelection() const
 {

-    return itemView()->selectionModel()->hasSelection();
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+    return (view != 0) && view->selectionModel()->hasSelection();

 }
 
 }
 

-void DolphinView::clearSelection()
+void DolphinView::markUrlsAsSelected(const QList<KUrl>& urls)

 {
 {

-    QItemSelectionModel* selModel = itemView()->selectionModel();
-    const QModelIndex currentIndex = selModel->currentIndex();
-    selModel->setCurrentIndex(currentIndex, QItemSelectionModel::Current |
-                                            QItemSelectionModel::Clear);
+    foreach (const KUrl& url, urls) {
+        KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
+        m_selectedItems.append(item);
+    }

 }
 
 KFileItemList DolphinView::selectedItems() const
 {
 }
 
 KFileItemList DolphinView::selectedItems() const
 {

-    if (isColumnViewActive()) {
-        return m_columnView->selectedItems();
+    KFileItemList itemList;
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+    if (view == 0) {
+        return itemList;

     }
 
     }
 

-    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 QItemSelection selection = m_viewAccessor.proxyModel()->mapSelectionToSource(view->selectionModel()->selection());

 
     const QModelIndexList indexList = selection.indexes();
     foreach (const QModelIndex &index, indexList) {
 
     const QModelIndexList indexList = selection.indexes();
     foreach (const QModelIndex &index, indexList) {

-        KFileItem item = m_dolphinModel->itemForIndex(index);
+        KFileItem item = m_viewAccessor.dirModel()->itemForIndex(index);

         if (!item.isNull()) {
             itemList.append(item);
         }
         if (!item.isNull()) {
             itemList.append(item);
         }


@@ -369,33 +331,17 @@ KUrl::List DolphinView::selectedUrls() const
 
 int DolphinView::selectedItemsCount() const
 {
 
 int DolphinView::selectedItemsCount() const
 {

-    if (isColumnViewActive()) {
-        // TODO: get rid of this special case by adjusting the dir lister
-        // to the current column
-        return m_columnView->selectedItems().count();
-    }
-
-    return itemView()->selectionModel()->selection().count();
-}
-
-void DolphinView::setContentsPosition(int x, int y)
-{
-    QAbstractItemView* view = itemView();
-
-    // the ColumnView takes care itself for the horizontal scrolling
-    if (!isColumnViewActive()) {
-        view->horizontalScrollBar()->setValue(x);
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+    if (view == 0) {
+        return 0;

     }
     }

-    view->verticalScrollBar()->setValue(y);

 
 

-    m_loadingDirectory = false;
+    return view->selectionModel()->selectedIndexes().count();

 }
 
 }
 

-QPoint DolphinView::contentsPosition() const
+QItemSelectionModel* DolphinView::selectionModel() const

 {
 {

-    const int x = itemView()->horizontalScrollBar()->value();
-    const int y = itemView()->verticalScrollBar()->value();
-    return QPoint(x, y);
+    return m_viewAccessor.itemView()->selectionModel();

 }
 
 void DolphinView::setZoomLevel(int level)
 }
 
 void DolphinView::setZoomLevel(int level)


@@ -408,7 +354,6 @@ void DolphinView::setZoomLevel(int level)
 
     if (level != zoomLevel()) {
         m_controller->setZoomLevel(level);
 
     if (level != zoomLevel()) {
         m_controller->setZoomLevel(level);

-        m_previewGenerator->updatePreviews();

         emit zoomLevelChanged(level);
     }
 }
         emit zoomLevelChanged(level);
     }
 }


@@ -427,7 +372,7 @@ void DolphinView::setSorting(Sorting sorting)
 
 DolphinView::Sorting DolphinView::sorting() const
 {
 
 DolphinView::Sorting DolphinView::sorting() const
 {

-    return m_proxyModel->sorting();
+    return m_viewAccessor.proxyModel()->sorting();

 }
 
 void DolphinView::setSortOrder(Qt::SortOrder order)
 }
 
 void DolphinView::setSortOrder(Qt::SortOrder order)


@@ -439,34 +384,52 @@ void DolphinView::setSortOrder(Qt::SortOrder order)
 
 Qt::SortOrder DolphinView::sortOrder() const
 {
 
 Qt::SortOrder DolphinView::sortOrder() const
 {

-    return m_proxyModel->sortOrder();
+    return m_viewAccessor.proxyModel()->sortOrder();
+}
+
+void DolphinView::setSortFoldersFirst(bool foldersFirst)
+{
+    if (sortFoldersFirst() != foldersFirst) {
+        updateSortFoldersFirst(foldersFirst);
+    }
+}
+
+bool DolphinView::sortFoldersFirst() const
+{
+    return m_viewAccessor.proxyModel()->sortFoldersFirst();

 }
 
 void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info)
 {
 }
 
 void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info)
 {

-    const KUrl viewPropsUrl = viewPropertiesUrl();
+    const KUrl viewPropsUrl = rootUrl();

     ViewProperties props(viewPropsUrl);
     props.setAdditionalInfo(info);
     ViewProperties props(viewPropsUrl);
     props.setAdditionalInfo(info);

-    m_fileItemDelegate->setShowInformation(info);
+    m_viewAccessor.itemDelegate()->setShowInformation(info);

 
     emit additionalInfoChanged();
 
 
     emit additionalInfoChanged();
 

-    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
+    if (m_viewAccessor.reloadOnAdditionalInfoChange()) {

         loadDirectory(viewPropsUrl);
     }
 }
 
 KFileItemDelegate::InformationList DolphinView::additionalInfo() const
 {
         loadDirectory(viewPropsUrl);
     }
 }
 
 KFileItemDelegate::InformationList DolphinView::additionalInfo() const
 {

-    return m_fileItemDelegate->showInformation();
+    return m_viewAccessor.itemDelegate()->showInformation();

 }
 
 void DolphinView::reload()
 {
 }
 
 void DolphinView::reload()
 {

+    QByteArray viewState;
+    QDataStream saveStream(&viewState, QIODevice::WriteOnly);
+    saveState(saveStream);
+    m_selectedItems= selectedItems();
+

     setUrl(url());
     loadDirectory(url(), true);
     setUrl(url());
     loadDirectory(url(), true);

+
+    QDataStream restoreStream(viewState);
+    restoreState(restoreStream);

 }
 
 void DolphinView::refresh()
 }
 
 void DolphinView::refresh()


@@ -478,53 +441,23 @@ void DolphinView::refresh()
     m_active = true;
 
     createView();
     m_active = true;
 
     createView();

-    applyViewProperties(m_controller->url());
+    applyViewProperties();

     reload();
 
     setActive(oldActivationState);
     updateZoomLevel(oldZoomLevel);
 }
 
     reload();
 
     setActive(oldActivationState);
     updateZoomLevel(oldZoomLevel);
 }
 

-void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)
-{
-    if (m_controller->url() == url) {
-        return;
-    }
-
-    m_previewGenerator->cancelPreviews();
-    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);
-    }
-
-    emit startedPathLoading(url);
-}
-

 void DolphinView::setNameFilter(const QString& nameFilter)
 {
 void DolphinView::setNameFilter(const QString& nameFilter)
 {

-    m_proxyModel->setFilterRegExp(nameFilter);
-
-    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);
-    }
+    m_controller->setNameFilter(nameFilter);

 }
 
 void DolphinView::calculateItemCount(int& fileCount,
                                      int& folderCount,
                                      KIO::filesize_t& totalFileSize) const
 {
 }
 
 void DolphinView::calculateItemCount(int& fileCount,
                                      int& folderCount,
                                      KIO::filesize_t& totalFileSize) const
 {

-    foreach (const KFileItem& item, m_dirLister->items()) {
+    foreach (const KFileItem& item, m_viewAccessor.dirLister()->items()) {

         if (item.isDir()) {
             ++folderCount;
         } else {
         if (item.isDir()) {
             ++folderCount;
         } else {


@@ -565,7 +498,7 @@ QString DolphinView::statusBarText() const
 
         if (folderCount + fileCount == 1) {
             // if only one item is selected, show the filename
 
         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", "<filename>%1</filename> selected", name) :
                                         i18nc("@info:status", "<filename>%1</filename> selected (%2)",
                                               name, KIO::convertSize(totalFileSize));
             text = (folderCount == 1) ? i18nc("@info:status", "<filename>%1</filename> selected", name) :
                                         i18nc("@info:status", "<filename>%1</filename> selected (%2)",
                                               name, KIO::convertSize(totalFileSize));


@@ -593,32 +526,60 @@ QString DolphinView::statusBarText() const
     return text;
 }
 
     return text;
 }
 

-void DolphinView::setUrl(const KUrl& url)
+QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) const

 {
 {

-    // remember current item candidate (see restoreCurrentItem())
-    m_currentItemUrl = url;
-    updateView(url, KUrl());
+    return m_controller->versionControlActions(items);

 }
 
 }
 

-void DolphinView::changeSelection(const KFileItemList& selection)
+void DolphinView::setUrl(const KUrl& url)

 {
 {

-    clearSelection();
-    if (selection.isEmpty()) {
-        return;
+    if (m_controller->url() != url) {
+        m_newFileNames.clear();
+
+        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);

     }
     }

-    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_proxyModel->mapFromSource(m_dolphinModel->indexForItem(item));
-            newSelection.select(index, index);
-        }
+
+    // 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)));

     }
     }

-    itemView()->selectionModel()->select(newSelection,
-                                         QItemSelectionModel::ClearAndSelect
-                                         | QItemSelectionModel::Current);
+}
+
+void DolphinView::selectAll()
+{
+    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()
 }
 
 void DolphinView::renameSelectedItems()


@@ -632,16 +593,23 @@ void DolphinView::renameSelectedItems()
     if (itemCount > 1) {
         // More than one item has been selected for renaming. Open
         // a rename dialog and rename all items afterwards.
     if (itemCount > 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) {
+        QPointer<RenameDialog> dialog = new RenameDialog(this, items);
+        if (dialog->exec() == QDialog::Rejected) {
+            delete dialog;

             return;
         }
 
             return;
         }
 

-        const QString newName = dialog.newName();
+        const QString newName = dialog->newName();

         if (newName.isEmpty()) {
         if (newName.isEmpty()) {

-            emit errorMessage(dialog.errorString());
+            emit errorMessage(dialog->errorString());
+            delete dialog;

             return;
         }
             return;
         }

+        delete dialog;
+
+        // the selection would be invalid after renaming the items, so just clear
+        // it before
+        clearSelection();

 
         // TODO: check how this can be integrated into KIO::FileUndoManager/KonqOperations
         // as one operation instead of n rename operations like it is done now...
 
         // TODO: check how this can be integrated into KIO::FileUndoManager/KonqOperations
         // as one operation instead of n rename operations like it is done now...


@@ -669,27 +637,25 @@ void DolphinView::renameSelectedItems()
         }
     } else if (DolphinSettings::instance().generalSettings()->renameInline()) {
         Q_ASSERT(itemCount == 1);
         }
     } else if (DolphinSettings::instance().generalSettings()->renameInline()) {
         Q_ASSERT(itemCount == 1);

-
-        if (isColumnViewActive()) {
-            m_columnView->editItem(items.first());
-        } else {
-            const QModelIndex dirIndex = m_dolphinModel->indexForItem(items.first());
-            const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
-            itemView()->edit(proxyIndex);
-        }
+        const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForItem(items.first());
+        const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
+        m_viewAccessor.itemView()->edit(proxyIndex);

     } else {
         Q_ASSERT(itemCount == 1);
 
     } else {
         Q_ASSERT(itemCount == 1);
 

-        RenameDialog dialog(this, items);
-        if (dialog.exec() == QDialog::Rejected) {
+        QPointer<RenameDialog> dialog = new RenameDialog(this, items);
+        if (dialog->exec() == QDialog::Rejected) {
+            delete dialog;

             return;
         }
 
             return;
         }
 

-        const QString& newName = dialog.newName();
+        const QString newName = dialog->newName();

         if (newName.isEmpty()) {
         if (newName.isEmpty()) {

-            emit errorMessage(dialog.errorString());
+            emit errorMessage(dialog->errorString());
+            delete dialog;

             return;
         }
             return;
         }

+        delete dialog;

 
         const KUrl& oldUrl = items.first().url();
         KUrl newUrl = oldUrl;
 
         const KUrl& oldUrl = items.first().url();
         KUrl newUrl = oldUrl;


@@ -755,13 +721,11 @@ void DolphinView::setShowPreview(bool show)
         return;
     }
 
         return;
     }
 

-    const KUrl viewPropsUrl = viewPropertiesUrl();
+    const KUrl viewPropsUrl = rootUrl();

     ViewProperties props(viewPropsUrl);
     props.setShowPreview(show);
 
     m_showPreview = show;
     ViewProperties props(viewPropsUrl);
     props.setShowPreview(show);
 
     m_showPreview = show;

-    m_previewGenerator->setPreviewShown(show);
-

     const int oldZoomLevel = m_controller->zoomLevel();
     emit showPreviewChanged();
 
     const int oldZoomLevel = m_controller->zoomLevel();
     emit showPreviewChanged();
 


@@ -769,24 +733,20 @@ void DolphinView::setShowPreview(bool show)
     // As the view does not emit a signal when the icon size has been changed,
     // the used zoom level of the controller must be adjusted manually:
     updateZoomLevel(oldZoomLevel);
     // As the view does not emit a signal when the icon size has been changed,
     // the used zoom level of the controller must be adjusted manually:
     updateZoomLevel(oldZoomLevel);

-
-    loadDirectory(viewPropsUrl);

 }
 
 void DolphinView::setShowHiddenFiles(bool show)
 {
 }
 
 void DolphinView::setShowHiddenFiles(bool show)
 {

-    if (m_dirLister->showingDotFiles() == show) {
+    if (m_viewAccessor.dirLister()->showingDotFiles() == show) {

         return;
     }
 
         return;
     }
 

-    const KUrl viewPropsUrl = viewPropertiesUrl();
+    const KUrl viewPropsUrl = rootUrl();

     ViewProperties props(viewPropsUrl);
     props.setShowHiddenFiles(show);
 
     ViewProperties props(viewPropsUrl);
     props.setShowHiddenFiles(show);
 

-    m_dirLister->setShowingDotFiles(show);
+    m_viewAccessor.dirLister()->setShowingDotFiles(show);

     emit showHiddenFilesChanged();
     emit showHiddenFilesChanged();

-
-    loadDirectory(viewPropsUrl);

 }
 
 void DolphinView::setCategorizedSorting(bool categorized)
 }
 
 void DolphinView::setCategorizedSorting(bool categorized)


@@ -799,12 +759,12 @@ void DolphinView::setCategorizedSorting(bool categorized)
     // if the view supports categorized sorting
     Q_ASSERT(!categorized || supportsCategorizedSorting());
 
     // if the view supports categorized sorting
     Q_ASSERT(!categorized || supportsCategorizedSorting());
 

-    ViewProperties props(viewPropertiesUrl());
+    ViewProperties props(rootUrl());

     props.setCategorizedSorting(categorized);
     props.save();
 
     m_storedCategorizedSorting = categorized;
     props.setCategorizedSorting(categorized);
     props.save();
 
     m_storedCategorizedSorting = categorized;

-    m_proxyModel->setCategorizedModel(categorized);
+    m_viewAccessor.proxyModel()->setCategorizedModel(categorized);

 
     emit categorizedSortingChanged();
 }
 
     emit categorizedSortingChanged();
 }


@@ -817,6 +777,11 @@ void DolphinView::toggleSortOrder()
     setSortOrder(order);
 }
 
     setSortOrder(order);
 }
 

+void DolphinView::toggleSortFoldersFirst()
+{
+    setSortFoldersFirst(!sortFoldersFirst());
+}
+

 void DolphinView::toggleAdditionalInfo(QAction* action)
 {
     const KFileItemDelegate::Information info =
 void DolphinView::toggleAdditionalInfo(QAction* action)
 {
     const KFileItemDelegate::Information info =


@@ -844,53 +809,23 @@ void DolphinView::mouseReleaseEvent(QMouseEvent* event)
     setActive(true);
 }
 
     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()) {
     case QEvent::FocusIn:
 bool DolphinView::eventFilter(QObject* watched, QEvent* event)
 {
     switch (event->type()) {
     case QEvent::FocusIn:

-        if (watched == itemView()) {
+        if (watched == m_viewAccessor.itemView()) {

             m_controller->requestActivation();
         }
         break;
 
             m_controller->requestActivation();
         }
         break;
 

-    case QEvent::MouseButtonPress:
-        if ((watched == itemView()->viewport()) && (m_expandedDragSource != 0)) {
-            // Listening to a mousebutton press event to delete expanded views is a
-            // workaround, as it seems impossible for the FolderExpander to know when
-            // a dragging outside a view has been finished. However it works quite well:
-            // A mousebutton press event indicates that a drag operation must be
-            // finished already.
-            m_expandedDragSource->deleteLater();
-            m_expandedDragSource = 0;
-        }
-        break;
-

     case QEvent::DragEnter:
     case QEvent::DragEnter:

-        if (watched == itemView()->viewport()) {
+        if (watched == m_viewAccessor.itemView()->viewport()) {

             setActive(true);
         }
         break;
 
     case QEvent::KeyPress:
             setActive(true);
         }
         break;
 
     case QEvent::KeyPress:

-        if (watched == itemView()) {
-            if (m_toolTipManager != 0) {
-                m_toolTipManager->hideTip();
-            }
-
+        if (watched == m_viewAccessor.itemView()) {

             // clear the selection when Escape has been pressed
             QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
             if (keyEvent->key() == Qt::Key_Escape) {
             // clear the selection when Escape has been pressed
             QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
             if (keyEvent->key() == Qt::Key_Escape) {


@@ -899,6 +834,24 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
         }
         break;
 
         }
         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<QWheelEvent*>(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;
     }
     default:
         break;
     }


@@ -925,12 +878,22 @@ void DolphinView::triggerItem(const KFileItem& item)
         return;
     }
 
         return;
     }
 

-    if (m_toolTipManager != 0) {
-        m_toolTipManager->hideTip();
-    }

     emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
 }
 
     emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
 }
 

+void DolphinView::slotSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected)
+{
+    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();
+}
+

 void DolphinView::emitSelectionChangedSignal()
 {
     emit selectionChanged(DolphinView::selectedItems());
 void DolphinView::emitSelectionChangedSignal()
 {
     emit selectionChanged(DolphinView::selectedItems());


@@ -940,18 +903,10 @@ void DolphinView::openContextMenu(const QPoint& pos,
                                   const QList<QAction*>& customActions)
 {
     KFileItem item;
                                   const QList<QAction*>& customActions)
 {
     KFileItem item;

-    if (isColumnViewActive()) {
-        item = m_columnView->itemAt(pos);
-    } else {
-        const QModelIndex index = itemView()->indexAt(pos);
-        if (index.isValid() && (index.column() == DolphinModel::Name)) {
-            const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
-            item = m_dolphinModel->itemForIndex(dolphinModelIndex);
-        }
-    }
-
-    if (m_toolTipManager != 0) {
-        m_toolTipManager->hideTip();
+    const QModelIndex index = m_viewAccessor.itemView()->indexAt(pos);
+    if (index.isValid() && (index.column() == DolphinModel::Name)) {
+        const QModelIndex dolphinModelIndex = m_viewAccessor.proxyModel()->mapToSource(index);
+        item = m_viewAccessor.dirModel()->itemForIndex(dolphinModelIndex);

     }
 
     m_isContextMenuOpen = true; // TODO: workaround for Qt-issue 207192
     }
 
     m_isContextMenuOpen = true; // TODO: workaround for Qt-issue 207192


@@ -963,36 +918,47 @@ void DolphinView::dropUrls(const KFileItem& destItem,
                            const KUrl& destPath,
                            QDropEvent* event)
 {
                            const KUrl& destPath,
                            QDropEvent* event)
 {

+    addNewFileNames(event->mimeData());

     DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);
 }
 
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
     DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);
 }
 
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {

-    ViewProperties props(viewPropertiesUrl());
+    ViewProperties props(rootUrl());

     props.setSorting(sorting);
 
     props.setSorting(sorting);
 

-    m_proxyModel->setSorting(sorting);
+    m_viewAccessor.proxyModel()->setSorting(sorting);

 
     emit sortingChanged(sorting);
 }
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
 {
 
     emit sortingChanged(sorting);
 }
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
 {

-    ViewProperties props(viewPropertiesUrl());
+    ViewProperties props(rootUrl());

     props.setSortOrder(order);
 
     props.setSortOrder(order);
 

-    m_proxyModel->setSortOrder(order);
+    m_viewAccessor.proxyModel()->setSortOrder(order);

 
     emit sortOrderChanged(order);
 }
 
 
     emit sortOrderChanged(order);
 }
 

+void DolphinView::updateSortFoldersFirst(bool foldersFirst)
+{
+    ViewProperties props(rootUrl());
+    props.setSortFoldersFirst(foldersFirst);
+
+    m_viewAccessor.proxyModel()->setSortFoldersFirst(foldersFirst);
+
+    emit sortFoldersFirstChanged(foldersFirst);
+}
+

 void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)
 {
 void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)
 {

-    ViewProperties props(viewPropertiesUrl());
+    ViewProperties props(rootUrl());

     props.setAdditionalInfo(info);
     props.save();
 
     props.setAdditionalInfo(info);
     props.save();
 

-    m_fileItemDelegate->setShowInformation(info);
+    m_viewAccessor.itemDelegate()->setShowInformation(info);

 
     emit additionalInfoChanged();
 }
 
     emit additionalInfoChanged();
 }


@@ -1023,7 +989,7 @@ void DolphinView::updateAdditionalInfoActions(KActionCollection* collection)
     showGroupInfo->setEnabled(enable);
     showMimeInfo->setEnabled(enable);
 
     showGroupInfo->setEnabled(enable);
     showMimeInfo->setEnabled(enable);
 

-    foreach (KFileItemDelegate::Information info, m_fileItemDelegate->showInformation()) {
+    foreach (KFileItemDelegate::Information info, m_viewAccessor.itemDelegate()->showInformation()) {

         switch (info) {
         case KFileItemDelegate::Size:
             showSizeInfo->setChecked(true);
         switch (info) {
         case KFileItemDelegate::Size:
             showSizeInfo->setChecked(true);


@@ -1066,62 +1032,78 @@ bool DolphinView::isTabsForFilesEnabled() const
 
 bool DolphinView::itemsExpandable() const
 {
 
 bool DolphinView::itemsExpandable() const
 {

-    return (m_detailsView != 0) && m_detailsView->itemsExpandable();
+    return m_viewAccessor.itemsExpandable();

 }
 
 }
 

-void DolphinView::deleteWhenNotDragSource(QAbstractItemView *view)
+void DolphinView::restoreState(QDataStream& stream)

 {
 {

-    if (view == 0)
-        return;
+    // current item
+    stream >> m_activeItemUrl;

 
 

-    if (DragAndDropHelper::instance().isDragSource(view)) {
-        // We must store for later deletion.
-        if (m_expandedDragSource != 0) {
-            // The old stored view is obviously not the drag source anymore.
-            m_expandedDragSource->deleteLater();
-            m_expandedDragSource = 0;
-        }
-        view->hide();
-        m_expandedDragSource = view;
+    // view position
+    stream >> m_restoredContentsPosition;
+
+    // expanded folders (only relevant for the details view - will be ignored by the view in other view modes)
+    QSet<KUrl> urlsToExpand;
+    stream >> urlsToExpand;
+    const DolphinDetailsViewExpander* expander = m_viewAccessor.setExpandedUrls(urlsToExpand);
+    if (expander != 0) {
+        m_expanderActive = true;
+        connect (expander, SIGNAL(completed()), this, SLOT(slotLoadingCompleted()));

     }
     else {
     }
     else {

-        view->deleteLater();
+        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;
 }
 
 void DolphinView::observeCreatedItem(const KUrl& url)
 {
     m_createdItemUrl = url;

-    connect(m_dolphinModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+    connect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)),

             this, SLOT(selectAndScrollToCreatedItem()));
 }
 
 void DolphinView::selectAndScrollToCreatedItem()
 {
             this, SLOT(selectAndScrollToCreatedItem()));
 }
 
 void DolphinView::selectAndScrollToCreatedItem()
 {

-    const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_createdItemUrl);
+    const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_createdItemUrl);

     if (dirIndex.isValid()) {
     if (dirIndex.isValid()) {

-        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
-        itemView()->setCurrentIndex(proxyIndex);
+        const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
+        m_viewAccessor.itemView()->setCurrentIndex(proxyIndex);

     }
 
     }
 

-    disconnect(m_dolphinModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+    disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)),

                this, SLOT(selectAndScrollToCreatedItem()));
     m_createdItemUrl = KUrl();
 }
 
                this, SLOT(selectAndScrollToCreatedItem()));
     m_createdItemUrl = KUrl();
 }
 

-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 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());
-    }
-}
-

 void DolphinView::showHoverInformation(const KFileItem& item)
 {
     emit requestItemInfo(item);
 void DolphinView::showHoverInformation(const KFileItem& item)
 {
     emit requestItemInfo(item);


@@ -1141,31 +1123,77 @@ void DolphinView::slotDeleteFileFinished(KJob* job)
     }
 }
 
     }
 }
 

-void DolphinView::slotRequestUrlChange(const KUrl& url)
+void DolphinView::slotDirListerCompleted()

 {
 {

-    emit requestUrlChange(url);
-    m_controller->setUrl(url);
+    if (!m_expanderActive) {
+        slotLoadingCompleted();
+    }
+
+    if (!m_newFileNames.isEmpty()) {
+        // select all newly added items created by a paste operation or
+        // a drag & drop operation
+        const int rowCount = m_viewAccessor.proxyModel()->rowCount();
+        QItemSelection selection;
+        for (int row = 0; row < rowCount; ++row) {
+            const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->index(row, 0);
+            const QModelIndex dirIndex = m_viewAccessor.proxyModel()->mapToSource(proxyIndex);
+            const KUrl url = m_viewAccessor.dirModel()->itemForIndex(dirIndex).url();
+            if (m_newFileNames.contains(url.fileName())) {
+                selection.merge(QItemSelection(proxyIndex, proxyIndex), QItemSelectionModel::Select);
+            }
+        }
+        m_viewAccessor.itemView()->selectionModel()->select(selection, QItemSelectionModel::Select);
+
+        m_newFileNames.clear();
+    }

 }
 
 }
 

-void DolphinView::restoreCurrentItem()
+void DolphinView::slotLoadingCompleted()

 {
 {

-    const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_currentItemUrl);
-    if (dirIndex.isValid()) {
-        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
-        QAbstractItemView* view = itemView();
-        const bool clearSelection = !hasSelection();
-        view->setCurrentIndex(proxyIndex);
-        if (clearSelection) {
-            view->clearSelection();
+    m_expanderActive = 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) {
         m_assureVisibleCurrentIndex = false;
 }
 
 void DolphinView::slotRefreshItems()
 {
     if (m_assureVisibleCurrentIndex) {
         m_assureVisibleCurrentIndex = false;

-        itemView()->scrollTo(itemView()->currentIndex());
+        m_viewAccessor.itemView()->scrollTo(m_viewAccessor.itemView()->currentIndex());

     }
 }
 
     }
 }
 


@@ -1181,45 +1209,17 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
         return;
     }
 
         return;
     }
 

-    m_loadingDirectory = true;
-
-    m_dirLister->stop();
-    m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
-
-    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) {
-            m_columnView->reload();
-        } else {
-            m_columnView->showColumn(url);
-        }
-    }
-}
-
-KUrl DolphinView::viewPropertiesUrl() const
-{
-    if (isColumnViewActive()) {
-        return m_columnView->rootUrl();
-    }
-
-    return url();
+    KDirLister* dirLister = m_viewAccessor.dirLister();
+    dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);

 }
 
 }
 

-void DolphinView::applyViewProperties(const KUrl& url)
+void DolphinView::applyViewProperties()

 {
     if (m_ignoreViewProperties) {
         return;
     }
 
 {
     if (m_ignoreViewProperties) {
         return;
     }
 

-    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;
-    }
-
-    const ViewProperties props(url);
+    const ViewProperties props(rootUrl());

 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {
 
     const Mode mode = props.viewMode();
     if (m_mode != mode) {


@@ -1231,48 +1231,52 @@ void DolphinView::applyViewProperties(const KUrl& url)
 
         updateZoomLevel(oldZoomLevel);
     }
 
         updateZoomLevel(oldZoomLevel);
     }

-    if (itemView() == 0) {
+    if (m_viewAccessor.itemView() == 0) {

         createView();
     }
         createView();
     }

-    Q_ASSERT(itemView() != 0);
-    Q_ASSERT(m_fileItemDelegate != 0);
+    Q_ASSERT(m_viewAccessor.itemView() != 0);
+    Q_ASSERT(m_viewAccessor.itemDelegate() != 0);

 
     const bool showHiddenFiles = props.showHiddenFiles();
 
     const bool showHiddenFiles = props.showHiddenFiles();

-    if (showHiddenFiles != m_dirLister->showingDotFiles()) {
-        m_dirLister->setShowingDotFiles(showHiddenFiles);
+    if (showHiddenFiles != m_viewAccessor.dirLister()->showingDotFiles()) {
+        m_viewAccessor.dirLister()->setShowingDotFiles(showHiddenFiles);

         emit showHiddenFilesChanged();
     }
 
     m_storedCategorizedSorting = props.categorizedSorting();
     const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
         emit showHiddenFilesChanged();
     }
 
     m_storedCategorizedSorting = props.categorizedSorting();
     const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();

-    if (categorized != m_proxyModel->isCategorizedModel()) {
-        m_proxyModel->setCategorizedModel(categorized);
+    if (categorized != m_viewAccessor.proxyModel()->isCategorizedModel()) {
+        m_viewAccessor.proxyModel()->setCategorizedModel(categorized);

         emit categorizedSortingChanged();
     }
 
     const DolphinView::Sorting sorting = props.sorting();
         emit categorizedSortingChanged();
     }
 
     const DolphinView::Sorting sorting = props.sorting();

-    if (sorting != m_proxyModel->sorting()) {
-        m_proxyModel->setSorting(sorting);
+    if (sorting != m_viewAccessor.proxyModel()->sorting()) {
+        m_viewAccessor.proxyModel()->setSorting(sorting);

         emit sortingChanged(sorting);
     }
 
     const Qt::SortOrder sortOrder = props.sortOrder();
         emit sortingChanged(sorting);
     }
 
     const Qt::SortOrder sortOrder = props.sortOrder();

-    if (sortOrder != m_proxyModel->sortOrder()) {
-        m_proxyModel->setSortOrder(sortOrder);
+    if (sortOrder != m_viewAccessor.proxyModel()->sortOrder()) {
+        m_viewAccessor.proxyModel()->setSortOrder(sortOrder);

         emit sortOrderChanged(sortOrder);
     }
 
         emit sortOrderChanged(sortOrder);
     }
 

+    const bool sortFoldersFirst = props.sortFoldersFirst();
+    if (sortFoldersFirst != m_viewAccessor.proxyModel()->sortFoldersFirst()) {
+        m_viewAccessor.proxyModel()->setSortFoldersFirst(sortFoldersFirst);
+        emit sortFoldersFirstChanged(sortFoldersFirst);
+    }
+

     KFileItemDelegate::InformationList info = props.additionalInfo();
     KFileItemDelegate::InformationList info = props.additionalInfo();

-    if (info != m_fileItemDelegate->showInformation()) {
-        m_fileItemDelegate->setShowInformation(info);
+    if (info != m_viewAccessor.itemDelegate()->showInformation()) {
+        m_viewAccessor.itemDelegate()->setShowInformation(info);

         emit additionalInfoChanged();
     }
 
     const bool showPreview = props.showPreview();
     if (showPreview != m_showPreview) {
         m_showPreview = showPreview;
         emit additionalInfoChanged();
     }
 
     const bool showPreview = props.showPreview();
     if (showPreview != m_showPreview) {
         m_showPreview = showPreview;

-        m_previewGenerator->setPreviewShown(showPreview);
-

         const int oldZoomLevel = m_controller->zoomLevel();
         emit showPreviewChanged();
 
         const int oldZoomLevel = m_controller->zoomLevel();
         emit showPreviewChanged();
 


@@ -1293,95 +1297,36 @@ void DolphinView::applyViewProperties(const KUrl& url)
 void DolphinView::createView()
 {
     deleteView();
 void DolphinView::createView()
 {
     deleteView();

-    Q_ASSERT(m_iconsView == 0);
-    Q_ASSERT(m_detailsView == 0);
-    Q_ASSERT(m_columnView == 0);
-
-    QAbstractItemView* view = 0;
-    switch (m_mode) {
-    case IconsView: {
-        m_iconsView = new DolphinIconsView(this, m_controller);
-        view = m_iconsView;
-        break;
-    }
-
-    case DetailsView:
-        m_detailsView = new DolphinDetailsView(this, m_controller);
-        view = m_detailsView;
-        break;

 
 

-    case ColumnView:
-        m_columnView = new DolphinColumnView(this, m_controller);
-        view = m_columnView;
-        break;
-    }
+    Q_ASSERT(m_viewAccessor.itemView() == 0);
+    m_viewAccessor.createView(this, m_controller, m_mode);

 
 

+    QAbstractItemView* view = m_viewAccessor.itemView();

     Q_ASSERT(view != 0);
     view->installEventFilter(this);
     view->viewport()->installEventFilter(this);
     Q_ASSERT(view != 0);
     view->installEventFilter(this);
     view->viewport()->installEventFilter(this);

-    setFocusProxy(view);
-
-    if (m_mode != ColumnView) {
-        // Give the view the ability to auto-expand its directories on hovering
-        // (the column view takes care about this itself). If the details view
-        // uses expandable folders, the auto-expanding should be used always.
-        DolphinSettings& settings = DolphinSettings::instance();
-        const bool enabled = settings.generalSettings()->autoExpandFolders() ||
-                            ((m_detailsView != 0) && settings.detailsModeSettings()->expandableFolders());
-
-        FolderExpander* folderExpander = new FolderExpander(view, m_proxyModel);
-        folderExpander->setEnabled(enabled);
-        connect(folderExpander, SIGNAL(enterDir(const QModelIndex&)),
-                m_controller, SLOT(triggerItem(const QModelIndex&)));
-    }
-    else {
-        // Listen out for requests to delete the current column.
-        connect(m_columnView, SIGNAL(requestColumnDeletion(QAbstractItemView*)),
-                this, SLOT(deleteWhenNotDragSource(QAbstractItemView*)));
-    }

 
     m_controller->setItemView(view);
 
 
     m_controller->setItemView(view);
 

-    m_fileItemDelegate = new DolphinFileItemDelegate(view);
-    m_fileItemDelegate->setShowToolTipWhenElided(false);
-    m_fileItemDelegate->setMinimizedNameColumn(m_mode == DetailsView);
-    view->setItemDelegate(m_fileItemDelegate);
-
-    view->setModel(m_proxyModel);
+    // 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
+    // selection model to DolphinView, so that it can be shared by all item views.

     if (m_selectionModel != 0) {
         view->setSelectionModel(m_selectionModel);
     } else {
         m_selectionModel = view->selectionModel();
     }
     if (m_selectionModel != 0) {
         view->setSelectionModel(m_selectionModel);
     } else {
         m_selectionModel = view->selectionModel();
     }

-
-    // reparent the selection model, as it should not be deleted
-    // when deleting the model

     m_selectionModel->setParent(this);
     m_selectionModel->setParent(this);

+    connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+            this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));

 
 

-    view->setSelectionMode(QAbstractItemView::ExtendedSelection);
-
-    m_previewGenerator = new KFilePreviewGenerator(view);
-    m_previewGenerator->setPreviewShown(m_showPreview);
-
-    if (DolphinSettings::instance().generalSettings()->showToolTips()) {
-        m_toolTipManager = new ToolTipManager(view, m_proxyModel);
-        connect(m_controller, SIGNAL(hideToolTip()),
-                m_toolTipManager, SLOT(hideTip()));
-    }
-
-    m_topLayout->insertWidget(1, view);
-
-    connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
-            this, SLOT(emitSelectionChangedSignal()));
-    connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
-            this, SLOT(emitContentsMoved()));
-    connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
-            this, SLOT(emitContentsMoved()));
+    setFocusProxy(m_viewAccessor.layoutTarget());
+    m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());

 }
 
 void DolphinView::deleteView()
 {
 }
 
 void DolphinView::deleteView()
 {

-    QAbstractItemView* view = itemView();
+    QAbstractItemView* view = m_viewAccessor.itemView();

     if (view != 0) {
         // It's important to set the keyboard focus to the parent
         // before deleting the view: Otherwise when having a split
     if (view != 0) {
         // It's important to set the keyboard focus to the parent
         // before deleting the view: Otherwise when having a split


@@ -1393,88 +1338,246 @@ void DolphinView::deleteView()
         m_topLayout->removeWidget(view);
         view->close();
 
         m_topLayout->removeWidget(view);
         view->close();
 

-        // m_previewGenerator's parent is not always destroyed, and we
-        // don't want two active at once - manually delete.
-        delete m_previewGenerator;
-        m_previewGenerator = 0;
-
+        // disconnect all signal/slots

         disconnect(view);
         m_controller->disconnect(view);
         view->disconnect();
 
         disconnect(view);
         m_controller->disconnect(view);
         view->disconnect();
 

-        deleteWhenNotDragSource(view);
-        view = 0;
+        m_viewAccessor.deleteView();
+    }
+}
+
+void DolphinView::pasteToUrl(const KUrl& url)
+{
+    addNewFileNames(QApplication::clipboard()->mimeData());
+    KonqOperations::doPaste(this, url);
+}
+
+void DolphinView::updateZoomLevel(int oldZoomLevel)
+{
+    const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize());
+    if (oldZoomLevel != newZoomLevel) {
+        m_controller->setZoomLevel(newZoomLevel);
+        emit zoomLevelChanged(newZoomLevel);
+    }
+}
+
+KUrl::List DolphinView::simplifiedSelectedUrls() const
+{
+    KUrl::List list = selectedUrls();
+    if (itemsExpandable() ) {
+        list = KDirModel::simplifiedUrlList(list);
+    }
+    return list;
+}
+
+QMimeData* DolphinView::selectionMimeData() const
+{
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+    Q_ASSERT((view != 0) && (view->selectionModel() != 0));
+    const QItemSelection selection = m_viewAccessor.proxyModel()->mapSelectionToSource(view->selectionModel()->selection());
+    return m_viewAccessor.dirModel()->mimeData(selection.indexes());
+}

 
 

-        m_iconsView = 0;
-        m_detailsView = 0;
-        m_columnView = 0;
-        m_fileItemDelegate = 0;
-        m_toolTipManager = 0;
+void DolphinView::addNewFileNames(const QMimeData* mimeData)
+{
+    const KUrl::List urls = KUrl::List::fromMimeData(mimeData);
+    foreach (const KUrl& url, urls) {
+        m_newFileNames.insert(url.fileName());

     }
 }
 
     }
 }
 

-QAbstractItemView* DolphinView::itemView() const
+DolphinView::ViewAccessor::ViewAccessor(DolphinSortFilterProxyModel* proxyModel) :
+    m_iconsView(0),
+    m_detailsView(0),
+    m_columnsContainer(0),
+    m_proxyModel(proxyModel),
+    m_dragSource(0)
+{
+}
+
+DolphinView::ViewAccessor::~ViewAccessor()
+{
+    delete m_dragSource;
+    m_dragSource = 0;
+}
+
+void DolphinView::ViewAccessor::createView(QWidget* parent,
+                                           DolphinController* controller,
+                                           Mode mode)

 {
 {

+    Q_ASSERT(itemView() == 0);
+
+    switch (mode) {
+    case IconsView:
+        m_iconsView = new DolphinIconsView(parent, controller, m_proxyModel);
+        break;
+
+    case DetailsView:
+        m_detailsView = new DolphinDetailsView(parent, controller, m_proxyModel);
+        break;
+
+    case ColumnView:
+        m_columnsContainer = new DolphinColumnViewContainer(parent, controller);
+        break;
+
+    default:
+        Q_ASSERT(false);
+    }
+}
+
+void DolphinView::ViewAccessor::deleteView()
+{
+    QAbstractItemView* view = itemView();
+    if (view != 0) {
+        if (DragAndDropHelper::instance().isDragSource(view)) {
+            // The view is a drag source (the feature "Open folders
+            // during drag operations" is used). Deleting the view
+            // during an ongoing drag operation is not allowed, so
+            // this will postponed.
+            if (m_dragSource != 0) {
+                // the old stored view is obviously not the drag source anymore
+                m_dragSource->deleteLater();
+                m_dragSource = 0;
+            }
+            view->hide();
+            m_dragSource = view;
+        } else {
+            view->deleteLater();
+        }
+    }
+
+    m_iconsView = 0;
+    m_detailsView = 0;
+
+    if (m_columnsContainer != 0) {
+        m_columnsContainer->deleteLater();
+    }
+    m_columnsContainer = 0;
+}
+
+
+void DolphinView::ViewAccessor::prepareUrlChange(const KUrl& url)
+{
+    if (m_columnsContainer != 0) {
+        m_columnsContainer->showColumn(url);
+    }
+}
+
+QAbstractItemView* DolphinView::ViewAccessor::itemView() const
+{
+    if (m_iconsView != 0) {
+        return m_iconsView;
+    }
+

     if (m_detailsView != 0) {
         return m_detailsView;
     if (m_detailsView != 0) {
         return m_detailsView;

-    } else if (m_columnView != 0) {
-        return m_columnView;

     }
 
     }
 

-    return m_iconsView;
+    if (m_columnsContainer != 0) {
+        return m_columnsContainer->activeColumn();
+    }
+
+    return 0;

 }
 
 }
 

-bool DolphinView::isCutItem(const KFileItem& item) const
+KFileItemDelegate* DolphinView::ViewAccessor::itemDelegate() const

 {
 {

-    const QMimeData* mimeData = QApplication::clipboard()->mimeData();
-    const KUrl::List cutUrls = KUrl::List::fromMimeData(mimeData);
+    return static_cast<KFileItemDelegate*>(itemView()->itemDelegate());
+}

 
 

-    const KUrl& itemUrl = item.url();
-    KUrl::List::const_iterator it = cutUrls.begin();
-    const KUrl::List::const_iterator end = cutUrls.end();
-    while (it != end) {
-        if (*it == itemUrl) {
-            return true;
-        }
-        ++it;
+QWidget* DolphinView::ViewAccessor::layoutTarget() const
+{
+    if (m_columnsContainer != 0) {
+        return m_columnsContainer;

     }
     }

+    return itemView();
+}

 
 

-    return false;
+KUrl DolphinView::ViewAccessor::rootUrl() const
+{
+    return (m_columnsContainer != 0) ? m_columnsContainer->rootUrl() : KUrl();

 }
 
 }
 

-void DolphinView::pasteToUrl(const KUrl& url)
+bool DolphinView::ViewAccessor::supportsCategorizedSorting() const

 {
 {

-    KonqOperations::doPaste(this, url);
+    return m_iconsView != 0;

 }
 
 }
 

-void DolphinView::updateZoomLevel(int oldZoomLevel)
+bool DolphinView::ViewAccessor::itemsExpandable() const

 {
 {

-    const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(itemView()->iconSize());
-    if (oldZoomLevel != newZoomLevel) {
-        m_controller->setZoomLevel(newZoomLevel);
-        emit zoomLevelChanged(newZoomLevel);
+    return (m_detailsView != 0) && m_detailsView->itemsExpandable();
+}
+
+
+QSet<KUrl> DolphinView::ViewAccessor::expandedUrls() const
+{
+    if (m_detailsView != 0) {
+        return m_detailsView->expandedUrls();

     }
     }

+
+    return QSet<KUrl>();

 }
 
 }
 

-KUrl::List DolphinView::simplifiedSelectedUrls() const
+const DolphinDetailsViewExpander* DolphinView::ViewAccessor::setExpandedUrls(const QSet<KUrl>& urlsToExpand)

 {
 {

-    KUrl::List list = selectedUrls();
-    if (itemsExpandable() ) {
-        list = KDirModel::simplifiedUrlList(list);
+    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;
+    }
+    else {
+        return 0;

     }
     }

-    return list;

 }
 
 }
 

-QMimeData* DolphinView::selectionMimeData() const
+bool DolphinView::ViewAccessor::reloadOnAdditionalInfoChange() const
+{
+    // the details view requires no reloading of the directory, as it maps
+    // the file item delegate info to its columns internally
+    return m_detailsView != 0;
+}
+
+DolphinModel* DolphinView::ViewAccessor::dirModel() const
+{
+    return static_cast<DolphinModel*>(proxyModel()->sourceModel());
+}
+
+DolphinSortFilterProxyModel* DolphinView::ViewAccessor::proxyModel() const

 {
 {

-    if (isColumnViewActive()) {
-        return m_columnView->selectionMimeData();
+    if (m_columnsContainer != 0) {
+        return static_cast<DolphinSortFilterProxyModel*>(m_columnsContainer->activeColumn()->model());

     }
     }

+    return m_proxyModel;
+}

 
 

-    const QAbstractItemView* view = itemView();
-    Q_ASSERT((view != 0) && (view->selectionModel() != 0));
-    const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
-    return m_dolphinModel->mimeData(selection.indexes());
+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);
+    }

 }
 
 #include "dolphinview.moc"
 }
 
 #include "dolphinview.moc"