Revert the 2.0 decision to always use KB for file-sizes

[dolphin.git] / src / views / dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 1df86439c7329fbaecd0f95ae9e6f32967a3885d..872853642a01c157f886afab194097b1f76aa16f 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -20,22 +20,33 @@
 
 #include "dolphinview.h"
 
 
 #include "dolphinview.h"
 

+#include <config-nepomuk.h>
+

 #include <QAbstractItemView>
 #include <QApplication>
 #include <QAbstractItemView>
 #include <QApplication>

+#include <QBoxLayout>

 #include <QClipboard>
 #include <QClipboard>

+#include <QDropEvent>
+#include <QGraphicsSceneDragDropEvent>

 #include <QKeyEvent>
 #include <QItemSelection>
 #include <QKeyEvent>
 #include <QItemSelection>

-#include <QBoxLayout>

 #include <QTimer>
 #include <QScrollBar>
 
 #include <KActionCollection>
 #include <KColorScheme>
 #include <KDirLister>
 #include <QTimer>
 #include <QScrollBar>
 
 #include <KActionCollection>
 #include <KColorScheme>
 #include <KDirLister>

+#include <KDirModel>

 #include <KIconEffect>
 #include <KFileItem>
 #include <KFileItemListProperties>
 #include <KLocale>
 #include <KIconEffect>
 #include <KFileItem>
 #include <KFileItemListProperties>
 #include <KLocale>

+#include <kitemviews/kfileitemmodel.h>
+#include <kitemviews/kfileitemlistview.h>
+#include <kitemviews/kitemlistheader.h>
+#include <kitemviews/kitemlistselectionmanager.h>
+#include <kitemviews/kitemlistview.h>
+#include <kitemviews/kitemlistcontroller.h>

 #include <KIO/DeleteJob>
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>
 #include <KIO/DeleteJob>
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>


@@ -48,90 +59,57 @@
 #include <KToggleAction>
 #include <KUrl>
 
 #include <KToggleAction>
 #include <KUrl>
 

-#include "additionalinfoaccessor.h"

 #include "dolphindirlister.h"
 #include "dolphindirlister.h"

-#include "dolphinmodel.h"
-#include "dolphincolumnviewcontainer.h"
-#include "dolphinviewcontroller.h"
-#include "dolphindetailsview.h"
-#include "dolphinfileitemdelegate.h"

 #include "dolphinnewfilemenuobserver.h"
 #include "dolphinnewfilemenuobserver.h"

-#include "dolphinsortfilterproxymodel.h"

 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_detailsmodesettings.h"

-#include "dolphiniconsview.h"

 #include "dolphin_generalsettings.h"
 #include "dolphin_generalsettings.h"

+#include "dolphinitemlistcontainer.h"

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

-#include "settings/dolphinsettings.h"
+#include "versioncontrol/versioncontrolobserver.h"

 #include "viewmodecontroller.h"
 #include "viewproperties.h"
 #include "viewmodecontroller.h"
 #include "viewproperties.h"

+#include "views/tooltips/tooltipmanager.h"

 #include "zoomlevelinfo.h"
 #include "zoomlevelinfo.h"

-#include "dolphindetailsviewexpander.h"
+
+#ifdef HAVE_NEPOMUK
+    #include <Nepomuk/ResourceManager>
+#endif
+
+namespace {
+    const int MaxModeEnum = DolphinView::CompactView;
+};

 
 DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     QWidget(parent),
     m_active(true),
 
 DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     QWidget(parent),
     m_active(true),

-    m_showPreview(false),
-    m_storedCategorizedSorting(false),

     m_tabsForFiles(false),
     m_tabsForFiles(false),

-    m_isContextMenuOpen(false),

     m_assureVisibleCurrentIndex(false),
     m_assureVisibleCurrentIndex(false),

-    m_expanderActive(false),

     m_isFolderWritable(true),
     m_isFolderWritable(true),

+    m_dragging(false),
+    m_url(url),

     m_mode(DolphinView::IconsView),
     m_mode(DolphinView::IconsView),

+    m_visibleRoles(),

     m_topLayout(0),
     m_topLayout(0),

-    m_dolphinViewController(0),
-    m_viewModeController(0),
-    m_viewAccessor(),
+    m_dirLister(0),
+    m_container(0),
+    m_toolTipManager(0),

     m_selectionChangedTimer(0),
     m_selectionChangedTimer(0),

-    m_activeItemUrl(),
+    m_currentItemUrl(),

     m_restoredContentsPosition(),
     m_createdItemUrl(),
     m_restoredContentsPosition(),
     m_createdItemUrl(),

-    m_selectedItems(),
-    m_newFileNames()
+    m_selectedUrls(),
+    m_versionControlObserver(0)

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

-    m_dolphinViewController = new DolphinViewController(this);
-
-    m_viewModeController = new ViewModeController(this);
-    m_viewModeController->setUrl(url);
-
-    connect(m_viewModeController, SIGNAL(urlChanged(const KUrl&)),
-            this, SIGNAL(urlChanged(const KUrl&)));
-
-    connect(m_dolphinViewController, SIGNAL(requestContextMenu(const QPoint&, const QList<QAction*>&)),
-            this, SLOT(openContextMenu(const QPoint&, const QList<QAction*>&)));
-    connect(m_dolphinViewController, SIGNAL(urlsDropped(const KFileItem&, const KUrl&, QDropEvent*)),
-            this, SLOT(dropUrls(const KFileItem&, const KUrl&, QDropEvent*)));
-    connect(m_dolphinViewController, SIGNAL(sortingChanged(DolphinView::Sorting)),
-            this, SLOT(updateSorting(DolphinView::Sorting)));
-    connect(m_dolphinViewController, SIGNAL(sortOrderChanged(Qt::SortOrder)),
-            this, SLOT(updateSortOrder(Qt::SortOrder)));
-    connect(m_dolphinViewController, SIGNAL(sortFoldersFirstChanged(bool)),
-            this, SLOT(updateSortFoldersFirst(bool)));
-    connect(m_dolphinViewController, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
-            this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&)));
-    connect(m_dolphinViewController, SIGNAL(itemTriggered(const KFileItem&)),
-            this, SLOT(triggerItem(const KFileItem&)));
-    connect(m_dolphinViewController, SIGNAL(tabRequested(const KUrl&)),
-            this, SIGNAL(tabRequested(const KUrl&)));
-    connect(m_dolphinViewController, SIGNAL(activated()),
-            this, SLOT(activate()));
-    connect(m_dolphinViewController, SIGNAL(itemEntered(const KFileItem&)),
-            this, SLOT(showHoverInformation(const KFileItem&)));
-    connect(m_dolphinViewController, SIGNAL(viewportEntered()),
-            this, SLOT(clearHoverInformation()));
-    connect(m_dolphinViewController, SIGNAL(urlChangeRequested(KUrl)),
-            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
     // creation is done asynchronously, several signals must be checked:
     // 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
     // creation is done asynchronously, several signals must be checked:

-    connect(&DolphinNewFileMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
-            this, SLOT(observeCreatedItem(const KUrl&)));
+    connect(&DolphinNewFileMenuObserver::instance(), SIGNAL(itemCreated(KUrl)),
+            this, SLOT(observeCreatedItem(KUrl)));

 
     m_selectionChangedTimer = new QTimer(this);
     m_selectionChangedTimer->setSingleShot(true);
 
     m_selectionChangedTimer = new QTimer(this);
     m_selectionChangedTimer->setSingleShot(true);


@@ -139,8 +117,76 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     connect(m_selectionChangedTimer, SIGNAL(timeout()),
             this, SLOT(emitSelectionChangedSignal()));
 
     connect(m_selectionChangedTimer, SIGNAL(timeout()),
             this, SLOT(emitSelectionChangedSignal()));
 

+    m_dirLister = new DolphinDirLister(this);
+    m_dirLister->setAutoUpdate(true);
+    m_dirLister->setDelayedMimeTypes(true);
+
+    connect(m_dirLister, SIGNAL(redirection(KUrl,KUrl)), this, SLOT(slotRedirection(KUrl,KUrl)));
+    connect(m_dirLister, SIGNAL(started(KUrl)),          this, SLOT(slotDirListerStarted(KUrl)));
+    connect(m_dirLister, SIGNAL(refreshItems(QList<QPair<KFileItem,KFileItem> >)),
+            this, SLOT(slotRefreshItems()));
+
+    connect(m_dirLister, SIGNAL(clear()),                     this, SIGNAL(itemCountChanged()));
+    connect(m_dirLister, SIGNAL(newItems(KFileItemList)),     this, SIGNAL(itemCountChanged()));
+    connect(m_dirLister, SIGNAL(infoMessage(QString)),        this, SIGNAL(infoMessage(QString)));
+    connect(m_dirLister, SIGNAL(errorMessage(QString)),       this, SIGNAL(infoMessage(QString)));
+    connect(m_dirLister, SIGNAL(percent(int)),                this, SIGNAL(pathLoadingProgress(int)));
+    connect(m_dirLister, SIGNAL(urlIsFileError(KUrl)),        this, SIGNAL(urlIsFileError(KUrl)));
+    connect(m_dirLister, SIGNAL(itemsDeleted(KFileItemList)), this, SIGNAL(itemCountChanged()));
+
+    m_container = new DolphinItemListContainer(m_dirLister, this);
+    m_container->setVisibleRoles(QList<QByteArray>() << "name");
+    m_container->installEventFilter(this);
+    setFocusProxy(m_container);
+    connect(m_container->horizontalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(hideToolTip()));
+    connect(m_container->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(hideToolTip()));
+
+    KItemListController* controller = m_container->controller();
+    controller->setSelectionBehavior(KItemListController::MultiSelection);
+    connect(controller, SIGNAL(itemActivated(int)), this, SLOT(slotItemActivated(int)));
+    connect(controller, SIGNAL(itemsActivated(QSet<int>)), this, SLOT(slotItemsActivated(QSet<int>)));
+    connect(controller, SIGNAL(itemMiddleClicked(int)), this, SLOT(slotItemMiddleClicked(int)));
+    connect(controller, SIGNAL(itemContextMenuRequested(int,QPointF)), this, SLOT(slotItemContextMenuRequested(int,QPointF)));
+    connect(controller, SIGNAL(viewContextMenuRequested(QPointF)), this, SLOT(slotViewContextMenuRequested(QPointF)));
+    connect(controller, SIGNAL(headerContextMenuRequested(QPointF)), this, SLOT(slotHeaderContextMenuRequested(QPointF)));
+    connect(controller, SIGNAL(mouseButtonPressed(int,Qt::MouseButtons)), this, SLOT(slotMouseButtonPressed(int,Qt::MouseButtons)));
+    connect(controller, SIGNAL(itemHovered(int)), this, SLOT(slotItemHovered(int)));
+    connect(controller, SIGNAL(itemUnhovered(int)), this, SLOT(slotItemUnhovered(int)));
+    connect(controller, SIGNAL(itemDropEvent(int,QGraphicsSceneDragDropEvent*)), this, SLOT(slotItemDropEvent(int,QGraphicsSceneDragDropEvent*)));
+    connect(controller, SIGNAL(modelChanged(KItemModelBase*,KItemModelBase*)), this, SLOT(slotModelChanged(KItemModelBase*,KItemModelBase*)));
+
+    KFileItemModel* model = fileItemModel();
+    if (model) {
+        connect(model, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
+    }
+
+    KItemListView* view = controller->view();
+    view->installEventFilter(this);
+    connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
+            this, SLOT(slotSortOrderChangedByHeader(Qt::SortOrder,Qt::SortOrder)));
+    connect(view, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
+            this, SLOT(slotSortRoleChangedByHeader(QByteArray,QByteArray)));
+    connect(view, SIGNAL(visibleRolesChanged(QList<QByteArray>,QList<QByteArray>)),
+            this, SLOT(slotVisibleRolesChangedByHeader(QList<QByteArray>,QList<QByteArray>)));
+    connect(view->header(), SIGNAL(columnWidthChanged(QByteArray,qreal,qreal)),
+            this, SLOT(slotHeaderColumnWidthChanged(QByteArray,qreal,qreal)));
+
+    KItemListSelectionManager* selectionManager = controller->selectionManager();
+    connect(selectionManager, SIGNAL(selectionChanged(QSet<int>,QSet<int>)),
+            this, SLOT(slotSelectionChanged(QSet<int>,QSet<int>)));
+
+    m_toolTipManager = new ToolTipManager(this);
+
+    m_versionControlObserver = new VersionControlObserver(this);
+    m_versionControlObserver->setModel(model);
+    connect(m_versionControlObserver, SIGNAL(infoMessage(QString)), this, SIGNAL(infoMessage(QString)));
+    connect(m_versionControlObserver, SIGNAL(errorMessage(QString)), this, SIGNAL(errorMessage(QString)));
+    connect(m_versionControlObserver, SIGNAL(operationCompletedMessage(QString)), this, SIGNAL(operationCompletedMessage(QString)));
+

     applyViewProperties();
     applyViewProperties();

-    m_topLayout->addWidget(m_viewAccessor.layoutTarget());
+    m_topLayout->addWidget(m_container);
+
+    loadDirectory(url);

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


@@ -149,17 +195,7 @@ DolphinView::~DolphinView()
 
 KUrl DolphinView::url() const
 {
 
 KUrl DolphinView::url() const
 {

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

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


@@ -175,21 +211,20 @@ void DolphinView::setActive(bool active)
         color.setAlpha(150);
     }
 
         color.setAlpha(150);
     }
 

-    QWidget* viewport = m_viewAccessor.itemView()->viewport();
-    QPalette palette;
-    palette.setColor(viewport->backgroundRole(), color);
-    viewport->setPalette(palette);
+    QWidget* viewport = m_container->viewport();
+    if (viewport) {
+        QPalette palette;
+        palette.setColor(viewport->backgroundRole(), color);
+        viewport->setPalette(palette);
+    }

 
     update();
 
     if (active) {
 
     update();
 
     if (active) {

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

         emit activated();
         emit activated();

-        emitSelectionChangedSignal();

         emit writeStateChanged(m_isFolderWritable);
     }
         emit writeStateChanged(m_isFolderWritable);
     }

-
-    m_viewModeController->indicateActivationChange(active);

 }
 
 bool DolphinView::isActive() const
 }
 
 bool DolphinView::isActive() const


@@ -199,170 +234,161 @@ bool DolphinView::isActive() const
 
 void DolphinView::setMode(Mode mode)
 {
 
 void DolphinView::setMode(Mode mode)
 {

-    if (mode == m_mode) {
-        return; // the wished mode is already set
-    }
-
-    const int oldZoomLevel = m_viewModeController->zoomLevel();
-    m_mode = mode;
+    if (mode != m_mode) {
+        ViewProperties props(url());
+        props.setViewMode(mode);
+        props.save();

 
 

-    // remember the currently selected items, so that they will
-    // be restored after reloading the directory
-    m_selectedItems = selectedItems();
-
-    const bool hasFocus = m_viewAccessor.itemView()->hasFocus();
-    deleteView();
-
-    const KUrl viewPropsUrl = rootUrl();
-    ViewProperties props(viewPropsUrl);
-    props.setViewMode(m_mode);
-    createView();
-
-    if (hasFocus) {
-        m_viewAccessor.itemView()->setFocus();
+        applyViewProperties();

     }
     }

+}

 
 

-    // the file item delegate has been recreated, apply the current
-    // additional information manually
-    const KFileItemDelegate::InformationList infoList = props.additionalInfo();
-    m_viewAccessor.itemDelegate()->setShowInformation(infoList);
-    emit additionalInfoChanged();
+DolphinView::Mode DolphinView::mode() const
+{
+    return m_mode;
+}

 
 

-    // Not all view modes support categorized sorting. Adjust the sorting model
-    // if changing the view mode results in a change of the categorized sorting
-    // capabilities.
-    m_storedCategorizedSorting = props.categorizedSorting();
-    const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
-    if (categorized != m_viewAccessor.proxyModel()->isCategorizedModel()) {
-        m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
-        emit categorizedSortingChanged();
+void DolphinView::setPreviewsShown(bool show)
+{
+    if (previewsShown() == show) {
+        return;

     }
 
     }
 

-    emit modeChanged();
+    ViewProperties props(url());
+    props.setPreviewsShown(show);

 
 

-    updateZoomLevel(oldZoomLevel);
-    loadDirectory(viewPropsUrl);
+    m_container->setPreviewsShown(show);
+    emit previewsShownChanged(show);

 }
 
 }
 

-DolphinView::Mode DolphinView::mode() const
+bool DolphinView::previewsShown() const

 {
 {

-    return m_mode;
+    return m_container->previewsShown();

 }
 
 }
 

-bool DolphinView::showPreview() const
+void DolphinView::setHiddenFilesShown(bool show)

 {
 {

-    return m_showPreview;
-}
+    if (m_dirLister->showingDotFiles() == show) {
+        return;
+    }

 
 

-bool DolphinView::showHiddenFiles() const
-{
-    return m_viewAccessor.dirLister()->showingDotFiles();
+    const KFileItemList itemList = selectedItems();
+    m_selectedUrls.clear();
+    m_selectedUrls = itemList.urlList();
+
+    ViewProperties props(url());
+    props.setHiddenFilesShown(show);
+
+    fileItemModel()->setShowHiddenFiles(show);
+    emit hiddenFilesShownChanged(show);

 }
 
 }
 

-bool DolphinView::categorizedSorting() const
+bool DolphinView::hiddenFilesShown() const

 {
 {

-    // If all view modes would support categorized sorting, returning
-    // 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
-    // checkbox by checking DolphinView::supportsCategorizedSorting() to indicate
-    // that this setting is not applied to the current view mode.
-    return m_storedCategorizedSorting;
+    return m_dirLister->showingDotFiles();

 }
 
 }
 

-bool DolphinView::supportsCategorizedSorting() const
+void DolphinView::setGroupedSorting(bool grouped)

 {
 {

-    return m_viewAccessor.supportsCategorizedSorting();
+    if (grouped == groupedSorting()) {
+        return;
+    }
+
+    ViewProperties props(url());
+    props.setGroupedSorting(grouped);
+    props.save();
+
+    m_container->controller()->model()->setGroupedSorting(grouped);
+
+    emit groupedSortingChanged(grouped);

 }
 
 }
 

-KFileItem DolphinView::rootItem() const
+bool DolphinView::groupedSorting() const

 {
 {

-    return m_viewAccessor.dirLister()->rootItem();
+    return fileItemModel()->groupedSorting();

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

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

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

-    KFileItemList itemList;
-    const QAbstractItemView* view = m_viewAccessor.itemView();
-    if (!view) {
-        return itemList;
-    }
-
-    const QItemSelection selection = m_viewAccessor.proxyModel()->mapSelectionToSource(view->selectionModel()->selection());
+    const KFileItemModel* model = fileItemModel();
+    const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+    const QSet<int> selectedIndexes = selectionManager->selectedItems();

 
 

-    const QModelIndexList indexList = selection.indexes();
-    foreach (const QModelIndex &index, indexList) {
-        KFileItem item = m_viewAccessor.dirModel()->itemForIndex(index);
-        if (!item.isNull()) {
-            itemList.append(item);
-        }
+    KFileItemList selectedItems;
+    QSetIterator<int> it(selectedIndexes);
+    while (it.hasNext()) {
+        const int index = it.next();
+        selectedItems.append(model->fileItem(index));

     }
     }

-
-    return itemList;
+    return selectedItems;

 }
 
 int DolphinView::selectedItemsCount() const
 {
 }
 
 int DolphinView::selectedItemsCount() const
 {

-    const QAbstractItemView* view = m_viewAccessor.itemView();
-    if (!view) {
-        return 0;
-    }
-
-    return view->selectionModel()->selectedIndexes().count();
+    const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+    return selectionManager->selectedItems().count();

 }
 
 void DolphinView::markUrlsAsSelected(const QList<KUrl>& urls)
 {
 }
 
 void DolphinView::markUrlsAsSelected(const QList<KUrl>& urls)
 {

-    foreach (const KUrl& url, urls) {
-        KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
-        m_selectedItems.append(item);
-    }
+    m_selectedUrls = urls;

 }
 
 }
 

-void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled)
+void DolphinView::markUrlAsCurrent(const KUrl& url)

 {
 {

-    const QItemSelection matchingIndexes = childrenMatchingPattern(QModelIndex(), pattern);
-    const QItemSelectionModel::SelectionFlags command = enabled
-                                                      ? QItemSelectionModel::Select
-                                                      : QItemSelectionModel::Deselect;
-    m_viewAccessor.itemView()->selectionModel()->select(matchingIndexes, command);
+    m_currentItemUrl = url;

 }
 
 }
 

-void DolphinView::setZoomLevel(int level)
+void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled)

 {
 {

-    if (level < ZoomLevelInfo::minimumLevel()) {
-        level = ZoomLevelInfo::minimumLevel();
-    } else if (level > ZoomLevelInfo::maximumLevel()) {
-        level = ZoomLevelInfo::maximumLevel();
+    const KItemListSelectionManager::SelectionMode mode = enabled
+                                                        ? KItemListSelectionManager::Select
+                                                        : KItemListSelectionManager::Deselect;
+    const KFileItemModel* model = fileItemModel();
+    KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+
+    for (int index = 0; index < model->count(); index++) {
+        const KFileItem item = model->fileItem(index);
+        if (pattern.exactMatch(item.text())) {
+            // An alternative approach would be to store the matching items in a QSet<int> and
+            // select them in one go after the loop, but we'd need a new function
+            // KItemListSelectionManager::setSelected(QSet<int>, SelectionMode mode)
+            // for that.
+            selectionManager->setSelected(index, 1, mode);
+        }

     }
     }

+}

 
 

-    if (level != zoomLevel()) {
-        m_viewModeController->setZoomLevel(level);
-        emit zoomLevelChanged(level);
+void DolphinView::setZoomLevel(int level)
+{
+    const int oldZoomLevel = zoomLevel();
+    m_container->setZoomLevel(level);
+    if (zoomLevel() != oldZoomLevel) {
+        emit zoomLevelChanged(zoomLevel(), oldZoomLevel);

     }
 }
 
 int DolphinView::zoomLevel() const
 {
     }
 }
 
 int DolphinView::zoomLevel() const
 {

-    return m_viewModeController->zoomLevel();
+    return m_container->zoomLevel();

 }
 
 }
 

-void DolphinView::setSorting(Sorting sorting)
+void DolphinView::setSortRole(const QByteArray& role)

 {
 {

-    if (sorting != this->sorting()) {
-        updateSorting(sorting);
+    if (role != sortRole()) {
+        updateSortRole(role);

     }
 }
 
     }
 }
 

-DolphinView::Sorting DolphinView::sorting() const
+QByteArray DolphinView::sortRole() const

 {
 {

-    return m_viewAccessor.proxyModel()->sorting();
+    const KItemModelBase* model = m_container->controller()->model();
+    return model->sortRole();

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


@@ -374,7 +400,8 @@ void DolphinView::setSortOrder(Qt::SortOrder order)
 
 Qt::SortOrder DolphinView::sortOrder() const
 {
 
 Qt::SortOrder DolphinView::sortOrder() const
 {

-    return m_viewAccessor.proxyModel()->sortOrder();
+    KItemModelBase* model = fileItemModel();
+    return model->sortOrder();

 }
 
 void DolphinView::setSortFoldersFirst(bool foldersFirst)
 }
 
 void DolphinView::setSortFoldersFirst(bool foldersFirst)


@@ -386,26 +413,26 @@ void DolphinView::setSortFoldersFirst(bool foldersFirst)
 
 bool DolphinView::sortFoldersFirst() const
 {
 
 bool DolphinView::sortFoldersFirst() const
 {

-    return m_viewAccessor.proxyModel()->sortFoldersFirst();
+    KFileItemModel* model = fileItemModel();
+    return model->sortFoldersFirst();

 }
 
 }
 

-void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info)
+void DolphinView::setVisibleRoles(const QList<QByteArray>& roles)

 {
 {

-    const KUrl viewPropsUrl = rootUrl();
-    ViewProperties props(viewPropsUrl);
-    props.setAdditionalInfo(info);
-    m_viewAccessor.itemDelegate()->setShowInformation(info);
+    const QList<QByteArray> previousRoles = roles;

 
 

-    emit additionalInfoChanged();
+    ViewProperties props(url());
+    props.setVisibleRoles(roles);

 
 

-    if (m_viewAccessor.reloadOnAdditionalInfoChange()) {
-        loadDirectory(viewPropsUrl);
-    }
+    m_visibleRoles = roles;
+    m_container->setVisibleRoles(roles);
+
+    emit visibleRolesChanged(m_visibleRoles, previousRoles);

 }
 
 }
 

-KFileItemDelegate::InformationList DolphinView::additionalInfo() const
+QList<QByteArray> DolphinView::visibleRoles() const

 {
 {

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

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


@@ -413,7 +440,10 @@ void DolphinView::reload()
     QByteArray viewState;
     QDataStream saveStream(&viewState, QIODevice::WriteOnly);
     saveState(saveStream);
     QByteArray viewState;
     QDataStream saveStream(&viewState, QIODevice::WriteOnly);
     saveState(saveStream);

-    m_selectedItems= selectedItems();
+
+    const KFileItemList itemList = selectedItems();
+    m_selectedUrls.clear();
+    m_selectedUrls = itemList.urlList();

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


@@ -424,38 +454,44 @@ void DolphinView::reload()
 
 void DolphinView::stopLoading()
 {
 
 void DolphinView::stopLoading()
 {

-    m_viewAccessor.dirLister()->stop();
+    m_dirLister->stop();

 }
 
 }
 

-void DolphinView::refresh()
+void DolphinView::readSettings()

 {
 {

-    const bool oldActivationState = m_active;
-    const int oldZoomLevel = m_viewModeController->zoomLevel();
-    m_active = true;
+    const int oldZoomLevel = m_container->zoomLevel();

 
 

-    createView();
+    GeneralSettings::self()->readConfig();
+    m_container->readSettings();

     applyViewProperties();
     applyViewProperties();

-    reload();

 
 

-    setActive(oldActivationState);
-    updateZoomLevel(oldZoomLevel);
+    const int newZoomLevel = m_container->zoomLevel();
+    if (newZoomLevel != oldZoomLevel) {
+        emit zoomLevelChanged(newZoomLevel, oldZoomLevel);
+    }
+}
+
+void DolphinView::writeSettings()
+{
+    GeneralSettings::self()->writeConfig();
+    m_container->writeSettings();

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

-    m_viewModeController->setNameFilter(nameFilter);
+    fileItemModel()->setNameFilter(nameFilter);

 }
 
 QString DolphinView::nameFilter() const
 {
 }
 
 QString DolphinView::nameFilter() const
 {

-    return m_viewModeController->nameFilter();
+    return fileItemModel()->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_viewAccessor.dirLister()->items()) {
+    foreach (const KFileItem& item, m_dirLister->items()) {

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


@@ -467,127 +503,106 @@ void DolphinView::calculateItemCount(int& fileCount,
 
 QString DolphinView::statusBarText() const
 {
 
 QString DolphinView::statusBarText() const
 {

-    QString text;
+    QString summary;
+    QString foldersText;
+    QString filesText;
+

     int folderCount = 0;
     int fileCount = 0;
     KIO::filesize_t totalFileSize = 0;
 
     if (hasSelection()) {
     int folderCount = 0;
     int fileCount = 0;
     KIO::filesize_t totalFileSize = 0;
 
     if (hasSelection()) {

-        // give a summary of the status of the selected files
+        // Give a summary of the status of the selected files

         const KFileItemList list = selectedItems();
         const KFileItemList list = selectedItems();

-        if (list.isEmpty()) {
-            // when an item is triggered, it is temporary selected but selectedItems()
-            // will return an empty list
-            return text;
-        }
-
-        KFileItemList::const_iterator it = list.begin();
-        const KFileItemList::const_iterator end = list.end();
-        while (it != end) {
-            const KFileItem& item = *it;
+        foreach (const KFileItem& item, list) {

             if (item.isDir()) {
                 ++folderCount;
             } else {
                 ++fileCount;
                 totalFileSize += item.size();
             }
             if (item.isDir()) {
                 ++folderCount;
             } else {
                 ++fileCount;
                 totalFileSize += item.size();
             }

-            ++it;

         }
 
         if (folderCount + fileCount == 1) {
         }
 
         if (folderCount + fileCount == 1) {

-            // if only one item is selected, show the filename
-            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));
+            // If only one item is selected, show the filename
+            filesText = i18nc("@info:status", "<filename>%1</filename> selected", list.first().text());

         } else {
         } else {

-            // at least 2 items are selected
-            const QString foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
-            const QString filesText = i18ncp("@info:status", "1 File selected", "%1 Files selected", fileCount);
-            if ((folderCount > 0) && (fileCount > 0)) {
-                text = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
-                             foldersText, filesText, KIO::convertSize(totalFileSize));
-            } else if (fileCount > 0) {
-                text = i18nc("@info:status files (size)", "%1 (%2)", filesText, KIO::convertSize(totalFileSize));
-            } else {
-                Q_ASSERT(folderCount > 0);
-                text = foldersText;
-            }
+            // At least 2 items are selected
+            foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
+            filesText = i18ncp("@info:status", "1 File selected", "%1 Files selected", fileCount);

         }
     } else {
         calculateItemCount(fileCount, folderCount, totalFileSize);
         }
     } else {
         calculateItemCount(fileCount, folderCount, totalFileSize);

-        text = KIO::itemsSummaryString(fileCount + folderCount,
-                                       fileCount, folderCount,
-                                       totalFileSize, true);
+        foldersText = i18ncp("@info:status", "1 Folder", "%1 Folders", folderCount);
+        filesText = i18ncp("@info:status", "1 File", "%1 Files", fileCount);

     }
 
     }
 

-    return text;
+    if (fileCount > 0 && folderCount > 0) {
+        summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
+                        foldersText, filesText,
+                        KGlobal::locale()->formatByteSize(totalFileSize));
+    } else if (fileCount > 0) {
+        summary = i18nc("@info:status files (size)", "%1 (%2)",
+                        filesText,
+                        KGlobal::locale()->formatByteSize(totalFileSize));
+    } else if (folderCount > 0) {
+        summary = foldersText;
+    }
+
+    return summary;

 }
 
 QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) const
 {
 }
 
 QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) const
 {

-    return m_dolphinViewController->versionControlActions(items);
+    QList<QAction*> actions;
+
+    if (items.isEmpty()) {
+        const KFileItem item = fileItemModel()->rootItem();
+        actions = m_versionControlObserver->actions(KFileItemList() << item);
+    } else {
+        actions = m_versionControlObserver->actions(items);
+    }
+
+    return actions;

 }
 
 void DolphinView::setUrl(const KUrl& url)
 {
 }
 
 void DolphinView::setUrl(const KUrl& url)
 {

-    if (m_viewModeController->url() == url) {
+    if (url == m_url) {

         return;
     }
 
         return;
     }
 

-    const bool hadSelection = hasSelection();
+    emit urlAboutToBeChanged(url);
+    m_url = url;

 
 

-    // The selection model and directory lister might change in the case of the column view:
-    disconnectViewAccessor();
+    hideToolTip();

 
 

-    m_newFileNames.clear();
-
-    m_viewModeController->setUrl(url); // emits urlChanged, which we forward
-    m_viewAccessor.prepareUrlChange(url);
+    // It is important to clear the items from the model before
+    // applying the view properties, otherwise expensive operations
+    // might be done on the existing items although they get cleared
+    // anyhow afterwards by loadDirectory().
+    fileItemModel()->clear();

     applyViewProperties();
     applyViewProperties();

-
-    // When changing the URL there is no need to keep the version
-    // data of the previous URL.
-    m_viewAccessor.dirModel()->clearVersionData();
-
-    // Reconnect to the (probably) new selection model and directory lister
-    connectViewAccessor();

     loadDirectory(url);
 
     loadDirectory(url);
 

-    if (hadSelection || hasSelection()) {
-        emitSelectionChangedSignal();
-    }
+    emit urlChanged(url);

 }
 
 void DolphinView::selectAll()
 {
 }
 
 void DolphinView::selectAll()
 {

-    m_viewAccessor.itemView()->selectAll();
+    KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+    selectionManager->setSelected(0, fileItemModel()->count());

 }
 
 void DolphinView::invertSelection()
 {
 }
 
 void DolphinView::invertSelection()
 {

-    // 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);
-        }
-    }
-
-    QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel();
-    selectionModel->select(invertedSelection, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Current);
+    KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+    selectionManager->setSelected(0, fileItemModel()->count(), KItemListSelectionManager::Toggle);

 }
 
 void DolphinView::clearSelection()
 {
 }
 
 void DolphinView::clearSelection()
 {

-    m_viewAccessor.itemView()->clearSelection();
+    m_container->controller()->selectionManager()->clearSelection();

 }
 
 void DolphinView::renameSelectedItems()
 }
 
 void DolphinView::renameSelectedItems()


@@ -598,17 +613,19 @@ void DolphinView::renameSelectedItems()
         return;
     }
 
         return;
     }
 

-    if ((itemCount == 1) && DolphinSettings::instance().generalSettings()->renameInline()) {
+    // TODO: The new view-engine introduced with Dolphin 2.0 does not support inline
+    // renaming yet.
+    /*if ((itemCount == 1) && DolphinSettings::instance().generalSettings()->renameInline()) {

         const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForItem(items.first());
         const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
         m_viewAccessor.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 {
+    } else {*/

         RenameDialog* dialog = new RenameDialog(this, items);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
         dialog->raise();
         dialog->activateWindow();
         RenameDialog* dialog = new RenameDialog(this, items);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
         dialog->raise();
         dialog->activateWindow();

-    }
+    //}

 
     // assure that the current index remains visible when KDirLister
     // will notify the view about changed items
 
     // assure that the current index remains visible when KDirLister
     // will notify the view about changed items


@@ -662,151 +679,337 @@ void DolphinView::pasteIntoFolder()
     }
 }
 
     }
 }
 

-void DolphinView::setShowPreview(bool show)
+bool DolphinView::eventFilter(QObject* watched, QEvent* event)

 {
 {

-    if (m_showPreview == show) {
-        return;
-    }
+    switch (event->type()) {
+    case QEvent::FocusIn:
+        if (watched == m_container) {
+            setActive(true);
+        }
+        break;

 
 

-    const KUrl viewPropsUrl = rootUrl();
-    ViewProperties props(viewPropsUrl);
-    props.setShowPreview(show);
+    case QEvent::GraphicsSceneDragEnter:
+        if (watched == m_container->controller()->view()) {
+            m_dragging = true;
+        }
+        break;

 
 

-    m_showPreview = show;
-    const int oldZoomLevel = m_viewModeController->zoomLevel();
-    emit showPreviewChanged();
+    case QEvent::GraphicsSceneDragLeave:
+        if (watched == m_container->controller()->view()) {
+            m_dragging = false;
+        }
+        break;

 
 

-    // Enabling or disabling the preview might change the icon size of the view.
-    // 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);
+    case QEvent::GraphicsSceneDrop:
+        if (watched == m_container->controller()->view()) {
+            m_dragging = false;
+        }
+    default:
+        break;
+    }
+
+    return QWidget::eventFilter(watched, event);

 }
 
 }
 

-void DolphinView::setShowHiddenFiles(bool show)
+void DolphinView::wheelEvent(QWheelEvent* event)

 {
 {

-    if (m_viewAccessor.dirLister()->showingDotFiles() == show) {
-        return;
+    if (event->modifiers().testFlag(Qt::ControlModifier)) {
+        const int numDegrees = event->delta() / 8;
+        const int numSteps = numDegrees / 15;
+
+        setZoomLevel(zoomLevel() + numSteps);
+        event->accept();
+    } else {
+        event->ignore();

     }
     }

+}

 
 

-    const KUrl viewPropsUrl = rootUrl();
-    ViewProperties props(viewPropsUrl);
-    props.setShowHiddenFiles(show);
+void DolphinView::hideEvent(QHideEvent* event)
+{
+    hideToolTip();
+    QWidget::hideEvent(event);
+}

 
 

-    m_viewAccessor.dirLister()->setShowingDotFiles(show);
-    emit showHiddenFilesChanged();
+void DolphinView::activate()
+{
+    setActive(true);

 }
 
 }
 

-void DolphinView::setCategorizedSorting(bool categorized)
+void DolphinView::slotItemActivated(int index)

 {
 {

-    if (categorized == categorizedSorting()) {
-        return;
+    const KFileItem item = fileItemModel()->fileItem(index);
+    if (!item.isNull()) {
+        emit itemActivated(item);

     }
     }

+}

 
 

-    // setCategorizedSorting(true) may only get invoked
-    // if the view supports categorized sorting
-    Q_ASSERT(!categorized || supportsCategorizedSorting());
+void DolphinView::slotItemsActivated(const QSet<int>& indexes)
+{
+    Q_ASSERT(indexes.count() >= 2);

 
 

-    ViewProperties props(rootUrl());
-    props.setCategorizedSorting(categorized);
-    props.save();
+    KFileItemList items;

 
 

-    m_storedCategorizedSorting = categorized;
-    m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
+    KFileItemModel* model = fileItemModel();
+    QSetIterator<int> it(indexes);
+    while (it.hasNext()) {
+        const int index = it.next();
+        items.append(model->fileItem(index));
+    }

 
 

-    emit categorizedSortingChanged();
+    foreach (const KFileItem& item, items) {
+        if (item.isDir()) {
+            emit tabRequested(item.url());
+        } else {
+            emit itemActivated(item);
+        }
+    }

 }
 
 }
 

-void DolphinView::mouseReleaseEvent(QMouseEvent* event)
+void DolphinView::slotItemMiddleClicked(int index)

 {
 {

-    QWidget::mouseReleaseEvent(event);
-    setActive(true);
+    const KFileItem item = fileItemModel()->fileItem(index);
+    if (item.isDir() || isTabsForFilesEnabled()) {
+        emit tabRequested(item.url());
+    }

 }
 
 }
 

-bool DolphinView::eventFilter(QObject* watched, QEvent* event)
+void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos)

 {
 {

-    switch (event->type()) {
-    case QEvent::FocusIn:
-        if (watched == m_viewAccessor.itemView()) {
-            m_dolphinViewController->requestActivation();
-        }
-        break;
+    const KFileItem item = fileItemModel()->fileItem(index);
+    emit requestContextMenu(pos.toPoint(), item, url(), QList<QAction*>());
+}

 
 

-    case QEvent::DragEnter:
-        if (watched == m_viewAccessor.itemView()->viewport()) {
-            setActive(true);
+void DolphinView::slotViewContextMenuRequested(const QPointF& pos)
+{
+    emit requestContextMenu(pos.toPoint(), KFileItem(), url(), QList<QAction*>());
+}
+
+void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
+{
+    ViewProperties props(url());
+
+    QPointer<KMenu> menu = new KMenu(QApplication::activeWindow());
+
+    KItemListView* view = m_container->controller()->view();
+    const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();
+
+    bool nepomukRunning = false;
+    bool indexingEnabled = false;
+#ifdef HAVE_NEPOMUK
+    nepomukRunning = (Nepomuk::ResourceManager::instance()->init() == 0);
+    if (nepomukRunning) {
+        KConfig config("nepomukserverrc");
+        indexingEnabled = config.group("Service-nepomukfileindexer").readEntry("autostart", false);
+    }
+#endif
+
+    QString groupName;
+    QMenu* groupMenu = 0;
+
+    // Add all roles to the menu that can be shown or hidden by the user
+    const QList<KFileItemModel::RoleInfo> rolesInfo = KFileItemModel::rolesInformation();
+    foreach (const KFileItemModel::RoleInfo& info, rolesInfo) {
+        if (info.role == "name") {
+            // It should not be possible to hide the "name" role
+            continue;

         }
         }

-        break;

 
 

-    case QEvent::KeyPress:
-        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) {
-                clearSelection();
+        const QString text = fileItemModel()->roleDescription(info.role);
+        QAction* action = 0;
+        if (info.group.isEmpty()) {
+            action = menu->addAction(text);
+        } else {
+            if (!groupMenu || info.group != groupName) {
+                groupName = info.group;
+                groupMenu = menu->addMenu(groupName);

             }
             }

+
+            action = groupMenu->addAction(text);

         }
         }

-        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);
+        action->setCheckable(true);
+        action->setChecked(visibleRolesSet.contains(info.role));
+        action->setData(info.role);
+
+        const bool enable = (!info.requiresNepomuk && !info.requiresIndexer) ||
+                            (info.requiresNepomuk && nepomukRunning) ||
+                            (info.requiresIndexer && indexingEnabled);
+        action->setEnabled(enable);
+    }
+
+    menu->addSeparator();
+
+    QActionGroup* widthsGroup = new QActionGroup(menu);
+    const bool autoColumnWidths = props.headerColumnWidths().isEmpty();
+
+    QAction* autoAdjustWidthsAction = menu->addAction(i18nc("@action:inmenu", "Automatic Column Widths"));
+    autoAdjustWidthsAction->setCheckable(true);
+    autoAdjustWidthsAction->setChecked(autoColumnWidths);
+    autoAdjustWidthsAction->setActionGroup(widthsGroup);
+
+    QAction* customWidthsAction = menu->addAction(i18nc("@action:inmenu", "Custom Column Widths"));
+    customWidthsAction->setCheckable(true);
+    customWidthsAction->setChecked(!autoColumnWidths);
+    customWidthsAction->setActionGroup(widthsGroup);
+
+    QAction* action = menu->exec(pos.toPoint());
+    if (menu && action) {
+        KItemListHeader* header = view->header();
+
+        if (action == autoAdjustWidthsAction) {
+            // Clear the column-widths from the viewproperties and turn on
+            // the automatic resizing of the columns
+            props.setHeaderColumnWidths(QList<int>());
+            header->setAutomaticColumnResizing(true);
+        } else if (action == customWidthsAction) {
+            // Apply the current column-widths as custom column-widths and turn
+            // off the automatic resizing of the columns
+            QList<int> columnWidths;
+            foreach (const QByteArray& role, view->visibleRoles()) {
+                columnWidths.append(header->columnWidth(role));
+            }
+            props.setHeaderColumnWidths(columnWidths);
+            header->setAutomaticColumnResizing(false);
+        } else {
+            // Show or hide the selected role
+            const QByteArray selectedRole = action->data().toByteArray();
+
+            QList<QByteArray> visibleRoles = view->visibleRoles();
+            if (action->isChecked()) {
+                visibleRoles.append(selectedRole);
+            } else {
+                visibleRoles.removeOne(selectedRole);
+            }
+
+            view->setVisibleRoles(visibleRoles);
+            props.setVisibleRoles(visibleRoles);
+
+            QList<int> columnWidths;
+            if (!header->automaticColumnResizing()) {
+                foreach (const QByteArray& role, view->visibleRoles()) {
+                    columnWidths.append(header->columnWidth(role));

                 }
                 }

-                return true;

             }
             }

+            props.setHeaderColumnWidths(columnWidths);

         }
         }

-        break;
+    }

 
 

-    default:
-        break;
+    delete menu;
+}
+
+void DolphinView::slotHeaderColumnWidthChanged(const QByteArray& role, qreal current, qreal previous)
+{
+    Q_UNUSED(previous);
+
+    const QList<QByteArray> visibleRoles = m_container->visibleRoles();
+
+    ViewProperties props(url());
+    QList<int> columnWidths = props.headerColumnWidths();
+    if (columnWidths.count() != visibleRoles.count()) {
+        columnWidths.clear();
+        columnWidths.reserve(visibleRoles.count());
+        const KItemListHeader* header = m_container->controller()->view()->header();
+        foreach (const QByteArray& role, visibleRoles) {
+            const int width = header->columnWidth(role);
+            columnWidths.append(width);
+        }

     }
 
     }
 

-    return QWidget::eventFilter(watched, event);
+    const int roleIndex = visibleRoles.indexOf(role);
+    Q_ASSERT(roleIndex >= 0 && roleIndex < columnWidths.count());
+    columnWidths[roleIndex] = current;
+
+    props.setHeaderColumnWidths(columnWidths);

 }
 
 }
 

-void DolphinView::showEvent(QShowEvent* event)
+void DolphinView::slotItemHovered(int index)

 {
 {

-    QWidget::showEvent(event);
-    if (!event->spontaneous()) {
-        loadDirectory(url());
+    const KFileItem item = fileItemModel()->fileItem(index);
+
+    if (GeneralSettings::showToolTips() && !m_dragging) {
+        QRectF itemRect = m_container->controller()->view()->itemContextRect(index);
+        const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
+        itemRect.moveTo(pos);
+
+        m_toolTipManager->showToolTip(item, itemRect);

     }
     }

+
+    emit requestItemInfo(item);

 }
 
 }
 

-void DolphinView::activate()
+void DolphinView::slotItemUnhovered(int index)

 {
 {

-    setActive(true);
+    Q_UNUSED(index);
+    hideToolTip();
+    emit requestItemInfo(KFileItem());

 }
 
 }
 

-void DolphinView::triggerItem(const KFileItem& item)
+void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)

 {
 {

-    const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
-    if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {
-        // items are selected by the user, hence don't trigger the
-        // item specified by 'index'
-        return;
+    KUrl destUrl;
+    KFileItem destItem = fileItemModel()->fileItem(index);
+    if (destItem.isNull() || (!destItem.isDir() && !destItem.isDesktopFile())) {
+        // Use the URL of the view as drop target if the item is no directory
+        // or desktop-file
+        destItem = fileItemModel()->rootItem();
+        destUrl = url();
+    } else {
+        // The item represents a directory or desktop-file
+        destUrl = destItem.url();

     }
 
     }
 

-    // TODO: the m_isContextMenuOpen check is a workaround for Qt-issue 207192
-    if (item.isNull() || m_isContextMenuOpen) {
-        return;
+    QDropEvent dropEvent(event->pos().toPoint(),
+                         event->possibleActions(),
+                         event->mimeData(),
+                         event->buttons(),
+                         event->modifiers());
+
+    const QString error = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent);
+    if (!error.isEmpty()) {
+        emit errorMessage(error);

     }
 
     }
 

-    emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
+    if (destUrl == url()) {
+        // Mark the dropped urls as selected.
+        markPastedUrlsAsSelected(event->mimeData());
+    }

 }
 
 }
 

-void DolphinView::slotSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected)
+void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)

 {
 {

-    const int count = selectedItemsCount();
-    const bool selectionStateChanged = ((count >  0) && (selected.count() == count)) ||
-                                       ((count == 0) && !deselected.isEmpty());
+    if (previous != 0) {
+        disconnect(previous, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
+    }
+
+    Q_ASSERT(qobject_cast<KFileItemModel*>(current));
+    connect(current, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
+
+    KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(current);
+    m_versionControlObserver->setModel(fileItemModel);
+}
+
+void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons)
+{
+    hideToolTip();
+
+    if (itemIndex < 0) {
+        // Trigger the history navigation only when clicking on the viewport:
+        // Above an item the XButtons provide a simple way to select items in
+        // the singleClick mode.
+        if (buttons & Qt::XButton1) {
+            emit goBackRequested();
+        } else if (buttons & Qt::XButton2) {
+            emit goForwardRequested();
+        }
+    }
+}
+
+void DolphinView::slotSelectionChanged(const QSet<int>& current, const QSet<int>& previous)
+{
+    const int currentCount = current.count();
+    const int previousCount = previous.count();
+    const bool selectionStateChanged = (currentCount == 0 && previousCount  > 0) ||
+                                       (currentCount >  0 && previousCount == 0);

 
     // If nothing has been selected before and something got selected (or if something
     // was selected before and now nothing is selected) the selectionChangedSignal must
 
     // If nothing has been selected before and something got selected (or if something
     // was selected before and now nothing is selected) the selectionChangedSignal must


@@ -821,89 +1024,39 @@ void DolphinView::emitSelectionChangedSignal()
     emit selectionChanged(selectedItems());
 }
 
     emit selectionChanged(selectedItems());
 }
 

-void DolphinView::openContextMenu(const QPoint& pos,
-                                  const QList<QAction*>& customActions)
-{
-    KFileItem item;
-    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
-    emit requestContextMenu(item, url(), customActions);
-    m_isContextMenuOpen = false;
-}
-
-void DolphinView::dropUrls(const KFileItem& destItem,
-                           const KUrl& destPath,
-                           QDropEvent* event)
-{
-    addNewFileNames(event->mimeData());
-    DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);
-}
-
-void DolphinView::updateSorting(DolphinView::Sorting sorting)
+void DolphinView::updateSortRole(const QByteArray& role)

 {
 {

-    ViewProperties props(rootUrl());
-    props.setSorting(sorting);
+    ViewProperties props(url());
+    props.setSortRole(role);

 
 

-    m_viewAccessor.proxyModel()->setSorting(sorting);
+    KItemModelBase* model = m_container->controller()->model();
+    model->setSortRole(role);

 
 

-    emit sortingChanged(sorting);
+    emit sortRoleChanged(role);

 }
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
 {
 }
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
 {

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

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

-    m_viewAccessor.proxyModel()->setSortOrder(order);
+    KItemModelBase* model = fileItemModel();
+    model->setSortOrder(order);

 
     emit sortOrderChanged(order);
 }
 
 void DolphinView::updateSortFoldersFirst(bool foldersFirst)
 {
 
     emit sortOrderChanged(order);
 }
 
 void DolphinView::updateSortFoldersFirst(bool foldersFirst)
 {

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

     props.setSortFoldersFirst(foldersFirst);
 
     props.setSortFoldersFirst(foldersFirst);
 

-    m_viewAccessor.proxyModel()->setSortFoldersFirst(foldersFirst);
+    KFileItemModel* model = fileItemModel();
+    model->setSortFoldersFirst(foldersFirst);

 
     emit sortFoldersFirstChanged(foldersFirst);
 }
 
 
     emit sortFoldersFirstChanged(foldersFirst);
 }
 

-void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)
-{
-    ViewProperties props(rootUrl());
-    props.setAdditionalInfo(info);
-    props.save();
-
-    m_viewAccessor.itemDelegate()->setShowInformation(info);
-
-    emit additionalInfoChanged();
-}
-
-void DolphinView::updateAdditionalInfoActions(KActionCollection* collection)
-{
-    const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
-
-    const KFileItemDelegate::InformationList checkedInfo = m_viewAccessor.itemDelegate()->showInformation();
-    const KFileItemDelegate::InformationList infoKeys = infoAccessor.keys();
-
-    const bool enable = (m_mode == DolphinView::DetailsView) ||
-                        (m_mode == DolphinView::IconsView);
-
-    foreach (const KFileItemDelegate::Information& info, infoKeys) {
-        const QString name = infoAccessor.actionCollectionName(info, AdditionalInfoAccessor::AdditionalInfoType);
-        QAction* action = collection->action(name);
-        Q_ASSERT(action);
-        action->setEnabled(enable);
-        action->setChecked(checkedInfo.contains(info));
-    }
-}
-

 QPair<bool, QString> DolphinView::pasteInfo() const
 {
     return KonqOperations::pasteInfo(url());
 QPair<bool, QString> DolphinView::pasteInfo() const
 {
     return KonqOperations::pasteInfo(url());


@@ -921,89 +1074,75 @@ bool DolphinView::isTabsForFilesEnabled() const
 
 bool DolphinView::itemsExpandable() const
 {
 
 bool DolphinView::itemsExpandable() const
 {

-    return m_viewAccessor.itemsExpandable();
+    return m_mode == DetailsView;

 }
 
 void DolphinView::restoreState(QDataStream& stream)
 {
 }
 
 void DolphinView::restoreState(QDataStream& stream)
 {

-    // Restore the URL of the current item that had the keyboard focus
-    stream >> m_activeItemUrl;
-
-    // Restore the root URL
-    KUrl rootUrl;
-    stream >> rootUrl;
-    m_viewAccessor.setRootUrl(rootUrl);
+    // Restore the current item that had the keyboard focus
+    stream >> m_currentItemUrl;

 
     // Restore the view position
     stream >> m_restoredContentsPosition;
 
     // Restore expanded folders (only relevant for the details view - will be ignored by the view in other view modes)
 
     // Restore the view position
     stream >> m_restoredContentsPosition;
 
     // Restore 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) {
-        m_expanderActive = true;
-        connect (expander, SIGNAL(completed()), this, SLOT(slotLoadingCompleted()));
-    }
-    else {
-        m_expanderActive = false;
-    }
+    QSet<KUrl> urls;
+    stream >> urls;
+    fileItemModel()->restoreExpandedUrls(urls);

 }
 
 void DolphinView::saveState(QDataStream& stream)
 {
 }
 
 void DolphinView::saveState(QDataStream& stream)
 {

-    // Save the URL of the current item that has the keyboard focus
-    KFileItem currentItem;
-    const QAbstractItemView* view = m_viewAccessor.itemView();
-
-    if (view) {
-        const QModelIndex proxyIndex = view->currentIndex();
-        const QModelIndex dirModelIndex = m_viewAccessor.proxyModel()->mapToSource(proxyIndex);
-        currentItem = m_viewAccessor.dirModel()->itemForIndex(dirModelIndex);
-    }
-
-    KUrl currentItemUrl;
-    if (!currentItem.isNull()) {
-        currentItemUrl = currentItem.url();
+    // Save the current item that has the keyboard focus
+    const int currentIndex = m_container->controller()->selectionManager()->currentItem();
+    if (currentIndex != -1) {
+        KFileItem item = fileItemModel()->fileItem(currentIndex);
+        Q_ASSERT(!item.isNull()); // If the current index is valid a item must exist
+        KUrl currentItemUrl = item.url();
+        stream << currentItemUrl;
+    } else {
+        stream << KUrl();

     }
 
     }
 

-    stream << currentItemUrl;
-
-    // Save the root URL
-    stream << m_viewAccessor.rootUrl();
-

     // Save view position
     // Save view position

-    const int x = view->horizontalScrollBar()->value();
-    const int y = view->verticalScrollBar()->value();
+    const qreal x = m_container->horizontalScrollBar()->value();
+    const qreal y = m_container->verticalScrollBar()->value();

     stream << QPoint(x, y);
 
     // Save expanded folders (only relevant for the details view - the set will be empty in other view modes)
     stream << QPoint(x, y);
 
     // Save expanded folders (only relevant for the details view - the set will be empty in other view modes)

-    stream << m_viewAccessor.expandedUrls();
+    stream << fileItemModel()->expandedUrls();

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

-    const QAbstractItemView* view = m_viewAccessor.itemView();
-    return view && view->selectionModel()->hasSelection();
+    return m_container->controller()->selectionManager()->hasSelection();
+}
+
+KFileItem DolphinView::rootItem() const
+{
+    return m_dirLister->rootItem();

 }
 
 void DolphinView::observeCreatedItem(const KUrl& url)
 {
     m_createdItemUrl = url;
 }
 
 void DolphinView::observeCreatedItem(const KUrl& url)
 {
     m_createdItemUrl = url;

-    connect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)),
-            this, SLOT(selectAndScrollToCreatedItem()));
+    //connect(m_dirModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+    //        this, SLOT(selectAndScrollToCreatedItem()));

 }
 
 void DolphinView::selectAndScrollToCreatedItem()
 {
 }
 
 void DolphinView::selectAndScrollToCreatedItem()
 {

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

     if (dirIndex.isValid()) {
         const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
     if (dirIndex.isValid()) {
         const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);

-        m_viewAccessor.itemView()->setCurrentIndex(proxyIndex);
+        QAbstractItemView* view = m_viewAccessor.itemView();
+        if (view) {
+            view->setCurrentIndex(proxyIndex);
+        }

     }
 
     }
 

-    disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)),
-               this, SLOT(selectAndScrollToCreatedItem()));
+    disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
+               this, SLOT(selectAndScrollToCreatedItem()));*/

     m_createdItemUrl = KUrl();
 }
 
     m_createdItemUrl = KUrl();
 }
 


@@ -1011,28 +1150,56 @@ void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
 {
     if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash)) {
         emit redirection(oldUrl, newUrl);
 {
     if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash)) {
         emit redirection(oldUrl, newUrl);

-        m_viewModeController->redirectToUrl(newUrl); // #186947
+        m_url = newUrl; // #186947

     }
 }
 
     }
 }
 

-void DolphinView::restoreContentsPosition()
+void DolphinView::updateViewState()

 {
 {

+    if (m_currentItemUrl != KUrl()) {
+        KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+        const int currentIndex = fileItemModel()->index(m_currentItemUrl);
+        if (currentIndex != -1) {
+            selectionManager->setCurrentItem(currentIndex);
+        } else {
+            selectionManager->setCurrentItem(0);
+        }
+        m_currentItemUrl = KUrl();
+    }
+

     if (!m_restoredContentsPosition.isNull()) {
         const int x = m_restoredContentsPosition.x();
         const int y = m_restoredContentsPosition.y();
         m_restoredContentsPosition = QPoint();
 
     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);
+        m_container->horizontalScrollBar()->setValue(x);
+        m_container->verticalScrollBar()->setValue(y);
+    }
+
+    if (!m_selectedUrls.isEmpty()) {
+        clearSelection();
+
+        KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+        QSet<int> selectedItems = selectionManager->selectedItems();
+        const KFileItemModel* model = fileItemModel();
+
+        foreach (const KUrl& url, m_selectedUrls) {
+            const int index = model->index(url);
+            if (index >= 0) {
+                selectedItems.insert(index);
+            }
+        }
+
+        selectionManager->setSelectedItems(selectedItems);
+        m_selectedUrls.clear();

     }
 }
 
     }
 }
 

-void DolphinView::slotUrlChangeRequested(const KUrl& url)
+void DolphinView::hideToolTip()

 {
 {

-    m_viewModeController->setUrl(url);
-    updateWritableState();
+    if (GeneralSettings::showToolTips()) {
+        m_toolTipManager->hideToolTip();
+    }

 }
 
 void DolphinView::showHoverInformation(const KFileItem& item)
 }
 
 void DolphinView::showHoverInformation(const KFileItem& item)


@@ -1057,7 +1224,7 @@ void DolphinView::slotDeleteFileFinished(KJob* job)
 void DolphinView::slotDirListerStarted(const KUrl& url)
 {
     // Disable the writestate temporary until it can be determined in a fast way
 void DolphinView::slotDirListerStarted(const KUrl& url)
 {
     // Disable the writestate temporary until it can be determined in a fast way

-    // in DolphinView::slotDirListerCompleted()
+    // in DolphinView::slotLoadingCompleted()

     if (m_isFolderWritable) {
         m_isFolderWritable = false;
         emit writeStateChanged(m_isFolderWritable);
     if (m_isFolderWritable) {
         m_isFolderWritable = false;
         emit writeStateChanged(m_isFolderWritable);


@@ -1066,83 +1233,69 @@ void DolphinView::slotDirListerStarted(const KUrl& url)
     emit startedPathLoading(url);
 }
 
     emit startedPathLoading(url);
 }
 

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

 {
 {

-    if (!m_expanderActive) {
-        slotLoadingCompleted();
-    }
+    // Update the view-state. This has to be done using a Qt::QueuedConnection
+    // because the view might not be in its final state yet.
+    QTimer::singleShot(0, this, SLOT(updateViewState()));

 
 

-    if (!m_newFileNames.isEmpty()) {
-        // select all newly added items created by a paste operation or
-        // a drag & drop operation, and clear the previous selection
-        m_viewAccessor.itemView()->clearSelection();
-        const int rowCount = m_viewAccessor.proxyModel()->rowCount();
-        QItemSelection selection;
-        for (int row = 0; row < rowCount; ++row) {
-            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);
+    emit finishedPathLoading(url());
+
+    updateWritableState();
+}

 
 

-        m_newFileNames.clear();
+void DolphinView::slotRefreshItems()
+{
+    if (m_assureVisibleCurrentIndex) {
+        m_assureVisibleCurrentIndex = false;
+        //QAbstractItemView* view = m_viewAccessor.itemView();
+        //if (view) {
+        //    m_viewAccessor.itemView()->scrollTo(m_viewAccessor.itemView()->currentIndex());
+        //}

     }
     }

+}

 
 

-    updateWritableState();
+void DolphinView::slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOrder previous)
+{
+    Q_UNUSED(previous);
+    Q_ASSERT(fileItemModel()->sortOrder() == current);
+
+    ViewProperties props(url());
+    props.setSortOrder(current);
+
+    emit sortOrderChanged(current);

 }
 
 }
 

-void DolphinView::slotLoadingCompleted()
+void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const QByteArray& previous)

 {
 {

-    m_expanderActive = false;
+    Q_UNUSED(previous);
+    Q_ASSERT(fileItemModel()->sortRole() == current);

 
 

-    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();
-        }
-    }
+    ViewProperties props(url());
+    props.setSortRole(current);

 
 

-    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)) {
-                const 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();
-    }
+    emit sortRoleChanged(current);
+}

 
 

-    // 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::slotVisibleRolesChangedByHeader(const QList<QByteArray>& current,
+                                                  const QList<QByteArray>& previous)
+{
+    Q_UNUSED(previous);
+    Q_ASSERT(m_container->controller()->view()->visibleRoles() == current);

 
 

-    emit finishedPathLoading(url());
+    const QList<QByteArray> previousVisibleRoles = m_visibleRoles;
+
+    m_visibleRoles = current;
+
+    ViewProperties props(url());
+    props.setVisibleRoles(m_visibleRoles);
+
+    emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles);

 }
 
 }
 

-void DolphinView::slotRefreshItems()
+KFileItemModel* DolphinView::fileItemModel() const

 {
 {

-    if (m_assureVisibleCurrentIndex) {
-        m_assureVisibleCurrentIndex = false;
-        m_viewAccessor.itemView()->scrollTo(m_viewAccessor.itemView()->currentIndex());
-    }
+    return static_cast<KFileItemModel*>(m_container->controller()->model());

 }
 
 void DolphinView::loadDirectory(const KUrl& url, bool reload)
 }
 
 void DolphinView::loadDirectory(const KUrl& url, bool reload)


@@ -1157,144 +1310,118 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
         return;
     }
 
         return;
     }
 

-    KDirLister* dirLister = m_viewAccessor.dirLister();
-    dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
+    m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);

 }
 
 void DolphinView::applyViewProperties()
 {
 }
 
 void DolphinView::applyViewProperties()
 {

-    const ViewProperties props(rootUrl());
+    m_container->beginTransaction();
+
+    const ViewProperties props(url());
+    KFileItemModel* model = fileItemModel();

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

-        const int oldZoomLevel = m_viewModeController->zoomLevel();
-
+        const Mode previousMode = m_mode;

         m_mode = mode;
         m_mode = mode;

-        createView();
-        emit modeChanged();

 
 

-        updateZoomLevel(oldZoomLevel);
-    }
-    if (!m_viewAccessor.itemView()) {
-        createView();
-    }
+        // Changing the mode might result in changing
+        // the zoom level. Remember the old zoom level so
+        // that zoomLevelChanged() can get emitted.
+        const int oldZoomLevel = m_container->zoomLevel();
+
+        switch (m_mode) {
+        case IconsView:   m_container->setItemLayout(KFileItemListView::IconsLayout); break;
+        case CompactView: m_container->setItemLayout(KFileItemListView::CompactLayout); break;
+        case DetailsView: m_container->setItemLayout(KFileItemListView::DetailsLayout); break;
+        default: Q_ASSERT(false); break;
+        }

 
 

-    Q_ASSERT(m_viewAccessor.itemView());
-    Q_ASSERT(m_viewAccessor.itemDelegate());
+        emit modeChanged(m_mode, previousMode);

 
 

-    const bool showHiddenFiles = props.showHiddenFiles();
-    if (showHiddenFiles != m_viewAccessor.dirLister()->showingDotFiles()) {
-        m_viewAccessor.dirLister()->setShowingDotFiles(showHiddenFiles);
-        emit showHiddenFilesChanged();
+        if (m_container->zoomLevel() != oldZoomLevel) {
+            emit zoomLevelChanged(m_container->zoomLevel(), oldZoomLevel);
+        }
+    }
+
+    const bool hiddenFilesShown = props.hiddenFilesShown();
+    if (hiddenFilesShown != model->showHiddenFiles()) {
+        model->setShowHiddenFiles(hiddenFilesShown);
+        emit hiddenFilesShownChanged(hiddenFilesShown);

     }
 
     }
 

-    m_storedCategorizedSorting = props.categorizedSorting();
-    const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
-    if (categorized != m_viewAccessor.proxyModel()->isCategorizedModel()) {
-        m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
-        emit categorizedSortingChanged();
+    const bool groupedSorting = props.groupedSorting();
+    if (groupedSorting != model->groupedSorting()) {
+        model->setGroupedSorting(groupedSorting);
+        emit groupedSortingChanged(groupedSorting);

     }
 
     }
 

-    const DolphinView::Sorting sorting = props.sorting();
-    if (sorting != m_viewAccessor.proxyModel()->sorting()) {
-        m_viewAccessor.proxyModel()->setSorting(sorting);
-        emit sortingChanged(sorting);
+    const QByteArray sortRole = props.sortRole();
+    if (sortRole != model->sortRole()) {
+        model->setSortRole(sortRole);
+        emit sortRoleChanged(sortRole);

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

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

         emit sortOrderChanged(sortOrder);
     }
 
     const bool sortFoldersFirst = props.sortFoldersFirst();
         emit sortOrderChanged(sortOrder);
     }
 
     const bool sortFoldersFirst = props.sortFoldersFirst();

-    if (sortFoldersFirst != m_viewAccessor.proxyModel()->sortFoldersFirst()) {
-        m_viewAccessor.proxyModel()->setSortFoldersFirst(sortFoldersFirst);
+    if (sortFoldersFirst != model->sortFoldersFirst()) {
+        model->setSortFoldersFirst(sortFoldersFirst);

         emit sortFoldersFirstChanged(sortFoldersFirst);
     }
 
         emit sortFoldersFirstChanged(sortFoldersFirst);
     }
 

-    KFileItemDelegate::InformationList info = props.additionalInfo();
-    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;
-        const int oldZoomLevel = m_viewModeController->zoomLevel();
-        emit showPreviewChanged();
-
-        // Enabling or disabling the preview might change the icon size of the view.
-        // 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);
+    const QList<QByteArray> visibleRoles = props.visibleRoles();
+    if (visibleRoles != m_visibleRoles) {
+        const QList<QByteArray> previousVisibleRoles = m_visibleRoles;
+        m_visibleRoles = visibleRoles;
+        m_container->setVisibleRoles(visibleRoles);
+        emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles);

     }
     }

-}
-
-void DolphinView::createView()
-{
-    deleteView();
-
-    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);
-    view->installEventFilter(this);
-    view->viewport()->installEventFilter(this);
-
-    m_dolphinViewController->setItemView(view);

 
 

-    const int zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(view->iconSize());
-    m_viewModeController->setZoomLevel(zoomLevel);
+    const bool previewsShown = props.previewsShown();
+    if (previewsShown != m_container->previewsShown()) {
+        const int oldZoomLevel = zoomLevel();

 
 

-    connectViewAccessor();
+        m_container->setPreviewsShown(previewsShown);
+        emit previewsShownChanged(previewsShown);

 
 

-    setFocusProxy(m_viewAccessor.layoutTarget());
-    m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());
-}
-
-void DolphinView::deleteView()
-{
-    QAbstractItemView* view = m_viewAccessor.itemView();
-    Q_ASSERT(!m_dolphinViewController->itemView() || (m_dolphinViewController->itemView() == view));
-    m_dolphinViewController->setItemView(0);
-
-    if (view) {
-        disconnectViewAccessor();
-
-        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();
+        // Changing the preview-state might result in a changed zoom-level
+        if (oldZoomLevel != zoomLevel()) {
+            emit zoomLevelChanged(zoomLevel(), oldZoomLevel);

         }
         }

+    }

 
 

-        m_viewModeController->disconnect(view);
+    KItemListView* itemListView = m_container->controller()->view();
+    if (itemListView->isHeaderVisible()) {
+        KItemListHeader* header = itemListView->header();
+        const QList<int> headerColumnWidths = props.headerColumnWidths();
+        const int rolesCount = m_visibleRoles.count();
+        if (headerColumnWidths.count() == rolesCount) {
+            header->setAutomaticColumnResizing(false);

 
 

-        m_viewAccessor.deleteView();
+            QHash<QByteArray, qreal> columnWidths;
+            for (int i = 0; i < rolesCount; ++i) {
+                columnWidths.insert(m_visibleRoles[i], headerColumnWidths[i]);
+            }
+            header->setColumnWidths(columnWidths);
+        } else {
+            header->setAutomaticColumnResizing(true);
+        }

     }
     }

+
+    m_container->endTransaction();

 }
 
 void DolphinView::pasteToUrl(const KUrl& url)
 {
 }
 
 void DolphinView::pasteToUrl(const KUrl& url)
 {

-    addNewFileNames(QApplication::clipboard()->mimeData());
+    markPastedUrlsAsSelected(QApplication::clipboard()->mimeData());

     KonqOperations::doPaste(this, url);
 }
 
     KonqOperations::doPaste(this, url);
 }
 

-void DolphinView::updateZoomLevel(int oldZoomLevel)
-{
-    const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize());
-    if (oldZoomLevel != newZoomLevel) {
-        m_viewModeController->setZoomLevel(newZoomLevel);
-        emit zoomLevelChanged(newZoomLevel);
-    }
-}
-

 KUrl::List DolphinView::simplifiedSelectedUrls() const
 {
     KUrl::List urls;
 KUrl::List DolphinView::simplifiedSelectedUrls() const
 {
     KUrl::List urls;


@@ -1304,8 +1431,8 @@ KUrl::List DolphinView::simplifiedSelectedUrls() const
         urls.append(item.url());
     }
 
         urls.append(item.url());
     }
 

-

     if (itemsExpandable()) {
     if (itemsExpandable()) {

+        // TODO: Check if we still need KDirModel for this in KDE 5.0

         urls = KDirModel::simplifiedUrlList(urls);
     }
 
         urls = KDirModel::simplifiedUrlList(urls);
     }
 


@@ -1314,86 +1441,22 @@ KUrl::List DolphinView::simplifiedSelectedUrls() const
 
 QMimeData* DolphinView::selectionMimeData() const
 {
 
 QMimeData* DolphinView::selectionMimeData() const
 {

-    const QAbstractItemView* view = m_viewAccessor.itemView();
-    Q_ASSERT((view) && (view->selectionModel()));
-    const QItemSelection selection = m_viewAccessor.proxyModel()->mapSelectionToSource(view->selectionModel()->selection());
-    return m_viewAccessor.dirModel()->mimeData(selection.indexes());
-}
+    const KFileItemModel* model = fileItemModel();
+    const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
+    const QSet<int> selectedIndexes = selectionManager->selectedItems();

 
 

-void DolphinView::addNewFileNames(const QMimeData* mimeData)
-{
-    const KUrl::List urls = KUrl::List::fromMimeData(mimeData);
-    foreach (const KUrl& url, urls) {
-        m_newFileNames.insert(url.fileName());
-    }
+    return model->createMimeData(selectedIndexes);

 }
 
 }
 

-QItemSelection DolphinView::childrenMatchingPattern(const QModelIndex& parent, const QRegExp& pattern) const
+void DolphinView::markPastedUrlsAsSelected(const QMimeData* mimeData)

 {
 {

-    QItemSelection matchingIndexes;
-    const DolphinSortFilterProxyModel* proxyModel = m_viewAccessor.proxyModel();
-    const DolphinModel* dolphinModel = m_viewAccessor.dirModel();
-
-    const int rowCount = proxyModel->rowCount(parent);
-
-    for (int row = 0; row < rowCount; ++row) {
-        QModelIndex index = proxyModel->index(row, 0, parent);
-        QModelIndex sourceIndex = proxyModel->mapToSource(index);
-
-        if (sourceIndex.isValid() && pattern.exactMatch(dolphinModel->data(sourceIndex).toString())) {
-            matchingIndexes += QItemSelectionRange(index);
-        }
-
-        if (proxyModel->hasChildren(index)) {
-            matchingIndexes += childrenMatchingPattern(index, pattern);
-        }
+    const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
+    KUrl::List destUrls;
+    foreach (const KUrl& source, sourceUrls) {
+        KUrl destination(url().url() + "/" + source.fileName());
+        destUrls << destination;

     }
     }

-
-    return matchingIndexes;
-}
-
-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<QPair<KFileItem,KFileItem>>&)),
-            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<QPair<KFileItem,KFileItem>>&)),
-               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)));
+    markUrlsAsSelected(destUrls);

 }
 
 void DolphinView::updateWritableState()
 }
 
 void DolphinView::updateWritableState()


@@ -1401,7 +1464,7 @@ void DolphinView::updateWritableState()
     const bool wasFolderWritable = m_isFolderWritable;
     m_isFolderWritable = true;
 
     const bool wasFolderWritable = m_isFolderWritable;
     m_isFolderWritable = true;
 

-    const KFileItem item = m_viewAccessor.dirLister()->rootItem();
+    const KFileItem item = m_dirLister->rootItem();

     if (!item.isNull()) {
         KFileItemListProperties capabilities(KFileItemList() << item);
         m_isFolderWritable = capabilities.supportsWriting();
     if (!item.isNull()) {
         KFileItemListProperties capabilities(KFileItemList() << item);
         m_isFolderWritable = capabilities.supportsWriting();


@@ -1411,220 +1474,4 @@ void DolphinView::updateWritableState()
     }
 }
 
     }
 }
 

-DolphinView::ViewAccessor::ViewAccessor() :
-    m_rootUrl(),
-    m_iconsView(0),
-    m_detailsView(0),
-    m_columnsContainer(0),
-    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;
-}
-
-void DolphinView::ViewAccessor::createView(QWidget* parent,
-                                           DolphinViewController* dolphinViewController,
-                                           const ViewModeController* viewModeController,
-                                           Mode mode)
-{
-    Q_ASSERT(!itemView());
-
-    switch (mode) {
-    case IconsView:
-        m_iconsView = new DolphinIconsView(parent,
-                                           dolphinViewController,
-                                           viewModeController,
-                                           m_proxyModel);
-        break;
-
-    case DetailsView:
-        m_detailsView = new DolphinDetailsView(parent,
-                                               dolphinViewController,
-                                               viewModeController,
-                                               m_proxyModel);
-        break;
-
-    case ColumnView:
-        m_columnsContainer = new DolphinColumnViewContainer(parent,
-                                                            dolphinViewController,
-                                                            viewModeController);
-        if (!m_rootUrl.isEmpty() && m_rootUrl.isParentOf(viewModeController->url())) {
-            // The column-view must show several columns starting with m_rootUrl as
-            // first column and viewModeController->url() as last column.
-            m_columnsContainer->showColumn(m_rootUrl);
-            m_columnsContainer->showColumn(viewModeController->url());
-        }
-        break;
-
-    default:
-        Q_ASSERT(false);
-    }
-}
-
-void DolphinView::ViewAccessor::deleteView()
-{
-    if (m_columnsContainer) {
-        m_columnsContainer->close();
-        m_columnsContainer->disconnect();
-        m_columnsContainer->deleteLater();
-        m_columnsContainer = 0;
-    } else {
-        QAbstractItemView* view = itemView();
-        if (view) {
-            view->close();
-            view->disconnect();
-
-            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) {
-                    // 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();
-                view = 0;
-            }
-        }
-
-        m_iconsView = 0;
-        m_detailsView = 0;
-    }
-}
-
-void DolphinView::ViewAccessor::prepareUrlChange(const KUrl& url)
-{
-    if (m_columnsContainer) {
-        m_columnsContainer->showColumn(url);
-    }
-}
-
-QAbstractItemView* DolphinView::ViewAccessor::itemView() const
-{
-    if (m_iconsView) {
-        return m_iconsView;
-    }
-
-    if (m_detailsView) {
-        return m_detailsView;
-    }
-
-    if (m_columnsContainer) {
-        return m_columnsContainer->activeColumn();
-    }
-
-    return 0;
-}
-
-KFileItemDelegate* DolphinView::ViewAccessor::itemDelegate() const
-{
-    return static_cast<KFileItemDelegate*>(itemView()->itemDelegate());
-}
-
-QWidget* DolphinView::ViewAccessor::layoutTarget() const
-{
-    if (m_columnsContainer) {
-        return m_columnsContainer;
-    }
-    return itemView();
-}
-
-void DolphinView::ViewAccessor::setRootUrl(const KUrl& rootUrl)
-{
-    m_rootUrl = rootUrl;
-}
-
-KUrl DolphinView::ViewAccessor::rootUrl() const
-{
-    return m_columnsContainer ? m_columnsContainer->rootUrl() : m_rootUrl;
-}
-
-bool DolphinView::ViewAccessor::supportsCategorizedSorting() const
-{
-    return m_iconsView != 0;
-}
-
-bool DolphinView::ViewAccessor::itemsExpandable() const
-{
-    return m_detailsView && m_detailsView->itemsExpandable();
-}
-
-QSet<KUrl> DolphinView::ViewAccessor::expandedUrls() const
-{
-    if (m_detailsView) {
-        return m_detailsView->expandedUrls();
-    }
-
-    return QSet<KUrl>();
-}
-
-const DolphinDetailsViewExpander* DolphinView::ViewAccessor::setExpandedUrls(const QSet<KUrl>& urlsToExpand)
-{
-    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();
-        }
-
-        m_detailsViewExpander = new DolphinDetailsViewExpander(m_detailsView, urlsToExpand);
-        return m_detailsViewExpander;
-    }
-    else {
-        return 0;
-    }
-}
-
-bool DolphinView::ViewAccessor::reloadOnAdditionalInfoChange() const
-{
-    // the details view requires no reloading of the directory, as it maps
-    // 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 (m_columnsContainer) {
-        return static_cast<DolphinSortFilterProxyModel*>(m_columnsContainer->activeColumn()->model());
-    }
-    return m_proxyModel;
-}
-
-KDirLister* DolphinView::ViewAccessor::dirLister() const
-{
-    return dirModel()->dirLister();
-}
-

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