removed unused member variable (the dependency to DolphinMainWindow has been removed...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 8d3bf1e2f7fa783732193e358da201d4bc24645a..606c5202d4e93a8f7f8c2e1c9b47930c28aa4473 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

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

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


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

+#include <QAbstractItemView>

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


@@ -28,90 +29,134 @@
 #include <QTimer>
 #include <QScrollBar>
 
 #include <QTimer>
 #include <QScrollBar>
 

-#include <kdirmodel.h>
+#include <kactioncollection.h>
+#include <kcolorscheme.h>

 #include <kdirlister.h>
 #include <kdirlister.h>

-#include <kfileitemdelegate.h>
-#include <kglobalsettings.h>
-#include <klocale.h>

 #include <kiconeffect.h>
 #include <kiconeffect.h>

+#include <kfileitem.h>
+#include <klocale.h>
+#include <kio/deletejob.h>

 #include <kio/netaccess.h>
 #include <kio/netaccess.h>

-#include <kio/renamedialog.h>

 #include <kio/previewjob.h>
 #include <kio/previewjob.h>

+#include <kjob.h>
+#include <kmenu.h>
+#include <kmessagebox.h>

 #include <kmimetyperesolver.h>
 #include <kmimetyperesolver.h>

-#include <konqmimedata.h>
+#include <konq_fileitemcapabilities.h>

 #include <konq_operations.h>
 #include <konq_operations.h>

+#include <konqmimedata.h>
+#include <kstringhandler.h>
+#include <ktoggleaction.h>

 #include <kurl.h>
 
 #include <kurl.h>
 

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

 #include "dolphincontroller.h"
 #include "dolphincontroller.h"

-#include "dolphinsortfilterproxymodel.h"

 #include "dolphindetailsview.h"
 #include "dolphindetailsview.h"

+#include "dolphinfileitemdelegate.h"
+#include "dolphinnewmenuobserver.h"
+#include "dolphinsortfilterproxymodel.h"
+#include "dolphin_detailsmodesettings.h"

 #include "dolphiniconsview.h"
 #include "dolphiniconsview.h"

-#include "dolphinitemcategorizer.h"
+#include "dolphin_generalsettings.h"
+#include "draganddrophelper.h"

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

+#include "settings/dolphinsettings.h"

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

-#include "dolphinsettings.h"
-#include "dolphin_generalsettings.h"
+#include "zoomlevelinfo.h"
+#include "dolphindetailsviewexpander.h"
+
+/**
+ * Helper function for sorting items with qSort() in
+ * DolphinView::renameSelectedItems().
+ */
+bool lessThan(const KFileItem& item1, const KFileItem& item2)
+{
+    return KStringHandler::naturalCompare(item1.name(), item2.name()) < 0;
+}

 
 DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,
 
 DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,

-                         KDirLister* dirLister,
-                         KDirModel* dirModel,
-                         DolphinSortFilterProxyModel* proxyModel,
-                         Mode mode,
-                         bool showHiddenFiles) :
+                         DolphinSortFilterProxyModel* proxyModel) :

     QWidget(parent),
     m_active(true),
     QWidget(parent),
     m_active(true),

-    m_blockContentsMovedSignal(false),
-    m_initializeColumnView(false),
-    m_mode(mode),
+    m_showPreview(false),
+    m_loadingDirectory(false),
+    m_storedCategorizedSorting(false),
+    m_tabsForFiles(false),
+    m_isContextMenuOpen(false),
+    m_ignoreViewProperties(false),
+    m_assureVisibleCurrentIndex(false),
+    m_mode(DolphinView::IconsView),

     m_topLayout(0),
     m_controller(0),
     m_topLayout(0),
     m_controller(0),

-    m_iconsView(0),
-    m_detailsView(0),
-    m_columnView(0),
-    m_fileItemDelegate(0),
-    m_dirModel(dirModel),
-    m_dirLister(dirLister),
-    m_proxyModel(proxyModel)
+    m_viewAccessor(proxyModel),
+    m_selectionModel(0),
+    m_selectionChangedTimer(0),
+    m_rootUrl(),
+    m_activeItemUrl(),
+    m_restoredContentsPosition(),
+    m_createdItemUrl(),
+    m_selectedItems(),
+    m_newFileNames()

 {
 {

-    setFocusPolicy(Qt::StrongFocus);

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

-    QClipboard* clipboard = QApplication::clipboard();
-    connect(clipboard, SIGNAL(dataChanged()),
-            this, SLOT(updateCutItems()));
-
-    connect(m_dirLister, SIGNAL(completed()),
-            this, SLOT(restoreContentsPos()));
-    connect(m_dirLister, SIGNAL(completed()),
-            this, SLOT(updateCutItems()));
-    connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
-            this, SLOT(generatePreviews(const KFileItemList&)));
-

     m_controller = new DolphinController(this);
     m_controller->setUrl(url);
     m_controller = new DolphinController(this);
     m_controller->setUrl(url);

-    connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
-            this, SLOT(openContextMenu(const QPoint&)));
-    connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const QModelIndex&, QWidget*)),
-            this, SLOT(dropUrls(const KUrl::List&, const QModelIndex&, QWidget*)));
+
+    connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
+            this, SIGNAL(urlChanged(const KUrl&)));
+    connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)),
+            this, SLOT(slotRequestUrlChange(const KUrl&)));
+
+    connect(m_controller, SIGNAL(requestContextMenu(const QPoint&, const QList<QAction*>&)),
+            this, SLOT(openContextMenu(const QPoint&, const QList<QAction*>&)));
+    connect(m_controller, SIGNAL(urlsDropped(const KFileItem&, const KUrl&, QDropEvent*)),
+            this, SLOT(dropUrls(const KFileItem&, const KUrl&, QDropEvent*)));

     connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)),
             this, SLOT(updateSorting(DolphinView::Sorting)));
     connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(updateSortOrder(Qt::SortOrder)));
     connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)),
             this, SLOT(updateSorting(DolphinView::Sorting)));
     connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(updateSortOrder(Qt::SortOrder)));

-    connect(m_controller, SIGNAL(itemTriggered(const QModelIndex&)),
-            this, SLOT(triggerItem(const QModelIndex&)));
+    connect(m_controller, SIGNAL(sortFoldersFirstChanged(bool)),
+            this, SLOT(updateSortFoldersFirst(bool)));
+    connect(m_controller, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
+            this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&)));
+    connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)),
+            this, SLOT(triggerItem(const KFileItem&)));
+    connect(m_controller, SIGNAL(tabRequested(const KUrl&)),
+            this, SIGNAL(tabRequested(const KUrl&)));

     connect(m_controller, SIGNAL(activated()),
             this, SLOT(activate()));
     connect(m_controller, SIGNAL(activated()),
             this, SLOT(activate()));

-    connect(m_controller, SIGNAL(itemEntered(const QModelIndex&)),
-            this, SLOT(showHoverInformation(const QModelIndex&)));
+    connect(m_controller, SIGNAL(itemEntered(const KFileItem&)),
+            this, SLOT(showHoverInformation(const KFileItem&)));

     connect(m_controller, SIGNAL(viewportEntered()),
             this, SLOT(clearHoverInformation()));
 
     connect(m_controller, SIGNAL(viewportEntered()),
             this, SLOT(clearHoverInformation()));
 

-    createView();
-    m_topLayout->addWidget(itemView());
+    KDirLister* dirLister = m_viewAccessor.dirLister();
+    connect(dirLister, SIGNAL(redirection(KUrl,KUrl)),
+            this, SLOT(slotRedirection(KUrl,KUrl)));
+    connect(dirLister, SIGNAL(completed()),
+            this, SLOT(slotDirListerCompleted()));
+    connect(dirLister, SIGNAL(refreshItems(const QList<QPair<KFileItem,KFileItem>>&)),
+            this, SLOT(slotRefreshItems()));
+
+    // When a new item has been created by the "Create New..." menu, the item should
+    // 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(&DolphinNewMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
+            this, SLOT(observeCreatedItem(const KUrl&)));
+
+    m_selectionChangedTimer = new QTimer(this);
+    m_selectionChangedTimer->setSingleShot(true);
+    m_selectionChangedTimer->setInterval(300);
+    connect(m_selectionChangedTimer, SIGNAL(timeout()),
+            this, SLOT(emitSelectionChangedSignal()));
+
+    applyViewProperties();
+    m_topLayout->addWidget(m_viewAccessor.layoutTarget());

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


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

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

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


@@ -136,15 +186,14 @@ void DolphinView::setActive(bool active)
 
     m_active = active;
 
 
     m_active = active;
 

-    QColor color = KGlobalSettings::baseColor();
+    QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();

     if (active) {
     if (active) {

-        emit urlChanged(url());
-        emit selectionChanged(selectedItems());
+        emitSelectionChangedSignal();

     } else {
     } else {

-        color.setAlpha(0);
+        color.setAlpha(150);

     }
 
     }
 

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

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


@@ -152,8 +201,11 @@ void DolphinView::setActive(bool active)
     update();
 
     if (active) {
     update();
 
     if (active) {

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

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

+
+    m_controller->indicateActivationChange(active);

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


@@ -167,25 +219,40 @@ void DolphinView::setMode(Mode mode)
         return; // the wished mode is already set
     }
 
         return; // the wished mode is already set
     }
 

+    const int oldZoomLevel = m_controller->zoomLevel();

     m_mode = mode;
 
     m_mode = mode;
 

-    if (isColumnViewActive()) {
-        // When changing the mode in the column view, it makes sense
-        // to go back to the root URL of the column view automatically.
-        // Otherwise there it would not be possible to turn off the column view
-        // without focusing the first column.
-        // TODO: reactivate again after DolphinView/DolphinViewController split works
-        //setUrl(m_dirLister->url());
-        //m_controller->setUrl(m_dirLister->url());
-    }
+    // remember the currently selected items, so that they will
+    // be restored after reloading the directory
+    m_selectedItems = selectedItems();

 
 

-    ViewProperties props(url());
-    props.setViewMode(m_mode);
+    deleteView();

 
 

+    const KUrl viewPropsUrl = rootUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setViewMode(m_mode);

     createView();
     createView();

-    startDirLister(url());
+
+    // the file item delegate has been recreated, apply the current
+    // additional information manually
+    const KFileItemDelegate::InformationList infoList = props.additionalInfo();
+    m_viewAccessor.itemDelegate()->setShowInformation(infoList);
+    emit additionalInfoChanged();
+
+    // Not all view modes support categorized sorting. Adjust the sorting model
+    // if changing the view mode results in a change of the categorized sorting
+    // capabilities.
+    m_storedCategorizedSorting = props.categorizedSorting();
+    const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
+    if (categorized != m_viewAccessor.proxyModel()->isCategorizedModel()) {
+        m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
+        emit categorizedSortingChanged();
+    }

 
     emit modeChanged();
 
     emit modeChanged();

+
+    updateZoomLevel(oldZoomLevel);
+    loadDirectory(viewPropsUrl);

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


@@ -193,190 +260,139 @@ DolphinView::Mode DolphinView::mode() const
     return m_mode;
 }
 
     return m_mode;
 }
 

-void DolphinView::setShowPreview(bool show)
-{
-    ViewProperties props(url());
-    props.setShowPreview(show);
-
-    m_controller->setShowPreview(show);
-    emit showPreviewChanged();
-
-    startDirLister(url(), true);
-}
-

 bool DolphinView::showPreview() const
 {
 bool DolphinView::showPreview() const
 {

-    return m_controller->showPreview();
+    return m_showPreview;

 }
 
 }
 

-void DolphinView::setShowHiddenFiles(bool show)
+bool DolphinView::showHiddenFiles() const

 {
 {

-    if (m_dirLister->showingDotFiles() == show) {
-        return;
-    }
-
-    ViewProperties props(url());
-    props.setShowHiddenFiles(show);
-
-    m_dirLister->setShowingDotFiles(show);
-    emit showHiddenFilesChanged();
-
-    startDirLister(url(), true);
+    return m_viewAccessor.dirLister()->showingDotFiles();

 }
 
 }
 

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

 {
 {

-    return m_dirLister->showingDotFiles();
+    // If all view modes would support categorized sorting, returning
+    // m_viewAccessor.proxyModel()->isCategorizedModel() would be the way to go. As
+    // currently only the icons view supports caterized sorting, we remember
+    // the stored view properties state in m_storedCategorizedSorting and
+    // return this state. The application takes care to disable the corresponding
+    // checkbox by checking DolphinView::supportsCategorizedSorting() to indicate
+    // that this setting is not applied to the current view mode.
+    return m_storedCategorizedSorting;

 }
 
 }
 

-void DolphinView::setCategorizedSorting(bool categorized)
+bool DolphinView::supportsCategorizedSorting() const

 {
 {

-    if (!supportsCategorizedSorting() || (categorized == categorizedSorting())) {
-        return;
-    }
-
-    Q_ASSERT(m_iconsView != 0);
-    if (categorized) {
-        Q_ASSERT(m_iconsView->itemCategorizer() == 0);
-        m_iconsView->setItemCategorizer(new DolphinItemCategorizer());
-    } else {
-        KItemCategorizer* categorizer = m_iconsView->itemCategorizer();
-        m_iconsView->setItemCategorizer(0);
-        delete categorizer;
-    }
-
-    ViewProperties props(url());
-    props.setCategorizedSorting(categorized);
-    props.save();
-
-    emit categorizedSortingChanged();
+    return m_viewAccessor.supportsCategorizedSorting();

 }
 
 }
 

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

 {
 {

-    if (!supportsCategorizedSorting()) {
-        return false;
-    }
-
-    Q_ASSERT(m_iconsView != 0);
-    return m_iconsView->itemCategorizer() != 0;
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+    return (view != 0) && view->selectionModel()->hasSelection();

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-void DolphinView::renameSelectedItems()
+KFileItemList DolphinView::selectedItems() const

 {
 {

-    // TODO: temporary deactivate due to DolphinView/DolphinViewController split
+    KFileItemList itemList;
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+    if (view == 0) {
+        return itemList;
+    }

 
 

-    /*DolphinView* view = 0; //mainWindow()->activeView();
-    const KUrl::List urls = selectedUrls();
-    if (urls.count() > 1) {
-        // More than one item has been selected for renaming. Open
-        // a rename dialog and rename all items afterwards.
-        RenameDialog dialog(urls);
-        if (dialog.exec() == QDialog::Rejected) {
-            return;
-        }
+    const QItemSelection selection = m_viewAccessor.proxyModel()->mapSelectionToSource(view->selectionModel()->selection());

 
 

-        const QString& newName = dialog.newName();
-        if (newName.isEmpty()) {
-            view->statusBar()->setMessage(dialog.errorString(),
-                                          DolphinStatusBar::Error);
-        } else {
-            // TODO: check how this can be integrated into KonqUndoManager/KonqOperations
-            // as one operation instead of n rename operations like it is done now...
-            Q_ASSERT(newName.contains('#'));
-
-            // iterate through all selected items and rename them...
-            const int replaceIndex = newName.indexOf('#');
-            Q_ASSERT(replaceIndex >= 0);
-            int index = 1;
-
-            KUrl::List::const_iterator it = urls.begin();
-            KUrl::List::const_iterator end = urls.end();
-            while (it != end) {
-                const KUrl& oldUrl = *it;
-                QString number;
-                number.setNum(index++);
-
-                QString name(newName);
-                name.replace(replaceIndex, 1, number);
-
-                if (oldUrl.fileName() != name) {
-                    KUrl newUrl = oldUrl;
-                    newUrl.setFileName(name);
-                    m_mainWindow->rename(oldUrl, newUrl);
-                }
-                ++it;
-            }
-        }
-    } else {
-        // Only one item has been selected for renaming. Use the custom
-        // renaming mechanism from the views.
-        Q_ASSERT(urls.count() == 1);
-
-        // TODO: Think about using KFileItemDelegate as soon as it supports editing.
-        // Currently the RenameDialog is used, but I'm not sure whether inline renaming
-        // is a benefit for the user at all -> let's wait for some input first...
-        RenameDialog dialog(urls);
-        if (dialog.exec() == QDialog::Rejected) {
-            return;
+    const QModelIndexList indexList = selection.indexes();
+    foreach (const QModelIndex &index, indexList) {
+        KFileItem item = m_viewAccessor.dirModel()->itemForIndex(index);
+        if (!item.isNull()) {
+            itemList.append(item);

         }
         }

+    }

 
 

-        const QString& newName = dialog.newName();
-        if (newName.isEmpty()) {
-            view->statusBar()->setMessage(dialog.errorString(),
-                                          DolphinStatusBar::Error);
-        } else {
-            const KUrl& oldUrl = urls.first();
-            KUrl newUrl = oldUrl;
-            newUrl.setFileName(newName);
-            m_mainWindow->rename(oldUrl, newUrl);
-        }
-    }*/
+    return itemList;

 }
 
 }
 

-void DolphinView::selectAll()
+KUrl::List DolphinView::selectedUrls() const

 {
 {

-    selectAll(QItemSelectionModel::Select);
+    KUrl::List urls;
+    const KFileItemList list = selectedItems();
+    foreach (const KFileItem &item, list) {
+        urls.append(item.url());
+    }
+    return urls;

 }
 
 }
 

-void DolphinView::invertSelection()
+int DolphinView::selectedItemsCount() const

 {
 {

-    selectAll(QItemSelectionModel::Toggle);
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+    if (view == 0) {
+        return 0;
+    }
+
+    return view->selectionModel()->selectedIndexes().count();

 }
 
 }
 

-int DolphinView::contentsX() const
+QItemSelectionModel* DolphinView::selectionModel() const

 {
 {

-    return itemView()->horizontalScrollBar()->value();
+    return m_viewAccessor.itemView()->selectionModel();

 }
 
 }
 

-int DolphinView::contentsY() const
+void DolphinView::setContentsPosition(int x, int y)

 {
 {

-    return itemView()->verticalScrollBar()->value();
+    QAbstractItemView* view = m_viewAccessor.itemView();
+    Q_ASSERT(view != 0);
+    view->horizontalScrollBar()->setValue(x);
+    view->verticalScrollBar()->setValue(y);
+
+    m_loadingDirectory = false;

 }
 
 }
 

-void DolphinView::zoomIn()
+void DolphinView::setRestoredContentsPosition(const QPoint& pos)

 {
 {

-    m_controller->triggerZoomIn();
+    // TODO: This function is called by DolphinViewContainer.
+    // If it makes use of DolphinView::restoreState(...) to restore the
+    // view state in KDE 4.5, this function can be removed.
+    m_restoredContentsPosition = pos;

 }
 
 }
 

-void DolphinView::zoomOut()
+QPoint DolphinView::contentsPosition() const

 {
 {

-    m_controller->triggerZoomOut();
+    // TODO: If DolphinViewContainer uses DolphinView::saveState(...) to save the
+    // view state in KDE 4.5, this code can be moved to DolphinView::saveState.
+    QAbstractItemView* view = m_viewAccessor.itemView();
+    Q_ASSERT(view != 0);
+    const int x = view->horizontalScrollBar()->value();
+    const int y = view->verticalScrollBar()->value();
+    return QPoint(x, y);

 }
 
 }
 

-bool DolphinView::isZoomInPossible() const
+void DolphinView::setZoomLevel(int level)

 {
 {

-    return m_controller->isZoomInPossible();
+    if (level < ZoomLevelInfo::minimumLevel()) {
+        level = ZoomLevelInfo::minimumLevel();
+    } else if (level > ZoomLevelInfo::maximumLevel()) {
+        level = ZoomLevelInfo::maximumLevel();
+    }
+
+    if (level != zoomLevel()) {
+        m_controller->setZoomLevel(level);
+        emit zoomLevelChanged(level);
+    }

 }
 
 }
 

-bool DolphinView::isZoomOutPossible() const
+int DolphinView::zoomLevel() const

 {
 {

-    return m_controller->isZoomOutPossible();
+    return m_controller->zoomLevel();

 }
 
 void DolphinView::setSorting(Sorting sorting)
 }
 
 void DolphinView::setSorting(Sorting sorting)


@@ -388,7 +404,7 @@ void DolphinView::setSorting(Sorting sorting)
 
 DolphinView::Sorting DolphinView::sorting() const
 {
 
 DolphinView::Sorting DolphinView::sorting() const
 {

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

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


@@ -400,706 +416,1230 @@ void DolphinView::setSortOrder(Qt::SortOrder order)
 
 Qt::SortOrder DolphinView::sortOrder() const
 {
 
 Qt::SortOrder DolphinView::sortOrder() const
 {

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

 }
 
 }
 

-void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
+void DolphinView::setSortFoldersFirst(bool foldersFirst)

 {
 {

-    ViewProperties props(url());
-    props.setAdditionalInfo(info);
-
-    m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation);
-    m_fileItemDelegate->setAdditionalInformation(info);
-
-    emit additionalInfoChanged(info);
-    startDirLister(url(), true);
+    if (sortFoldersFirst() != foldersFirst) {
+        updateSortFoldersFirst(foldersFirst);
+    }

 }
 
 }
 

-KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const
+bool DolphinView::sortFoldersFirst() const

 {
 {

-    return m_fileItemDelegate->additionalInformation();
+    return m_viewAccessor.proxyModel()->sortFoldersFirst();

 }
 
 }
 

-bool DolphinView::hasSelection() const
+void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info)

 {
 {

-    return itemView()->selectionModel()->hasSelection();
+    const KUrl viewPropsUrl = rootUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setAdditionalInfo(info);
+    m_viewAccessor.itemDelegate()->setShowInformation(info);
+
+    emit additionalInfoChanged();
+
+    if (m_viewAccessor.reloadOnAdditionalInfoChange()) {
+        loadDirectory(viewPropsUrl);
+    }

 }
 
 }
 

-void DolphinView::clearSelection()
+KFileItemDelegate::InformationList DolphinView::additionalInfo() const

 {
 {

-    itemView()->selectionModel()->clear();
+    return m_viewAccessor.itemDelegate()->showInformation();

 }
 
 }
 

-KFileItemList DolphinView::selectedItems() const
+void DolphinView::reload()

 {
 {

-    const QAbstractItemView* view = itemView();
+    QByteArray viewState;
+    QDataStream saveStream(&viewState, QIODevice::WriteOnly);
+    saveState(saveStream);
+    m_selectedItems= selectedItems();

 
 

-    // Our view has a selection, we will map them back to the DirModel
-    // and then fill the KFileItemList.
-    Q_ASSERT((view != 0) && (view->selectionModel() != 0));
+    setUrl(url());
+    loadDirectory(url(), true);

 
 

-    const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
-    KFileItemList itemList;
+    QDataStream restoreStream(viewState);
+    restoreState(restoreStream);
+}

 
 

-    const QModelIndexList indexList = selection.indexes();
-    QModelIndexList::const_iterator end = indexList.end();
-    for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) {
-        Q_ASSERT((*it).isValid());
+void DolphinView::refresh()
+{
+    m_ignoreViewProperties = false;

 
 

-        KFileItem* item = m_dirModel->itemForIndex(*it);
-        if (item != 0) {
-            itemList.append(item);
-        }
-    }
+    const bool oldActivationState = m_active;
+    const int oldZoomLevel = m_controller->zoomLevel();
+    m_active = true;

 
 

-    return itemList;
+    createView();
+    applyViewProperties();
+    reload();
+
+    setActive(oldActivationState);
+    updateZoomLevel(oldZoomLevel);

 }
 
 }
 

-KUrl::List DolphinView::selectedUrls() const
+void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)

 {
 {

-    KUrl::List urls;
+    Q_UNUSED(rootUrl); // TODO: remove after columnview-cleanup has been finished

 
 

-    const KFileItemList list = selectedItems();
-    KFileItemList::const_iterator it = list.begin();
-    const KFileItemList::const_iterator end = list.end();
-    while (it != end) {
-        KFileItem* item = *it;
-        urls.append(item->url());
-        ++it;
+    if (m_controller->url() == url) {
+        return;

     }
 
     }
 

-    return urls;
+    m_controller->setUrl(url); // emits urlChanged, which we forward
+    m_viewAccessor.prepareUrlChange(url);
+    applyViewProperties();
+    loadDirectory(url);
+
+    // When changing the URL there is no need to keep the version
+    // data of the previous URL.
+    m_viewAccessor.dirModel()->clearVersionData();
+
+    emit startedPathLoading(url);

 }
 
 }
 

-KFileItem* DolphinView::fileItem(const QModelIndex index) const
+void DolphinView::setNameFilter(const QString& nameFilter)

 {
 {

-    const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
-    return m_dirModel->itemForIndex(dirModelIndex);
+    m_controller->setNameFilter(nameFilter);

 }
 
 }
 

-void DolphinView::rename(const KUrl& source, const QString& newName)
+void DolphinView::calculateItemCount(int& fileCount,
+                                     int& folderCount,
+                                     KIO::filesize_t& totalFileSize) const

 {
 {

-    bool ok = false;
-
-    if (newName.isEmpty() || (source.fileName() == newName)) {
-        return;
+    foreach (const KFileItem& item, m_viewAccessor.dirLister()->items()) {
+        if (item.isDir()) {
+            ++folderCount;
+        } else {
+            ++fileCount;
+            totalFileSize += item.size();
+        }

     }
     }

+}

 
 

-    KUrl dest(source.upUrl());
-    dest.addPath(newName);
-
-    const bool destExists = KIO::NetAccess::exists(dest, false, this);
-    if (destExists) {
-        // the destination already exists, hence ask the user
-        // how to proceed...
-        KIO::RenameDialog renameDialog(this,
-                                       i18n("File Already Exists"),
-                                       source.path(),
-                                       dest.path(),
-                                       KIO::M_OVERWRITE);
-        switch (renameDialog.exec()) {
-        case KIO::R_OVERWRITE:
-            // the destination should be overwritten
-            ok = KIO::NetAccess::file_move(source, dest, -1, true);
-            break;
+QString DolphinView::statusBarText() const
+{
+    QString text;
+    int folderCount = 0;
+    int fileCount = 0;
+    KIO::filesize_t totalFileSize = 0;

 
 

-        case KIO::R_RENAME: {
-            // a new name for the destination has been used
-            KUrl newDest(renameDialog.newDestUrl());
-            ok = KIO::NetAccess::file_move(source, newDest);
-            break;
+    if (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;

         }
 
         }
 

-        default:
-            // the renaming operation has been canceled
-            return;
+        KFileItemList::const_iterator it = list.begin();
+        const KFileItemList::const_iterator end = list.end();
+        while (it != end) {
+            const KFileItem& item = *it;
+            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().name();
+            text = (folderCount == 1) ? i18nc("@info:status", "<filename>%1</filename> selected", name) :
+                                        i18nc("@info:status", "<filename>%1</filename> selected (%2)",
+                                              name, KIO::convertSize(totalFileSize));
+        } 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;
+            }

         }
     } else {
         }
     } else {

-        // no destination exists, hence just move the file to
-        // do the renaming
-        ok = KIO::NetAccess::file_move(source, dest);
+        calculateItemCount(fileCount, folderCount, totalFileSize);
+        text = KIO::itemsSummaryString(fileCount + folderCount,
+                                       fileCount, folderCount,
+                                       totalFileSize, true);

     }
 
     }
 

-    const QString destFileName = dest.fileName();
-    if (ok) {
-        // XYDZ
-        //m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.", source.fileName(), destFileName),
-        //                        DolphinStatusBar::OperationCompleted);
+    return text;
+}

 
 

-        KonqOperations::rename(this, source, destFileName);
-    } else {
-        // XYDZ
-        //m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.", source.fileName(), destFileName),
-        //                        DolphinStatusBar::Error);
-    }
+QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) const
+{
+    return m_controller->versionControlActions(items);

 }
 
 }
 

-void DolphinView::reload()
+void DolphinView::setUrl(const KUrl& url)

 {
 {

-    setUrl(url());
-    startDirLister(url(), true);
+    m_newFileNames.clear();
+    updateView(url, KUrl());

 }
 
 }
 

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

 {
 {

-    createView();
-    reload();
+    m_viewAccessor.itemView()->selectAll();

 }
 
 }
 

-void DolphinView::mouseReleaseEvent(QMouseEvent* event)
+void DolphinView::invertSelection()

 {
 {

-    QWidget::mouseReleaseEvent(event);
-    setActive(true);;
+    QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel();
+    const QAbstractItemModel* itemModel = selectionModel->model();
+
+    const QModelIndex topLeft = itemModel->index(0, 0);
+    const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
+                                                     itemModel->columnCount() - 1);
+
+    const QItemSelection selection(topLeft, bottomRight);
+    selectionModel->select(selection, QItemSelectionModel::Toggle);

 }
 }

-void DolphinView::activate()
+
+void DolphinView::clearSelection()

 {
 {

-    setActive(true);
+    m_viewAccessor.itemView()->clearSelection();

 }
 
 }
 

-void DolphinView::triggerItem(const QModelIndex& index)
+void DolphinView::renameSelectedItems()

 {
 {

-    if (!isValidNameIndex(index)) {
-        clearSelection();
-        showHoverInformation(index);
+    KFileItemList items = selectedItems();
+    const int itemCount = items.count();
+    if (itemCount < 1) {

         return;
     }
 
         return;
     }
 

-    const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
-    if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {
-        // items are selected by the user, hence don't trigger the
-        // item specified by 'index'
-        return;
-    }
+    if (itemCount > 1) {
+        // More than one item has been selected for renaming. Open
+        // a rename dialog and rename all items afterwards.
+        QPointer<RenameDialog> dialog = new RenameDialog(this, items);
+        if (dialog->exec() == QDialog::Rejected) {
+            delete dialog;
+            return;
+        }

 
 

-    KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index));
-    if (item == 0) {
-        return;
-    }
+        const QString newName = dialog->newName();
+        if (newName.isEmpty()) {
+            emit errorMessage(dialog->errorString());
+            delete dialog;
+            return;
+        }
+        delete dialog;

 
 

-    // Prefer the local path over the URL. This assures that the
-    // volume space information is correct. Assuming that the URL is media:/sda1,
-    // and the local path is /windows/C: For the URL the space info is related
-    // to the root partition (and hence wrong) and for the local path the space
-    // info is related to the windows partition (-> correct).
-    const QString localPath(item->localPath());
-    KUrl url;
-    if (localPath.isEmpty()) {
-        url = item->url();
-    } else {
-        url = localPath;
-    }
-
-    if (item->isDir()) {
-        setUrl(url);
-    } else if (item->isFile()) {
-        // allow to browse through ZIP and tar files
-        KMimeType::Ptr mime = item->mimeTypePtr();
-        if (mime->is("application/zip")) {
-            url.setProtocol("zip");
-            setUrl(url);
-        } else if (mime->is("application/x-tar") ||
-                   mime->is("application/x-tarz") ||
-                   mime->is("application/x-bzip-compressed-tar") ||
-                   mime->is("application/x-compressed-tar") ||
-                   mime->is("application/x-tzo")) {
-            url.setProtocol("tar");
-            setUrl(url);
-        } else {
-            item->run();
+        // the selection would be invalid after renaming the items, so just clear
+        // it before
+        clearSelection();
+
+        // TODO: check how this can be integrated into KIO::FileUndoManager/KonqOperations
+        // as one operation instead of n rename operations like it is done now...
+        Q_ASSERT(newName.contains('#'));
+
+        // currently the items are sorted by the selection order, resort
+        // them by the file name
+        qSort(items.begin(), items.end(), lessThan);
+
+        // iterate through all selected items and rename them...
+        int index = 1;
+        foreach (const KFileItem& item, items) {
+            const KUrl& oldUrl = item.url();
+            QString number;
+            number.setNum(index++);
+
+            QString name = newName;
+            name.replace('#', number);
+
+            if (oldUrl.fileName() != name) {
+                KUrl newUrl = oldUrl;
+                newUrl.setFileName(name);
+                KonqOperations::rename(this, oldUrl, newUrl);
+            }

         }
         }

+    } else if (DolphinSettings::instance().generalSettings()->renameInline()) {
+        Q_ASSERT(itemCount == 1);
+        const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForItem(items.first());
+        const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
+        m_viewAccessor.itemView()->edit(proxyIndex);

     } else {
     } else {

-        item->run();
+        Q_ASSERT(itemCount == 1);
+
+        QPointer<RenameDialog> dialog = new RenameDialog(this, items);
+        if (dialog->exec() == QDialog::Rejected) {
+            delete dialog;
+            return;
+        }
+
+        const QString newName = dialog->newName();
+        if (newName.isEmpty()) {
+            emit errorMessage(dialog->errorString());
+            delete dialog;
+            return;
+        }
+        delete dialog;
+
+        const KUrl& oldUrl = items.first().url();
+        KUrl newUrl = oldUrl;
+        newUrl.setFileName(newName);
+        KonqOperations::rename(this, oldUrl, newUrl);

     }
     }

+
+    // assure that the current index remains visible when KDirLister
+    // will notify the view about changed items
+    m_assureVisibleCurrentIndex = true;

 }
 
 }
 

-void DolphinView::generatePreviews(const KFileItemList& items)
+void DolphinView::trashSelectedItems()

 {
 {

-    if (m_controller->showPreview()) {
-
-        // Must turn QList<KFileItem *> to QList<KFileItem>...
-        QList<KFileItem> itemsToPreview;
-        foreach( KFileItem* it, items )
-            itemsToPreview.append( *it );
+    const KUrl::List list = simplifiedSelectedUrls();
+    KonqOperations::del(this, KonqOperations::TRASH, list);
+}

 
 

-        KIO::PreviewJob* job = KIO::filePreview(itemsToPreview, 128);
-        connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
-                this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
+void DolphinView::deleteSelectedItems()
+{
+    const KUrl::List list = simplifiedSelectedUrls();
+    const bool del = KonqOperations::askDeleteConfirmation(list,
+                     KonqOperations::DEL,
+                     KonqOperations::DEFAULT_CONFIRMATION,
+                     this);
+
+    if (del) {
+        KIO::Job* job = KIO::del(list);
+        connect(job, SIGNAL(result(KJob*)),
+                this, SLOT(slotDeleteFileFinished(KJob*)));

     }
 }
 
     }
 }
 

-void DolphinView::showPreview(const KFileItem& item, const QPixmap& pixmap)
+void DolphinView::cutSelectedItems()

 {
 {

-    Q_ASSERT(!item.isNull());
-    if (item.url().directory() != m_dirLister->url().path()) {
-        // the preview job is still working on items of an older URL, hence
-        // the item is not part of the directory model anymore
-        return;
-    }
+    QMimeData* mimeData = selectionMimeData();
+    KonqMimeData::addIsCutSelection(mimeData, true);
+    QApplication::clipboard()->setMimeData(mimeData);
+}

 
 

-    const QModelIndex idx = m_dirModel->indexForItem(item);
-    if (idx.isValid() && (idx.column() == 0)) {
-        const QMimeData* mimeData = QApplication::clipboard()->mimeData();
-        if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) {
-            KIconEffect iconEffect;
-            const QPixmap cutPixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState);
-            m_dirModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole);
-        } else {
-            m_dirModel->setData(idx, QIcon(pixmap), Qt::DecorationRole);
-        }
-    }
+void DolphinView::copySelectedItems()
+{
+    QMimeData* mimeData = selectionMimeData();
+    QApplication::clipboard()->setMimeData(mimeData);

 }
 
 }
 

-void DolphinView::restoreContentsPos()
+void DolphinView::paste()

 {
 {

-    m_blockContentsMovedSignal = false;
-    if (!url().isEmpty()) {
-        QAbstractItemView* view = itemView();
-        // TODO #1: view->setCurrentItem(m_urlNavigator->currentFileName());
-        // TODO #2: temporary deactivated due to DolphinView/DolphinViewController split
-        //QPoint pos = m_urlNavigator->savedPosition();
-        QPoint pos(0, 0);
-        view->horizontalScrollBar()->setValue(pos.x());
-        view->verticalScrollBar()->setValue(pos.y());
-    }
+    pasteToUrl(url());

 }
 
 }
 

-void DolphinView::emitSelectionChangedSignal()
+void DolphinView::pasteIntoFolder()

 {
 {

-    emit selectionChanged(DolphinView::selectedItems());
+    const KFileItemList items = selectedItems();
+    if ((items.count() == 1) && items.first().isDir()) {
+        pasteToUrl(items.first().url());
+    }

 }
 
 }
 

-void DolphinView::startDirLister(const KUrl& url, bool reload)
+void DolphinView::setShowPreview(bool show)

 {
 {

-    if (!url.isValid()) {
-        // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-
-        //const QString location(url.pathOrUrl());
-        //if (location.isEmpty()) {
-        //    m_statusBar->setMessage(i18n("The location is empty."), DolphinStatusBar::Error);
-        //} else {
-        //    m_statusBar->setMessage(i18n("The location '%1' is invalid.", location),
-        //                            DolphinStatusBar::Error);
-        //}
+    if (m_showPreview == show) {

         return;
     }
 
         return;
     }
 

-    // Only show the directory loading progress if the status bar does
-    // not contain another progress information. This means that
-    // the directory loading progress information has the lowest priority.
-
-    // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-    //const QString progressText(m_statusBar->progressText());
-    //m_showProgress = progressText.isEmpty() ||
-    //                 (progressText == i18n("Loading folder..."));
-    //if (m_showProgress) {
-    //    m_statusBar->setProgressText(i18n("Loading folder..."));
-    //    m_statusBar->setProgress(0);
-    //}
-
-    m_cutItemsCache.clear();
-    m_blockContentsMovedSignal = true;
-    m_dirLister->stop();
-
-    bool openDir = true;
-    bool keepOldDirs = isColumnViewActive() && !m_initializeColumnView;
-    m_initializeColumnView = false;
-
-    if (keepOldDirs) {
-        if (reload) {
-            keepOldDirs = false;
-
-            const KUrl& dirListerUrl = m_dirLister->url();
-            if (dirListerUrl.isValid()) {
-                const KUrl::List dirs = m_dirLister->directories();
-                KUrl url;
-                foreach(url, dirs) {
-                    m_dirLister->updateDirectory(url);
-                }
-                openDir = false;
-            }
-        } else if (m_dirLister->directories().contains(url)) {
-            // The dir lister contains the directory already, so
-            // KDirLister::openUrl() may not been invoked twice.
-            m_dirLister->updateDirectory(url);
-            openDir = false;
-        } else {
-            const KUrl& dirListerUrl = m_dirLister->url();
-            if ((dirListerUrl == url) || !m_dirLister->url().isParentOf(url)) {
-                // The current URL is not a child of the dir lister
-                // URL. This may happen when e. g. a bookmark has been selected
-                // and hence the view must be reset.
-                keepOldDirs = false;
-            }
-        }
-    }
+    const KUrl viewPropsUrl = rootUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setShowPreview(show);

 
 

-    if (openDir) {
-        m_dirLister->openUrl(url, keepOldDirs, reload);
-    }
+    m_showPreview = show;
+    const int oldZoomLevel = m_controller->zoomLevel();
+    emit showPreviewChanged();
+
+    // Enabling or disabling the preview might change the icon size of the view.
+    // As the view does not emit a signal when the icon size has been changed,
+    // the used zoom level of the controller must be adjusted manually:
+    updateZoomLevel(oldZoomLevel);

 }
 
 }
 

-void DolphinView::setUrl(const KUrl& url)
+void DolphinView::setShowHiddenFiles(bool show)

 {
 {

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

         return;
     }
 
         return;
     }
 

-    m_controller->setUrl(url);
+    const KUrl viewPropsUrl = rootUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setShowHiddenFiles(show);

 
 

-    const ViewProperties props(url);
+    m_viewAccessor.dirLister()->setShowingDotFiles(show);
+    emit showHiddenFilesChanged();
+}

 
 

-    const Mode mode = props.viewMode();
-    bool changeMode = (m_mode != mode);
-    if (changeMode && isColumnViewActive()) {
-        // The column view is active. Only change the
-        // mode if the current URL is no child of the column view.
-        if (m_dirLister->url().isParentOf(url)) {
-            changeMode = false;
-        }
+void DolphinView::setCategorizedSorting(bool categorized)
+{
+    if (categorized == categorizedSorting()) {
+        return;

     }
 
     }
 

-    if (changeMode) {
-        m_mode = mode;
-        createView();
-        emit modeChanged();
+    // setCategorizedSorting(true) may only get invoked
+    // if the view supports categorized sorting
+    Q_ASSERT(!categorized || supportsCategorizedSorting());

 
 

-        if (m_mode == ColumnView) {
-            // The mode has been changed to the Column View. When starting the dir
-            // lister with DolphinView::startDirLister() it is important to give a
-            // hint that the dir lister may not keep the current directory
-            // although this is the default for showing a hierarchy.
-            m_initializeColumnView = true;
-        }
-    }
+    ViewProperties props(rootUrl());
+    props.setCategorizedSorting(categorized);
+    props.save();

 
 

-    const bool showHiddenFiles = props.showHiddenFiles();
-    if (showHiddenFiles != m_dirLister->showingDotFiles()) {
-        m_dirLister->setShowingDotFiles(showHiddenFiles);
-        emit showHiddenFilesChanged();
+    m_storedCategorizedSorting = categorized;
+    m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
+
+    emit categorizedSortingChanged();
+}
+
+void DolphinView::toggleSortOrder()
+{
+    const Qt::SortOrder order = (sortOrder() == Qt::AscendingOrder) ?
+                                Qt::DescendingOrder :
+                                Qt::AscendingOrder;
+    setSortOrder(order);
+}
+
+void DolphinView::toggleSortFoldersFirst()
+{
+    setSortFoldersFirst(!sortFoldersFirst());
+}
+
+void DolphinView::toggleAdditionalInfo(QAction* action)
+{
+    const KFileItemDelegate::Information info =
+        static_cast<KFileItemDelegate::Information>(action->data().toInt());
+
+    KFileItemDelegate::InformationList list = additionalInfo();
+
+    const bool show = action->isChecked();
+
+    const int index = list.indexOf(info);
+    const bool containsInfo = (index >= 0);
+    if (show && !containsInfo) {
+        list.append(info);
+        setAdditionalInfo(list);
+    } else if (!show && containsInfo) {
+        list.removeAt(index);
+        setAdditionalInfo(list);
+        Q_ASSERT(list.indexOf(info) < 0);

     }
     }

+}

 
 

-    const bool categorized = props.categorizedSorting();
-    if (categorized != categorizedSorting()) {
-        if (supportsCategorizedSorting()) {
-            Q_ASSERT(m_iconsView != 0);
-            if (categorized) {
-                Q_ASSERT(m_iconsView->itemCategorizer() == 0);
-                m_iconsView->setItemCategorizer(new DolphinItemCategorizer());
-            } else {
-                KItemCategorizer* categorizer = m_iconsView->itemCategorizer();
-                m_iconsView->setItemCategorizer(0);
-                delete categorizer;
+void DolphinView::mouseReleaseEvent(QMouseEvent* event)
+{
+    QWidget::mouseReleaseEvent(event);
+    setActive(true);
+}
+
+bool DolphinView::eventFilter(QObject* watched, QEvent* event)
+{
+    switch (event->type()) {
+    case QEvent::FocusIn:
+        if (watched == m_viewAccessor.itemView()) {
+            m_controller->requestActivation();
+        }
+        break;
+
+    case QEvent::DragEnter:
+        if (watched == m_viewAccessor.itemView()->viewport()) {
+            setActive(true);
+        }
+        break;
+
+    case QEvent::KeyPress:
+        if (watched == m_viewAccessor.itemView()) {
+            // clear the selection when Escape has been pressed
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            if (keyEvent->key() == Qt::Key_Escape) {
+                clearSelection();

             }
         }
             }
         }

-        emit categorizedSortingChanged();
-    }
+        break;

 
 

-    const DolphinView::Sorting sorting = props.sorting();
-    if (sorting != m_proxyModel->sorting()) {
-        m_proxyModel->setSorting(sorting);
-        emit sortingChanged(sorting);
+    case QEvent::Wheel:
+        if (watched == m_viewAccessor.itemView()->viewport()) {
+            // Ctrl+wheel events should cause icon zooming, but not if the left mouse button is pressed
+            // (the user is probably trying to scroll during a selection in that case)
+            QWheelEvent* wheelEvent = static_cast<QWheelEvent*>(event);
+            if (wheelEvent->modifiers() & Qt::ControlModifier && !(wheelEvent->buttons() & Qt::LeftButton)) {
+                const int delta = wheelEvent->delta();
+                const int level = zoomLevel();
+                if (delta > 0) {
+                    setZoomLevel(level + 1);
+                } else if (delta < 0) {
+                    setZoomLevel(level - 1);
+                }
+                return true;
+            }
+        }
+        break;
+        
+    default:
+        break;

     }
 
     }
 

-    const Qt::SortOrder sortOrder = props.sortOrder();
-    if (sortOrder != m_proxyModel->sortOrder()) {
-        m_proxyModel->setSortOrder(sortOrder);
-        emit sortOrderChanged(sortOrder);
-    }
+    return QWidget::eventFilter(watched, event);
+}

 
 

-    KFileItemDelegate::AdditionalInformation info = props.additionalInfo();
-    if (info != m_fileItemDelegate->additionalInformation()) {
-        m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation);
-        m_fileItemDelegate->setAdditionalInformation(info);
-        emit additionalInfoChanged(info);
+void DolphinView::activate()
+{
+    setActive(true);
+}
+
+void DolphinView::triggerItem(const KFileItem& item)
+{
+    const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
+    if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {
+        // items are selected by the user, hence don't trigger the
+        // item specified by 'index'
+        return;

     }
 
     }
 

-    const bool showPreview = props.showPreview();
-    if (showPreview != m_controller->showPreview()) {
-        m_controller->setShowPreview(showPreview);
-        emit showPreviewChanged();
+    // TODO: the m_isContextMenuOpen check is a workaround for Qt-issue 207192
+    if (item.isNull() || m_isContextMenuOpen) {
+        return;

     }
 
     }
 

-    startDirLister(url);
-    emit urlChanged(url);
+    emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
+}

 
 

-    // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-    //m_statusBar->clear();
+void DolphinView::slotSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected)
+{
+    const int count = selectedItemsCount();
+    const bool selectionStateChanged = ((count >  0) && (selected.count() == count)) ||
+                                       ((count == 0) && !deselected.isEmpty());
+
+    // If nothing has been selected before and something got selected (or if something
+    // was selected before and now nothing is selected) the selectionChangedSignal must
+    // be emitted asynchronously as fast as possible to update the edit-actions.
+    m_selectionChangedTimer->setInterval(selectionStateChanged ? 0 : 300);
+    m_selectionChangedTimer->start();

 }
 
 }
 

-void DolphinView::changeSelection(const KFileItemList& selection)
+void DolphinView::emitSelectionChangedSignal()

 {
 {

-    clearSelection();
-    if (selection.isEmpty()) {
-        return;
+    emit selectionChanged(DolphinView::selectedItems());
+}
+
+void DolphinView::openContextMenu(const QPoint& pos,
+                                  const QList<QAction*>& customActions)
+{
+    KFileItem item;
+    const QModelIndex index = m_viewAccessor.itemView()->indexAt(pos);
+    if (index.isValid() && (index.column() == DolphinModel::Name)) {
+        const QModelIndex dolphinModelIndex = m_viewAccessor.proxyModel()->mapToSource(index);
+        item = m_viewAccessor.dirModel()->itemForIndex(dolphinModelIndex);

     }
     }

-    const KUrl& baseUrl = url();
-    KUrl url;
-    QItemSelection new_selection;
-    foreach(KFileItem* item, selection) {
-        url = item->url().upUrl();
-        if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
-            QModelIndex index = m_proxyModel->mapFromSource(m_dirModel->indexForItem(*item));
-            new_selection.select(index, index);
+
+    m_isContextMenuOpen = true; // TODO: workaround for Qt-issue 207192
+    emit requestContextMenu(item, url(), customActions);
+    m_isContextMenuOpen = false;
+}
+
+void DolphinView::dropUrls(const KFileItem& destItem,
+                           const KUrl& destPath,
+                           QDropEvent* event)
+{
+    addNewFileNames(event->mimeData());
+    DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);
+}
+
+void DolphinView::updateSorting(DolphinView::Sorting sorting)
+{
+    ViewProperties props(rootUrl());
+    props.setSorting(sorting);
+
+    m_viewAccessor.proxyModel()->setSorting(sorting);
+
+    emit sortingChanged(sorting);
+}
+
+void DolphinView::updateSortOrder(Qt::SortOrder order)
+{
+    ViewProperties props(rootUrl());
+    props.setSortOrder(order);
+
+    m_viewAccessor.proxyModel()->setSortOrder(order);
+
+    emit sortOrderChanged(order);
+}
+
+void DolphinView::updateSortFoldersFirst(bool foldersFirst)
+{
+    ViewProperties props(rootUrl());
+    props.setSortFoldersFirst(foldersFirst);
+
+    m_viewAccessor.proxyModel()->setSortFoldersFirst(foldersFirst);
+
+    emit sortFoldersFirstChanged(foldersFirst);
+}
+
+void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)
+{
+    ViewProperties props(rootUrl());
+    props.setAdditionalInfo(info);
+    props.save();
+
+    m_viewAccessor.itemDelegate()->setShowInformation(info);
+
+    emit additionalInfoChanged();
+}
+
+void DolphinView::updateAdditionalInfoActions(KActionCollection* collection)
+{
+    const bool enable = (m_mode == DolphinView::DetailsView) ||
+                        (m_mode == DolphinView::IconsView);
+
+    QAction* showSizeInfo = collection->action("show_size_info");
+    QAction* showDateInfo = collection->action("show_date_info");
+    QAction* showPermissionsInfo = collection->action("show_permissions_info");
+    QAction* showOwnerInfo = collection->action("show_owner_info");
+    QAction* showGroupInfo = collection->action("show_group_info");
+    QAction* showMimeInfo = collection->action("show_mime_info");
+
+    showSizeInfo->setChecked(false);
+    showDateInfo->setChecked(false);
+    showPermissionsInfo->setChecked(false);
+    showOwnerInfo->setChecked(false);
+    showGroupInfo->setChecked(false);
+    showMimeInfo->setChecked(false);
+
+    showSizeInfo->setEnabled(enable);
+    showDateInfo->setEnabled(enable);
+    showPermissionsInfo->setEnabled(enable);
+    showOwnerInfo->setEnabled(enable);
+    showGroupInfo->setEnabled(enable);
+    showMimeInfo->setEnabled(enable);
+
+    foreach (KFileItemDelegate::Information info, m_viewAccessor.itemDelegate()->showInformation()) {
+        switch (info) {
+        case KFileItemDelegate::Size:
+            showSizeInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::ModificationTime:
+            showDateInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::Permissions:
+            showPermissionsInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::Owner:
+            showOwnerInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::OwnerAndGroup:
+            showGroupInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::FriendlyMimeType:
+            showMimeInfo->setChecked(true);
+            break;
+        default:
+            break;

         }
     }
         }
     }

-    itemView()->selectionModel()->select(new_selection,
-                                         QItemSelectionModel::ClearAndSelect
-                                         | QItemSelectionModel::Current);

 }
 
 }
 

-void DolphinView::openContextMenu(const QPoint& pos)
+QPair<bool, QString> DolphinView::pasteInfo() const
+{
+    return KonqOperations::pasteInfo(url());
+}
+
+void DolphinView::setTabsForFilesEnabled(bool tabsForFiles)
+{
+    m_tabsForFiles = tabsForFiles;
+}
+
+bool DolphinView::isTabsForFilesEnabled() const
+{
+    return m_tabsForFiles;
+}
+
+void DolphinView::activateItem(const KUrl& url)
+{
+    // TODO: If DolphinViewContainer uses DolphinView::restoreState(...) to restore the
+    // view state in KDE 4.5, this function can be removed.
+    m_activeItemUrl = url;
+}
+
+bool DolphinView::itemsExpandable() const
+{
+    return m_viewAccessor.itemsExpandable();
+}
+
+void DolphinView::restoreState(QDataStream &stream)

 {
 {

-    KFileItem* item = 0;
+     // current item
+    stream >> m_activeItemUrl;
+
+    // view position
+    stream >> m_restoredContentsPosition;
+
+    // expanded folders (only relevant for the details view - will be ignored by the view in other view modes)
+    QSet<KUrl> urlsToExpand;
+    stream >> urlsToExpand;
+    const DolphinDetailsViewExpander* expander = m_viewAccessor.setExpandedUrls(urlsToExpand);

 
 

-    const QModelIndex index = itemView()->indexAt(pos);
-    if (isValidNameIndex(index)) {
-        item = fileItem(index);
+    if (expander) {
+        m_expanderActive = true;
+        connect (expander, SIGNAL(completed()), this, SLOT(slotLoadingCompleted()));

     }
     }

+    else {
+        m_expanderActive = false;
+    }
+}
+
+void DolphinView::saveState(QDataStream &stream)
+{
+    // current item
+    KFileItem currentItem;
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+
+    if(view) {
+        const QModelIndex proxyIndex = view->currentIndex();
+        const QModelIndex dirModelIndex = m_viewAccessor.proxyModel()->mapToSource(proxyIndex);
+        currentItem = m_viewAccessor.dirModel()->itemForIndex(dirModelIndex);
+    }
+
+    KUrl currentUrl;
+    if (!currentItem.isNull())
+        currentUrl = currentItem.url();
+
+    stream << currentUrl;
+
+    // view position
+    stream << contentsPosition();

 
 

-    emit requestContextMenu(item, url());
+    // expanded folders (only relevant for the details view - the set will be empty in other view modes)
+    stream << m_viewAccessor.expandedUrls();

 }
 
 }
 

-void DolphinView::dropUrls(const KUrl::List& urls,
-                           const QModelIndex& index,
-                           QWidget* source)
+void DolphinView::observeCreatedItem(const KUrl& url)

 {
 {

-    KFileItem* directory = 0;
-    if (isValidNameIndex(index)) {
-        KFileItem* item = fileItem(index);
-        Q_ASSERT(item != 0);
-        if (item->isDir()) {
-            // the URLs are dropped above a directory
-            directory = item;
-        }
+    m_createdItemUrl = url;
+    connect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+            this, SLOT(selectAndScrollToCreatedItem()));
+}
+
+void DolphinView::selectAndScrollToCreatedItem()
+{
+    const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_createdItemUrl);
+    if (dirIndex.isValid()) {
+        const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
+        m_viewAccessor.itemView()->setCurrentIndex(proxyIndex);

     }
 
     }
 

-    if ((directory == 0) && (source == itemView())) {
-        // The dropping is done into the same viewport where
-        // the dragging has been started. Just ignore this...
-        return;
+    disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+               this, SLOT(selectAndScrollToCreatedItem()));
+    m_createdItemUrl = KUrl();
+}
+
+void DolphinView::emitContentsMoved()
+{
+    // TODO: If DolphinViewContainer uses DolphinView::saveState(...) to save the
+    // view state in KDE 4.5, the contentsMoved signal might not be needed anymore,
+    // depending on how the implementation is done.
+    // In that case, the code in contentsPosition() can be moved to saveState().
+
+    // only emit the contents moved signal if no directory loading is ongoing
+    // (this would reset the contents position always to (0, 0))
+    if (!m_loadingDirectory) {
+        const QPoint pos(contentsPosition());
+        emit contentsMoved(pos.x(), pos.y());

     }
     }

+}

 
 

-    const KUrl& destination = (directory == 0) ?
-                              url() : directory->url();
-    dropUrls(urls, destination);
+void DolphinView::showHoverInformation(const KFileItem& item)
+{
+    emit requestItemInfo(item);

 }
 
 }
 

-void DolphinView::dropUrls(const KUrl::List& urls,
-                           const KUrl& destination)
+void DolphinView::clearHoverInformation()

 {
 {

-    emit urlsDropped(urls, destination);
+    emit requestItemInfo(KFileItem());

 }
 
 }
 

-void DolphinView::updateSorting(DolphinView::Sorting sorting)
+void DolphinView::slotDeleteFileFinished(KJob* job)

 {
 {

-    ViewProperties props(url());
-    props.setSorting(sorting);
+    if (job->error() == 0) {
+        emit operationCompletedMessage(i18nc("@info:status", "Delete operation completed."));
+    } else if (job->error() != KIO::ERR_USER_CANCELED) {
+        emit errorMessage(job->errorString());
+    }
+}

 
 

-    m_proxyModel->setSorting(sorting);
+void DolphinView::slotRequestUrlChange(const KUrl& url)
+{
+    emit requestUrlChange(url);
+    m_controller->setUrl(url);
+}

 
 

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

 }
 
 }
 

-void DolphinView::updateSortOrder(Qt::SortOrder order)
+void DolphinView::slotLoadingCompleted()

 {
 {

-    ViewProperties props(url());
-    props.setSortOrder(order);
+    m_expanderActive = false;
+    m_loadingDirectory = false; 
+
+    if (!m_activeItemUrl.isEmpty()) {
+        // assure that the current item remains visible
+        const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_activeItemUrl);
+        if (dirIndex.isValid()) {
+            const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
+            QAbstractItemView* view = m_viewAccessor.itemView();
+            const bool clearSelection = !hasSelection();
+            view->setCurrentIndex(proxyIndex);
+            if (clearSelection) {
+                view->clearSelection();
+            }
+            m_activeItemUrl.clear();
+        }
+    }

 
 

-    m_proxyModel->setSortOrder(order);
+    if (!m_selectedItems.isEmpty()) {
+        const KUrl& baseUrl = url();
+        KUrl url;
+        QItemSelection newSelection;
+        foreach(const KFileItem& item, m_selectedItems) {
+            url = item.url().upUrl();
+            if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
+                QModelIndex index = m_viewAccessor.proxyModel()->mapFromSource(m_viewAccessor.dirModel()->indexForItem(item));
+                newSelection.select(index, index);
+            }
+        }
+        m_viewAccessor.itemView()->selectionModel()->select(newSelection,
+                                                            QItemSelectionModel::ClearAndSelect
+                                                            | QItemSelectionModel::Current);
+        m_selectedItems.clear();
+    }

 
 

-    emit sortOrderChanged(order);
+    // Restore the contents position. This has to be done using a Qt::QueuedConnection
+    // because the view might not be in its final state yet.
+    QMetaObject::invokeMethod(this, "restoreContentsPosition", Qt::QueuedConnection);

 }
 
 }
 

-void DolphinView::emitContentsMoved()
+void DolphinView::slotRefreshItems()

 {
 {

-    if (!m_blockContentsMovedSignal) {
-        emit contentsMoved(contentsX(), contentsY());
+    if (m_assureVisibleCurrentIndex) {
+        m_assureVisibleCurrentIndex = false;
+        m_viewAccessor.itemView()->scrollTo(m_viewAccessor.itemView()->currentIndex());

     }
 }
 
     }
 }
 

-void DolphinView::updateCutItems()
+void DolphinView::loadDirectory(const KUrl& url, bool reload)

 {
 {

-    // restore the icons of all previously selected items to the
-    // original state...
-    QList<CutItem>::const_iterator it = m_cutItemsCache.begin();
-    QList<CutItem>::const_iterator end = m_cutItemsCache.end();
-    while (it != end) {
-        const QModelIndex index = m_dirModel->indexForUrl((*it).url);
-        if (index.isValid()) {
-            m_dirModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole);
+    if (!url.isValid()) {
+        const QString location(url.pathOrUrl());
+        if (location.isEmpty()) {
+            emit errorMessage(i18nc("@info:status", "The location is empty."));
+        } else {
+            emit errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location));

         }
         }

-        ++it;
+        return;

     }
     }

-    m_cutItemsCache.clear();

 
 

-    // ... and apply an item effect to all currently cut items
-    applyCutItemEffect();
+    m_loadingDirectory = true;
+    m_expanderActive = false;
+
+    m_viewAccessor.dirLister()->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);

 }
 
 }
 

-void DolphinView::showHoverInformation(const QModelIndex& index)
+void DolphinView::applyViewProperties()

 {
 {

-    if (hasSelection()) {
+    if (m_ignoreViewProperties) {

         return;
     }
 
         return;
     }
 

-    const KFileItem* item = fileItem(index);
-    if (item != 0) {
-        // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-        //m_statusBar->setMessage(item->getStatusBarInfo(), DolphinStatusBar::Default);
-        emit requestItemInfo(item->url());
+    const ViewProperties props(rootUrl());
+
+    const Mode mode = props.viewMode();
+    if (m_mode != mode) {
+        const int oldZoomLevel = m_controller->zoomLevel();
+
+        m_mode = mode;
+        createView();
+        emit modeChanged();
+
+        updateZoomLevel(oldZoomLevel);
+    }
+    if (m_viewAccessor.itemView() == 0) {
+        createView();
+    }
+    Q_ASSERT(m_viewAccessor.itemView() != 0);
+    Q_ASSERT(m_viewAccessor.itemDelegate() != 0);
+
+    const bool showHiddenFiles = props.showHiddenFiles();
+    if (showHiddenFiles != m_viewAccessor.dirLister()->showingDotFiles()) {
+        m_viewAccessor.dirLister()->setShowingDotFiles(showHiddenFiles);
+        emit showHiddenFilesChanged();
+    }
+
+    m_storedCategorizedSorting = props.categorizedSorting();
+    const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
+    if (categorized != m_viewAccessor.proxyModel()->isCategorizedModel()) {
+        m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
+        emit categorizedSortingChanged();
+    }
+
+    const DolphinView::Sorting sorting = props.sorting();
+    if (sorting != m_viewAccessor.proxyModel()->sorting()) {
+        m_viewAccessor.proxyModel()->setSorting(sorting);
+        emit sortingChanged(sorting);
+    }
+
+    const Qt::SortOrder sortOrder = props.sortOrder();
+    if (sortOrder != m_viewAccessor.proxyModel()->sortOrder()) {
+        m_viewAccessor.proxyModel()->setSortOrder(sortOrder);
+        emit sortOrderChanged(sortOrder);
+    }
+
+    const bool sortFoldersFirst = props.sortFoldersFirst();
+    if (sortFoldersFirst != m_viewAccessor.proxyModel()->sortFoldersFirst()) {
+        m_viewAccessor.proxyModel()->setSortFoldersFirst(sortFoldersFirst);
+        emit sortFoldersFirstChanged(sortFoldersFirst);
+    }
+
+    KFileItemDelegate::InformationList info = props.additionalInfo();
+    if (info != m_viewAccessor.itemDelegate()->showInformation()) {
+        m_viewAccessor.itemDelegate()->setShowInformation(info);
+        emit additionalInfoChanged();
+    }
+
+    const bool showPreview = props.showPreview();
+    if (showPreview != m_showPreview) {
+        m_showPreview = showPreview;
+        const int oldZoomLevel = m_controller->zoomLevel();
+        emit showPreviewChanged();
+
+        // Enabling or disabling the preview might change the icon size of the view.
+        // As the view does not emit a signal when the icon size has been changed,
+        // the used zoom level of the controller must be adjusted manually:
+        updateZoomLevel(oldZoomLevel);
+    }
+
+    if (DolphinSettings::instance().generalSettings()->globalViewProps()) {
+        // During the lifetime of a DolphinView instance the global view properties
+        // should not be changed. This allows e. g. to split a view and use different
+        // view properties for each view.
+        m_ignoreViewProperties = true;

     }
 }
 
     }
 }
 

-void DolphinView::clearHoverInformation()
+void DolphinView::createView()

 {
 {

-    // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-    //m_statusBar->clear();
-    emit requestItemInfo(KUrl());
-}
+    deleteView();

 
 

+    Q_ASSERT(m_viewAccessor.itemView() == 0);
+    m_viewAccessor.createView(this, m_controller, m_mode);

 
 

-void DolphinView::createView()
+    QAbstractItemView* view = m_viewAccessor.itemView();
+    Q_ASSERT(view != 0);
+    view->installEventFilter(this);
+    view->viewport()->installEventFilter(this);
+
+    m_controller->setItemView(view);
+
+    // When changing the view mode, the selection is lost due to reinstantiating
+    // a new item view with a custom selection model. Pass the ownership of the
+    // selection model to DolphinView, so that it can be shared by all item views.
+    if (m_selectionModel != 0) {
+        view->setSelectionModel(m_selectionModel);
+    } else {
+        m_selectionModel = view->selectionModel();
+    }
+    m_selectionModel->setParent(this);
+    connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
+            this, SLOT(slotSelectionChanged(const QItemSelection&, const QItemSelection&)));
+
+    connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
+            this, SLOT(emitContentsMoved()));
+    connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
+            this, SLOT(emitContentsMoved()));
+
+    setFocusProxy(m_viewAccessor.layoutTarget());
+    m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());
+}
+
+void DolphinView::deleteView()

 {
 {

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

     if (view != 0) {
     if (view != 0) {

+        // It's important to set the keyboard focus to the parent
+        // before deleting the view: Otherwise when having a split
+        // view the other view will get the focus and will request
+        // an activation (see DolphinView::eventFilter()).
+        setFocusProxy(0);
+        setFocus();
+

         m_topLayout->removeWidget(view);
         view->close();
         m_topLayout->removeWidget(view);
         view->close();

-        if (view == m_iconsView) {
-            KItemCategorizer* categorizer = m_iconsView->itemCategorizer();
-            m_iconsView->setItemCategorizer(0);
-            delete categorizer;
-        }
-        view->deleteLater();
-        view = 0;
-        m_iconsView = 0;
-        m_detailsView = 0;
-        m_columnView = 0;
-        m_fileItemDelegate = 0;
+
+        // disconnect all signal/slots
+        disconnect(view);
+        m_controller->disconnect(view);
+        view->disconnect();
+        disconnect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
+                   this, SLOT(emitContentsMoved()));
+        disconnect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
+                   this, SLOT(emitContentsMoved()));
+
+        m_viewAccessor.deleteView();
+    }
+}
+
+void DolphinView::pasteToUrl(const KUrl& url)
+{
+    addNewFileNames(QApplication::clipboard()->mimeData());
+    KonqOperations::doPaste(this, url);
+}
+
+void DolphinView::updateZoomLevel(int oldZoomLevel)
+{
+    const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize());
+    if (oldZoomLevel != newZoomLevel) {
+        m_controller->setZoomLevel(newZoomLevel);
+        emit zoomLevelChanged(newZoomLevel);
+    }
+}
+
+KUrl::List DolphinView::simplifiedSelectedUrls() const
+{
+    KUrl::List list = selectedUrls();
+    if (itemsExpandable() ) {
+        list = KDirModel::simplifiedUrlList(list);
+    }
+    return list;
+}
+
+QMimeData* DolphinView::selectionMimeData() const
+{
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+    Q_ASSERT((view != 0) && (view->selectionModel() != 0));
+    const QItemSelection selection = m_viewAccessor.proxyModel()->mapSelectionToSource(view->selectionModel()->selection());
+    return m_viewAccessor.dirModel()->mimeData(selection.indexes());
+}
+
+void DolphinView::addNewFileNames(const QMimeData* mimeData)
+{
+    const KUrl::List urls = KUrl::List::fromMimeData(mimeData);
+    foreach (const KUrl& url, urls) {
+        m_newFileNames.insert(url.fileName());

     }
     }

+}

 
 

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

 
 

-    // ... and recreate it representing the current mode
-    switch (m_mode) {
+    switch (mode) {

     case IconsView:
     case IconsView:

-        m_iconsView = new DolphinIconsView(this, m_controller);
-        view = m_iconsView;
+        m_iconsView = new DolphinIconsView(parent, controller, m_proxyModel);

         break;
 
     case DetailsView:
         break;
 
     case DetailsView:

-        m_detailsView = new DolphinDetailsView(this, m_controller);
-        view = m_detailsView;
+        m_detailsView = new DolphinDetailsView(parent, controller, m_proxyModel);

         break;
 
     case ColumnView:
         break;
 
     case ColumnView:

-        m_columnView = new DolphinColumnView(this, m_controller);
-        view = m_columnView;
+        m_columnsContainer = new DolphinColumnViewContainer(parent, controller);

         break;
         break;

+
+    default:
+        Q_ASSERT(false);

     }
     }

+}

 
 

-    Q_ASSERT(view != 0);
+void DolphinView::ViewAccessor::deleteView()
+{
+    QAbstractItemView* view = itemView();
+    if (view != 0) {
+        if (DragAndDropHelper::instance().isDragSource(view)) {
+            // The view is a drag source (the feature "Open folders
+            // during drag operations" is used). Deleting the view
+            // during an ongoing drag operation is not allowed, so
+            // this will postponed.
+            if (m_dragSource != 0) {
+                // the old stored view is obviously not the drag source anymore
+                m_dragSource->deleteLater();
+                m_dragSource = 0;
+            }
+            view->hide();
+            m_dragSource = view;
+        } else {
+            view->deleteLater();
+        }
+    }

 
 

-    m_fileItemDelegate = new KFileItemDelegate(view);
-    view->setItemDelegate(m_fileItemDelegate);
+    m_iconsView = 0;
+    m_detailsView = 0;

 
 

-    view->setModel(m_proxyModel);
-    view->setSelectionMode(QAbstractItemView::ExtendedSelection);
+    if (m_columnsContainer != 0) {
+        m_columnsContainer->deleteLater();
+    }
+    m_columnsContainer = 0;
+}

 
 

-    new KMimeTypeResolver(view, m_dirModel);
-    m_topLayout->insertWidget(1, view);

 
 

-    connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
-            this, SLOT(emitSelectionChangedSignal()));
-    connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
-            this, SLOT(emitContentsMoved()));
-    connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
-            this, SLOT(emitContentsMoved()));
+void DolphinView::ViewAccessor::prepareUrlChange(const KUrl& url)
+{
+    if (m_columnsContainer != 0) {
+        m_columnsContainer->showColumn(url);
+    }
+
+    if(!m_detailsViewExpander.isNull()) {
+        // Stop expanding items in the current folder
+        m_detailsViewExpander->stop();
+    }

 }
 
 }
 

-void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
+QAbstractItemView* DolphinView::ViewAccessor::itemView() const

 {
 {

-    QItemSelectionModel* selectionModel = itemView()->selectionModel();
-    const QAbstractItemModel* itemModel = selectionModel->model();
+    if (m_iconsView != 0) {
+        return m_iconsView;
+    }

 
 

-    const QModelIndex topLeft = itemModel->index(0, 0);
-    const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
-                                    itemModel->columnCount() - 1);
+    if (m_detailsView != 0) {
+        return m_detailsView;
+    }

 
 

-    QItemSelection selection(topLeft, bottomRight);
-    selectionModel->select(selection, flags);
+    if (m_columnsContainer != 0) {
+        return m_columnsContainer->activeColumn();
+    }
+
+    return 0;

 }
 
 }
 

-QAbstractItemView* DolphinView::itemView() const
+KFileItemDelegate* DolphinView::ViewAccessor::itemDelegate() const

 {
 {

-    if (m_detailsView != 0) {
-        return m_detailsView;
-    } else if (m_columnView != 0) {
-        return m_columnView;
+    return static_cast<KFileItemDelegate*>(itemView()->itemDelegate());
+}
+
+QWidget* DolphinView::ViewAccessor::layoutTarget() const
+{
+    if (m_columnsContainer != 0) {
+        return m_columnsContainer;

     }
     }

+    return itemView();
+}

 
 

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

 }
 
 }
 

-bool DolphinView::isValidNameIndex(const QModelIndex& index) const
+bool DolphinView::ViewAccessor::supportsCategorizedSorting() const

 {
 {

-    return index.isValid() && (index.column() == KDirModel::Name);
+    return m_iconsView != 0;

 }
 
 }
 

-bool DolphinView::isCutItem(const KFileItem& item) const
+bool DolphinView::ViewAccessor::itemsExpandable() const

 {
 {

-    const QMimeData* mimeData = QApplication::clipboard()->mimeData();
-    const KUrl::List cutUrls = KUrl::List::fromMimeData(mimeData);
+    return (m_detailsView != 0) && m_detailsView->itemsExpandable();
+}

 
 

-    const KUrl& itemUrl = item.url();
-    KUrl::List::const_iterator it = cutUrls.begin();
-    const KUrl::List::const_iterator end = cutUrls.end();
-    while (it != end) {
-        if (*it == itemUrl) {
-            return true;
-        }
-        ++it;
+
+QSet<KUrl> DolphinView::ViewAccessor::expandedUrls() const
+{
+    if(m_detailsView != 0) {
+        return m_detailsView->expandedUrls();

     }
     }

+    else {
+        return QSet<KUrl>();
+    }
+}

 
 

-    return false;
+const DolphinDetailsViewExpander* DolphinView::ViewAccessor::setExpandedUrls(const QSet<KUrl>& urlsToExpand)
+{
+    if((m_detailsView != 0) && m_detailsView->itemsExpandable() && !urlsToExpand.isEmpty()) {
+        m_detailsViewExpander = new DolphinDetailsViewExpander(m_detailsView, urlsToExpand);
+        return m_detailsViewExpander;
+    }
+    else {
+        return 0;
+    }

 }
 
 }
 

-void DolphinView::applyCutItemEffect()
+bool DolphinView::ViewAccessor::reloadOnAdditionalInfoChange() const

 {
 {

-    const QMimeData* mimeData = QApplication::clipboard()->mimeData();
-    if (!KonqMimeData::decodeIsCutSelection(mimeData)) {
-        return;
+    // the details view requires no reloading of the directory, as it maps
+    // the file item delegate info to its columns internally
+    return m_detailsView != 0;
+}
+
+DolphinModel* DolphinView::ViewAccessor::dirModel() const
+{
+    return static_cast<DolphinModel*>(proxyModel()->sourceModel());
+}
+
+DolphinSortFilterProxyModel* DolphinView::ViewAccessor::proxyModel() const
+{
+    if (m_columnsContainer != 0) {
+        return static_cast<DolphinSortFilterProxyModel*>(m_columnsContainer->activeColumn()->model());

     }
     }

+    return m_proxyModel;
+}

 
 

-    KFileItemList items(m_dirLister->items());
-    KFileItemList::const_iterator it = items.begin();
-    const KFileItemList::const_iterator end = items.end();
-    while (it != end) {
-        KFileItem* item = *it;
-        if (isCutItem(*item)) {
-            const QModelIndex index = m_dirModel->indexForItem(*item);
-            const KFileItem* item = m_dirModel->itemForIndex(index);
-            const QVariant value = m_dirModel->data(index, Qt::DecorationRole);
-            if ((value.type() == QVariant::Icon) && (item != 0)) {
-                const QIcon icon(qvariant_cast<QIcon>(value));
-                QPixmap pixmap = icon.pixmap(128, 128);
-
-                // remember current pixmap for the item to be able
-                // to restore it when other items get cut
-                CutItem cutItem;
-                cutItem.url = item->url();
-                cutItem.pixmap = pixmap;
-                m_cutItemsCache.append(cutItem);
-
-                // apply icon effect to the cut item
-                KIconEffect iconEffect;
-                pixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState);
-                m_dirModel->setData(index, QIcon(pixmap), Qt::DecorationRole);
-            }
-        }
-        ++it;
+KDirLister* DolphinView::ViewAccessor::dirLister() const
+{
+    return dirModel()->dirLister();
+}
+
+void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
+{
+    emit redirection(oldUrl, newUrl);
+    m_controller->redirectToUrl(newUrl); // #186947
+}
+
+void DolphinView::restoreContentsPosition()
+{
+    if (!m_restoredContentsPosition.isNull()) {
+        setContentsPosition(m_restoredContentsPosition.x(), m_restoredContentsPosition.y());
+        m_restoredContentsPosition = QPoint();

     }
 }
 
     }
 }