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

[dolphin.git] / src / dolphinview.cpp

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

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

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


@@ -15,164 +15,241 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *

- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *

  ***************************************************************************/
 
 #include "dolphinview.h"
 
  ***************************************************************************/
 
 #include "dolphinview.h"
 

-#include <qlayout.h>
-//Added by qt3to4:
-#include <Q3ValueList>
-#include <QDropEvent>
-#include <QMouseEvent>
-#include <Q3VBoxLayout>
-#include <kurl.h>
+#include <QAbstractItemView>
+#include <QApplication>
+#include <QClipboard>
+#include <QKeyEvent>
+#include <QItemSelection>
+#include <QBoxLayout>
+#include <QTimer>
+#include <QScrollBar>
+
+#include <kactioncollection.h>
+#include <kcolorscheme.h>
+#include <kdirlister.h>
+#include <kiconeffect.h>
+#include <kfileitem.h>

 #include <klocale.h>
 #include <klocale.h>

+#include <kio/deletejob.h>

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

-#include <kio/renamedlg.h>
-#include <assert.h>
+#include <kio/previewjob.h>
+#include <kjob.h>
+#include <kmenu.h>
+#include <kmessagebox.h>
+#include <kmimetyperesolver.h>
+#include <konq_fileitemcapabilities.h>
+#include <konq_operations.h>
+#include <konqmimedata.h>
+#include <kstringhandler.h>
+#include <ktoggleaction.h>
+#include <kurl.h>

 
 

-#include "urlnavigator.h"
-#include "dolphinstatusbar.h"
-#include "dolphin.h"
-#include "dolphindirlister.h"
-#include "viewproperties.h"
+#include "dolphinmodel.h"
+#include "dolphincolumnviewcontainer.h"
+#include "dolphincontroller.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 "dolphincontextmenu.h"
-#include "undomanager.h"
+#include "dolphin_generalsettings.h"
+#include "draganddrophelper.h"

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

-#include "progressindicator.h"
+#include "settings/dolphinsettings.h"
+#include "viewproperties.h"
+#include "zoomlevelinfo.h"
+#include "dolphindetailsviewexpander.h"

 
 

-#include "filterbar.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,
+DolphinView::DolphinView(QWidget* parent,

                          const KUrl& url,
                          const KUrl& url,

-                         Mode mode,
-                         bool showHiddenFiles) :
+                         DolphinSortFilterProxyModel* proxyModel) :

     QWidget(parent),
     QWidget(parent),

-    m_refreshing(false),
-    m_showProgress(false),
-    m_mode(mode),
-    m_iconsView(0),
-    m_detailsView(0),
-    m_statusBar(0),
-    m_iconSize(0),
-    m_folderCount(0),
-    m_fileCount(0),
-    m_filterBar(0)
-{
-    setFocusPolicy(Qt::StrongFocus);
-    m_topLayout = new Q3VBoxLayout(this);
-
-    Dolphin& dolphin = Dolphin::mainWin();
-
-    connect(this, SIGNAL(signalModeChanged()),
-            &dolphin, SLOT(slotViewModeChanged()));
-    connect(this, SIGNAL(signalShowHiddenFilesChanged()),
-            &dolphin, SLOT(slotShowHiddenFilesChanged()));
-    connect(this, SIGNAL(signalSortingChanged(DolphinView::Sorting)),
-            &dolphin, SLOT(slotSortingChanged(DolphinView::Sorting)));
-    connect(this, SIGNAL(signalSortOrderChanged(Qt::SortOrder)),
-            &dolphin, SLOT(slotSortOrderChanged(Qt::SortOrder)));
-
-    m_urlNavigator = new UrlNavigator(url, this);
-    connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(slotUrlChanged(const KUrl&)));
-    connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
-            &dolphin, SLOT(slotUrlChanged(const KUrl&)));
-    connect(m_urlNavigator, SIGNAL(historyChanged()),
-            &dolphin, SLOT(slotHistoryChanged()));
-
-    m_statusBar = new DolphinStatusBar(this);
-
-    m_dirLister = new DolphinDirLister();
-    m_dirLister->setAutoUpdate(true);
-    m_dirLister->setMainWindow(this);
-    m_dirLister->setShowingDotFiles(showHiddenFiles);
-    connect(m_dirLister, SIGNAL(clear()),
-            this, SLOT(slotClear()));
-    connect(m_dirLister, SIGNAL(percent(int)),
-            this, SLOT(slotPercent(int)));
-    connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)),
-            this, SLOT(slotDeleteItem(KFileItem*)));
-    connect(m_dirLister, SIGNAL(completed()),
-            this, SLOT(slotCompleted()));
-    connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
-            this, SLOT(slotInfoMessage(const QString&)));
-    connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
-            this, SLOT(slotErrorMessage(const QString&)));
-    connect(m_dirLister, SIGNAL(refreshItems(const KFileItemList&)),
-            this, SLOT(slotRefreshItems(const KFileItemList&)));
-    connect(m_dirLister, SIGNAL(redirection(const KUrl&, const KUrl&)),
-            this, SIGNAL(redirection(const KUrl&, const KUrl&)));
-    connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
-           this, SLOT(slotAddItems(const KFileItemList&)));
-
-    m_iconSize = K3Icon::SizeMedium;
-
-    m_topLayout->addWidget(m_urlNavigator);
-    createView();
-
-    m_filterBar = new FilterBar(this);
-    m_filterBar->hide();
-    m_topLayout->addWidget(m_filterBar);
-    connect(m_filterBar, SIGNAL(signalFilterChanged(const QString&)),
-           this, SLOT(slotChangeNameFilter(const QString&)));
-
-    m_topLayout->addWidget(m_statusBar);
+    m_active(true),
+    m_showPreview(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_viewAccessor(proxyModel),
+    m_selectionModel(0),
+    m_selectionChangedTimer(0),
+    m_rootUrl(),
+    m_activeItemUrl(),
+    m_restoredContentsPosition(),
+    m_createdItemUrl(),
+    m_selectedItems(),
+    m_newFileNames()
+{
+    m_topLayout = new QVBoxLayout(this);
+    m_topLayout->setSpacing(0);
+    m_topLayout->setMargin(0);
+
+    m_controller = new DolphinController(this);
+    m_controller->setUrl(url);
+
+    connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
+            this, SIGNAL(urlChanged(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(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(itemEntered(const KFileItem&)),
+            this, SLOT(showHoverInformation(const KFileItem&)));
+    connect(m_controller, SIGNAL(viewportEntered()),
+            this, SLOT(clearHoverInformation()));
+
+    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()
 {

-    delete m_dirLister;
-    m_dirLister = 0;

 }
 
 }
 

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

 {
 {

-    m_urlNavigator->setUrl(url);
+    return m_controller->url();

 }
 
 }
 

-const KUrl& DolphinView::url() const
+KUrl DolphinView::rootUrl() const

 {
 {

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

 }
 
 }
 

-void DolphinView::requestActivation()
+void DolphinView::setActive(bool active)

 {
 {

-    Dolphin::mainWin().setActiveView(this);
+    if (active == m_active) {
+        return;
+    }
+
+    m_active = active;
+
+    QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
+    if (active) {
+        emitSelectionChangedSignal();
+    } else {
+        color.setAlpha(150);
+    }
+
+    QWidget* viewport = m_viewAccessor.itemView()->viewport();
+    QPalette palette;
+    palette.setColor(viewport->backgroundRole(), color);
+    viewport->setPalette(palette);
+
+    update();
+
+    if (active) {
+        m_viewAccessor.itemView()->setFocus();
+        emit activated();
+    }
+
+    m_controller->indicateActivationChange(active);

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

-    return (Dolphin::mainWin().activeView() == this);
+    return m_active;

 }
 
 void DolphinView::setMode(Mode mode)
 {
     if (mode == m_mode) {
 }
 
 void DolphinView::setMode(Mode mode)
 {
     if (mode == m_mode) {

-        return;         // the wished mode is already set
-    }
-
-    QWidget* view = (m_iconsView != 0) ? static_cast<QWidget*>(m_iconsView) :
-                                         static_cast<QWidget*>(m_detailsView);
-    if (view != 0) {
-        m_topLayout->remove(view);
-        view->close();
-        view->deleteLater();
-        m_iconsView = 0;
-        m_detailsView = 0;
+        return; // the wished mode is already set

     }
 
     }
 

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

     m_mode = mode;
 
     m_mode = mode;
 

-    createView();
+    // remember the currently selected items, so that they will
+    // be restored after reloading the directory
+    m_selectedItems = selectedItems();
+
+    deleteView();

 
 

-    ViewProperties props(m_urlNavigator->url());
+    const KUrl viewPropsUrl = rootUrl();
+    ViewProperties props(viewPropsUrl);

     props.setViewMode(m_mode);
     props.setViewMode(m_mode);

+    createView();
+
+    // 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 signalModeChanged();
+    emit modeChanged();
+
+    updateZoomLevel(oldZoomLevel);
+    loadDirectory(viewPropsUrl);

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


@@ -180,908 +257,1327 @@ DolphinView::Mode DolphinView::mode() const
     return m_mode;
 }
 
     return m_mode;
 }
 

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

 {
 {

-    if (m_dirLister->showingDotFiles() == show) {
-        return;
-    }
-
-    ViewProperties props(m_urlNavigator->url());
-    props.setShowHiddenFilesEnabled(show);
-    props.save();
-
-    m_dirLister->setShowingDotFiles(show);
+    return m_showPreview;
+}

 
 

-    emit signalShowHiddenFilesChanged();
+bool DolphinView::showHiddenFiles() const
+{
+    return m_viewAccessor.dirLister()->showingDotFiles();
+}

 
 

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

 }
 
 }
 

-bool DolphinView::isShowHiddenFilesEnabled() const
+bool DolphinView::supportsCategorizedSorting() const

 {
 {

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

 }
 
 }
 

-void DolphinView::setViewProperties(const ViewProperties& props)
+bool DolphinView::hasSelection() const

 {
 {

-    setMode(props.viewMode());
-    setSorting(props.sorting());
-    setSortOrder(props.sortOrder());
-    setShowHiddenFilesEnabled(props.isShowHiddenFilesEnabled());
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+    return (view != 0) && view->selectionModel()->hasSelection();

 }
 
 }
 

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

 {
 {

-    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;
-        }
+    foreach (const KUrl& url, urls) {
+        KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
+        m_selectedItems.append(item);
+    }
+}

 
 

-        DolphinView* view = Dolphin::mainWin().activeView();
-        const QString& newName = dialog.newName();
-        if (newName.isEmpty()) {
-            view->statusBar()->setMessage(i18n("The new item name is invalid."),
-                                          DolphinStatusBar::Error);
-        }
-        else {
-            UndoManager& undoMan = UndoManager::instance();
-            undoMan.beginMacro();
-
-            assert(newName.contains('#'));
-
-            const int urlsCount = urls.count();
-            ProgressIndicator* progressIndicator =
-                new  ProgressIndicator(i18n("Renaming items..."),
-                                       i18n("Renaming finished."),
-                                       urlsCount);
-
-            // iterate through all selected items and rename them...
-            const int replaceIndex = newName.find('#');
-            assert(replaceIndex >= 0);
-            for (int i = 0; i < urlsCount; ++i) {
-                const KUrl& source = urls[i];
-                QString name(newName);
-                name.replace(replaceIndex, 1, renameIndexPresentation(i + 1, urlsCount));
-
-                if (source.fileName() != name) {
-                    KUrl dest(source.upUrl());
-                    dest.addPath(name);
-
-                    const bool destExists = KIO::NetAccess::exists(dest, false, view);
-                    if (destExists) {
-                        delete progressIndicator;
-                        progressIndicator = 0;
-                        view->statusBar()->setMessage(i18n("Renaming failed (item '%1' already exists).",name),
-                                                      DolphinStatusBar::Error);
-                        break;
-                    }
-                    else if (KIO::NetAccess::file_move(source, dest)) {
-                        // TODO: From the users point of view he executed one 'rename n files' operation,
-                        // but internally we store it as n 'rename 1 file' operations for the undo mechanism.
-                        DolphinCommand command(DolphinCommand::Rename, source, dest);
-                        undoMan.addCommand(command);
-                    }
-                }
+KFileItemList DolphinView::selectedItems() const
+{
+    KFileItemList itemList;
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+    if (view == 0) {
+        return itemList;
+    }

 
 

-                progressIndicator->execOperation();
-            }
-            delete progressIndicator;
-            progressIndicator = 0;
+    const QItemSelection selection = m_viewAccessor.proxyModel()->mapSelectionToSource(view->selectionModel()->selection());

 
 

-            undoMan.endMacro();
-        }
-    }
-    else {
-        // Only one item has been selected for renaming. Use the custom
-        // renaming mechanism from the views.
-        assert(urls.count() == 1);
-        if (m_mode == DetailsView) {
-            Q3ListViewItem* item = m_detailsView->firstChild();
-            while (item != 0) {
-                if (item->isSelected()) {
-                    m_detailsView->rename(item, DolphinDetailsView::NameColumn);
-                    break;
-                }
-                item = item->nextSibling();
-            }
-        }
-        else {
-            KFileIconViewItem* item = static_cast<KFileIconViewItem*>(m_iconsView->firstItem());
-            while (item != 0) {
-                if (item->isSelected()) {
-                    item->rename();
-                    break;
-                }
-                item = static_cast<KFileIconViewItem*>(item->nextItem());
-            }
+    const QModelIndexList indexList = selection.indexes();
+    foreach (const QModelIndex &index, indexList) {
+        KFileItem item = m_viewAccessor.dirModel()->itemForIndex(index);
+        if (!item.isNull()) {
+            itemList.append(item);

         }
     }
         }
     }

+
+    return itemList;

 }
 
 }
 

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

 {
 {

-    fileView()->selectAll();
+    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

 {
 {

-    fileView()->invertSelection();
+    const QAbstractItemView* view = m_viewAccessor.itemView();
+    if (view == 0) {
+        return 0;
+    }
+
+    return view->selectionModel()->selectedIndexes().count();

 }
 
 }
 

-DolphinStatusBar* DolphinView::statusBar() const
+QItemSelectionModel* DolphinView::selectionModel() const

 {
 {

-    return m_statusBar;
+    return m_viewAccessor.itemView()->selectionModel();

 }
 
 }
 

-int DolphinView::contentsX() const
+void DolphinView::setZoomLevel(int level)

 {
 {

-    return scrollView()->contentsX();
+    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);
+    }

 }
 
 }
 

-int DolphinView::contentsY() const
+int DolphinView::zoomLevel() const

 {
 {

-    return scrollView()->contentsY();
+    return m_controller->zoomLevel();

 }
 
 }
 

-void DolphinView::refreshSettings()
+void DolphinView::setSorting(Sorting sorting)

 {
 {

-    if (m_iconsView != 0) {
-        m_iconsView->refreshSettings();
+    if (sorting != this->sorting()) {
+        updateSorting(sorting);

     }
     }

+}

 
 

-    if (m_detailsView != 0) {
-        // TODO: There is no usable interface in QListView/KFileDetailView
-        // to hide/show columns. The easiest approach is to delete
-        // the current instance and recreate a new one, which automatically
-        // refreshs the settings. If a proper interface is available in Qt4
-        // m_detailsView->refreshSettings() would be enough.
-        m_topLayout->remove(m_detailsView);
-        m_detailsView->close();
-        m_detailsView->deleteLater();
-        m_detailsView = 0;
+DolphinView::Sorting DolphinView::sorting() const
+{
+    return m_viewAccessor.proxyModel()->sorting();
+}

 
 

-        createView();
+void DolphinView::setSortOrder(Qt::SortOrder order)
+{
+    if (sortOrder() != order) {
+        updateSortOrder(order);

     }
 }
 
     }
 }
 

-void DolphinView::updateStatusBar()
+Qt::SortOrder DolphinView::sortOrder() const

 {
 {

-    // As the item count information is less important
-    // in comparison with other messages, it should only
-    // be shown if:
-    // - the status bar is empty or
-    // - shows already the item count information or
-    // - shows only a not very important information
-    // - if any progress is given don't show the item count info at all
-    const QString msg(m_statusBar->message());
-    const bool updateStatusBarMsg = (msg.isEmpty() ||
-                                     (msg == m_statusBar->defaultText()) ||
-                                     (m_statusBar->type() == DolphinStatusBar::Information)) &&
-                                    (m_statusBar->progress() == 100);
-
-    const QString text(hasSelection() ? selectionStatusBarText() : defaultStatusBarText());
-    m_statusBar->setDefaultText(text);
+    return m_viewAccessor.proxyModel()->sortOrder();
+}

 
 

-    if (updateStatusBarMsg) {
-        m_statusBar->setMessage(text, DolphinStatusBar::Default);
+void DolphinView::setSortFoldersFirst(bool foldersFirst)
+{
+    if (sortFoldersFirst() != foldersFirst) {
+        updateSortFoldersFirst(foldersFirst);

     }
 }
 
     }
 }
 

-void DolphinView::requestItemInfo(const KUrl& url)
+bool DolphinView::sortFoldersFirst() const

 {
 {

-    emit signalRequestItemInfo(url);
+    return m_viewAccessor.proxyModel()->sortFoldersFirst();

 }
 
 }
 

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

 {
 {

-    return m_urlNavigator->isUrlEditable();
+    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::zoomIn()
+KFileItemDelegate::InformationList DolphinView::additionalInfo() const

 {
 {

-    itemEffectsManager()->zoomIn();
+    return m_viewAccessor.itemDelegate()->showInformation();

 }
 
 }
 

-void DolphinView::zoomOut()
+void DolphinView::reload()

 {
 {

-    itemEffectsManager()->zoomOut();
+    QByteArray viewState;
+    QDataStream saveStream(&viewState, QIODevice::WriteOnly);
+    saveState(saveStream);
+    m_selectedItems= selectedItems();
+
+    setUrl(url());
+    loadDirectory(url(), true);
+
+    QDataStream restoreStream(viewState);
+    restoreState(restoreStream);

 }
 
 }
 

-bool DolphinView::isZoomInPossible() const
+void DolphinView::refresh()

 {
 {

-    return itemEffectsManager()->isZoomInPossible();
+    m_ignoreViewProperties = false;
+
+    const bool oldActivationState = m_active;
+    const int oldZoomLevel = m_controller->zoomLevel();
+    m_active = true;
+
+    createView();
+    applyViewProperties();
+    reload();
+
+    setActive(oldActivationState);
+    updateZoomLevel(oldZoomLevel);

 }
 
 }
 

-bool DolphinView::isZoomOutPossible() const
+void DolphinView::setNameFilter(const QString& nameFilter)

 {
 {

-    return itemEffectsManager()->isZoomOutPossible();
+    m_controller->setNameFilter(nameFilter);

 }
 
 }
 

-void DolphinView::setSorting(Sorting sorting)
+void DolphinView::calculateItemCount(int& fileCount,
+                                     int& folderCount,
+                                     KIO::filesize_t& totalFileSize) const

 {
 {

-    if (sorting != this->sorting()) {
-        KFileView* view = fileView();
-        int spec = view->sorting() & ~QDir::Name & ~QDir::Size & ~QDir::Time & ~QDir::Unsorted;
-
-        switch (sorting) {
-            case SortByName: spec = spec | QDir::Name; break;
-            case SortBySize: spec = spec | QDir::Size; break;
-            case SortByDate: spec = spec | QDir::Time; break;
-            default: break;
+    foreach (const KFileItem& item, m_viewAccessor.dirLister()->items()) {
+        if (item.isDir()) {
+            ++folderCount;
+        } else {
+            ++fileCount;
+            totalFileSize += item.size();

         }
         }

+    }
+}

 
 

-        ViewProperties props(url());
-        props.setSorting(sorting);
+QString DolphinView::statusBarText() const
+{
+    QString text;
+    int folderCount = 0;
+    int fileCount = 0;
+    KIO::filesize_t totalFileSize = 0;
+
+    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;
+        }

 
 

-        view->setSorting(static_cast<QDir::SortFlags>(spec));
+        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;
+        }

 
 

-        emit signalSortingChanged(sorting);
+        if (folderCount + fileCount == 1) {
+            // if only one item is selected, show the filename
+            const QString name = list.first().text();
+            text = (folderCount == 1) ? i18nc("@info:status", "<filename>%1</filename> selected", name) :
+                                        i18nc("@info:status", "<filename>%1</filename> selected (%2)",
+                                              name, KIO::convertSize(totalFileSize));
+        } 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 {
+        calculateItemCount(fileCount, folderCount, totalFileSize);
+        text = KIO::itemsSummaryString(fileCount + folderCount,
+                                       fileCount, folderCount,
+                                       totalFileSize, true);

     }
     }

+
+    return text;

 }
 
 }
 

-DolphinView::Sorting DolphinView::sorting() const
+QList<QAction*> DolphinView::versionControlActions(const KFileItemList& items) const

 {
 {

-    const QDir::SortFlags spec = fileView()->sorting();
+    return m_controller->versionControlActions(items);
+}

 
 

-    if (spec & QDir::Time) {
-        return SortByDate;
-    }
+void DolphinView::setUrl(const KUrl& url)
+{
+    if (m_controller->url() != url) {
+        m_newFileNames.clear();

 
 

-    if (spec & QDir::Size) {
-        return SortBySize;
+        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);

     }
 
     }
 

-    return SortByName;
+    // the selection model might have changed in the case of a column view
+    QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel();
+    if (m_selectionModel != selectionModel) {
+        disconnect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+                   this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+        m_selectionModel = selectionModel;
+        connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+                this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+    }

 }
 
 }
 

-void DolphinView::setSortOrder(Qt::SortOrder order)
+void DolphinView::selectAll()

 {
 {

-    if (sortOrder() != order) {
-        KFileView* view = fileView();
-        int sorting = view->sorting();
-        sorting = (order == Qt::Ascending) ? (sorting & ~QDir::Reversed) :
-                                             (sorting | QDir::Reversed);
+    m_viewAccessor.itemView()->selectAll();
+}

 
 

-        ViewProperties props(url());
-        props.setSortOrder(order);
+void DolphinView::invertSelection()
+{
+    QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel();
+    const QAbstractItemModel* itemModel = selectionModel->model();

 
 

-        view->setSorting(static_cast<QDir::SortFlags>(sorting));
+    const QModelIndex topLeft = itemModel->index(0, 0);
+    const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
+                                                     itemModel->columnCount() - 1);

 
 

-        emit signalSortOrderChanged(order);
-    }
+    const QItemSelection selection(topLeft, bottomRight);
+    selectionModel->select(selection, QItemSelectionModel::Toggle);

 }
 
 }
 

-Qt::SortOrder DolphinView::sortOrder() const
+void DolphinView::clearSelection()

 {
 {

-    return fileView()->isReversed() ? Qt::Descending : Qt::Ascending;
+    m_viewAccessor.itemView()->clearSelection();

 }
 
 }
 

-void DolphinView::goBack()
+void DolphinView::renameSelectedItems()

 {
 {

-    m_urlNavigator->goBack();
+    KFileItemList items = selectedItems();
+    const int itemCount = items.count();
+    if (itemCount < 1) {
+        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;
+        }
+
+        const QString newName = dialog->newName();
+        if (newName.isEmpty()) {
+            emit errorMessage(dialog->errorString());
+            delete dialog;
+            return;
+        }
+        delete dialog;
+
+        // the selection would be invalid after renaming the items, so just clear
+        // it before
+        clearSelection();
+
+        // TODO: check how this can be integrated into KIO::FileUndoManager/KonqOperations
+        // as one operation instead of n rename operations like it is done now...
+        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 {
+        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::goForward()
+void DolphinView::trashSelectedItems()

 {
 {

-    m_urlNavigator->goForward();
+    const KUrl::List list = simplifiedSelectedUrls();
+    KonqOperations::del(this, KonqOperations::TRASH, list);

 }
 
 }
 

-void DolphinView::goUp()
+void DolphinView::deleteSelectedItems()

 {
 {

-    m_urlNavigator->goUp();
+    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::goHome()
+void DolphinView::cutSelectedItems()

 {
 {

-    m_urlNavigator->goHome();
+    QMimeData* mimeData = selectionMimeData();
+    KonqMimeData::addIsCutSelection(mimeData, true);
+    QApplication::clipboard()->setMimeData(mimeData);

 }
 
 }
 

-void DolphinView::setUrlEditable(bool editable)
+void DolphinView::copySelectedItems()

 {
 {

-    m_urlNavigator->editUrl(editable);
+    QMimeData* mimeData = selectionMimeData();
+    QApplication::clipboard()->setMimeData(mimeData);

 }
 
 }
 

-const Q3ValueList<UrlNavigator::HistoryElem> DolphinView::urlHistory(int& index) const
+void DolphinView::paste()

 {
 {

-    return m_urlNavigator->history(index);
+    pasteToUrl(url());

 }
 
 }
 

-bool DolphinView::hasSelection() const
+void DolphinView::pasteIntoFolder()

 {
 {

-    const KFileItemList* list = selectedItems();
-    return (list != 0) && !list->isEmpty();
+    const KFileItemList items = selectedItems();
+    if ((items.count() == 1) && items.first().isDir()) {
+        pasteToUrl(items.first().url());
+    }

 }
 
 }
 

-const KFileItemList* DolphinView::selectedItems() const
+void DolphinView::setShowPreview(bool show)

 {
 {

-    return fileView()->selectedItems();
+    if (m_showPreview == show) {
+        return;
+    }
+
+    const KUrl viewPropsUrl = rootUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setShowPreview(show);
+
+    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);

 }
 
 }
 

-KUrl::List DolphinView::selectedUrls() const
+void DolphinView::setShowHiddenFiles(bool show)

 {
 {

-    KUrl::List urls;
+    if (m_viewAccessor.dirLister()->showingDotFiles() == show) {
+        return;
+    }

 
 

-    const KFileItemList* list = fileView()->selectedItems();
-    if (list != 0) {
-        KFileItemList::const_iterator it = list->begin();
-        const KFileItemList::const_iterator end = list->end();
-        while (it != end) {
-            KFileItem* item = *it;
-            urls.append(item->url());
-            ++it;
-        }
+    const KUrl viewPropsUrl = rootUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setShowHiddenFiles(show);
+
+    m_viewAccessor.dirLister()->setShowingDotFiles(show);
+    emit showHiddenFilesChanged();
+}
+
+void DolphinView::setCategorizedSorting(bool categorized)
+{
+    if (categorized == categorizedSorting()) {
+        return;

     }
 
     }
 

-    return urls;
+    // setCategorizedSorting(true) may only get invoked
+    // if the view supports categorized sorting
+    Q_ASSERT(!categorized || supportsCategorizedSorting());
+
+    ViewProperties props(rootUrl());
+    props.setCategorizedSorting(categorized);
+    props.save();
+
+    m_storedCategorizedSorting = categorized;
+    m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
+
+    emit categorizedSortingChanged();

 }
 
 }
 

-const KFileItem* DolphinView::currentFileItem() const
+void DolphinView::toggleSortOrder()

 {
 {

-    return fileView()->currentFileItem();
+    const Qt::SortOrder order = (sortOrder() == Qt::AscendingOrder) ?
+                                Qt::DescendingOrder :
+                                Qt::AscendingOrder;
+    setSortOrder(order);

 }
 
 }
 

-void DolphinView::openContextMenu(KFileItem* fileInfo, const QPoint& pos)
+void DolphinView::toggleSortFoldersFirst()

 {
 {

-    DolphinContextMenu contextMenu(this, fileInfo, pos);
-    contextMenu.open();
+    setSortFoldersFirst(!sortFoldersFirst());

 }
 
 }
 

-void DolphinView::rename(const KUrl& source, const QString& newName)
+void DolphinView::toggleAdditionalInfo(QAction* action)

 {
 {

-    bool ok = false;
+    const KFileItemDelegate::Information info =
+        static_cast<KFileItemDelegate::Information>(action->data().toInt());

 
 

-    if (newName.isEmpty() || (source.fileName() == newName)) {
-        return;
+    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);

     }
     }

+}
+
+void DolphinView::mouseReleaseEvent(QMouseEvent* event)
+{
+    QWidget::mouseReleaseEvent(event);
+    setActive(true);
+}

 
 

-    KUrl dest(source.upUrl());
-    dest.addPath(newName);
-
-    const bool destExists = KIO::NetAccess::exists(dest,
-                                                   false,
-                                                   Dolphin::mainWin().activeView());
-    if (destExists) {
-        // the destination already exists, hence ask the user
-        // how to proceed...
-        KIO::RenameDlg 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;
-
-            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;
+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();

             }
             }

+        }
+        break;

 
 

-            default:
-                // the renaming operation has been canceled
-                reload();
-                return;
+    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;
+            }

         }
         }

-    }
-    else {
-        // no destination exists, hence just move the file to
-        // do the renaming
-        ok = KIO::NetAccess::file_move(source, dest);
+        break;
+
+    default:
+        break;

     }
 
     }
 

-    if (ok) {
-        m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.",source.fileName(), dest.fileName()),
-                                DolphinStatusBar::OperationCompleted);
+    return QWidget::eventFilter(watched, event);
+}
+
+void DolphinView::activate()
+{
+    setActive(true);
+}

 
 

-        DolphinCommand command(DolphinCommand::Rename, source, dest);
-        UndoManager::instance().addCommand(command);
+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;

     }
     }

-    else {
-        m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.",source.fileName(), dest.fileName()),
-                                DolphinStatusBar::Error);
-        reload();
+
+    // TODO: the m_isContextMenuOpen check is a workaround for Qt-issue 207192
+    if (item.isNull() || m_isContextMenuOpen) {
+        return;

     }
     }

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

 }
 
 }
 

-void DolphinView::reload()
+void DolphinView::slotSelectionChanged(const QItemSelection& selected, const QItemSelection& deselected)

 {
 {

-    startDirLister(m_urlNavigator->url(), true);
+    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::slotUrlListDropped(QDropEvent* /* event */,
-                                     const KUrl::List& urls,
-                                     const KUrl& url)
+void DolphinView::emitSelectionChangedSignal()

 {
 {

-    KUrl destination(url);
-    if (destination.isEmpty()) {
-        destination = m_urlNavigator->url();
-    }
-    else {
-        // Check whether the destination Url is a directory. If this is not the
-        // case, use the navigator Url as destination (otherwise the destination,
-        // which represents a file, would be replaced by a copy- or move-operation).
-        KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, destination);
-        if (!fileItem.isDir()) {
-            destination = m_urlNavigator->url();
-        }
+    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);

     }
 
     }
 

-    Dolphin::mainWin().dropUrls(urls, destination);
+    m_isContextMenuOpen = true; // TODO: workaround for Qt-issue 207192
+    emit requestContextMenu(item, url(), customActions);
+    m_isContextMenuOpen = false;

 }
 
 }
 

-void DolphinView::mouseReleaseEvent(QMouseEvent* event)
+void DolphinView::dropUrls(const KFileItem& destItem,
+                           const KUrl& destPath,
+                           QDropEvent* event)

 {
 {

-    QWidget::mouseReleaseEvent(event);
-    Dolphin::mainWin().setActiveView(this);
+    addNewFileNames(event->mimeData());
+    DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);

 }
 
 }
 

-void DolphinView::slotUrlChanged(const KUrl& url)
+void DolphinView::updateSorting(DolphinView::Sorting sorting)

 {
 {

-    const ViewProperties props(url);
-    setMode(props.viewMode());
+    ViewProperties props(rootUrl());
+    props.setSorting(sorting);

 
 

-    const bool showHiddenFiles = props.isShowHiddenFilesEnabled();
-    setShowHiddenFilesEnabled(showHiddenFiles);
-    m_dirLister->setShowingDotFiles(showHiddenFiles);
+    m_viewAccessor.proxyModel()->setSorting(sorting);

 
 

-    setSorting(props.sorting());
-    setSortOrder(props.sortOrder());
+    emit sortingChanged(sorting);
+}

 
 

-    startDirLister(url);
+void DolphinView::updateSortOrder(Qt::SortOrder order)
+{
+    ViewProperties props(rootUrl());
+    props.setSortOrder(order);

 
 

-    // The selectionChanged signal is not emitted when a new view object is
-    // created. The application does not care whether a view is represented by a
-    // different instance, hence inform the application that the selection might have
-    // changed so that it can update it's actions.
-    Dolphin::mainWin().slotSelectionChanged();
+    m_viewAccessor.proxyModel()->setSortOrder(order);

 
 

-    emit signalUrlChanged(url);
+    emit sortOrderChanged(order);

 }
 
 }
 

-void DolphinView::triggerIconsViewItem(Q3IconViewItem* item)
+void DolphinView::updateSortFoldersFirst(bool foldersFirst)

 {
 {

-    /* KDE4-TODO:
-    const Qt::ButtonState keyboardState = KApplication::keyboardMouseState();
-    const bool isSelectionActive = ((keyboardState & Qt::ShiftModifier) > 0) ||
-                                   ((keyboardState & Qt::ControlModifier) > 0);*/
-    const bool isSelectionActive = false;
-    if ((item != 0) && !isSelectionActive) {
-        // Updating the Url must be done outside the scope of this slot,
-        // as iconview items will get deleted.
-        QTimer::singleShot(0, this, SLOT(updateUrl()));
-        Dolphin::mainWin().setActiveView(this);
-    }
+    ViewProperties props(rootUrl());
+    props.setSortFoldersFirst(foldersFirst);
+
+    m_viewAccessor.proxyModel()->setSortFoldersFirst(foldersFirst);
+
+    emit sortFoldersFirstChanged(foldersFirst);

 }
 
 }
 

-void DolphinView::triggerDetailsViewItem(Q3ListViewItem* item,
-                                         const QPoint& pos,
-                                         int /* column */)
+void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)

 {
 {

-    if (item == 0) {
-        return;
+    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;
+        }

     }
     }

+}
+
+QPair<bool, QString> DolphinView::pasteInfo() const
+{
+    return KonqOperations::pasteInfo(url());
+}
+
+void DolphinView::setTabsForFilesEnabled(bool tabsForFiles)
+{
+    m_tabsForFiles = tabsForFiles;
+}

 
 

-    if (m_detailsView->isOnFilename(item, pos)) {
-        // Updating the Url must be done outside the scope of this slot,
-        // as listview items will get deleted.
-        QTimer::singleShot(0, this, SLOT(updateUrl()));
-        Dolphin::mainWin().setActiveView(this);
+bool DolphinView::isTabsForFilesEnabled() const
+{
+    return m_tabsForFiles;
+}
+
+bool DolphinView::itemsExpandable() const
+{
+    return m_viewAccessor.itemsExpandable();
+}
+
+void DolphinView::restoreState(QDataStream& stream)
+{
+    // 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);
+    if (expander != 0) {
+        m_expanderActive = true;
+        connect (expander, SIGNAL(completed()), this, SLOT(slotLoadingCompleted()));

     }
     else {
     }
     else {

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

     }
     }

+
+    stream << currentUrl;
+
+    // view position
+    const int x = view->horizontalScrollBar()->value();
+    const int y = view->verticalScrollBar()->value();
+    stream << QPoint(x, y);
+
+    // expanded folders (only relevant for the details view - the set will be empty in other view modes)
+    stream << m_viewAccessor.expandedUrls();

 }
 
 }
 

-void DolphinView::triggerDetailsViewItem(Q3ListViewItem* item)
+void DolphinView::observeCreatedItem(const KUrl& url)

 {
 {

-    const QPoint pos(0, item->itemPos());
-    triggerDetailsViewItem(item, pos, 0);
+    m_createdItemUrl = url;
+    connect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+            this, SLOT(selectAndScrollToCreatedItem()));

 }
 
 }
 

-void DolphinView::updateUrl()
+void DolphinView::selectAndScrollToCreatedItem()

 {
 {

-    KFileView* fileView = (m_iconsView != 0) ? static_cast<KFileView*>(m_iconsView) :
-                                               static_cast<KFileView*>(m_detailsView);
+    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);
+    }

 
 

-    KFileItem* fileItem = fileView->currentFileItem();
-    if (fileItem == 0) {
-        return;
+    disconnect(m_viewAccessor.dirModel(), SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+               this, SLOT(selectAndScrollToCreatedItem()));
+    m_createdItemUrl = KUrl();
+}
+
+void DolphinView::showHoverInformation(const KFileItem& item)
+{
+    emit requestItemInfo(item);
+}
+
+void DolphinView::clearHoverInformation()
+{
+    emit requestItemInfo(KFileItem());
+}
+
+void DolphinView::slotDeleteFileFinished(KJob* job)
+{
+    if (job->error() == 0) {
+        emit operationCompletedMessage(i18nc("@info:status", "Delete operation completed."));
+    } else if (job->error() != KIO::ERR_USER_CANCELED) {
+        emit errorMessage(job->errorString());

     }
     }

+}

 
 

-    if (fileItem->isDir()) {
-        // 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(fileItem->localPath());
-        if (localPath.isEmpty()) {
-            setUrl(fileItem->url());
-        }
-        else {
-            setUrl(KUrl(localPath));
-        }
+void DolphinView::slotDirListerCompleted()
+{
+    if (!m_expanderActive) {
+        slotLoadingCompleted();

     }
     }

-    else {
-        fileItem->run();
+
+    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::slotPercent(int percent)
+void DolphinView::slotLoadingCompleted()

 {
 {

-    if (m_showProgress) {
-        m_statusBar->setProgress(percent);
+    m_expanderActive = false;
+
+    if (!m_activeItemUrl.isEmpty()) {
+        // assure that the current item remains visible
+        const QModelIndex dirIndex = m_viewAccessor.dirModel()->indexForUrl(m_activeItemUrl);
+        if (dirIndex.isValid()) {
+            const QModelIndex proxyIndex = m_viewAccessor.proxyModel()->mapFromSource(dirIndex);
+            QAbstractItemView* view = m_viewAccessor.itemView();
+            const bool clearSelection = !hasSelection();
+            view->setCurrentIndex(proxyIndex);
+            if (clearSelection) {
+                view->clearSelection();
+            }
+            m_activeItemUrl.clear();
+        }
+    }
+
+    if (!m_selectedItems.isEmpty()) {
+        const KUrl& baseUrl = url();
+        KUrl url;
+        QItemSelection newSelection;
+        foreach(const KFileItem& item, m_selectedItems) {
+            url = item.url().upUrl();
+            if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
+                QModelIndex index = m_viewAccessor.proxyModel()->mapFromSource(m_viewAccessor.dirModel()->indexForItem(item));
+                newSelection.select(index, index);
+            }
+        }
+        m_viewAccessor.itemView()->selectionModel()->select(newSelection,
+                                                            QItemSelectionModel::ClearAndSelect
+                                                            | QItemSelectionModel::Current);
+        m_selectedItems.clear();

     }
     }

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

 }
 
 }
 

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

 {
 {

-    fileView()->clearView();
-    updateStatusBar();
+    if (m_assureVisibleCurrentIndex) {
+        m_assureVisibleCurrentIndex = false;
+        m_viewAccessor.itemView()->scrollTo(m_viewAccessor.itemView()->currentIndex());
+    }

 }
 
 }
 

-void DolphinView::slotDeleteItem(KFileItem* item)
+void DolphinView::loadDirectory(const KUrl& url, bool reload)

 {
 {

-    fileView()->removeItem(item);
-    updateStatusBar();
+    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));
+        }
+        return;
+    }
+
+    KDirLister* dirLister = m_viewAccessor.dirLister();
+    dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);

 }
 
 }
 

-void DolphinView::slotCompleted()
+void DolphinView::applyViewProperties()

 {
 {

-    m_refreshing = true;
+    if (m_ignoreViewProperties) {
+        return;
+    }

 
 

-    KFileView* view = fileView();
-    view->clearView();
+    const ViewProperties props(rootUrl());

 
 

-    // TODO: in Qt4 the code should get a lot
-    // simpler and nicer due to Interview...
-    if (m_iconsView != 0) {
-        m_iconsView->beginItemUpdates();
+    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_detailsView != 0) {
-        m_detailsView->beginItemUpdates();
+    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();

     }
 
     }
 

-    if (m_showProgress) {
-        m_statusBar->setProgressText(QString::null);
-        m_statusBar->setProgress(100);
-        m_showProgress = false;
+    m_storedCategorizedSorting = props.categorizedSorting();
+    const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
+    if (categorized != m_viewAccessor.proxyModel()->isCategorizedModel()) {
+        m_viewAccessor.proxyModel()->setCategorizedModel(categorized);
+        emit categorizedSortingChanged();

     }
 
     }
 

-    KFileItemList items(m_dirLister->items());
-    KFileItemList::const_iterator it = items.begin();
-    const KFileItemList::const_iterator end = items.end();
+    const DolphinView::Sorting sorting = props.sorting();
+    if (sorting != m_viewAccessor.proxyModel()->sorting()) {
+        m_viewAccessor.proxyModel()->setSorting(sorting);
+        emit sortingChanged(sorting);
+    }

 
 

-    m_fileCount = 0;
-    m_folderCount = 0;
+    const Qt::SortOrder sortOrder = props.sortOrder();
+    if (sortOrder != m_viewAccessor.proxyModel()->sortOrder()) {
+        m_viewAccessor.proxyModel()->setSortOrder(sortOrder);
+        emit sortOrderChanged(sortOrder);
+    }

 
 

-    while (it != end) {
-        KFileItem* item = *it;
-        view->insertItem(item);
-        if (item->isDir()) {
-            ++m_folderCount;
-        }
-        else {
-            ++m_fileCount;
-        }
-        ++it;
+    const bool sortFoldersFirst = props.sortFoldersFirst();
+    if (sortFoldersFirst != m_viewAccessor.proxyModel()->sortFoldersFirst()) {
+        m_viewAccessor.proxyModel()->setSortFoldersFirst(sortFoldersFirst);
+        emit sortFoldersFirstChanged(sortFoldersFirst);

     }
 
     }
 

-    updateStatusBar();
+    KFileItemDelegate::InformationList info = props.additionalInfo();
+    if (info != m_viewAccessor.itemDelegate()->showInformation()) {
+        m_viewAccessor.itemDelegate()->setShowInformation(info);
+        emit additionalInfoChanged();
+    }

 
 

-    if (m_iconsView != 0) {
-        // Prevent a flickering of the icon view widget by giving a small
-        // timeslot to swallow asynchronous update events.
-        m_iconsView->setUpdatesEnabled(false);
-        QTimer::singleShot(10, this, SLOT(slotDelayedUpdate()));
+    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 (m_detailsView != 0) {
-        m_detailsView->endItemUpdates();
-        m_refreshing = false;
+    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::slotDelayedUpdate()
+void DolphinView::createView()

 {
 {

-    if (m_iconsView != 0) {
-        m_iconsView->setUpdatesEnabled(true);
-        m_iconsView->endItemUpdates();
+    deleteView();
+
+    Q_ASSERT(m_viewAccessor.itemView() == 0);
+    m_viewAccessor.createView(this, m_controller, m_mode);
+
+    QAbstractItemView* view = m_viewAccessor.itemView();
+    Q_ASSERT(view != 0);
+    view->installEventFilter(this);
+    view->viewport()->installEventFilter(this);
+
+    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_refreshing = false;
+    m_selectionModel->setParent(this);
+    connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+            this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection)));
+
+    setFocusProxy(m_viewAccessor.layoutTarget());
+    m_topLayout->insertWidget(1, m_viewAccessor.layoutTarget());

 }
 
 }
 

-void DolphinView::slotInfoMessage(const QString& msg)
+void DolphinView::deleteView()

 {
 {

-    m_statusBar->setMessage(msg, DolphinStatusBar::Information);
+    QAbstractItemView* view = m_viewAccessor.itemView();
+    if (view != 0) {
+        // It's important to set the keyboard focus to the parent
+        // before deleting the view: Otherwise when having a split
+        // 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();
+
+        // disconnect all signal/slots
+        disconnect(view);
+        m_controller->disconnect(view);
+        view->disconnect();
+
+        m_viewAccessor.deleteView();
+    }

 }
 
 }
 

-void DolphinView::slotErrorMessage(const QString& msg)
+void DolphinView::pasteToUrl(const KUrl& url)

 {
 {

-    m_statusBar->setMessage(msg, DolphinStatusBar::Error);
+    addNewFileNames(QApplication::clipboard()->mimeData());
+    KonqOperations::doPaste(this, url);

 }
 
 }
 

-void DolphinView::slotRefreshItems(const KFileItemList& /* list */)
+void DolphinView::updateZoomLevel(int oldZoomLevel)

 {
 {

-    QTimer::singleShot(0, this, SLOT(reload()));
+    const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(m_viewAccessor.itemView()->iconSize());
+    if (oldZoomLevel != newZoomLevel) {
+        m_controller->setZoomLevel(newZoomLevel);
+        emit zoomLevelChanged(newZoomLevel);
+    }

 }
 
 }
 

-void DolphinView::slotAddItems(const KFileItemList& list)
+KUrl::List DolphinView::simplifiedSelectedUrls() const

 {
 {

-  fileView()->addItemList(list);
-  fileView()->updateView();
+    KUrl::List list = selectedUrls();
+    if (itemsExpandable() ) {
+        list = KDirModel::simplifiedUrlList(list);
+    }
+    return list;

 }
 
 }
 

-void DolphinView::slotGrabActivation()
+QMimeData* DolphinView::selectionMimeData() const

 {
 {

-    Dolphin::mainWin().setActiveView(this);
+    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::slotContentsMoving(int x, int y)
+void DolphinView::addNewFileNames(const QMimeData* mimeData)

 {
 {

-    if (!m_refreshing) {
-        // Only emit a 'contents moved' signal if the user
-        // moved the content by adjusting the sliders. Adjustments
-        // resulted by refreshing a directory should not be respected.
-        emit contentsMoved(x, y);
+    const KUrl::List urls = KUrl::List::fromMimeData(mimeData);
+    foreach (const KUrl& url, urls) {
+        m_newFileNames.insert(url.fileName());

     }
 }
 
     }
 }
 

-void DolphinView::createView()
+DolphinView::ViewAccessor::ViewAccessor(DolphinSortFilterProxyModel* proxyModel) :
+    m_iconsView(0),
+    m_detailsView(0),
+    m_columnsContainer(0),
+    m_proxyModel(proxyModel),
+    m_dragSource(0)

 {
 {

-    assert(m_iconsView == 0);
-    assert(m_detailsView == 0);
+}

 
 

-    switch (m_mode) {
+DolphinView::ViewAccessor::~ViewAccessor()
+{
+    delete m_dragSource;
+    m_dragSource = 0;
+}
+
+void DolphinView::ViewAccessor::createView(QWidget* parent,
+                                           DolphinController* controller,
+                                           Mode mode)
+{
+    Q_ASSERT(itemView() == 0);
+
+    switch (mode) {

     case IconsView:
     case IconsView:

-    case PreviewsView: {
-        const DolphinIconsView::LayoutMode layoutMode = (m_mode == IconsView) ?
-                                                        DolphinIconsView::Icons :
-                                                        DolphinIconsView::Previews;
-        m_iconsView = new DolphinIconsView(this, layoutMode);
-        m_topLayout->insertWidget(1, m_iconsView);
-        setFocusProxy(m_iconsView);
-
-        connect(m_iconsView, SIGNAL(executed(Q3IconViewItem*)),
-                this, SLOT(triggerIconsViewItem(Q3IconViewItem*)));
-        connect(m_iconsView, SIGNAL(returnPressed(Q3IconViewItem*)),
-                this, SLOT(triggerIconsViewItem(Q3IconViewItem*)));
-        connect(m_iconsView, SIGNAL(signalRequestActivation()),
-                this, SLOT(slotGrabActivation()));
-
-        m_iconsView->endItemUpdates();
-        m_iconsView->show();
-        m_iconsView->setFocus();
+        m_iconsView = new DolphinIconsView(parent, controller, m_proxyModel);

         break;
         break;

-    }

 
 

-    case DetailsView: {
-        m_detailsView = new DolphinDetailsView(this);
-        m_topLayout->insertWidget(1, m_detailsView);
-        setFocusProxy(m_detailsView);
+    case DetailsView:
+        m_detailsView = new DolphinDetailsView(parent, controller, m_proxyModel);
+        break;

 
 

-        connect(m_detailsView, SIGNAL(executed(Q3ListViewItem*, const QPoint&, int)),
-                this, SLOT(triggerDetailsViewItem(Q3ListViewItem*, const QPoint&, int)));
-        connect(m_detailsView, SIGNAL(returnPressed(Q3ListViewItem*)),
-                this, SLOT(triggerDetailsViewItem(Q3ListViewItem*)));
-        connect(m_detailsView, SIGNAL(signalRequestActivation()),
-                this, SLOT(slotGrabActivation()));
-        m_detailsView->show();
-        m_detailsView->setFocus();
+    case ColumnView:
+        m_columnsContainer = new DolphinColumnViewContainer(parent, controller);

         break;
         break;

-    }

 
     default:
 
     default:

-        break;
+        Q_ASSERT(false);

     }
     }

-
-    connect(scrollView(), SIGNAL(contentsMoving(int, int)),
-            this, SLOT(slotContentsMoving(int, int)));
-
-    startDirLister(m_urlNavigator->url());

 }
 
 }
 

-KFileView* DolphinView::fileView() const
+void DolphinView::ViewAccessor::deleteView()

 {
 {

-    return (m_mode == DetailsView) ? static_cast<KFileView*>(m_detailsView) :
-                                     static_cast<KFileView*>(m_iconsView);
-}
+    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();
+        }
+    }

 
 

-Q3ScrollView* DolphinView::scrollView() const
-{
-    return (m_mode == DetailsView) ? static_cast<Q3ScrollView*>(m_detailsView) :
-                                     static_cast<Q3ScrollView*>(m_iconsView);
+    m_iconsView = 0;
+    m_detailsView = 0;
+
+    if (m_columnsContainer != 0) {
+        m_columnsContainer->deleteLater();
+    }
+    m_columnsContainer = 0;

 }
 
 }
 

-ItemEffectsManager* DolphinView::itemEffectsManager() const
+
+void DolphinView::ViewAccessor::prepareUrlChange(const KUrl& url)

 {
 {

-    return (m_mode == DetailsView) ? static_cast<ItemEffectsManager*>(m_detailsView) :
-                                     static_cast<ItemEffectsManager*>(m_iconsView);
+    if (m_columnsContainer != 0) {
+        m_columnsContainer->showColumn(url);
+    }

 }
 
 }
 

-void DolphinView::startDirLister(const KUrl& url, bool reload)
+QAbstractItemView* DolphinView::ViewAccessor::itemView() const

 {
 {

-    if (!url.isValid()) {
-        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);
-        }
-        return;
+    if (m_iconsView != 0) {
+        return m_iconsView;
+    }
+
+    if (m_detailsView != 0) {
+        return m_detailsView;

     }
 
     }
 

-    // 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.
-    const QString progressText(m_statusBar->progressText());
-    m_showProgress = progressText.isEmpty() ||
-                     (progressText == i18n("Loading directory..."));
-    if (m_showProgress) {
-        m_statusBar->setProgressText(i18n("Loading directory..."));
-        m_statusBar->setProgress(0);
+    if (m_columnsContainer != 0) {
+        return m_columnsContainer->activeColumn();

     }
 
     }
 

-    m_refreshing = true;
-    m_dirLister->stop();
-    m_dirLister->openUrl(url, false, reload);
+    return 0;

 }
 
 }
 

-QString DolphinView::defaultStatusBarText() const
+KFileItemDelegate* DolphinView::ViewAccessor::itemDelegate() const

 {
 {

-    // TODO: the following code is not suitable for languages where multiple forms
-    // of plurals are given (e. g. in Poland three forms of plurals exist).
-    const int itemCount = m_folderCount + m_fileCount;
+    return static_cast<KFileItemDelegate*>(itemView()->itemDelegate());
+}

 
 

-    QString text;
-    if (itemCount == 1) {
-        text = i18n("1 Item");
-    }
-    else {
-        text = i18n("%1 Items",itemCount);
+QWidget* DolphinView::ViewAccessor::layoutTarget() const
+{
+    if (m_columnsContainer != 0) {
+        return m_columnsContainer;

     }
     }

+    return itemView();
+}

 
 

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

 
 

-    if (m_folderCount == 1) {
-        text += i18n("1 Folder");
-    }
-    else {
-        text += i18n("%1 Folders",m_folderCount);
-    }
+bool DolphinView::ViewAccessor::supportsCategorizedSorting() const
+{
+    return m_iconsView != 0;
+}

 
 

-    text += ", ";
+bool DolphinView::ViewAccessor::itemsExpandable() const
+{
+    return (m_detailsView != 0) && m_detailsView->itemsExpandable();
+}

 
 

-    if (m_fileCount == 1) {
-        text += i18n("1 File");
-    }
-    else {
-        text += i18n("%1 Files",m_fileCount);
-    }

 
 

-    text += ")";
+QSet<KUrl> DolphinView::ViewAccessor::expandedUrls() const
+{
+    if (m_detailsView != 0) {
+        return m_detailsView->expandedUrls();
+    }

 
 

-    return text;
+    return QSet<KUrl>();

 }
 
 }
 

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

 {
 {

-    // TODO: the following code is not suitable for languages where multiple forms
-    // of plurals are given (e. g. in Poland three forms of plurals exist).
-    QString text;
-    const KFileItemList* list = selectedItems();
-    assert((list != 0) && !list->isEmpty());
-
-    int fileCount = 0;
-    int folderCount = 0;
-    KIO::filesize_t byteSize = 0;
-    KFileItemList::const_iterator it = list->begin();
-    const KFileItemList::const_iterator end = list->end();
-    while (it != end){
-        KFileItem* item = *it;
-        if (item->isDir()) {
-            ++folderCount;
+    if ((m_detailsView != 0) && m_detailsView->itemsExpandable() && !urlsToExpand.isEmpty()) {
+        // Check if another expander is already active and stop it if necessary.
+        if(!m_detailsViewExpander.isNull()) {
+            m_detailsViewExpander->stop();

         }
         }

-        else {
-            ++fileCount;
-            byteSize += item->size();
-        }
-        ++it;
-    }

 
 

-    if (folderCount == 1) {
-        text = i18n("1 Folder selected");
+        m_detailsViewExpander = new DolphinDetailsViewExpander(m_detailsView, urlsToExpand);
+        return m_detailsViewExpander;

     }
     }

-    else if (folderCount > 1) {
-        text = i18n("%1 Folders selected",folderCount);
-    }
-
-    if ((fileCount > 0) && (folderCount > 0)) {
-        text += ", ";
+    else {
+        return 0;

     }
     }

+}

 
 

-    const QString sizeText(KIO::convertSize(byteSize));
-    if (fileCount == 1) {
-        text += i18n("1 File selected (%1)",sizeText);
-    }
-    else if (fileCount > 1) {
-        text += i18n("%1 Files selected (%1)",fileCount,sizeText);
-    }
+bool DolphinView::ViewAccessor::reloadOnAdditionalInfoChange() const
+{
+    // the details view requires no reloading of the directory, as it maps
+    // the file item delegate info to its columns internally
+    return m_detailsView != 0;
+}

 
 

-    return text;
+DolphinModel* DolphinView::ViewAccessor::dirModel() const
+{
+    return static_cast<DolphinModel*>(proxyModel()->sourceModel());

 }
 
 }
 

-QString DolphinView::renameIndexPresentation(int index, int itemCount) const
+DolphinSortFilterProxyModel* DolphinView::ViewAccessor::proxyModel() const

 {
 {

-    // assure that the string reprentation for all indicess have the same
-    // number of characters based on the given number of items
-    QString str(QString::number(index));
-    int chrCount = 1;
-    while (itemCount >= 10) {
-        ++chrCount;
-        itemCount /= 10;
+    if (m_columnsContainer != 0) {
+        return static_cast<DolphinSortFilterProxyModel*>(m_columnsContainer->activeColumn()->model());

     }
     }

-    str.reserve(chrCount);
+    return m_proxyModel;
+}

 
 

-    const int insertCount = chrCount - str.length();
-    for (int i = 0; i < insertCount; ++i) {
-        str.insert(0, '0');
-    }
-    return str;
+KDirLister* DolphinView::ViewAccessor::dirLister() const
+{
+    return dirModel()->dirLister();

 }
 
 }
 

-void DolphinView::slotShowFilterBar(bool show)
+void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)

 {
 {

-    assert(m_filterBar != 0);
-    if (show) {
-        m_filterBar->show();
-    }
-    else {
-        m_filterBar->hide();
-    }
-}
-
-void DolphinView::slotChangeNameFilter(const QString& nameFilter)
-{
-    // The name filter of KDirLister does a 'hard' filtering, which
-    // means that only the items are shown where the names match
-    // exactly the filter. This is non-transparent for the user, which
-    // just wants to have a 'soft' filtering: does the name contain
-    // the filter string?
-    QString adjustedFilter(nameFilter);
-    adjustedFilter.insert(0, '*');
-    adjustedFilter.append('*');
-
-    m_dirLister->setNameFilter(adjustedFilter);
-    m_dirLister->emitChanges();
-
-    // TODO: this is a workaround for QIconView: the item position
-    // stay as they are by filtering, only an inserting of an item
-    // results to an automatic adjusting of the item position. In Qt4/KDE4
-    // this workaround should get obsolete due to Interview.
-    KFileView* view = fileView();
-    if (view == m_iconsView) {
-        KFileItem* first = view->firstFileItem();
-        if (first != 0) {
-            view->removeItem(first);
-            view->insertItem(first);
-        }
-    }
+    emit redirection(oldUrl, newUrl);
+    m_controller->redirectToUrl(newUrl); // #186947

 }
 
 }
 

-bool DolphinView::isFilterBarVisible()
+void DolphinView::restoreContentsPosition()

 {
 {

-  return m_filterBar->isVisible();
+    if (!m_restoredContentsPosition.isNull()) {
+        const int x = m_restoredContentsPosition.x();
+        const int y = m_restoredContentsPosition.y();
+        m_restoredContentsPosition = QPoint();
+
+        QAbstractItemView* view = m_viewAccessor.itemView();
+        Q_ASSERT(view != 0);
+        view->horizontalScrollBar()->setValue(x);
+        view->verticalScrollBar()->setValue(y);
+    }

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