Remove the automoc noise

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

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 750cbb99849a14e5903e36bbae481aaec2c785eb..ce8e08210fffbf39f8cb05a8f4ee38f5df0b5dc1 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -20,6 +20,8 @@
 
 #include "dolphinview.h"
 
 
 #include "dolphinview.h"
 

+#include <config-baloo.h>
+

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


@@ -30,10 +32,13 @@
 #include <QItemSelection>
 #include <QTimer>
 #include <QScrollBar>
 #include <QItemSelection>
 #include <QTimer>
 #include <QScrollBar>

+#include <QPointer>
+#include <QMenu>

 
 

+#include <KDesktopFile>
+#include <KProtocolManager>

 #include <KActionCollection>
 #include <KColorScheme>
 #include <KActionCollection>
 #include <KColorScheme>

-#include <KDirLister>

 #include <KDirModel>
 #include <KIconEffect>
 #include <KFileItem>
 #include <KDirModel>
 #include <KIconEffect>
 #include <KFileItem>


@@ -41,27 +46,30 @@
 #include <KLocale>
 #include <kitemviews/kfileitemmodel.h>
 #include <kitemviews/kfileitemlistview.h>
 #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 <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 <KMenu>
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>
 #include <KJob>
 #include <KMenu>

+#include <KGlobal>

 #include <KMessageBox>
 #include <KMessageBox>

+#include <KJobWidgets>

 #include <konq_fileitemcapabilities.h>
 #include <konq_operations.h>
 #include <konqmimedata.h>
 #include <KToggleAction>
 #include <KUrl>
 
 #include <konq_fileitemcapabilities.h>
 #include <konq_operations.h>
 #include <konqmimedata.h>
 #include <KToggleAction>
 #include <KUrl>
 

-#include "additionalinfoaccessor.h"
-#include "dolphindirlister.h"

 #include "dolphinnewfilemenuobserver.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.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 "versioncontrol/versioncontrolobserver.h"
 #include "draganddrophelper.h"
 #include "renamedialog.h"
 #include "versioncontrol/versioncontrolobserver.h"


@@ -70,9 +78,12 @@
 #include "views/tooltips/tooltipmanager.h"
 #include "zoomlevelinfo.h"
 
 #include "views/tooltips/tooltipmanager.h"
 #include "zoomlevelinfo.h"
 

+#ifdef HAVE_BALOO
+    #include <Baloo/IndexerConfig>
+#endif
+

 namespace {
     const int MaxModeEnum = DolphinView::CompactView;
 namespace {
     const int MaxModeEnum = DolphinView::CompactView;

-    const int MaxSortingEnum = DolphinView::SortByPath;

 };
 
 DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
 };
 
 DolphinView::DolphinView(const KUrl& url, QWidget* parent) :


@@ -81,18 +92,23 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     m_tabsForFiles(false),
     m_assureVisibleCurrentIndex(false),
     m_isFolderWritable(true),
     m_tabsForFiles(false),
     m_assureVisibleCurrentIndex(false),
     m_isFolderWritable(true),

+    m_dragging(false),

     m_url(url),
     m_url(url),

+    m_viewPropertiesContext(),

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

-    m_additionalInfoList(),
+    m_visibleRoles(),

     m_topLayout(0),
     m_topLayout(0),

-    m_dirLister(0),
+    m_model(0),
+    m_view(0),

     m_container(0),
     m_toolTipManager(0),
     m_selectionChangedTimer(0),
     m_currentItemUrl(),
     m_container(0),
     m_toolTipManager(0),
     m_selectionChangedTimer(0),
     m_currentItemUrl(),

+    m_scrollToCurrentItem(false),

     m_restoredContentsPosition(),
     m_restoredContentsPosition(),

-    m_createdItemUrl(),

     m_selectedUrls(),
     m_selectedUrls(),

+    m_clearSelectionBeforeSelectingNewItems(false),
+    m_markFirstNewlySelectedItemAsCurrent(false),

     m_versionControlObserver(0)
 {
     m_topLayout = new QVBoxLayout(this);
     m_versionControlObserver(0)
 {
     m_topLayout = new QVBoxLayout(this);


@@ -102,75 +118,86 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) :
     // 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(KUrl)),
-            this, SLOT(observeCreatedItem(KUrl)));
+    connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::itemCreated,
+            this, &DolphinView::observeCreatedItem);

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

-    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");
+    connect(m_selectionChangedTimer, &QTimer::timeout,
+            this, &DolphinView::emitSelectionChangedSignal);
+
+    m_model = new KFileItemModel(this);
+    m_view = new DolphinItemListView();
+    m_view->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle());
+    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);
+
+    // The EnlargeSmallPreviews setting can only be changed after the model
+    // has been set in the view by KItemListController.
+    m_view->setEnlargeSmallPreviews(GeneralSettings::enlargeSmallPreviews());
+
+    m_container = new KItemListContainer(controller, this);

     m_container->installEventFilter(this);
     setFocusProxy(m_container);
     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()));
+    connect(m_container->horizontalScrollBar(), &QScrollBar::valueChanged, this, &DolphinView::hideToolTip);
+    connect(m_container->verticalScrollBar(), &QScrollBar::valueChanged, this, &DolphinView::hideToolTip);

 
 

-    KItemListController* controller = m_container->controller();

     controller->setSelectionBehavior(KItemListController::MultiSelection);
     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(itemPressed(int,Qt::MouseButton)), this, SLOT(hideToolTip()));
-    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();
-    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(controller, &KItemListController::itemActivated, this, &DolphinView::slotItemActivated);
+    connect(controller, &KItemListController::itemsActivated, this, &DolphinView::slotItemsActivated);
+    connect(controller, &KItemListController::itemMiddleClicked, this, &DolphinView::slotItemMiddleClicked);
+    connect(controller, &KItemListController::itemContextMenuRequested, this, &DolphinView::slotItemContextMenuRequested);
+    connect(controller, &KItemListController::viewContextMenuRequested, this, &DolphinView::slotViewContextMenuRequested);
+    connect(controller, &KItemListController::headerContextMenuRequested, this, &DolphinView::slotHeaderContextMenuRequested);
+    connect(controller, &KItemListController::mouseButtonPressed, this, &DolphinView::slotMouseButtonPressed);
+    connect(controller, &KItemListController::itemHovered, this, &DolphinView::slotItemHovered);
+    connect(controller, &KItemListController::itemUnhovered, this, &DolphinView::slotItemUnhovered);
+    connect(controller, &KItemListController::itemDropEvent, this, &DolphinView::slotItemDropEvent);
+    connect(controller, &KItemListController::escapePressed, this, &DolphinView::stopLoading);
+    connect(controller, &KItemListController::modelChanged, this, &DolphinView::slotModelChanged);
+
+    connect(m_model, &KFileItemModel::directoryLoadingStarted,       this, &DolphinView::slotDirectoryLoadingStarted);
+    connect(m_model, &KFileItemModel::directoryLoadingCompleted,     this, &DolphinView::slotDirectoryLoadingCompleted);
+    connect(m_model, &KFileItemModel::directoryLoadingCanceled,      this, &DolphinView::directoryLoadingCanceled);
+    connect(m_model, &KFileItemModel::directoryLoadingProgress,   this, &DolphinView::directoryLoadingProgress);
+    connect(m_model, &KFileItemModel::directorySortingProgress,   this, &DolphinView::directorySortingProgress);
+    connect(m_model, &KFileItemModel::itemsChanged,
+            this, &DolphinView::slotItemsChanged);
+    connect(m_model, &KFileItemModel::itemsRemoved,    this, &DolphinView::itemCountChanged);
+    connect(m_model, &KFileItemModel::itemsInserted,   this, &DolphinView::itemCountChanged);
+    connect(m_model, &KFileItemModel::infoMessage,            this, &DolphinView::infoMessage);
+    connect(m_model, &KFileItemModel::errorMessage,           this, &DolphinView::errorMessage);
+    connect(m_model, &KFileItemModel::directoryRedirection, this, &DolphinView::slotDirectoryRedirection);
+    connect(m_model, &KFileItemModel::urlIsFileError,            this, &DolphinView::urlIsFileError);
+
+    m_view->installEventFilter(this);
+    connect(m_view, &DolphinItemListView::sortOrderChanged,
+            this, &DolphinView::slotSortOrderChangedByHeader);
+    connect(m_view, &DolphinItemListView::sortRoleChanged,
+            this, &DolphinView::slotSortRoleChangedByHeader);
+    connect(m_view, &DolphinItemListView::visibleRolesChanged,
+            this, &DolphinView::slotVisibleRolesChangedByHeader);
+    connect(m_view, &DolphinItemListView::roleEditingCanceled,
+            this, &DolphinView::slotRoleEditingCanceled);
+    connect(m_view->header(), &KItemListHeader::columnWidthChanged,
+            this, &DolphinView::slotHeaderColumnWidthChanged);

 
     KItemListSelectionManager* selectionManager = controller->selectionManager();
 
     KItemListSelectionManager* selectionManager = controller->selectionManager();

-    connect(selectionManager, SIGNAL(selectionChanged(QSet<int>,QSet<int>)),
-            this, SLOT(slotSelectionChanged(QSet<int>,QSet<int>)));
+    connect(selectionManager, &KItemListSelectionManager::selectionChanged,
+            this, &DolphinView::slotSelectionChanged);

 
     m_toolTipManager = new ToolTipManager(this);
 
     m_versionControlObserver = new VersionControlObserver(this);
 
     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)));
+    m_versionControlObserver->setModel(m_model);
+    connect(m_versionControlObserver, &VersionControlObserver::infoMessage, this, &DolphinView::infoMessage);
+    connect(m_versionControlObserver, &VersionControlObserver::errorMessage, this, &DolphinView::errorMessage);
+    connect(m_versionControlObserver, &VersionControlObserver::operationCompletedMessage, this, &DolphinView::operationCompletedMessage);

 
     applyViewProperties();
     m_topLayout->addWidget(m_container);
 
     applyViewProperties();
     m_topLayout->addWidget(m_container);


@@ -224,11 +251,14 @@ bool DolphinView::isActive() const
 void DolphinView::setMode(Mode mode)
 {
     if (mode != m_mode) {
 void DolphinView::setMode(Mode mode)
 {
     if (mode != m_mode) {

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

         props.setViewMode(mode);
         props.setViewMode(mode);

-        props.save();

 
 

-        applyViewProperties();
+        // We pass the new ViewProperties to applyViewProperties, rather than
+        // storing them on disk and letting applyViewProperties() read them
+        // from there, to prevent that changing the view mode fails if the
+        // .directory file is not writable (see bug 318534).
+        applyViewProperties(props);

     }
 }
 
     }
 }
 


@@ -243,38 +273,44 @@ void DolphinView::setPreviewsShown(bool show)
         return;
     }
 
         return;
     }
 

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

     props.setPreviewsShown(show);
 
     props.setPreviewsShown(show);
 

-    m_container->setPreviewsShown(show);
+    const int oldZoomLevel = m_view->zoomLevel();
+    m_view->setPreviewsShown(show);

     emit previewsShownChanged(show);
     emit previewsShownChanged(show);

+
+    const int newZoomLevel = m_view->zoomLevel();
+    if (newZoomLevel != oldZoomLevel) {
+        emit zoomLevelChanged(newZoomLevel, oldZoomLevel);
+    }

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

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

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

-    if (m_dirLister->showingDotFiles() == show) {
+    if (m_model->showHiddenFiles() == show) {

         return;
     }
 
     const KFileItemList itemList = selectedItems();
     m_selectedUrls.clear();
         return;
     }
 
     const KFileItemList itemList = selectedItems();
     m_selectedUrls.clear();

-    m_selectedUrls = itemList.urlList();
+    m_selectedUrls = KUrl::List(itemList.urlList());

 
 

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

     props.setHiddenFilesShown(show);
 
     props.setHiddenFilesShown(show);
 

-    fileItemModel()->setShowHiddenFiles(show);
+    m_model->setShowHiddenFiles(show);

     emit hiddenFilesShownChanged(show);
 }
 
 bool DolphinView::hiddenFilesShown() const
 {
     emit hiddenFilesShownChanged(show);
 }
 
 bool DolphinView::hiddenFilesShown() const
 {

-    return m_dirLister->showingDotFiles();
+    return m_model->showHiddenFiles();

 }
 
 void DolphinView::setGroupedSorting(bool grouped)
 }
 
 void DolphinView::setGroupedSorting(bool grouped)


@@ -283,7 +319,7 @@ void DolphinView::setGroupedSorting(bool grouped)
         return;
     }
 
         return;
     }
 

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

     props.setGroupedSorting(grouped);
     props.save();
 
     props.setGroupedSorting(grouped);
     props.save();
 


@@ -294,25 +330,34 @@ void DolphinView::setGroupedSorting(bool grouped)
 
 bool DolphinView::groupedSorting() const
 {
 
 bool DolphinView::groupedSorting() const
 {

-    return fileItemModel()->groupedSorting();
+    return m_model->groupedSorting();

 }
 
 KFileItemList DolphinView::items() const
 {
 }
 
 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
 {
 }
 
 KFileItemList DolphinView::selectedItems() const
 {

-    const KFileItemModel* model = fileItemModel();

     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();

-    const QSet<int> selectedIndexes = selectionManager->selectedItems();

 
     KFileItemList selectedItems;
 
     KFileItemList selectedItems;

-    QSetIterator<int> it(selectedIndexes);
-    while (it.hasNext()) {
-        const int index = it.next();
-        selectedItems.append(model->fileItem(index));
+    foreach (int index, selectionManager->selectedItems()) {
+        selectedItems.append(m_model->fileItem(index));

     }
     return selectedItems;
 }
     }
     return selectedItems;
 }


@@ -331,22 +376,22 @@ void DolphinView::markUrlsAsSelected(const QList<KUrl>& urls)
 void DolphinView::markUrlAsCurrent(const KUrl& url)
 {
     m_currentItemUrl = url;
 void DolphinView::markUrlAsCurrent(const KUrl& url)
 {
     m_currentItemUrl = url;

+    m_scrollToCurrentItem = true;

 }
 
 }
 

-void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled)
+void DolphinView::selectItems(const QRegExp& pattern, bool enabled)

 {
     const KItemListSelectionManager::SelectionMode mode = enabled
                                                         ? KItemListSelectionManager::Select
                                                         : KItemListSelectionManager::Deselect;
 {
     const KItemListSelectionManager::SelectionMode mode = enabled
                                                         ? KItemListSelectionManager::Select
                                                         : KItemListSelectionManager::Deselect;

-    const KFileItemModel* model = fileItemModel();

     KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
 
     KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
 

-    for (int index = 0; index < model->count(); index++) {
-        const KFileItem item = model->fileItem(index);
+    for (int index = 0; index < m_model->count(); index++) {
+        const KFileItem item = m_model->fileItem(index);

         if (pattern.exactMatch(item.text())) {
         if (pattern.exactMatch(item.text())) {

-            // An alternative approach would be to store the matching items in a QSet<int> and
+            // An alternative approach would be to store the matching items in a KItemSet and

             // select them in one go after the loop, but we'd need a new function
             // select them in one go after the loop, but we'd need a new function

-            // KItemListSelectionManager::setSelected(QSet<int>, SelectionMode mode)
+            // KItemListSelectionManager::setSelected(KItemSet, SelectionMode mode)

             // for that.
             selectionManager->setSelected(index, 1, mode);
         }
             // for that.
             selectionManager->setSelected(index, 1, mode);
         }


@@ -356,28 +401,29 @@ void DolphinView::setItemSelectionEnabled(const QRegExp& pattern, bool enabled)
 void DolphinView::setZoomLevel(int level)
 {
     const int oldZoomLevel = zoomLevel();
 void DolphinView::setZoomLevel(int level)
 {
     const int oldZoomLevel = zoomLevel();

-    m_container->setZoomLevel(level);
+    m_view->setZoomLevel(level);

     if (zoomLevel() != oldZoomLevel) {
     if (zoomLevel() != oldZoomLevel) {

+        hideToolTip();

         emit zoomLevelChanged(zoomLevel(), oldZoomLevel);
     }
 }
 
 int DolphinView::zoomLevel() const
 {
         emit zoomLevelChanged(zoomLevel(), oldZoomLevel);
     }
 }
 
 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

 {
 {

-    KItemModelBase* model = m_container->controller()->model();
-    return sortingForSortRole(model->sortRole());
+    const KItemModelBase* model = m_container->controller()->model();
+    return model->sortRole();

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


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

-    KItemModelBase* model = fileItemModel();
-    return model->sortOrder();
+    return m_model->sortOrder();

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


@@ -402,26 +447,25 @@ void DolphinView::setSortFoldersFirst(bool foldersFirst)
 
 bool DolphinView::sortFoldersFirst() const
 {
 
 bool DolphinView::sortFoldersFirst() const
 {

-    KFileItemModel* model = fileItemModel();
-    return model->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);
+    ViewProperties props(viewPropertiesUrl());
+    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()
 }
 
 void DolphinView::reload()


@@ -432,7 +476,7 @@ void DolphinView::reload()
 
     const KFileItemList itemList = selectedItems();
     m_selectedUrls.clear();
 
     const KFileItemList itemList = selectedItems();
     m_selectedUrls.clear();

-    m_selectedUrls = itemList.urlList();
+    m_selectedUrls = KUrl::List(itemList.urlList());

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


@@ -441,20 +485,18 @@ void DolphinView::reload()
     restoreState(restoreStream);
 }
 
     restoreState(restoreStream);
 }
 

-void DolphinView::stopLoading()
-{
-    m_dirLister->stop();
-}
-

 void DolphinView::readSettings()
 {
 void DolphinView::readSettings()
 {

-    const int oldZoomLevel = m_container->zoomLevel();
-    
+    const int oldZoomLevel = m_view->zoomLevel();
+

     GeneralSettings::self()->readConfig();
     GeneralSettings::self()->readConfig();

-    m_container->readSettings();
+    m_view->readSettings();

     applyViewProperties();
     applyViewProperties();

-    
-    const int newZoomLevel = m_container->zoomLevel();
+
+    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);
     }
     if (newZoomLevel != oldZoomLevel) {
         emit zoomLevelChanged(newZoomLevel, oldZoomLevel);
     }


@@ -463,31 +505,27 @@ void DolphinView::readSettings()
 void DolphinView::writeSettings()
 {
     GeneralSettings::self()->writeConfig();
 void DolphinView::writeSettings()
 {
     GeneralSettings::self()->writeConfig();

-    m_container->writeSettings();
+    m_view->writeSettings();

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

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

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

-    return fileItemModel()->nameFilter();
+    return m_model->nameFilter();

 }
 
 }
 

-void DolphinView::calculateItemCount(int& fileCount,
-                                     int& folderCount,
-                                     KIO::filesize_t& totalFileSize) const
+void DolphinView::setMimeTypeFilters(const QStringList& filters)

 {
 {

-    foreach (const KFileItem& item, m_dirLister->items()) {
-        if (item.isDir()) {
-            ++folderCount;
-        } else {
-            ++fileCount;
-            totalFileSize += item.size();
-        }
-    }
+    return m_model->setMimeTypeFilters(filters);
+}
+
+QStringList DolphinView::mimeTypeFilters() const
+{
+    return m_model->mimeTypeFilters();

 }
 
 QString DolphinView::statusBarText() const
 }
 
 QString DolphinView::statusBarText() const


@@ -500,7 +538,7 @@ QString DolphinView::statusBarText() const
     int fileCount = 0;
     KIO::filesize_t totalFileSize = 0;
 
     int fileCount = 0;
     KIO::filesize_t totalFileSize = 0;
 

-    if (hasSelection()) {
+    if (m_container->controller()->selectionManager()->hasSelection()) {

         // Give a summary of the status of the selected files
         const KFileItemList list = selectedItems();
         foreach (const KFileItem& item, list) {
         // Give a summary of the status of the selected files
         const KFileItemList list = selectedItems();
         foreach (const KFileItem& item, list) {


@@ -513,8 +551,8 @@ QString DolphinView::statusBarText() const
         }
 
         if (folderCount + fileCount == 1) {
         }
 
         if (folderCount + fileCount == 1) {

-            // If only one item is selected, show the filename
-            filesText = i18nc("@info:status", "<filename>%1</filename> selected", list.first().text());
+            // If only one item is selected, show info about it
+            return list.first().getStatusBarInfo();

         } else {
             // At least 2 items are selected
             foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
         } else {
             // At least 2 items are selected
             foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);


@@ -528,11 +566,16 @@ QString DolphinView::statusBarText() const
 
     if (fileCount > 0 && folderCount > 0) {
         summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
 
     if (fileCount > 0 && folderCount > 0) {
         summary = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",

-                        foldersText, filesText, fileSizeText(totalFileSize));
+                        foldersText, filesText,
+                        KGlobal::locale()->formatByteSize(totalFileSize));

     } else if (fileCount > 0) {
     } else if (fileCount > 0) {

-        summary = i18nc("@info:status files (size)", "%1 (%2)", filesText, fileSizeText(totalFileSize));
+        summary = i18nc("@info:status files (size)", "%1 (%2)",
+                        filesText,
+                        KGlobal::locale()->formatByteSize(totalFileSize));

     } else if (folderCount > 0) {
         summary = foldersText;
     } else if (folderCount > 0) {
         summary = foldersText;

+    } else {
+        summary = i18nc("@info:status", "0 Folders, 0 Files");

     }
 
     return summary;
     }
 
     return summary;


@@ -543,8 +586,10 @@ QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) c
     QList<QAction*> actions;
 
     if (items.isEmpty()) {
     QList<QAction*> actions;
 
     if (items.isEmpty()) {

-        const KFileItem item = fileItemModel()->rootItem();
-        actions = m_versionControlObserver->actions(KFileItemList() << item);
+        const KFileItem item = m_model->rootItem();
+        if (!item.isNull()) {
+            actions = m_versionControlObserver->actions(KFileItemList() << item);
+        }

     } else {
         actions = m_versionControlObserver->actions(items);
     }
     } else {
         actions = m_versionControlObserver->actions(items);
     }


@@ -558,16 +603,21 @@ void DolphinView::setUrl(const KUrl& url)
         return;
     }
 
         return;
     }
 

+    clearSelection();
+

     emit urlAboutToBeChanged(url);
     m_url = url;
 
     hideToolTip();
 
     emit urlAboutToBeChanged(url);
     m_url = url;
 
     hideToolTip();
 

+    disconnect(m_view, &DolphinItemListView::roleEditingFinished,
+               this, &DolphinView::slotRoleEditingFinished);
+

     // 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().
     // 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);
 
     applyViewProperties();
     loadDirectory(url);
 


@@ -577,44 +627,47 @@ void DolphinView::setUrl(const KUrl& url)
 void DolphinView::selectAll()
 {
     KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
 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();
 }
 
 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()
 {
 }
 
 void DolphinView::clearSelection()
 {

+    m_selectedUrls.clear();

     m_container->controller()->selectionManager()->clearSelection();
 }
 
 void DolphinView::renameSelectedItems()
 {
     m_container->controller()->selectionManager()->clearSelection();
 }
 
 void DolphinView::renameSelectedItems()
 {

-    KFileItemList items = selectedItems();
-    const int itemCount = items.count();
-    if (itemCount < 1) {
+    const KFileItemList items = selectedItems();
+    if (items.isEmpty()) {

         return;
     }
 
         return;
     }
 

-    // 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);
-    } else {*/
+    if (items.count() == 1 && GeneralSettings::renameInline()) {
+        const int index = m_model->index(items.first());
+        m_view->editRole(index, "text");
+
+        hideToolTip();
+
+        connect(m_view, &DolphinItemListView::roleEditingFinished,
+                this, &DolphinView::slotRoleEditingFinished);
+    } 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 KFileItemModel
+    // will notify the view about changed items (which might result in
+    // a changed sorting).

     m_assureVisibleCurrentIndex = true;
 }
 
     m_assureVisibleCurrentIndex = true;
 }
 


@@ -634,8 +687,11 @@ void DolphinView::deleteSelectedItems()
 
     if (del) {
         KIO::Job* job = KIO::del(list);
 
     if (del) {
         KIO::Job* job = KIO::del(list);

-        connect(job, SIGNAL(result(KJob*)),
-                this, SLOT(slotDeleteFileFinished(KJob*)));
+        if (job->ui()) {
+            KJobWidgets::setWindow(job, this);
+        }
+        connect(job, &KIO::Job::result,
+                this, &DolphinView::slotDeleteFileFinished);

     }
 }
 
     }
 }
 


@@ -665,6 +721,11 @@ void DolphinView::pasteIntoFolder()
     }
 }
 
     }
 }
 

+void DolphinView::stopLoading()
+{
+    m_model->cancelDirectoryLoading();
+}
+

 bool DolphinView::eventFilter(QObject* watched, QEvent* event)
 {
     switch (event->type()) {
 bool DolphinView::eventFilter(QObject* watched, QEvent* event)
 {
     switch (event->type()) {


@@ -674,6 +735,22 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
         }
         break;
 
         }
         break;
 

+    case QEvent::GraphicsSceneDragEnter:
+        if (watched == m_view) {
+            m_dragging = true;
+        }
+        break;
+
+    case QEvent::GraphicsSceneDragLeave:
+        if (watched == m_view) {
+            m_dragging = false;
+        }
+        break;
+
+    case QEvent::GraphicsSceneDrop:
+        if (watched == m_view) {
+            m_dragging = false;
+        }

     default:
         break;
     }
     default:
         break;
     }


@@ -700,6 +777,20 @@ void DolphinView::hideEvent(QHideEvent* event)
     QWidget::hideEvent(event);
 }
 
     QWidget::hideEvent(event);
 }
 

+bool DolphinView::event(QEvent* event)
+{
+    /* See Bug 297355
+     * Dolphin leaves file preview tooltips open even when is not visible.
+     *
+     * Hide tool-tip when Dolphin loses focus.
+     */
+    if (event->type() == QEvent::WindowDeactivate) {
+        hideToolTip();
+    }
+
+    return QWidget::event(event);
+}
+

 void DolphinView::activate()
 {
     setActive(true);
 void DolphinView::activate()
 {
     setActive(true);


@@ -707,45 +798,65 @@ void DolphinView::activate()
 
 void DolphinView::slotItemActivated(int index)
 {
 
 void DolphinView::slotItemActivated(int index)
 {

-    const KFileItem item = fileItemModel()->fileItem(index);
+    const KFileItem item = m_model->fileItem(index);

     if (!item.isNull()) {
         emit itemActivated(item);
     }
 }
 
     if (!item.isNull()) {
         emit itemActivated(item);
     }
 }
 

-void DolphinView::slotItemsActivated(const QSet<int>& indexes)
+void DolphinView::slotItemsActivated(const KItemSet& indexes)

 {
     Q_ASSERT(indexes.count() >= 2);
 
 {
     Q_ASSERT(indexes.count() >= 2);
 

+    if (indexes.count() > 5) {
+        QString question = i18np("Are you sure you want to open 1 item?", "Are you sure you want to open %1 items?", indexes.count());
+        const int answer = KMessageBox::warningYesNo(this, question);
+        if (answer != KMessageBox::Yes) {
+            return;
+        }
+    }
+

     KFileItemList items;
     KFileItemList items;

+    items.reserve(indexes.count());

 
 

-    KFileItemModel* model = fileItemModel();
-    QSetIterator<int> it(indexes);
-    while (it.hasNext()) {
-        const int index = it.next();
-        items.append(model->fileItem(index));
-    }
+    foreach (int index, indexes) {
+        KFileItem item = m_model->fileItem(index);
+        const KUrl& url = openItemAsFolderUrl(item);

 
 

-    foreach (const KFileItem& item, items) {
-        if (item.isDir()) {
-            emit tabRequested(item.url());
+        if (!url.isEmpty()) { // Open folders in new tabs
+            emit tabRequested(url);

         } else {
         } else {

-            emit itemActivated(item);
+            items.append(item);

         }
     }
         }
     }

+
+    if (items.count() == 1) {
+        emit itemActivated(items.first());
+    } else if (items.count() > 1) {
+        emit itemsActivated(items);
+    }

 }
 
 void DolphinView::slotItemMiddleClicked(int index)
 {
 }
 
 void DolphinView::slotItemMiddleClicked(int index)
 {

-    const KFileItem item = fileItemModel()->fileItem(index);
-    if (item.isDir() || isTabsForFilesEnabled()) {
+    const KFileItem& item = m_model->fileItem(index);
+    const KUrl& url = openItemAsFolderUrl(item);
+    if (!url.isEmpty()) {
+        emit tabRequested(url);
+    } else if (isTabsForFilesEnabled()) {

         emit tabRequested(item.url());
     }
 }
 
 void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos)
 {
         emit tabRequested(item.url());
     }
 }
 
 void DolphinView::slotItemContextMenuRequested(int index, const QPointF& pos)
 {

-    const KFileItem item = fileItemModel()->fileItem(index);
+    // Force emit of a selection changed signal before we request the
+    // context menu, to update the edit-actions first. (See Bug 294013)
+    if (m_selectionChangedTimer->isActive()) {
+        emitSelectionChangedSignal();
+    }
+
+    const KFileItem item = m_model->fileItem(index);

     emit requestContextMenu(pos.toPoint(), item, url(), QList<QAction*>());
 }
 
     emit requestContextMenu(pos.toPoint(), item, url(), QList<QAction*>());
 }
 


@@ -756,59 +867,143 @@ void DolphinView::slotViewContextMenuRequested(const QPointF& pos)
 
 void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
 {
 
 void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
 {

-    QWeakPointer<KMenu> menu = new KMenu(QApplication::activeWindow());
+    ViewProperties props(viewPropertiesUrl());
+
+    QPointer<KMenu> menu = new KMenu(QApplication::activeWindow());

 
     KItemListView* view = m_container->controller()->view();
     const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();
 
 
     KItemListView* view = m_container->controller()->view();
     const QSet<QByteArray> visibleRolesSet = view->visibleRoles().toSet();
 

+    bool indexingEnabled = false;
+#ifdef HAVE_BALOO
+    Baloo::IndexerConfig config;
+    indexingEnabled = config.fileIndexingEnabled();
+#endif
+
+    QString groupName;
+    QMenu* groupMenu = 0;
+

     // Add all roles to the menu that can be shown or hidden by the user
     // Add all roles to the menu that can be shown or hidden by the user

-    const AdditionalInfoAccessor& infoAccessor = AdditionalInfoAccessor::instance();
-    const QList<DolphinView::AdditionalInfo> keys = infoAccessor.keys();
-    foreach (const DolphinView::AdditionalInfo info, keys) {
-        const QByteArray& role = infoAccessor.role(info);
-        if (role != "name") {
-            const QString text = fileItemModel()->roleDescription(role);
-
-            QAction* action = menu.data()->addAction(text);
-            action->setCheckable(true);
-            action->setChecked(visibleRolesSet.contains(role));
-            action->setData(info);
+    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;

         }
         }

-    }

 
 

-    QAction* action = menu.data()->exec(pos.toPoint());
-    if (action) {
-        // Show or hide the selected role
-        const DolphinView::AdditionalInfo info =
-            static_cast<DolphinView::AdditionalInfo>(action->data().toInt());
+        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);
+        }

 
 

-        ViewProperties props(url());
-        QList<DolphinView::AdditionalInfo> infoList = props.additionalInfoList();
+        action->setCheckable(true);
+        action->setChecked(visibleRolesSet.contains(info.role));
+        action->setData(info.role);

 
 

-        const QByteArray selectedRole = infoAccessor.role(info);
-        QList<QByteArray> visibleRoles = view->visibleRoles();
+        const bool enable = (!info.requiresBaloo && !info.requiresIndexer) ||
+                            (info.requiresBaloo) ||
+                            (info.requiresIndexer && indexingEnabled);
+        action->setEnabled(enable);
+    }

 
 

-        if (action->isChecked()) {
-            const int index = keys.indexOf(info) + 1;
-            visibleRoles.insert(index, selectedRole);
-            infoList.insert(index, info);
+    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 {
         } else {

-            visibleRoles.removeOne(selectedRole);
-            infoList.removeOne(info);
+            // 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);

         }
         }

+    }
+
+    delete menu;
+}
+
+void DolphinView::slotHeaderColumnWidthChanged(const QByteArray& role, qreal current, qreal previous)
+{
+    Q_UNUSED(previous);

 
 

-        view->setVisibleRoles(visibleRoles);
-        props.setAdditionalInfoList(infoList);
+    const QList<QByteArray> visibleRoles = m_view->visibleRoles();
+
+    ViewProperties props(viewPropertiesUrl());
+    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);
+        }

     }
 
     }
 

-    delete menu.data();
+    const int roleIndex = visibleRoles.indexOf(role);
+    Q_ASSERT(roleIndex >= 0 && roleIndex < columnWidths.count());
+    columnWidths[roleIndex] = current;
+
+    props.setHeaderColumnWidths(columnWidths);

 }
 
 void DolphinView::slotItemHovered(int index)
 {
 }
 
 void DolphinView::slotItemHovered(int index)
 {

-    const KFileItem item = fileItemModel()->fileItem(index);
+    const KFileItem item = m_model->fileItem(index);

 
 

-    if (GeneralSettings::showToolTips() && hasFocus() && QApplication::mouseButtons() == Qt::NoButton) {
+    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);
         QRectF itemRect = m_container->controller()->view()->itemContextRect(index);
         const QPoint pos = m_container->mapToGlobal(itemRect.topLeft().toPoint());
         itemRect.moveTo(pos);


@@ -829,11 +1024,11 @@ void DolphinView::slotItemUnhovered(int index)
 void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {
     KUrl destUrl;
 void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event)
 {
     KUrl destUrl;

-    KFileItem destItem = fileItemModel()->fileItem(index);
+    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
     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();
+        destItem = m_model->rootItem();

         destUrl = url();
     } else {
         // The item represents a directory or desktop-file
         destUrl = url();
     } else {
         // The item represents a directory or desktop-file


@@ -846,26 +1041,65 @@ void DolphinView::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* even
                          event->buttons(),
                          event->modifiers());
 
                          event->buttons(),
                          event->modifiers());
 

-    const QString error = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent);
+    QString error;
+    KonqOperations* op = DragAndDropHelper::dropUrls(destItem, destUrl, &dropEvent, error);

     if (!error.isEmpty()) {
     if (!error.isEmpty()) {

-        emit errorMessage(error);
+        emit infoMessage(error);

     }
     }

+
+    if (op && destUrl == url()) {
+        // Mark the dropped urls as selected.
+        m_clearSelectionBeforeSelectingNewItems = true;
+        m_markFirstNewlySelectedItemAsCurrent = true;
+        connect(op, static_cast<void(KonqOperations::*)(const KUrl::List&)>(&KonqOperations::aboutToCreate), this, &DolphinView::slotAboutToCreate);
+    }
+
+    setActive(true);

 }
 
 void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
 {
     if (previous != 0) {
 }
 
 void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous)
 {
     if (previous != 0) {

-        disconnect(previous, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
+        Q_ASSERT(qobject_cast<KFileItemModel*>(previous));
+        KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(previous);
+        disconnect(fileItemModel, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted);
+        m_versionControlObserver->setModel(0);

     }
 
     }
 

-    Q_ASSERT(qobject_cast<KFileItemModel*>(current));
-    connect(current, SIGNAL(loadingCompleted()), this, SLOT(slotLoadingCompleted()));
+    if (current) {
+        Q_ASSERT(qobject_cast<KFileItemModel*>(current));
+        KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(current);
+        connect(fileItemModel, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted);
+        m_versionControlObserver->setModel(fileItemModel);
+    }
+}

 
 

-    KFileItemModel* fileItemModel = static_cast<KFileItemModel*>(current);
-    m_versionControlObserver->setModel(fileItemModel);
+void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons)
+{
+    Q_UNUSED(itemIndex);
+
+    hideToolTip();
+
+    // TODO: Qt5: Replace Qt::XButton1 by Qt::BackButton and Qt::XButton2 by Qt::ForwardButton
+    if (buttons & Qt::XButton1) {
+        emit goBackRequested();
+    } else if (buttons & Qt::XButton2) {
+        emit goForwardRequested();
+    }
+}
+
+void DolphinView::slotAboutToCreate(const KUrl::List& urls)
+{
+    if (!urls.isEmpty()) {
+        if (m_markFirstNewlySelectedItemAsCurrent) {
+            markUrlAsCurrent(urls.first());
+            m_markFirstNewlySelectedItemAsCurrent = false;
+        }
+        m_selectedUrls << KUrl::List(KDirModel::simplifiedUrlList(urls));
+    }

 }
 
 }
 

-void DolphinView::slotSelectionChanged(const QSet<int>& current, const QSet<int>& previous)
+void DolphinView::slotSelectionChanged(const KItemSet& current, const KItemSet& previous)

 {
     const int currentCount = current.count();
     const int previousCount = previous.count();
 {
     const int currentCount = current.count();
     const int previousCount = previous.count();


@@ -885,35 +1119,33 @@ void DolphinView::emitSelectionChangedSignal()
     emit selectionChanged(selectedItems());
 }
 
     emit selectionChanged(selectedItems());
 }
 

-void DolphinView::updateSorting(DolphinView::Sorting sorting)
+void DolphinView::updateSortRole(const QByteArray& role)

 {
 {

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

 
     KItemModelBase* model = m_container->controller()->model();
 
     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)
 {
 }
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
 {

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

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

-    KItemModelBase* model = fileItemModel();
-    model->setSortOrder(order);
+    m_model->setSortOrder(order);

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

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

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

-    KFileItemModel* model = fileItemModel();
-    model->setSortFoldersFirst(foldersFirst);
+    m_model->setSortDirectoriesFirst(foldersFirst);

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


@@ -949,7 +1181,7 @@ void DolphinView::restoreState(QDataStream& stream)
     // Restore expanded folders (only relevant for the details view - will be ignored by the view in other view modes)
     QSet<KUrl> urls;
     stream >> urls;
     // Restore expanded folders (only relevant for the details view - will be ignored by the view in other view modes)
     QSet<KUrl> urls;
     stream >> urls;

-    fileItemModel()->restoreExpandedUrls(urls);
+    m_model->restoreExpandedDirectories(urls);

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


@@ -957,7 +1189,7 @@ void DolphinView::saveState(QDataStream& stream)
     // Save the current item that has the keyboard focus
     const int currentIndex = m_container->controller()->selectionManager()->currentItem();
     if (currentIndex != -1) {
     // 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);
+        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;
         Q_ASSERT(!item.isNull()); // If the current index is valid a item must exist
         KUrl currentItemUrl = item.url();
         stream << currentItemUrl;


@@ -971,43 +1203,77 @@ 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 << QPoint(x, y);
 
     // Save expanded folders (only relevant for the details view - the set will be empty in other view modes)

-    stream << fileItemModel()->expandedUrls();
+    stream << m_model->expandedDirectories();

 }
 
 }
 

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

 {
 {

-    return m_container->controller()->selectionManager()->hasSelection();
+    return m_model->rootItem();

 }
 
 }
 

-KFileItem DolphinView::rootItem() const
+void DolphinView::setViewPropertiesContext(const QString& context)

 {
 {

-    return m_dirLister->rootItem();
+    m_viewPropertiesContext = context;

 }
 
 }
 

-void DolphinView::observeCreatedItem(const KUrl& url)
+QString DolphinView::viewPropertiesContext() const

 {
 {

-    m_createdItemUrl = url;
-    //connect(m_dirModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
-    //        this, SLOT(selectAndScrollToCreatedItem()));
+    return m_viewPropertiesContext;

 }
 
 }
 

-void DolphinView::selectAndScrollToCreatedItem()
+KUrl DolphinView::openItemAsFolderUrl(const KFileItem& item, const bool browseThroughArchives)

 {
 {

-    /*const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_createdItemUrl);
-    if (dirIndex.isValid()) {
-        const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
-        QAbstractItemView* view = m_viewAccessor.itemView();
-        if (view) {
-            view->setCurrentIndex(proxyIndex);
+    if (item.isNull()) {
+        return KUrl();
+    }
+
+    KUrl url = item.targetUrl();
+
+    if (item.isDir()) {
+        return url;
+    }
+
+    if (item.isMimeTypeKnown()) {
+        const QString& mimetype = item.mimetype();
+
+        if (browseThroughArchives && item.isFile() && url.isLocalFile()) {
+            // Generic mechanism for redirecting to tar:/<path>/ when clicking on a tar file,
+            // zip:/<path>/ when clicking on a zip file, etc.
+            // The .protocol file specifies the mimetype that the kioslave handles.
+            // Note that we don't use mimetype inheritance since we don't want to
+            // open OpenDocument files as zip folders...
+            const QString& protocol = KProtocolManager::protocolForArchiveMimetype(mimetype);
+            if (!protocol.isEmpty()) {
+                url.setProtocol(protocol);
+                return url;
+            }
+        }
+
+        if (mimetype == QLatin1String("application/x-desktop")) {
+            // Redirect to the URL in Type=Link desktop files, unless it is a http(s) URL.
+            KDesktopFile desktopFile(url.toLocalFile());
+            if (desktopFile.hasLinkType()) {
+                const QString linkUrl = desktopFile.readUrl();
+                if (!linkUrl.startsWith(QLatin1String("http"))) {
+                    return linkUrl;
+                }
+            }

         }
     }
 
         }
     }
 

-    disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(QModelIndex,int,int)),
-               this, SLOT(selectAndScrollToCreatedItem()));*/
-    m_createdItemUrl = KUrl();
+    return KUrl();

 }
 
 }
 

-void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
+void DolphinView::observeCreatedItem(const KUrl& url)
+{
+    if (m_active) {
+        clearSelection();
+        markUrlAsCurrent(url);
+        markUrlsAsSelected(QList<KUrl>() << url);
+    }
+}
+
+void DolphinView::slotDirectoryRedirection(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);


@@ -1019,13 +1285,20 @@ void DolphinView::updateViewState()
 {
     if (m_currentItemUrl != KUrl()) {
         KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
 {
     if (m_currentItemUrl != KUrl()) {
         KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();

-        const int currentIndex = fileItemModel()->index(m_currentItemUrl);
+        const int currentIndex = m_model->index(m_currentItemUrl);

         if (currentIndex != -1) {
             selectionManager->setCurrentItem(currentIndex);
         if (currentIndex != -1) {
             selectionManager->setCurrentItem(currentIndex);

+
+            // scroll to current item and reset the state
+            if (m_scrollToCurrentItem) {
+                m_view->scrollToItem(currentIndex);
+                m_scrollToCurrentItem = false;
+            }
+
+            m_currentItemUrl = KUrl();

         } else {
             selectionManager->setCurrentItem(0);
         }
         } else {
             selectionManager->setCurrentItem(0);
         }

-        m_currentItemUrl = KUrl();

     }
 
     if (!m_restoredContentsPosition.isNull()) {
     }
 
     if (!m_restoredContentsPosition.isNull()) {


@@ -1039,18 +1312,26 @@ void DolphinView::updateViewState()
 
     if (!m_selectedUrls.isEmpty()) {
         KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
 
     if (!m_selectedUrls.isEmpty()) {
         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 (m_clearSelectionBeforeSelectingNewItems) {
+            selectionManager->clearSelection();
+            m_clearSelectionBeforeSelectingNewItems = false;
+        }
+
+        KItemSet selectedItems = selectionManager->selectedItems();
+
+        QList<KUrl>::iterator it = m_selectedUrls.begin();
+        while (it != m_selectedUrls.end()) {
+            const int index = m_model->index(*it);

             if (index >= 0) {
                 selectedItems.insert(index);
             if (index >= 0) {
                 selectedItems.insert(index);

+                it = m_selectedUrls.erase(it);
+            } else {
+                 ++it;

             }
         }
 
         selectionManager->setSelectedItems(selectedItems);
             }
         }
 
         selectionManager->setSelectedItems(selectedItems);

-        m_selectedUrls.clear();

     }
 }
 
     }
 }
 


@@ -1061,14 +1342,20 @@ void DolphinView::hideToolTip()
     }
 }
 
     }
 }
 

-void DolphinView::showHoverInformation(const KFileItem& item)
-{
-    emit requestItemInfo(item);
-}
-
-void DolphinView::clearHoverInformation()
+void DolphinView::calculateItemCount(int& fileCount,
+                                     int& folderCount,
+                                     KIO::filesize_t& totalFileSize) const

 {
 {

-    emit requestItemInfo(KFileItem());
+    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();
+        }
+    }

 }
 
 void DolphinView::slotDeleteFileFinished(KJob* job)
 }
 
 void DolphinView::slotDeleteFileFinished(KJob* job)


@@ -1080,7 +1367,17 @@ void DolphinView::slotDeleteFileFinished(KJob* job)
     }
 }
 
     }
 }
 

-void DolphinView::slotDirListerStarted(const KUrl& url)
+void DolphinView::slotRenamingFailed(const KUrl& oldUrl, const KUrl& newUrl)
+{
+    const int index = m_model->index(newUrl);
+    if (index >= 0) {
+        QHash<QByteArray, QVariant> data;
+        data.insert("text", oldUrl.fileName());
+        m_model->setData(index, data);
+    }
+}
+
+void DolphinView::slotDirectoryLoadingStarted()

 {
     // Disable the writestate temporary until it can be determined in a fast way
     // in DolphinView::slotLoadingCompleted()
 {
     // Disable the writestate temporary until it can be determined in a fast way
     // in DolphinView::slotLoadingCompleted()


@@ -1089,39 +1386,31 @@ void DolphinView::slotDirListerStarted(const KUrl& url)
         emit writeStateChanged(m_isFolderWritable);
     }
 
         emit writeStateChanged(m_isFolderWritable);
     }
 

-    emit startedPathLoading(url);
+    emit directoryLoadingStarted();

 }
 
 }
 

-void DolphinView::slotLoadingCompleted()
+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()));
 
     QTimer::singleShot(0, this, SLOT(updateViewState()));
 

-    emit finishedPathLoading(url());
+    emit directoryLoadingCompleted();

 
     updateWritableState();
 }
 
 
     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);
 }
 
 void DolphinView::slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOrder previous)
 {
     Q_UNUSED(previous);

-    Q_ASSERT(fileItemModel()->sortOrder() == current);
+    Q_ASSERT(m_model->sortOrder() == current);

 
 

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

     props.setSortOrder(current);
 
     emit sortOrderChanged(current);
     props.setSortOrder(current);
 
     emit sortOrderChanged(current);


@@ -1130,18 +1419,72 @@ void DolphinView::slotSortOrderChangedByHeader(Qt::SortOrder current, Qt::SortOr
 void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const QByteArray& previous)
 {
     Q_UNUSED(previous);
 void DolphinView::slotSortRoleChangedByHeader(const QByteArray& current, const QByteArray& previous)
 {
     Q_UNUSED(previous);

-    Q_ASSERT(fileItemModel()->sortRole() == current);
+    Q_ASSERT(m_model->sortRole() == current);

 
 

-    ViewProperties props(url());
-    const Sorting sorting = sortingForSortRole(current);
-    props.setSorting(sorting);
+    ViewProperties props(viewPropertiesUrl());
+    props.setSortRole(current);

 
 

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

 }
 
 }
 

-KFileItemModel* DolphinView::fileItemModel() const
+void DolphinView::slotVisibleRolesChangedByHeader(const QList<QByteArray>& current,
+                                                  const QList<QByteArray>& previous)

 {
 {

-    return static_cast<KFileItemModel*>(m_container->controller()->model());
+    Q_UNUSED(previous);
+    Q_ASSERT(m_container->controller()->view()->visibleRoles() == current);
+
+    const QList<QByteArray> previousVisibleRoles = m_visibleRoles;
+
+    m_visibleRoles = current;
+
+    ViewProperties props(viewPropertiesUrl());
+    props.setVisibleRoles(m_visibleRoles);
+
+    emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles);
+}
+
+void DolphinView::slotRoleEditingCanceled()
+{
+    disconnect(m_view, &DolphinItemListView::roleEditingFinished,
+               this, &DolphinView::slotRoleEditingFinished);
+}
+
+void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value)
+{
+    disconnect(m_view, &DolphinItemListView::roleEditingFinished,
+               this, &DolphinView::slotRoleEditingFinished);
+
+    if (index < 0 || index >= m_model->count()) {
+        return;
+    }
+
+    if (role == "text") {
+        const KFileItem oldItem = m_model->fileItem(index);
+        const QString newName = value.toString();
+        if (!newName.isEmpty() && newName != oldItem.text() && newName != QLatin1String(".") && newName != QLatin1String("..")) {
+            const KUrl oldUrl = oldItem.url();
+
+            const KUrl newUrl(url().path(KUrl::AddTrailingSlash) + newName);
+            const bool newNameExistsAlready = (m_model->index(newUrl) >= 0);
+            if (!newNameExistsAlready) {
+                // Only change the data in the model if no item with the new name
+                // is in the model yet. If there is an item with the new name
+                // already, calling KonqOperations::rename() will open a dialog
+                // asking for a new name, and KFileItemModel will update the
+                // data when the dir lister signals that the file name has changed.
+                QHash<QByteArray, QVariant> data;
+                data.insert(role, value);
+                m_model->setData(index, data);
+            }
+
+            KonqOperations* op = KonqOperations::renameV2(this, oldUrl, newName);
+            if (op && !newNameExistsAlready) {
+                // Only connect the renamingFailed signal if there is no item with the new name
+                // in the model yet, see bug 328262.
+                connect(op, &KonqOperations::renamingFailed, this, &DolphinView::slotRenamingFailed);
+            }
+        }
+    }

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


@@ -1156,15 +1499,22 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
         return;
     }
 
         return;
     }
 

-    m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
+    if (reload) {
+        m_model->refreshDirectory(url);
+    } else {
+        m_model->loadDirectory(url);
+    }

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

-    m_container->beginTransaction();
+    const ViewProperties props(viewPropertiesUrl());
+    applyViewProperties(props);
+}

 
 

-    const ViewProperties props(url());
-    KFileItemModel* model = fileItemModel();
+void DolphinView::applyViewProperties(const ViewProperties& props)
+{
+    m_view->beginTransaction();

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


@@ -1174,66 +1524,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.
         // 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);
 
 
         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();
         }
     }
 
     const bool hiddenFilesShown = props.hiddenFilesShown();

-    if (hiddenFilesShown != model->showHiddenFiles()) {
-        model->setShowHiddenFiles(hiddenFilesShown);
+    if (hiddenFilesShown != m_model->showHiddenFiles()) {
+        m_model->setShowHiddenFiles(hiddenFilesShown);

         emit hiddenFilesShownChanged(hiddenFilesShown);
     }
 
     const bool groupedSorting = props.groupedSorting();
         emit hiddenFilesShownChanged(hiddenFilesShown);
     }
 
     const bool groupedSorting = props.groupedSorting();

-    if (groupedSorting != model->groupedSorting()) {
-        model->setGroupedSorting(groupedSorting);
+    if (groupedSorting != m_model->groupedSorting()) {
+        m_model->setGroupedSorting(groupedSorting);

         emit groupedSortingChanged(groupedSorting);
     }
 
         emit groupedSortingChanged(groupedSorting);
     }
 

-    const DolphinView::Sorting sorting = props.sorting();
-    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();
     }
 
     const Qt::SortOrder sortOrder = props.sortOrder();

-    if (sortOrder != model->sortOrder()) {
-        model->setSortOrder(sortOrder);
+    if (sortOrder != m_model->sortOrder()) {
+        m_model->setSortOrder(sortOrder);

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

-    if (sortFoldersFirst != model->sortFoldersFirst()) {
-        model->setSortFoldersFirst(sortFoldersFirst);
+    if (sortFoldersFirst != m_model->sortDirectoriesFirst()) {
+        m_model->setSortDirectoriesFirst(sortFoldersFirst);

         emit sortFoldersFirstChanged(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();
     }
 
     const bool previewsShown = props.previewsShown();

-    if (previewsShown != m_container->previewsShown()) {
+    if (previewsShown != m_view->previewsShown()) {

         const int oldZoomLevel = zoomLevel();
 
         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
         emit previewsShownChanged(previewsShown);
 
         // Changing the preview-state might result in a changed zoom-level


@@ -1242,28 +1585,45 @@ 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();
-
-    QList<QByteArray> visibleRoles;
-    visibleRoles.reserve(m_additionalInfoList.count() + 1);
-    visibleRoles.append("name");
-
-    foreach (AdditionalInfo info, m_additionalInfoList) {
-        visibleRoles.append(infoAccessor.role(info));
+    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)
 {
 }
 
 void DolphinView::pasteToUrl(const KUrl& url)
 {

-    markPastedUrlsAsSelected(QApplication::clipboard()->mimeData());
-    KonqOperations::doPaste(this, url);
+    KonqOperations* op = KonqOperations::doPasteV2(this, url);
+    if (op) {
+        m_clearSelectionBeforeSelectingNewItems = true;
+        m_markFirstNewlySelectedItemAsCurrent = true;
+        connect(op, static_cast<void(KonqOperations::*)(const KUrl::List&)>(&KonqOperations::aboutToCreate), this, &DolphinView::slotAboutToCreate);
+    }

 }
 
 KUrl::List DolphinView::simplifiedSelectedUrls() const
 }
 
 KUrl::List DolphinView::simplifiedSelectedUrls() const


@@ -1271,7 +1631,7 @@ KUrl::List DolphinView::simplifiedSelectedUrls() const
     KUrl::List urls;
 
     const KFileItemList items = selectedItems();
     KUrl::List urls;
 
     const KFileItemList items = selectedItems();

-    foreach (const KFileItem &item, items) {
+    foreach (const KFileItem& item, items) {

         urls.append(item.url());
     }
 
         urls.append(item.url());
     }
 


@@ -1285,90 +1645,41 @@ KUrl::List DolphinView::simplifiedSelectedUrls() const
 
 QMimeData* DolphinView::selectionMimeData() const
 {
 
 QMimeData* DolphinView::selectionMimeData() const
 {

-    const KFileItemModel* model = fileItemModel();

     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
     const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();

-    const QSet<int> selectedIndexes = selectionManager->selectedItems();
+    const KItemSet selectedIndexes = selectionManager->selectedItems();

 
 

-    return model->createMimeData(selectedIndexes);
-}
-
-void DolphinView::markPastedUrlsAsSelected(const QMimeData* mimeData)
-{
-    const KUrl::List urls = KUrl::List::fromMimeData(mimeData);
-    markUrlsAsSelected(urls);
+    return m_model->createMimeData(selectedIndexes);

 }
 
 void DolphinView::updateWritableState()
 {
     const bool wasFolderWritable = m_isFolderWritable;
 }
 
 void DolphinView::updateWritableState()
 {
     const bool wasFolderWritable = m_isFolderWritable;

-    m_isFolderWritable = true;
+    m_isFolderWritable = false;

 
 

-    const KFileItem item = m_dirLister->rootItem();
-    if (!item.isNull()) {
-        KFileItemListProperties capabilities(KFileItemList() << item);
-        m_isFolderWritable = capabilities.supportsWriting();
+    KFileItem item = m_model->rootItem();
+    if (item.isNull()) {
+        // Try to find out if the URL is writable even if the "root item" is
+        // null, see https://bugs.kde.org/show_bug.cgi?id=330001
+        item = KFileItem(KFileItem::Unknown, KFileItem::Unknown, url(), true);

     }
     }

+
+    KFileItemListProperties capabilities(KFileItemList() << item);
+    m_isFolderWritable = capabilities.supportsWriting();
+

     if (m_isFolderWritable != wasFolderWritable) {
         emit writeStateChanged(m_isFolderWritable);
     }
 }
 
     if (m_isFolderWritable != wasFolderWritable) {
         emit writeStateChanged(m_isFolderWritable);
     }
 }
 

-QByteArray DolphinView::sortRoleForSorting(Sorting sorting) const
+KUrl DolphinView::viewPropertiesUrl() 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;
+    if (m_viewPropertiesContext.isEmpty()) {
+        return m_url;

     }
 
     }
 

-    return QByteArray();
-}
-
-DolphinView::Sorting DolphinView::sortingForSortRole(const QByteArray& sortRole) const
-{
-    static QHash<QByteArray, DolphinView::Sorting> sortHash;
-    if (sortHash.isEmpty()) {
-        sortHash.insert("name", SortByName);
-        sortHash.insert("size", SortBySize);
-        sortHash.insert("date", SortByDate);
-        sortHash.insert("permissions", SortByPermissions);
-        sortHash.insert("owner", SortByOwner);
-        sortHash.insert("group", SortByGroup);
-        sortHash.insert("type", SortByType);
-        sortHash.insert("destination", SortByDestination);
-        sortHash.insert("path", SortByPath);
-    }
-    return sortHash.value(sortRole);
-}
-
-QString DolphinView::fileSizeText(KIO::filesize_t fileSize)
-{
-    const KLocale* locale = KGlobal::locale();
-    const unsigned int multiplier = (locale->binaryUnitDialect() == KLocale::MetricBinaryDialect)
-                                    ? 1000 : 1024;
-
-    QString text;
-    if (fileSize < multiplier) {
-        // Show the size in bytes
-        text = locale->formatByteSize(fileSize, 0, KLocale::DefaultBinaryDialect, KLocale::UnitByte);
-    } else if (fileSize < multiplier * multiplier) {
-        // Show the size in kilobytes and always round up. This is done
-        // for consistency with the values shown e.g. in the "Size" column
-        // of the details-view.
-        fileSize += (multiplier / 2) - 1;
-        text = locale->formatByteSize(fileSize, 0, KLocale::DefaultBinaryDialect, KLocale::UnitKiloByte);
-    } else {
-        // Show the size in the best fitting unit having one decimal
-        text = locale->formatByteSize(fileSize, 1);
-    }
-    return text;
+    KUrl url;
+    url.setProtocol(m_url.protocol());
+    url.setPath(m_viewPropertiesContext);
+    return url;

 }
 
 }
 

-#include "dolphinview.moc"