]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/views/dolphinview.cpp
Provide additional default groups for the Places Panel
[dolphin.git] / src / views / dolphinview.cpp
index 5cb3d90b539e477c0762e7e0973218c8a40dcdb6..d21743bf490b0483a6e901c5f3886b5f3f1baba9 100644 (file)
 
 #include "dolphinview.h"
 
+#include <config-nepomuk.h>
+
 #include <QAbstractItemView>
 #include <QApplication>
+#include <QBoxLayout>
 #include <QClipboard>
+#include <QDropEvent>
+#include <QGraphicsSceneDragDropEvent>
 #include <QKeyEvent>
 #include <QItemSelection>
-#include <QBoxLayout>
 #include <QTimer>
 #include <QScrollBar>
 
 #include <KActionCollection>
 #include <KColorScheme>
-#include <KDirLister>
+#include <KDirModel>
 #include <KIconEffect>
 #include <KFileItem>
 #include <KFileItemListProperties>
 #include <KLocale>
 #include <kitemviews/kfileitemmodel.h>
 #include <kitemviews/kfileitemlistview.h>
+#include <kitemviews/kitemlistcontainer.h>
+#include <kitemviews/kitemlistheader.h>
 #include <kitemviews/kitemlistselectionmanager.h>
 #include <kitemviews/kitemlistview.h>
 #include <kitemviews/kitemlistcontroller.h>
 #include <KIO/DeleteJob>
+#include <KIO/JobUiDelegate>
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>
 #include <KJob>
 #include <KToggleAction>
 #include <KUrl>
 
-#include "additionalinfoaccessor.h"
-#include "dolphindirlister.h"
 #include "dolphinnewfilemenuobserver.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
-#include "dolphinitemlistcontainer.h"
+#include "dolphinitemlistview.h"
+#include "draganddrophelper.h"
 #include "renamedialog.h"
-#include "settings/dolphinsettings.h"
+#include "versioncontrol/versioncontrolobserver.h"
 #include "viewmodecontroller.h"
 #include "viewproperties.h"
 #include "views/tooltips/tooltipmanager.h"
 #include "zoomlevelinfo.h"
 
+#ifdef HAVE_NEPOMUK
+    #include <Nepomuk/ResourceManager>
+#endif
+
 namespace {
     const int MaxModeEnum = DolphinView::CompactView;
-    const int MaxSortingEnum = DolphinView::SortByPath;
 };
 
 DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
@@ -77,56 +86,26 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     m_tabsForFiles(false),
     m_assureVisibleCurrentIndex(false),
     m_isFolderWritable(true),
+    m_dragging(false),
     m_url(url),
     m_mode(DolphinView::IconsView),
-    m_additionalInfoList(),
+    m_visibleRoles(),
     m_topLayout(0),
-    m_dirLister(0),
+    m_model(0),
+    m_view(0),
     m_container(0),
     m_toolTipManager(0),
     m_selectionChangedTimer(0),
-    m_currentItemIndex(-1),
+    m_currentItemUrl(),
     m_restoredContentsPosition(),
     m_createdItemUrl(),
-    m_selectedItems()
+    m_selectedUrls(),
+    m_versionControlObserver(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(KUrl)),
-            this, SIGNAL(urlChanged(KUrl)));
-
-    connect(m_dolphinViewController, SIGNAL(requestContextMenu(QPoint,QList<QAction*>)),
-            this, SLOT(openContextMenu(QPoint,QList<QAction*>)));
-    connect(m_dolphinViewController, SIGNAL(urlsDropped(KFileItem,KUrl,QDropEvent*)),
-            this, SLOT(dropUrls(KFileItem,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(QList<DolphinView::AdditionalInfo>)),
-            this, SLOT(updateAdditionalInfo(QList<DolphinView::AdditionalInfo>)));*/
-    //connect(m_dolphinViewController, SIGNAL(itemTriggered(KFileItem)),
-    //        this, SLOT(triggerItem(KFileItem)));
-    //connect(m_dolphinViewController, SIGNAL(tabRequested(KUrl)),
-    //        this, SIGNAL(tabRequested(KUrl)));
-    /*connect(m_dolphinViewController, SIGNAL(activated()),
-            this, SLOT(activate()));
-    connect(m_dolphinViewController, SIGNAL(itemEntered(KFileItem)),
-            this, SLOT(showHoverInformation(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:
@@ -139,38 +118,59 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     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(completed()),            this, SLOT(slotDirListerCompleted()));
-    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);
-    QHash<QByteArray, int> visibleRoles;
-    visibleRoles.insert("name", 0);
-    m_container->setVisibleRoles(visibleRoles);
-
-    KItemListController* controller = m_container->controller();
+    m_model = new KFileItemModel(this);
+    m_view = new DolphinItemListView();
+    m_view->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());
+    m_view->setEnlargeSmallPreviews(GeneralSettings::enlargeSmallPreviews());
+    m_view->setVisibleRoles(QList<QByteArray>() << "text");
+    applyModeToView();
+
+    KItemListController* controller = new KItemListController(m_model, m_view, this);
+    const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
+    controller->setAutoActivationDelay(delay);
+
+    m_container = new KItemListContainer(controller, this);
+    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()));
+
     controller->setSelectionBehavior(KItemListController::MultiSelection);
-    connect(controller, SIGNAL(itemActivated(int)),
-            this, SLOT(slotItemActivated(int)));
+    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(contextMenuRequested(int,QPointF)), this, SLOT(slotContextMenuRequested(int,QPointF)));
-    connect(controller, SIGNAL(itemExpansionToggleClicked(int)), this, SLOT(slotItemExpansionToggleClicked(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*)));
+
+    connect(m_model, SIGNAL(directoryLoadingStarted()),       this, SLOT(slotDirectoryLoadingStarted()));
+    connect(m_model, SIGNAL(directoryLoadingCompleted()),     this, SLOT(slotDirectoryLoadingCompleted()));
+    connect(m_model, SIGNAL(directoryLoadingProgress(int)),   this, SIGNAL(directoryLoadingProgress(int)));
+    connect(m_model, SIGNAL(directorySortingProgress(int)),   this, SIGNAL(directorySortingProgress(int)));
+    connect(m_model, SIGNAL(itemsChanged(KItemRangeList,QSet<QByteArray>)),
+            this, SLOT(slotItemsChanged()));
+    connect(m_model, SIGNAL(itemsRemoved(KItemRangeList)),    this, SIGNAL(itemCountChanged()));
+    connect(m_model, SIGNAL(itemsInserted(KItemRangeList)),   this, SIGNAL(itemCountChanged()));
+    connect(m_model, SIGNAL(infoMessage(QString)),            this, SIGNAL(infoMessage(QString)));
+    connect(m_model, SIGNAL(errorMessage(QString)),           this, SIGNAL(errorMessage(QString)));
+    connect(m_model, SIGNAL(directoryRedirection(KUrl,KUrl)), this, SLOT(slotDirectoryRedirection(KUrl,KUrl)));
+
+    m_view->installEventFilter(this);
+    connect(m_view, SIGNAL(sortOrderChanged(Qt::SortOrder,Qt::SortOrder)),
+            this, SLOT(slotSortOrderChangedByHeader(Qt::SortOrder,Qt::SortOrder)));
+    connect(m_view, SIGNAL(sortRoleChanged(QByteArray,QByteArray)),
+            this, SLOT(slotSortRoleChangedByHeader(QByteArray,QByteArray)));
+    connect(m_view, SIGNAL(visibleRolesChanged(QList<QByteArray>,QList<QByteArray>)),
+            this, SLOT(slotVisibleRolesChangedByHeader(QList<QByteArray>,QList<QByteArray>)));
+    connect(m_view, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
+            this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
+    connect(m_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>)),
@@ -178,6 +178,12 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
 
     m_toolTipManager = new ToolTipManager(this);
 
+    m_versionControlObserver = new VersionControlObserver(this);
+    m_versionControlObserver->setModel(m_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();
     m_topLayout->addWidget(m_container);
 
@@ -206,25 +212,20 @@ void DolphinView::setActive(bool active)
         color.setAlpha(150);
     }
 
-    /*QAbstractItemView* view = m_viewAccessor.itemView();
-    QWidget* viewport = view ? view->viewport() : 0;
+    QWidget* viewport = m_container->viewport();
     if (viewport) {
         QPalette palette;
         palette.setColor(viewport->backgroundRole(), color);
         viewport->setPalette(palette);
-    }*/
+    }
 
     update();
 
     if (active) {
-        //if (view) {
-        //    view->setFocus();
-        //}
+        m_container->setFocus();
         emit activated();
         emit writeStateChanged(m_isFolderWritable);
     }
-
-    //m_viewModeController->indicateActivationChange(active);
 }
 
 bool DolphinView::isActive() const
@@ -248,29 +249,86 @@ DolphinView::Mode DolphinView::mode() const
     return m_mode;
 }
 
+void DolphinView::setPreviewsShown(bool show)
+{
+    if (previewsShown() == show) {
+        return;
+    }
+
+    ViewProperties props(url());
+    props.setPreviewsShown(show);
+
+    m_view->setPreviewsShown(show);
+    emit previewsShownChanged(show);
+}
+
 bool DolphinView::previewsShown() const
 {
-    return m_container->previewsShown();
+    return m_view->previewsShown();
+}
+
+void DolphinView::setHiddenFilesShown(bool show)
+{
+    if (m_model->showHiddenFiles() == show) {
+        return;
+    }
+
+    const KFileItemList itemList = selectedItems();
+    m_selectedUrls.clear();
+    m_selectedUrls = itemList.urlList();
+
+    ViewProperties props(url());
+    props.setHiddenFilesShown(show);
+
+    m_model->setShowHiddenFiles(show);
+    emit hiddenFilesShownChanged(show);
 }
 
 bool DolphinView::hiddenFilesShown() const
 {
-    return m_dirLister->showingDotFiles();
+    return m_model->showHiddenFiles();
 }
 
-bool DolphinView::categorizedSorting() const
+void DolphinView::setGroupedSorting(bool grouped)
 {
-    return false; //m_storedCategorizedSorting;
+    if (grouped == groupedSorting()) {
+        return;
+    }
+
+    ViewProperties props(url());
+    props.setGroupedSorting(grouped);
+    props.save();
+
+    m_container->controller()->model()->setGroupedSorting(grouped);
+
+    emit groupedSortingChanged(grouped);
+}
+
+bool DolphinView::groupedSorting() const
+{
+    return m_model->groupedSorting();
 }
 
 KFileItemList DolphinView::items() const
 {
-    return m_dirLister->items();
+    KFileItemList list;
+    const int itemCount = m_model->count();
+    list.reserve(itemCount);
+
+    for (int i = 0; i < itemCount; ++i) {
+        list.append(m_model->fileItem(i));
+    }
+
+    return list;
+}
+
+int DolphinView::itemsCount() const
+{
+    return m_model->count();
 }
 
 KFileItemList DolphinView::selectedItems() const
 {
-    const KFileItemModel* model = fileItemModel();
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
     const QSet<int> selectedIndexes = selectionManager->selectedItems();
 
@@ -278,7 +336,7 @@ KFileItemList DolphinView::selectedItems() const
     QSetIterator<int> it(selectedIndexes);
     while (it.hasNext()) {
         const int index = it.next();
-        selectedItems.append(model->fileItem(index));
+        selectedItems.append(m_model->fileItem(index));
     }
     return selectedItems;
 }
@@ -291,23 +349,24 @@ int DolphinView::selectedItemsCount() const
 
 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)
+{
+    m_currentItemUrl = url;
+}
+
+void DolphinView::selectItems(const QRegExp& pattern, bool enabled)
 {
     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.name())) {
+    for (int index = 0; index < m_model->count(); index++) {
+        const KFileItem item = m_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)
@@ -320,7 +379,7 @@ void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled)
 void DolphinView::setZoomLevel(int level)
 {
     const int oldZoomLevel = zoomLevel();
-    m_container->setZoomLevel(level);
+    m_view->setZoomLevel(level);
     if (zoomLevel() != oldZoomLevel) {
         emit zoomLevelChanged(zoomLevel(), oldZoomLevel);
     }
@@ -328,20 +387,20 @@ void DolphinView::setZoomLevel(int level)
 
 int DolphinView::zoomLevel() const
 {
-    return m_container->zoomLevel();
+    return m_view->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 DolphinView::SortByName;
-    //return m_viewAccessor.proxyModel()->sorting();
+    const KItemModelBase* model = m_container->controller()->model();
+    return model->sortRole();
 }
 
 void DolphinView::setSortOrder(Qt::SortOrder order)
@@ -353,7 +412,7 @@ void DolphinView::setSortOrder(Qt::SortOrder order)
 
 Qt::SortOrder DolphinView::sortOrder() const
 {
-    return Qt::AscendingOrder; // m_viewAccessor.proxyModel()->sortOrder();
+    return m_model->sortOrder();
 }
 
 void DolphinView::setSortFoldersFirst(bool foldersFirst)
@@ -365,25 +424,25 @@ void DolphinView::setSortFoldersFirst(bool foldersFirst)
 
 bool DolphinView::sortFoldersFirst() const
 {
-    return true; // m_viewAccessor.proxyModel()->sortFoldersFirst();
+    return m_model->sortDirectoriesFirst();
 }
 
-void DolphinView::setAdditionalInfoList(const QList<AdditionalInfo>& info)
+void DolphinView::setVisibleRoles(const QList<QByteArray>& roles)
 {
-    const QList<AdditionalInfo> previousList = info;
+    const QList<QByteArray> previousRoles = roles;
 
     ViewProperties props(url());
-    props.setAdditionalInfoList(info);
+    props.setVisibleRoles(roles);
 
-    m_additionalInfoList = info;
-    applyAdditionalInfoListToView();
+    m_visibleRoles = roles;
+    m_view->setVisibleRoles(roles);
 
-    emit additionalInfoListChanged(m_additionalInfoList, previousList);
+    emit visibleRolesChanged(m_visibleRoles, previousRoles);
 }
 
-QList<DolphinView::AdditionalInfo> DolphinView::additionalInfoList() const
+QList<QByteArray> DolphinView::visibleRoles() const
 {
-    return m_additionalInfoList;
+    return m_visibleRoles;
 }
 
 void DolphinView::reload()
@@ -391,7 +450,10 @@ void DolphinView::reload()
     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);
@@ -402,110 +464,107 @@ void DolphinView::reload()
 
 void DolphinView::stopLoading()
 {
-    m_dirLister->stop();
+    m_model->cancelDirectoryLoading();
 }
 
-void DolphinView::refresh()
+void DolphinView::readSettings()
 {
-    const bool oldActivationState = m_active;
-    const int oldZoomLevel = zoomLevel();
-    m_active = true;
+    const int oldZoomLevel = m_view->zoomLevel();
 
+    GeneralSettings::self()->readConfig();
+    m_view->readSettings();
     applyViewProperties();
-    reload();
 
-    setActive(oldActivationState);
-    updateZoomLevel(oldZoomLevel);
+    const int delay = GeneralSettings::autoExpandFolders() ? 750 : -1;
+    m_container->controller()->setAutoActivationDelay(delay);
+
+    const int newZoomLevel = m_view->zoomLevel();
+    if (newZoomLevel != oldZoomLevel) {
+        emit zoomLevelChanged(newZoomLevel, oldZoomLevel);
+    }
 }
 
-void DolphinView::setNameFilter(const QString& nameFilter)
+void DolphinView::writeSettings()
 {
-    Q_UNUSED(nameFilter);
-    //m_viewModeController->setNameFilter(nameFilter);
+    GeneralSettings::self()->writeConfig();
+    m_view->writeSettings();
 }
 
-QString DolphinView::nameFilter() const
+void DolphinView::setNameFilter(const QString& nameFilter)
 {
-    return QString(); //m_viewModeController->nameFilter();
+    m_model->setNameFilter(nameFilter);
 }
 
-void DolphinView::calculateItemCount(int& fileCount,
-                                     int& folderCount,
-                                     KIO::filesize_t& totalFileSize) const
+QString DolphinView::nameFilter() const
 {
-    foreach (const KFileItem& item, m_dirLister->items()) {
-        if (item.isDir()) {
-            ++folderCount;
-        } else {
-            ++fileCount;
-            totalFileSize += item.size();
-        }
-    }
+    return m_model->nameFilter();
 }
 
 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()) {
-        // give a summary of the status of the selected files
+    if (m_container->controller()->selectionManager()->hasSelection()) {
+        // Give a summary of the status of the selected files
         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();
             }
-            ++it;
         }
 
         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 {
-            // 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);
-        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);
+    }
+
+    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;
+    } else {
+        summary = i18nc("@info:status", "0 Folders, 0 Files");
     }
 
-    return text;
+    return summary;
 }
 
 QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) const
 {
-    Q_UNUSED(items);
-    return QList<QAction*>(); //m_dolphinViewController->versionControlActions(items);
+    QList<QAction*> actions;
+
+    if (items.isEmpty()) {
+        const KFileItem item = m_model->rootItem();
+        actions = m_versionControlObserver->actions(KFileItemList() << item);
+    } else {
+        actions = m_versionControlObserver->actions(items);
+    }
+
+    return actions;
 }
 
 void DolphinView::setUrl(const KUrl& url)
@@ -517,15 +576,13 @@ void DolphinView::setUrl(const KUrl& url)
     emit urlAboutToBeChanged(url);
     m_url = url;
 
-    if (GeneralSettings::showToolTips()) {
-        m_toolTipManager->hideToolTip();
-    }
+    hideToolTip();
 
     // 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();
+    m_model->clear();
     applyViewProperties();
     loadDirectory(url);
 
@@ -535,13 +592,13 @@ void DolphinView::setUrl(const KUrl& url)
 void DolphinView::selectAll()
 {
     KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
-    selectionManager->setSelected(0, fileItemModel()->count());
+    selectionManager->setSelected(0, m_model->count());
 }
 
 void DolphinView::invertSelection()
 {
     KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
-    selectionManager->setSelected(0, fileItemModel()->count(), KItemListSelectionManager::Toggle);
+    selectionManager->setSelected(0, m_model->count(), KItemListSelectionManager::Toggle);
 }
 
 void DolphinView::clearSelection()
@@ -551,27 +608,26 @@ void DolphinView::clearSelection()
 
 void DolphinView::renameSelectedItems()
 {
-    KFileItemList items = selectedItems();
-    const int itemCount = items.count();
-    if (itemCount < 1) {
-        return;
-    }
-
-    /*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);
-    } else {*/
-        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
-    m_assureVisibleCurrentIndex = true;
+    const KFileItemList items = selectedItems();
+     if (items.isEmpty()) {
+         return;
+     }
+
+     if (items.count() == 1) {
+         const int index = m_model->index(items.first());
+         m_container->controller()->view()->editRole(index, "text");
+     } else {
+         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 KFileItemModel
+     // will notify the view about changed items (which might result in
+     // a changed sorting).
+     m_assureVisibleCurrentIndex = true;
 }
 
 void DolphinView::trashSelectedItems()
@@ -590,6 +646,9 @@ void DolphinView::deleteSelectedItems()
 
     if (del) {
         KIO::Job* job = KIO::del(list);
+        if (job->ui()) {
+            job->ui()->setWindow(this);
+        }
         connect(job, SIGNAL(result(KJob*)),
                 this, SLOT(slotDeleteFileFinished(KJob*)));
     }
@@ -621,129 +680,254 @@ void DolphinView::pasteIntoFolder()
     }
 }
 
-void DolphinView::setPreviewsShown(bool show)
+bool DolphinView::eventFilter(QObject* watched, QEvent* event)
 {
-    if (previewsShown() == show) {
-        return;
-    }
+    switch (event->type()) {
+    case QEvent::FocusIn:
+        if (watched == m_container) {
+            setActive(true);
+        }
+        break;
 
-    ViewProperties props(url());
-    props.setPreviewsShown(show);
+    case QEvent::GraphicsSceneDragEnter:
+        if (watched == m_view) {
+            m_dragging = true;
+        }
+        break;
 
-    m_container->setPreviewsShown(show);
-    emit previewsShownChanged(show);
-}
+    case QEvent::GraphicsSceneDragLeave:
+        if (watched == m_view) {
+            m_dragging = false;
+        }
+        break;
 
-void DolphinView::setHiddenFilesShown(bool show)
-{
-    if (m_dirLister->showingDotFiles() == show) {
-        return;
+    case QEvent::GraphicsSceneDrop:
+        if (watched == m_view) {
+            m_dragging = false;
+        }
+    default:
+        break;
     }
 
-    m_selectedItems = selectedItems();
-
-    ViewProperties props(url());
-    props.setHiddenFilesShown(show);
-
-    m_dirLister->setShowingDotFiles(show);
-    m_dirLister->emitChanges();
-    emit hiddenFilesShownChanged(show);
+    return QWidget::eventFilter(watched, event);
 }
 
-void DolphinView::setCategorizedSorting(bool categorized)
+void DolphinView::wheelEvent(QWheelEvent* event)
 {
-    if (categorized == categorizedSorting()) {
-        return;
-    }
-
-    ViewProperties props(url());
-    props.setCategorizedSorting(categorized);
-    props.save();
+    if (event->modifiers().testFlag(Qt::ControlModifier)) {
+        const int numDegrees = event->delta() / 8;
+        const int numSteps = numDegrees / 15;
 
-    //m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
+        setZoomLevel(zoomLevel() + numSteps);
+        event->accept();
+    } else {
+        event->ignore();
+    }
+}
 
-    emit categorizedSortingChanged(categorized);
+void DolphinView::hideEvent(QHideEvent* event)
+{
+    hideToolTip();
+    QWidget::hideEvent(event);
 }
 
-void DolphinView::mouseReleaseEvent(QMouseEvent* event)
+void DolphinView::activate()
 {
-    QWidget::mouseReleaseEvent(event);
     setActive(true);
 }
 
-void DolphinView::contextMenuEvent(QContextMenuEvent* event)
+void DolphinView::slotItemActivated(int index)
 {
-    Q_UNUSED(event);
-
-    const QPoint pos = m_container->mapFromGlobal(QCursor::pos());
-    const KItemListView* view = m_container->controller()->view();
-    if (view->itemAt(pos) < 0) {
-        // Only open the context-menu if the cursor is above the viewport
-        // (the context-menu for items is handled in slotContextMenuRequested())
-        requestContextMenu(KFileItem(), url(), QList<QAction*>());
+    const KFileItem item = m_model->fileItem(index);
+    if (!item.isNull()) {
+        emit itemActivated(item);
     }
 }
 
-void DolphinView::activate()
+void DolphinView::slotItemsActivated(const QSet<int>& indexes)
 {
-    setActive(true);
-}
+    Q_ASSERT(indexes.count() >= 2);
 
-void DolphinView::slotItemActivated(int index)
-{
-    const QSet<int> selectedItems = m_container->controller()->selectionManager()->selectedItems();
-    if (selectedItems.isEmpty())
-        return;
-    if (selectedItems.count() == 1) {
-        emit itemTriggered(fileItemModel()->fileItem(index)); // caught by DolphinViewContainer or DolphinPart
-    }
-    else {
-        foreach (int i, selectedItems) {
-            const KFileItem fileItem;
-            fileItem = fileItemModel()->fileItem(i);
-            if (fileItem.isDir()) {
-                emit tabRequested(fileItem.url());
-            } else {
-                emit itemTriggered(fileItem);
-            }
+    KFileItemList items;
+
+    QSetIterator<int> it(indexes);
+    while (it.hasNext()) {
+        const int index = it.next();
+        items.append(m_model->fileItem(index));
+    }
+
+    foreach (const KFileItem& item, items) {
+        if (item.isDir()) {
+            emit tabRequested(item.url());
+        } else {
+            emit itemActivated(item);
         }
     }
 }
 
 void DolphinView::slotItemMiddleClicked(int index)
 {
-    const KFileItem item = fileItemModel()->fileItem(index);
+    const KFileItem item = m_model->fileItem(index);
     if (item.isDir() || isTabsForFilesEnabled()) {
         emit tabRequested(item.url());
     }
 }
 
-void DolphinView::slotContextMenuRequested(int index, const QPointF& pos)
+void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos)
 {
-    if (GeneralSettings::showToolTips()) {
-        m_toolTipManager->hideToolTip();
+    const KFileItem item = m_model->fileItem(index);
+    emit requestContextMenu(pos.toPoint(), item, url(), QList<QAction*>());
+}
+
+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()->initialized());
+    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 == "text") {
+            // It should not be possible to hide the "text" role
+            continue;
+        }
+
+        const QString text = m_model->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);
+        }
+
+        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));
+                }
+            }
+            props.setHeaderColumnWidths(columnWidths);
+        }
     }
-    const KFileItem item = fileItemModel()->fileItem(index);
-    emit requestContextMenu(item, url(), QList<QAction*>());
+
+    delete menu;
 }
 
-void DolphinView::slotItemExpansionToggleClicked(int index)
+void DolphinView::slotHeaderColumnWidthChanged(const QByteArray& role, qreal current, qreal previous)
 {
-    // TODO: When doing a model->setExpanded(false) it should
-    // be checked here whether the current index is part of the
-    // closed sub-tree. If this is the case, the current index
-    // should be adjusted to the parent index.
-    KFileItemModel* model = fileItemModel();
-    const bool expanded = model->isExpanded(index);
-    model->setExpanded(index, !expanded);
+    Q_UNUSED(previous);
+
+    const QList<QByteArray> visibleRoles = m_view->visibleRoles();
+
+    ViewProperties props(url());
+    QList<int> columnWidths = props.headerColumnWidths();
+    if (columnWidths.count() != visibleRoles.count()) {
+        columnWidths.clear();
+        columnWidths.reserve(visibleRoles.count());
+        const KItemListHeader* header = m_view->header();
+        foreach (const QByteArray& role, visibleRoles) {
+            const int width = header->columnWidth(role);
+            columnWidths.append(width);
+        }
+    }
+
+    const int roleIndex = visibleRoles.indexOf(role);
+    Q_ASSERT(roleIndex >= 0 && roleIndex < columnWidths.count());
+    columnWidths[roleIndex] = current;
+
+    props.setHeaderColumnWidths(columnWidths);
 }
 
 void DolphinView::slotItemHovered(int index)
 {
-    const KFileItem item = fileItemModel()->fileItem(index);
+    const KFileItem item = m_model->fileItem(index);
 
-    if (GeneralSettings::showToolTips()) {
-        QRectF itemRect = m_container->controller()->view()->itemBoundingRect(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);
 
@@ -756,12 +940,73 @@ void DolphinView::slotItemHovered(int index)
 void DolphinView::slotItemUnhovered(int index)
 {
     Q_UNUSED(index);
-    if (GeneralSettings::showToolTips()) {
-        m_toolTipManager->hideToolTip();
-    }
+    hideToolTip();
     emit requestItemInfo(KFileItem());
 }
 
+void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
+{
+    KUrl destUrl;
+    KFileItem destItem = m_model->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 = m_model->rootItem();
+        destUrl = url();
+    } else {
+        // The item represents a directory or desktop-file
+        destUrl = destItem.url();
+    }
+
+    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);
+    }
+
+    if (destUrl == url()) {
+        // Mark the dropped urls as selected.
+        markPastedUrlsAsSelected(event->mimeData());
+    }
+}
+
+void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
+{
+    if (previous != 0) {
+        disconnect(previous, SIGNAL(directoryLoadingCompleted()), this, SLOT(slotDirectoryLoadingCompleted()));
+        m_versionControlObserver->setModel(0);
+    }
+
+    if (current) {
+        Q_ASSERT(qobject_cast<KFileItemModel*>(current));
+        connect(current, SIGNAL(loadingCompleted()), this, SLOT(slotDirectoryLoadingCompleted()));
+
+        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();
@@ -782,37 +1027,15 @@ void DolphinView::emitSelectionChangedSignal()
     emit selectionChanged(selectedItems());
 }
 
-void DolphinView::openContextMenu(const QPoint& pos,
-                                  const QList<QAction*>& customActions)
-{
-    KFileItem item;
-    const int index = m_container->controller()->view()->itemAt(pos);
-    if (index >= 0) {
-        item = fileItemModel()->fileItem(index);
-    }
-
-    emit requestContextMenu(item, url(), customActions);
-}
-
-void DolphinView::dropUrls(const KFileItem& destItem,
-                           const KUrl& destPath,
-                           QDropEvent* event)
-{
-    Q_UNUSED(destItem);
-    Q_UNUSED(destPath);
-    markPastedUrlsAsSelected(event->mimeData());
-    //DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);
-}
-
-void DolphinView::updateSorting(DolphinView::Sorting sorting)
+void DolphinView::updateSortRole(const QByteArray& role)
 {
     ViewProperties props(url());
-    props.setSorting(sorting);
+    props.setSortRole(role);
 
     KItemModelBase* model = m_container->controller()->model();
-    model->setSortRole(sortRoleForSorting(sorting));
+    model->setSortRole(role);
 
-    emit sortingChanged(sorting);
+    emit sortRoleChanged(role);
 }
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
@@ -820,7 +1043,7 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
     ViewProperties props(url());
     props.setSortOrder(order);
 
-    //m_viewAccessor.proxyModel()->setSortOrder(order);
+    m_model->setSortOrder(order);
 
     emit sortOrderChanged(order);
 }
@@ -830,7 +1053,7 @@ void DolphinView::updateSortFoldersFirst(bool foldersFirst)
     ViewProperties props(url());
     props.setSortFoldersFirst(foldersFirst);
 
-    //m_viewAccessor.proxyModel()->setSortFoldersFirst(foldersFirst);
+    m_model->setSortDirectoriesFirst(foldersFirst);
 
     emit sortFoldersFirstChanged(foldersFirst);
 }
@@ -852,34 +1075,35 @@ bool DolphinView::isTabsForFilesEnabled() const
 
 bool DolphinView::itemsExpandable() const
 {
-    return false; //m_viewAccessor.itemsExpandable();
+    return m_mode == DetailsView;
 }
 
 void DolphinView::restoreState(QDataStream& stream)
 {
     // Restore the current item that had the keyboard focus
-    stream >> m_currentItemIndex;
+    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)
-    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;
+    m_model->restoreExpandedDirectories(urls);
 }
 
 void DolphinView::saveState(QDataStream& stream)
 {
     // Save the current item that has the keyboard focus
-    stream << m_container->controller()->selectionManager()->currentItem();
+    const int currentIndex = m_container->controller()->selectionManager()->currentItem();
+    if (currentIndex != -1) {
+        KFileItem item = m_model->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();
+    }
 
     // Save view position
     const qreal x = m_container->horizontalScrollBar()->value();
@@ -887,17 +1111,12 @@ void DolphinView::saveState(QDataStream& stream)
     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();
-}
-
-bool DolphinView::hasSelection() const
-{
-    return m_container->controller()->selectionManager()->hasSelection();
+    stream << m_model->expandedDirectories();
 }
 
 KFileItem DolphinView::rootItem() const
 {
-    return m_dirLister->rootItem();
+    return m_model->rootItem();
 }
 
 void DolphinView::observeCreatedItem(const KUrl& url)
@@ -923,7 +1142,7 @@ void DolphinView::selectAndScrollToCreatedItem()
     m_createdItemUrl = KUrl();
 }
 
-void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
+void DolphinView::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl)
 {
     if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash)) {
         emit redirection(oldUrl, newUrl);
@@ -933,10 +1152,15 @@ void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
 
 void DolphinView::updateViewState()
 {
-    if (m_currentItemIndex >= 0) {
+    if (m_currentItemUrl != KUrl()) {
         KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
-        selectionManager->setCurrentItem(m_currentItemIndex);
-        m_currentItemIndex =-1;
+        const int currentIndex = m_model->index(m_currentItemUrl);
+        if (currentIndex != -1) {
+            selectionManager->setCurrentItem(currentIndex);
+        } else {
+            selectionManager->setCurrentItem(0);
+        }
+        m_currentItemUrl = KUrl();
     }
 
     if (!m_restoredContentsPosition.isNull()) {
@@ -948,20 +1172,44 @@ void DolphinView::updateViewState()
         m_container->verticalScrollBar()->setValue(y);
     }
 
-    if (!m_selectedItems.isEmpty()) {
+    if (!m_selectedUrls.isEmpty()) {
+        clearSelection();
+
         KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
         QSet<int> selectedItems = selectionManager->selectedItems();
-        const KFileItemModel* model = fileItemModel();
 
-        foreach (const KFileItem& selectedItem, m_selectedItems) {
-            const int index = model->index(selectedItem);
+        foreach (const KUrl& url, m_selectedUrls) {
+            const int index = m_model->index(url);
             if (index >= 0) {
                 selectedItems.insert(index);
             }
         }
 
         selectionManager->setSelectedItems(selectedItems);
-        m_selectedItems.clear();
+        m_selectedUrls.clear();
+    }
+}
+
+void DolphinView::hideToolTip()
+{
+    if (GeneralSettings::showToolTips()) {
+        m_toolTipManager->hideToolTip();
+    }
+}
+
+void DolphinView::calculateItemCount(int& fileCount,
+                                     int& folderCount,
+                                     KIO::filesize_t& totalFileSize) const
+{
+    const int itemCount = m_model->count();
+    for (int i = 0; i < itemCount; ++i) {
+        const KFileItem item = m_model->fileItem(i);
+        if (item.isDir()) {
+            ++folderCount;
+        } else {
+            ++fileCount;
+            totalFileSize += item.size();
+        }
     }
 }
 
@@ -984,45 +1232,81 @@ void DolphinView::slotDeleteFileFinished(KJob* job)
     }
 }
 
-void DolphinView::slotDirListerStarted(const KUrl& url)
+void DolphinView::slotDirectoryLoadingStarted()
 {
     // 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);
     }
 
-    emit startedPathLoading(url);
+    emit directoryLoadingStarted();
 }
 
-void DolphinView::slotDirListerCompleted()
+void DolphinView::slotDirectoryLoadingCompleted()
 {
-    // Update the view-state. This has to be done using a Qt::QueuedConnection
-    // because the view might not be in its final state yet (the view also
-    // listens to the completed()-signal from KDirLister and the order of
-    // of slots is undefined).
+    // Update the view-state. This has to be done asynchronously
+    // because the view might not be in its final state yet.
     QTimer::singleShot(0, this, SLOT(updateViewState()));
 
-    emit finishedPathLoading(url());
+    emit directoryLoadingCompleted();
 
     updateWritableState();
 }
 
-void DolphinView::slotRefreshItems()
+void DolphinView::slotItemsChanged()
 {
-    if (m_assureVisibleCurrentIndex) {
-        m_assureVisibleCurrentIndex = false;
-        //QAbstractItemView* view = m_viewAccessor.itemView();
-        //if (view) {
-        //    m_viewAccessor.itemView()->scrollTo(m_viewAccessor.itemView()->currentIndex());
-        //}
-    }
+    m_assureVisibleCurrentIndex = false;
+}
+
+void DolphinView::slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOrder previous)
+{
+    Q_UNUSED(previous);
+    Q_ASSERT(m_model->sortOrder() == current);
+
+    ViewProperties props(url());
+    props.setSortOrder(current);
+
+    emit sortOrderChanged(current);
+}
+
+void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const QByteArray& previous)
+{
+    Q_UNUSED(previous);
+    Q_ASSERT(m_model->sortRole() == current);
+
+    ViewProperties props(url());
+    props.setSortRole(current);
+
+    emit sortRoleChanged(current);
+}
+
+void DolphinView::slotVisibleRolesChangedByHeader(const QList<QByteArray>& current,
+                                                  const QList<QByteArray>& previous)
+{
+    Q_UNUSED(previous);
+    Q_ASSERT(m_container->controller()->view()->visibleRoles() == current);
+
+    const QList<QByteArray> previousVisibleRoles = m_visibleRoles;
+
+    m_visibleRoles = current;
+
+    ViewProperties props(url());
+    props.setVisibleRoles(m_visibleRoles);
+
+    emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles);
 }
 
-KFileItemModel* DolphinView::fileItemModel() const
+void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value)
 {
-    return static_cast<KFileItemModel*>(m_container->controller()->model());
+    if (role == "text") {
+        const KFileItem item = m_model->fileItem(index);
+        const QString newName = value.toString();
+        if (!newName.isEmpty() && newName != item.text() && newName != QLatin1String(".") && newName != QLatin1String("..")) {
+            KonqOperations::rename(this, item.url(), newName);
+        }
+    }
 }
 
 void DolphinView::loadDirectory(const KUrl& url, bool reload)
@@ -1037,12 +1321,16 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
         return;
     }
 
-    m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
+    if (reload) {
+        m_model->refreshDirectory(url);
+    } else {
+        m_model->loadDirectory(url);
+    }
 }
 
 void DolphinView::applyViewProperties()
 {
-    m_container->beginTransaction();
+    m_view->beginTransaction();
 
     const ViewProperties props(url());
 
@@ -1054,69 +1342,59 @@ void DolphinView::applyViewProperties()
         // 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;
-        }
+        const int oldZoomLevel = m_view->zoomLevel();
+        applyModeToView();
 
         emit modeChanged(m_mode, previousMode);
 
-        if (m_container->zoomLevel() != oldZoomLevel) {
-            emit zoomLevelChanged(m_container->zoomLevel(), oldZoomLevel);
+        if (m_view->zoomLevel() != oldZoomLevel) {
+            emit zoomLevelChanged(m_view->zoomLevel(), oldZoomLevel);
         }
     }
 
     const bool hiddenFilesShown = props.hiddenFilesShown();
-    if (hiddenFilesShown != m_dirLister->showingDotFiles()) {
-        m_dirLister->setShowingDotFiles(hiddenFilesShown);
-        m_dirLister->emitChanges();
+    if (hiddenFilesShown != m_model->showHiddenFiles()) {
+        m_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 != m_model->groupedSorting()) {
+        m_model->setGroupedSorting(groupedSorting);
+        emit groupedSortingChanged(groupedSorting);
+    }
 
-    const DolphinView::Sorting sorting = props.sorting();
-    KItemModelBase* model = m_container->controller()->model();
-    const QByteArray newSortRole = sortRoleForSorting(sorting);
-    if (newSortRole != model->sortRole()) {
-        model->setSortRole(newSortRole);
-        emit sortingChanged(sorting);
+    const QByteArray sortRole = props.sortRole();
+    if (sortRole != m_model->sortRole()) {
+        m_model->setSortRole(sortRole);
+        emit sortRoleChanged(sortRole);
     }
-/*
+
     const Qt::SortOrder sortOrder = props.sortOrder();
-    if (sortOrder != m_viewAccessor.proxyModel()->sortOrder()) {
-        m_viewAccessor.proxyModel()->setSortOrder(sortOrder);
+    if (sortOrder != m_model->sortOrder()) {
+        m_model->setSortOrder(sortOrder);
         emit sortOrderChanged(sortOrder);
     }
 
     const bool sortFoldersFirst = props.sortFoldersFirst();
-    if (sortFoldersFirst != m_viewAccessor.proxyModel()->sortFoldersFirst()) {
-        m_viewAccessor.proxyModel()->setSortFoldersFirst(sortFoldersFirst);
+    if (sortFoldersFirst != m_model->sortDirectoriesFirst()) {
+        m_model->setSortDirectoriesFirst(sortFoldersFirst);
         emit sortFoldersFirstChanged(sortFoldersFirst);
     }
-*/
-    const QList<DolphinView::AdditionalInfo> infoList = props.additionalInfoList();
-    if (infoList != m_additionalInfoList) {
-        const QList<DolphinView::AdditionalInfo> previousList = m_additionalInfoList;
-        m_additionalInfoList = infoList;
-        applyAdditionalInfoListToView();
-        emit additionalInfoListChanged(m_additionalInfoList, previousList);
+
+    const QList<QByteArray> visibleRoles = props.visibleRoles();
+    if (visibleRoles != m_visibleRoles) {
+        const QList<QByteArray> previousVisibleRoles = m_visibleRoles;
+        m_visibleRoles = visibleRoles;
+        m_view->setVisibleRoles(visibleRoles);
+        emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles);
     }
 
     const bool previewsShown = props.previewsShown();
-    if (previewsShown != m_container->previewsShown()) {
+    if (previewsShown != m_view->previewsShown()) {
         const int oldZoomLevel = zoomLevel();
 
-        m_container->setPreviewsShown(previewsShown);
+        m_view->setPreviewsShown(previewsShown);
         emit previewsShownChanged(previewsShown);
 
         // Changing the preview-state might result in a changed zoom-level
@@ -1125,23 +1403,35 @@ void DolphinView::applyViewProperties()
         }
     }
 
-    m_container->endTransaction();
+    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);
+
+            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_view->endTransaction();
 }
 
-void DolphinView::applyAdditionalInfoListToView()
+void DolphinView::applyModeToView()
 {
-    const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
-
-    QHash<QByteArray, int> visibleRoles;
-    visibleRoles.insert("name", 0);
-
-    int index = 1;
-    foreach (AdditionalInfo info, m_additionalInfoList) {
-        visibleRoles.insert(infoAccessor.role(info), index);
-        ++index;
+    switch (m_mode) {
+    case IconsView:   m_view->setItemLayout(KFileItemListView::IconsLayout); break;
+    case CompactView: m_view->setItemLayout(KFileItemListView::CompactLayout); break;
+    case DetailsView: m_view->setItemLayout(KFileItemListView::DetailsLayout); break;
+    default: Q_ASSERT(false); break;
     }
-
-    m_container->setVisibleRoles(visibleRoles);
 }
 
 void DolphinView::pasteToUrl(const KUrl& url)
@@ -1150,47 +1440,40 @@ void DolphinView::pasteToUrl(const KUrl& url)
     KonqOperations::doPaste(this, url);
 }
 
-void DolphinView::updateZoomLevel(int oldZoomLevel)
-{
-    Q_UNUSED(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
 {
-    Q_ASSERT(false); // TODO
     KUrl::List urls;
-/*
+
     const KFileItemList items = selectedItems();
     foreach (const KFileItem &item, items) {
         urls.append(item.url());
     }
 
-
     if (itemsExpandable()) {
+        // TODO: Check if we still need KDirModel for this in KDE 5.0
         urls = KDirModel::simplifiedUrlList(urls);
-    }*/
+    }
 
     return urls;
 }
 
 QMimeData* DolphinView::selectionMimeData() const
 {
-    const KFileItemModel* model = fileItemModel();
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
     const QSet<int> selectedIndexes = selectionManager->selectedItems();
 
-    return model->createMimeData(selectedIndexes);
+    return m_model->createMimeData(selectedIndexes);
 }
 
 void DolphinView::markPastedUrlsAsSelected(const QMimeData* mimeData)
 {
-    const KUrl::List urls = KUrl::List::fromMimeData(mimeData);
-    markUrlsAsSelected(urls);
+    const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
+    KUrl::List destUrls;
+    foreach (const KUrl& source, sourceUrls) {
+        KUrl destination(url().url() + "/" + source.fileName());
+        destUrls << destination;
+    }
+    markUrlsAsSelected(destUrls);
 }
 
 void DolphinView::updateWritableState()
@@ -1198,7 +1481,7 @@ void DolphinView::updateWritableState()
     const bool wasFolderWritable = m_isFolderWritable;
     m_isFolderWritable = true;
 
-    const KFileItem item = m_dirLister->rootItem();
+    const KFileItem item = m_model->rootItem();
     if (!item.isNull()) {
         KFileItemListProperties capabilities(KFileItemList() << item);
         m_isFolderWritable = capabilities.supportsWriting();
@@ -1208,22 +1491,4 @@ void DolphinView::updateWritableState()
     }
 }
 
-QByteArray DolphinView::sortRoleForSorting(Sorting sorting) const
-{
-    switch (sorting) {
-    case SortByName:        return "name";
-    case SortBySize:        return "size";
-    case SortByDate:        return "date";
-    case SortByPermissions: return "permissions";
-    case SortByOwner:       return "owner";
-    case SortByGroup:       return "group";
-    case SortByType:        return "type";
-    case SortByDestination: return "destination";
-    case SortByPath:        return "path";
-    default: break;
-    }
-
-    return QByteArray();
-}
-
 #include "dolphinview.moc"