]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/dolphinview.cpp
As requested by Peter: upgrade version to 1.0
[dolphin.git] / src / dolphinview.cpp
index 64722e1e219a39feb0bae9f7009c6af15baedb59..7418997d94dc16fcbc025c736eda5dd9920c38b3 100644 (file)
  ***************************************************************************/
 
 #include "dolphinview.h"
+#include <ktoggleaction.h>
+#include <kactioncollection.h>
 
 #include <QApplication>
 #include <QClipboard>
-#include <QDropEvent>
-#include <QItemSelectionModel>
-#include <QMouseEvent>
-#include <QVBoxLayout>
+#include <QKeyEvent>
+#include <QItemSelection>
+#include <QBoxLayout>
 #include <QTimer>
 #include <QScrollBar>
 
-#include <kdirmodel.h>
+#include <kcolorscheme.h>
+#include <kdirlister.h>
 #include <kfileitemdelegate.h>
-#include <kfileplacesmodel.h>
 #include <klocale.h>
 #include <kiconeffect.h>
+#include <kio/deletejob.h>
 #include <kio/netaccess.h>
-#include <kio/renamedialog.h>
 #include <kio/previewjob.h>
+#include <kjob.h>
+#include <kmenu.h>
 #include <kmimetyperesolver.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <kurl.h>
 
+#include "dolphindropcontroller.h"
+#include "dolphinmodel.h"
 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"
-#include "dolphinstatusbar.h"
-#include "dolphinmainwindow.h"
-#include "dolphindirlister.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphindetailsview.h"
 #include "dolphiniconsview.h"
-#include "dolphincontextmenu.h"
-#include "dolphinitemcategorizer.h"
-#include "filterbar.h"
 #include "renamedialog.h"
-#include "kurlnavigator.h"
 #include "viewproperties.h"
 #include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 
-DolphinView::DolphinView(DolphinMainWindow* mainWindow,
-                         QWidget* parent,
+DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,
-                         Mode mode,
-                         bool showHiddenFiles) :
+                         KDirLister* dirLister,
+                         DolphinModel* dolphinModel,
+                         DolphinSortFilterProxyModel* proxyModel) :
     QWidget(parent),
-    m_showProgress(false),
-    m_blockContentsMovedSignal(false),
-    m_initializeColumnView(false),
-    m_mode(mode),
-    m_iconSize(0),
-    m_folderCount(0),
-    m_fileCount(0),
-    m_mainWindow(mainWindow),
+    m_active(true),
+    m_showPreview(false),
+    m_loadingDirectory(false),
+    m_storedCategorizedSorting(false),
+    m_mode(DolphinView::IconsView),
     m_topLayout(0),
-    m_urlNavigator(0),
     m_controller(0),
     m_iconsView(0),
     m_detailsView(0),
     m_columnView(0),
     m_fileItemDelegate(0),
-    m_filterBar(0),
-    m_statusBar(0),
-    m_dirModel(0),
-    m_dirLister(0),
-    m_proxyModel(0)
+    m_selectionModel(0),
+    m_dolphinModel(dolphinModel),
+    m_dirLister(dirLister),
+    m_proxyModel(proxyModel),
+    m_previewJob(0)
 {
-    hide();
     setFocusPolicy(Qt::StrongFocus);
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
-    connect(m_mainWindow, SIGNAL(activeViewChanged()),
-            this, SLOT(updateActivationState()));
-
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
             this, SLOT(updateCutItems()));
 
-    m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this);
-    m_urlNavigator->setUrlEditable(DolphinSettings::instance().generalSettings()->editableUrl());
-    m_urlNavigator->setHomeUrl(DolphinSettings::instance().generalSettings()->homeUrl());
-    connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(changeDirectory(const KUrl&)));
-    connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
-            this, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
-    connect(m_urlNavigator, SIGNAL(activated()),
-            this, SLOT(requestActivation()));
-    connect(this, SIGNAL(contentsMoved(int, int)),
-            m_urlNavigator, SLOT(savePosition(int, int)));
-
-    m_statusBar = new DolphinStatusBar(this);
-
-    m_dirLister = new DolphinDirLister();
-    m_dirLister->setAutoUpdate(true);
-    m_dirLister->setMainWindow(this);
-    m_dirLister->setShowingDotFiles(showHiddenFiles);
-    m_dirLister->setDelayedMimeTypes(true);
-
-    connect(m_dirLister, SIGNAL(clear()),
-            this, SLOT(updateStatusBar()));
-    connect(m_dirLister, SIGNAL(percent(int)),
-            this, SLOT(updateProgress(int)));
-    connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)),
-            this, SLOT(updateStatusBar()));
-    connect(m_dirLister, SIGNAL(completed()),
-            this, SLOT(updateItemCount()));
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(updateCutItems()));
     connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
             this, SLOT(generatePreviews(const KFileItemList&)));
-    connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
-            this, SLOT(showInfoMessage(const QString&)));
-    connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
-            this, SLOT(showErrorMessage(const QString&)));
 
-    m_dirModel = new KDirModel();
-    m_dirModel->setDirLister(m_dirLister);
-    m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory);
+    m_controller = new DolphinController(this);
+    m_controller->setUrl(url);
 
-    m_proxyModel = new DolphinSortFilterProxyModel(this);
-    m_proxyModel->setSourceModel(m_dirModel);
+    // Receiver of the DolphinView signal 'urlChanged()' don't need
+    // to care whether the internal controller changed the URL already or whether
+    // the controller just requested an URL change and will be updated later.
+    // In both cases the URL has been changed:
+    connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
+            this, SIGNAL(urlChanged(const KUrl&)));
+    connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)),
+            this, SIGNAL(urlChanged(const KUrl&)));
 
-    m_controller = new DolphinController(this);
     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(urlsDropped(const KUrl::List&, const KUrl&, const KFileItem&)),
+            this, SLOT(dropUrls(const KUrl::List&, const KUrl&, const KFileItem&)));
     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(selectionChanged()),
-            this, SLOT(emitSelectionChangedSignal()));
+    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(activated()),
-            this, SLOT(requestActivation()));
-
-    createView();
+            this, SLOT(activate()));
+    connect(m_controller, SIGNAL(itemEntered(const KFileItem&)),
+            this, SLOT(showHoverInformation(const KFileItem&)));
+    connect(m_controller, SIGNAL(viewportEntered()),
+            this, SLOT(clearHoverInformation()));
 
-    m_iconSize = K3Icon::SizeMedium;
-
-    m_filterBar = new FilterBar(this);
-    m_filterBar->hide();
-    connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
-            this, SLOT(changeNameFilter(const QString&)));
-    connect(m_filterBar, SIGNAL(closeRequest()),
-            this, SLOT(closeFilterBar()));
-
-    m_topLayout->addWidget(m_urlNavigator);
+    applyViewProperties(url);
     m_topLayout->addWidget(itemView());
-    m_topLayout->addWidget(m_filterBar);
-    m_topLayout->addWidget(m_statusBar);
 }
 
 DolphinView::~DolphinView()
 {
-    delete m_dirLister;
-    m_dirLister = 0;
+    if (m_previewJob != 0) {
+        m_previewJob->kill();
+        m_previewJob = 0;
+    }
 }
 
-void DolphinView::setUrl(const KUrl& url)
+const KUrl& DolphinView::url() const
 {
-    m_urlNavigator->setUrl(url);
-    m_controller->setUrl(url);
+    return m_controller->url();
 }
 
-const KUrl& DolphinView::url() const
+KUrl DolphinView::rootUrl() const
+{
+    return isColumnViewActive() ? m_columnView->rootUrl() : url();
+}
+
+void DolphinView::setActive(bool active)
 {
-    return m_urlNavigator->url();
+    if (active == m_active) {
+        return;
+    }
+
+    m_active = active;
+    m_selectionModel->clearSelection();
+
+    QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
+    if (active) {
+        // TODO: emitting urlChanged() is a hack, as the URL hasn't really changed. It
+        // bypasses the problem when having a split view and changing the active view to
+        // update the some URL dependent states. A nicer approach should be no big deal...
+        emit urlChanged(url());
+        emit selectionChanged(selectedItems());
+    } else {
+        color.setAlpha(150);
+    }
+
+    QWidget* viewport = itemView()->viewport();
+    QPalette palette;
+    palette.setColor(viewport->backgroundRole(), color);
+    viewport->setPalette(palette);
+
+    update();
+
+    if (active) {
+        emit activated();
+    }
+
+    m_controller->indicateActivationChange(active);
 }
 
 bool DolphinView::isActive() const
 {
-    return m_mainWindow->activeView() == this;
+    return m_active;
 }
 
 void DolphinView::setMode(Mode mode)
@@ -211,14 +199,36 @@ void DolphinView::setMode(Mode mode)
         // 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.
-        setUrl(m_dirLister->url());
+        const KUrl root = rootUrl();
+        setUrl(root);
+        m_controller->setUrl(root);
     }
 
-    ViewProperties props(m_urlNavigator->url());
-    props.setViewMode(m_mode);
+    deleteView();
 
+    // It is important to read the view properties _after_ deleting the view,
+    // as e. g. the detail view might adjust the additional information properties
+    // after getting closed:
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setViewMode(m_mode);
     createView();
-    startDirLister(m_urlNavigator->url());
+
+    // the file item delegate has been recreated, apply the current
+    // additional information manually
+    const KFileItemDelegate::InformationList infoList = props.additionalInfo();
+    m_fileItemDelegate->setShowInformation(infoList);
+    emit additionalInfoChanged(infoList);
+
+    // 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_proxyModel->isCategorizedModel()) {
+        m_proxyModel->setCategorizedModel(categorized);
+        emit categorizedSortingChanged();
+    }
 
     emit modeChanged();
 }
@@ -230,18 +240,24 @@ DolphinView::Mode DolphinView::mode() const
 
 void DolphinView::setShowPreview(bool show)
 {
-    ViewProperties props(m_urlNavigator->url());
+    if (m_showPreview == show) {
+        return;
+    }
+
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
     props.setShowPreview(show);
 
-    m_controller->setShowPreview(show);
+    m_showPreview = show;
+
     emit showPreviewChanged();
 
-    startDirLister(m_urlNavigator->url(), true);
+    loadDirectory(viewPropsUrl, true);
 }
 
 bool DolphinView::showPreview() const
 {
-    return m_controller->showPreview();
+    return m_showPreview;
 }
 
 void DolphinView::setShowHiddenFiles(bool show)
@@ -250,13 +266,14 @@ void DolphinView::setShowHiddenFiles(bool show)
         return;
     }
 
-    ViewProperties props(m_urlNavigator->url());
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
     props.setShowHiddenFiles(show);
 
     m_dirLister->setShowingDotFiles(show);
     emit showHiddenFilesChanged();
 
-    startDirLister(m_urlNavigator->url(), true);
+    loadDirectory(viewPropsUrl, true);
 }
 
 bool DolphinView::showHiddenFiles() const
@@ -266,35 +283,34 @@ bool DolphinView::showHiddenFiles() const
 
 void DolphinView::setCategorizedSorting(bool categorized)
 {
-    if (!supportsCategorizedSorting() || (categorized == categorizedSorting())) {
+    if (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;
-    }
+    // setCategorizedSorting(true) may only get invoked
+    // if the view supports categorized sorting
+    Q_ASSERT(!categorized || supportsCategorizedSorting());
 
-    ViewProperties props(m_urlNavigator->url());
+    ViewProperties props(viewPropertiesUrl());
     props.setCategorizedSorting(categorized);
     props.save();
 
+    m_storedCategorizedSorting = categorized;
+    m_proxyModel->setCategorizedModel(categorized);
+
     emit categorizedSortingChanged();
 }
 
 bool DolphinView::categorizedSorting() const
 {
-    if (!supportsCategorizedSorting()) {
-        return false;
-    }
-
-    Q_ASSERT(m_iconsView != 0);
-    return m_iconsView->itemCategorizer() != 0;
+    // If all view modes would support categorized sorting, returning
+    // m_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::supportsCategorizedSorting() const
@@ -302,114 +318,105 @@ bool DolphinView::supportsCategorizedSorting() const
     return m_iconsView != 0;
 }
 
-void DolphinView::renameSelectedItems()
+void DolphinView::selectAll()
 {
-    DolphinView* view = 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 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);
+    QAbstractItemView* view = itemView();
+    // TODO: there seems to be a bug in QAbstractItemView::selectAll(); if
+    // the Ctrl-key is pressed (e. g. for Ctrl+A), selectAll() inverts the
+    // selection instead of selecting all items. This is bypassed for KDE 4.0
+    // by invoking clearSelection() first.
+    view->clearSelection();
+    view->selectAll();
+}
 
-                if (oldUrl.fileName() != name) {
-                    KUrl newUrl = oldUrl;
-                    newUrl.setFileName(name);
-                    m_mainWindow->rename(oldUrl, newUrl);
-                }
-                ++it;
-            }
-        }
+void DolphinView::invertSelection()
+{
+    if (isColumnViewActive()) {
+        // QAbstractItemView does not offer a virtual method invertSelection()
+        // as counterpart to QAbstractItemView::selectAll(). This makes it
+        // necessary to delegate the inverting of the selection to the
+        // column view, as only the selection of the active column should
+        // get inverted.
+        m_columnView->invertSelection();
     } else {
-        // Only one item has been selected for renaming. Use the custom
-        // renaming mechanism from the views.
-        Q_ASSERT(urls.count() == 1);
+        QItemSelectionModel* selectionModel = itemView()->selectionModel();
+        const QAbstractItemModel* itemModel = selectionModel->model();
 
-        // 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 QModelIndex topLeft = itemModel->index(0, 0);
+        const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
+                                                         itemModel->columnCount() - 1);
 
-        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);
-        }
+        const QItemSelection selection(topLeft, bottomRight);
+        selectionModel->select(selection, QItemSelectionModel::Toggle);
     }
 }
 
-void DolphinView::selectAll()
+bool DolphinView::hasSelection() const
 {
-    selectAll(QItemSelectionModel::Select);
+    return itemView()->selectionModel()->hasSelection();
 }
 
-void DolphinView::invertSelection()
+void DolphinView::clearSelection()
 {
-    selectAll(QItemSelectionModel::Toggle);
+    itemView()->selectionModel()->clear();
 }
 
-DolphinStatusBar* DolphinView::statusBar() const
+KFileItemList DolphinView::selectedItems() const
 {
-    return m_statusBar;
-}
+    const QAbstractItemView* view = itemView();
 
-int DolphinView::contentsX() const
-{
-    return itemView()->horizontalScrollBar()->value();
+    // Our view has a selection, we will map them back to the DolphinModel
+    // and then fill the KFileItemList.
+    Q_ASSERT((view != 0) && (view->selectionModel() != 0));
+
+    const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
+    KFileItemList itemList;
+
+    const QModelIndexList indexList = selection.indexes();
+    foreach (QModelIndex index, indexList) {
+        KFileItem item = m_dolphinModel->itemForIndex(index);
+        if (!item.isNull()) {
+            itemList.append(item);
+        }
+    }
+
+    return itemList;
 }
 
-int DolphinView::contentsY() const
+KUrl::List DolphinView::selectedUrls() const
 {
-    return itemView()->verticalScrollBar()->value();
+    KUrl::List urls;
+    const KFileItemList list = selectedItems();
+    foreach (KFileItem item, list) {
+        urls.append(item.url());
+    }
+    return urls;
 }
 
-void DolphinView::emitRequestItemInfo(const KUrl& url)
+KFileItem DolphinView::fileItem(const QModelIndex& index) const
 {
-    emit requestItemInfo(url);
+    const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
+    return m_dolphinModel->itemForIndex(dolphinModelIndex);
 }
 
-bool DolphinView::isFilterBarVisible() const
+void DolphinView::setContentsPosition(int x, int y)
 {
-    return m_filterBar->isVisible();
+    QAbstractItemView* view = itemView();
+
+    // the ColumnView takes care itself for the horizontal scrolling
+    if (!isColumnViewActive()) {
+        view->horizontalScrollBar()->setValue(x);
+    }
+    view->verticalScrollBar()->setValue(y);
+
+    m_loadingDirectory = false;
 }
 
-bool DolphinView::isUrlEditable() const
+QPoint DolphinView::contentsPosition() const
 {
-    return m_urlNavigator->isUrlEditable();
+    const int x = itemView()->horizontalScrollBar()->value();
+    const int y = itemView()->verticalScrollBar()->value();
+    return QPoint(x, y);
 }
 
 void DolphinView::zoomIn()
@@ -456,210 +463,225 @@ Qt::SortOrder DolphinView::sortOrder() const
     return m_proxyModel->sortOrder();
 }
 
-void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
+void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info)
 {
-    ViewProperties props(m_urlNavigator->url());
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
     props.setAdditionalInfo(info);
-
-    m_fileItemDelegate->setAdditionalInformation(info);
+    m_fileItemDelegate->setShowInformation(info);
 
     emit additionalInfoChanged(info);
-    startDirLister(m_urlNavigator->url(), true);
+
+    if (itemView() != m_detailsView) {
+        // the details view requires no reloading of the directory, as it maps
+        // the file item delegate info to its columns internally
+        loadDirectory(viewPropsUrl, true);
+    }
 }
 
-KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const
+KFileItemDelegate::InformationList DolphinView::additionalInfo() const
 {
-    return m_fileItemDelegate->additionalInformation();
+    return m_fileItemDelegate->showInformation();
 }
 
-void DolphinView::goBack()
+void DolphinView::reload()
 {
-    m_urlNavigator->goBack();
+    setUrl(url());
+    loadDirectory(url(), true);
 }
 
-void DolphinView::goForward()
+void DolphinView::refresh()
 {
-    m_urlNavigator->goForward();
+    const bool oldActivationState = m_active;
+    m_active = true;
+
+    createView();
+    applyViewProperties(m_controller->url());
+    reload();
+
+    setActive(oldActivationState);
 }
 
-void DolphinView::goUp()
+void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)
 {
-    m_urlNavigator->goUp();
+    if (m_controller->url() == url) {
+        return;
+    }
+
+    m_controller->setUrl(url); // emits urlChanged, which we forward
+
+    if (!rootUrl.isEmpty() && rootUrl.isParentOf(url)) {
+        applyViewProperties(rootUrl);
+        loadDirectory(rootUrl);
+        if (itemView() == m_columnView) {
+            m_columnView->setRootUrl(rootUrl);
+            m_columnView->showColumn(url);
+        }
+    } else {
+        applyViewProperties(url);
+        loadDirectory(url);
+    }
+
+    emit startedPathLoading(url);
 }
 
-void DolphinView::goHome()
+void DolphinView::setNameFilter(const QString& nameFilter)
 {
-    m_urlNavigator->goHome();
+    m_proxyModel->setFilterRegExp(nameFilter);
+
+    if (isColumnViewActive()) {
+        // adjusting the directory lister is not enough in the case of the
+        // column view, as each column has its own directory lister internally...
+        m_columnView->setNameFilter(nameFilter);
+    }
 }
 
-void DolphinView::setUrlEditable(bool editable)
+void DolphinView::calculateItemCount(int& fileCount, int& folderCount)
 {
-    m_urlNavigator->setUrlEditable(editable);
+    foreach (KFileItem item, m_dirLister->items()) {
+        if (item.isDir()) {
+            ++folderCount;
+        } else {
+            ++fileCount;
+        }
+    }
 }
 
-bool DolphinView::hasSelection() const
+void DolphinView::setUrl(const KUrl& url)
 {
-    return itemView()->selectionModel()->hasSelection();
+    updateView(url, KUrl());
 }
 
-void DolphinView::clearSelection()
+void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
-    itemView()->selectionModel()->clear();
+    QWidget::mouseReleaseEvent(event);
+    setActive(true);
 }
-
-KFileItemList DolphinView::selectedItems() const
+void DolphinView::activate()
 {
-    const QAbstractItemView* view = itemView();
+    setActive(true);
+}
 
-    // 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));
+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 QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
-    KFileItemList itemList;
+    if (item.isNull()) {
+        return;
+    }
 
-    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());
+    emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
+}
 
-        KFileItem* item = m_dirModel->itemForIndex(*it);
-        if (item != 0) {
-            itemList.append(item);
+void DolphinView::generatePreviews(const KFileItemList& items)
+{
+    if (m_controller->dolphinView()->showPreview()) {
+        if (m_previewJob != 0) {
+            m_previewJob->kill();
+            m_previewJob = 0;
         }
-    }
 
-    return itemList;
+        m_previewJob = KIO::filePreview(items, 128);
+        connect(m_previewJob, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
+                this, SLOT(replaceIcon(const KFileItem&, const QPixmap&)));
+        connect(m_previewJob, SIGNAL(finished(KJob*)),
+                this, SLOT(slotPreviewJobFinished(KJob*)));
+    }
 }
 
-KUrl::List DolphinView::selectedUrls() const
+void DolphinView::replaceIcon(const KFileItem& item, const QPixmap& pixmap)
 {
-    KUrl::List urls;
-
-    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;
+    Q_ASSERT(!item.isNull());
+    if (!m_showPreview || (item.url().directory() != m_dirLister->url().path())) {
+        // the preview has been deactivated in the meanwhile or the preview
+        // job is still working on items of an older URL, hence
+        // the item is not part of the directory model anymore
+        return;
     }
 
-    return urls;
+    const QModelIndex idx = m_dolphinModel->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, KIconLoader::Desktop, KIconLoader::DisabledState);
+            m_dolphinModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole);
+        } else {
+            m_dolphinModel->setData(idx, QIcon(pixmap), Qt::DecorationRole);
+        }
+    }
 }
 
-KFileItem* DolphinView::fileItem(const QModelIndex index) const
+void DolphinView::emitSelectionChangedSignal()
 {
-    const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
-    return m_dirModel->itemForIndex(dirModelIndex);
+    emit selectionChanged(DolphinView::selectedItems());
 }
 
-void DolphinView::rename(const KUrl& source, const QString& newName)
+void DolphinView::loadDirectory(const KUrl& url, bool reload)
 {
-    bool ok = false;
-
-    if (newName.isEmpty() || (source.fileName() == newName)) {
+    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;
     }
 
-    KUrl dest(source.upUrl());
-    dest.addPath(newName);
-
-    const bool destExists = KIO::NetAccess::exists(dest,
-                            false,
-                            mainWindow()->activeView());
-    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;
-
-        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;
-        }
-
-        default:
-            // the renaming operation has been canceled
-            return;
-        }
-    } else {
-        // no destination exists, hence just move the file to
-        // do the renaming
-        ok = KIO::NetAccess::file_move(source, dest);
-    }
+    m_cutItemsCache.clear();
+    m_loadingDirectory = true;
 
-    const QString destFileName = dest.fileName();
-    if (ok) {
-        m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.", source.fileName(), destFileName),
-                                DolphinStatusBar::OperationCompleted);
+    m_dirLister->stop();
+    m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
 
-        KonqOperations::rename(this, source, destFileName);
-    } else {
-        m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.", source.fileName(), destFileName),
-                                DolphinStatusBar::Error);
+    if (isColumnViewActive()) {
+        // adjusting the directory lister is not enough in the case of the
+        // column view, as each column has its own directory lister internally...
+        if (reload) {
+            m_columnView->reload();
+        } else {
+            m_columnView->showColumn(url);
+        }
     }
 }
 
-void DolphinView::reload()
-{
-    const KUrl& url = m_urlNavigator->url();
-    changeDirectory(url);
-    startDirLister(url, true);
-}
-
-void DolphinView::mouseReleaseEvent(QMouseEvent* event)
+KUrl DolphinView::viewPropertiesUrl() const
 {
-    QWidget::mouseReleaseEvent(event);
-    mainWindow()->setActiveView(this);
-}
+    if (isColumnViewActive()) {
+        return m_dirLister->url();
+    }
 
-DolphinMainWindow* DolphinView::mainWindow() const
-{
-    return m_mainWindow;
+    return url();
 }
 
-void DolphinView::changeDirectory(const KUrl& url)
+void DolphinView::applyViewProperties(const KUrl& url)
 {
-    if (!isActive()) {
-        requestActivation();
+    if (isColumnViewActive() && rootUrl().isParentOf(url)) {
+        // The column view is active, hence don't apply the view properties
+        // of sub directories (represented by columns) to the view. The
+        // view always represents the properties of the first column.
+        return;
     }
 
     const ViewProperties props(url);
 
     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;
-        }
-    }
-
-    if (changeMode) {
+    if (m_mode != mode) {
         m_mode = mode;
         createView();
         emit modeChanged();
-
-        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;
-        }
     }
+    if (itemView() == 0) {
+        createView();
+    }
+    Q_ASSERT(itemView() != 0);
+    Q_ASSERT(m_fileItemDelegate != 0);
 
     const bool showHiddenFiles = props.showHiddenFiles();
     if (showHiddenFiles != m_dirLister->showingDotFiles()) {
@@ -667,19 +689,10 @@ void DolphinView::changeDirectory(const KUrl& url)
         emit showHiddenFilesChanged();
     }
 
-    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;
-            }
-        }
+    m_storedCategorizedSorting = props.categorizedSorting();
+    const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
+    if (categorized != m_proxyModel->isCategorizedModel()) {
+        m_proxyModel->setCategorizedModel(categorized);
         emit categorizedSortingChanged();
     }
 
@@ -695,353 +708,32 @@ void DolphinView::changeDirectory(const KUrl& url)
         emit sortOrderChanged(sortOrder);
     }
 
-    KFileItemDelegate::AdditionalInformation info = props.additionalInfo();
-    if (info != m_fileItemDelegate->additionalInformation()) {
-        m_fileItemDelegate->setAdditionalInformation(info);
-
+    KFileItemDelegate::InformationList info = props.additionalInfo();
+    if (info != m_fileItemDelegate->showInformation()) {
+        m_fileItemDelegate->setShowInformation(info);
         emit additionalInfoChanged(info);
     }
 
     const bool showPreview = props.showPreview();
-    if (showPreview != m_controller->showPreview()) {
-        m_controller->setShowPreview(showPreview);
+    if (showPreview != m_showPreview) {
+        m_showPreview = showPreview;
         emit showPreviewChanged();
     }
-
-    startDirLister(url);
-    emit urlChanged(url);
-
-    m_statusBar->clear();
 }
 
-void DolphinView::triggerItem(const QModelIndex& index)
+void DolphinView::changeSelection(const KFileItemList& selection)
 {
-    if (!isValidNameIndex(index)) {
-        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'
+    clearSelection();
+    if (selection.isEmpty()) {
         return;
     }
-
-    KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index));
-    if (item == 0) {
-        return;
-    }
-
-    // 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();
-        }
-    } else {
-        item->run();
-    }
-}
-
-void DolphinView::updateProgress(int percent)
-{
-    if (m_showProgress) {
-        m_statusBar->setProgress(percent);
-    }
-}
-
-void DolphinView::updateItemCount()
-{
-    if (m_showProgress) {
-        m_statusBar->setProgressText(QString());
-        m_statusBar->setProgress(100);
-        m_showProgress = false;
-    }
-
-    KFileItemList items(m_dirLister->items());
-    KFileItemList::const_iterator it = items.begin();
-    const KFileItemList::const_iterator end = items.end();
-
-    m_fileCount = 0;
-    m_folderCount = 0;
-
-    while (it != end) {
-        KFileItem* item = *it;
-        if (item->isDir()) {
-            ++m_folderCount;
-        } else {
-            ++m_fileCount;
-        }
-        ++it;
-    }
-
-    updateStatusBar();
-
-    m_blockContentsMovedSignal = false;
-    QTimer::singleShot(0, this, SLOT(restoreContentsPos()));
-}
-
-void DolphinView::generatePreviews(const KFileItemList& items)
-{
-    if (m_controller->showPreview()) {
-
-        // Must turn QList<KFileItem *> to QList<KFileItem>...
-        QList<KFileItem> itemsToPreview;
-        foreach( KFileItem* it, items )
-            itemsToPreview.append( *it );
-
-        KIO::PreviewJob* job = KIO::filePreview(itemsToPreview, 128);
-        connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
-                this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
-    }
-}
-
-void DolphinView::showPreview(const KFileItem& item, const QPixmap& pixmap)
-{
-    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;
-    }
-
-    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::restoreContentsPos()
-{
-    KUrl currentUrl = m_urlNavigator->url();
-    if (!currentUrl.isEmpty()) {
-        QAbstractItemView* view = itemView();
-        // TODO: view->setCurrentItem(m_urlNavigator->currentFileName());
-        QPoint pos = m_urlNavigator->savedPosition();
-        view->horizontalScrollBar()->setValue(pos.x());
-        view->verticalScrollBar()->setValue(pos.y());
-    }
-}
-
-void DolphinView::showInfoMessage(const QString& msg)
-{
-    m_statusBar->setMessage(msg, DolphinStatusBar::Information);
-}
-
-void DolphinView::showErrorMessage(const QString& msg)
-{
-    m_statusBar->setMessage(msg, DolphinStatusBar::Error);
-}
-
-void DolphinView::emitSelectionChangedSignal()
-{
-    emit selectionChanged(DolphinView::selectedItems());
-}
-
-void DolphinView::closeFilterBar()
-{
-    m_filterBar->hide();
-    emit showFilterBarChanged(false);
-}
-
-void DolphinView::startDirLister(const KUrl& url, bool reload)
-{
-    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;
-    }
-
-    // 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 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;
-            }
-        }
-    }
-
-    if (openDir) {
-        m_dirLister->openUrl(url, keepOldDirs, reload);
-    }
-}
-
-QString DolphinView::defaultStatusBarText() const
-{
-    return KIO::itemsSummaryString(m_fileCount + m_folderCount,
-                                   m_fileCount,
-                                   m_folderCount,
-                                   0, false);
-}
-
-QString DolphinView::selectionStatusBarText() const
-{
-    QString text;
-    const KFileItemList list = selectedItems();
-    if (list.isEmpty()) {
-        // when an item is triggered, it is temporary selected but selectedItems()
-        // will return an empty list
-        return QString();
-    }
-
-    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;
-        } else {
-            ++fileCount;
-            byteSize += item->size();
-        }
-        ++it;
-    }
-
-    if (folderCount > 0) {
-        text = i18np("1 Folder selected", "%1 Folders selected", folderCount);
-        if (fileCount > 0) {
-            text += ", ";
-        }
-    }
-
-    if (fileCount > 0) {
-        const QString sizeText(KIO::convertSize(byteSize));
-        text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText);
-    }
-
-    return text;
-}
-
-void DolphinView::showFilterBar(bool show)
-{
-    Q_ASSERT(m_filterBar != 0);
-    if (show) {
-        m_filterBar->show();
-    } else {
-        m_filterBar->hide();
-    }
-}
-
-void DolphinView::updateStatusBar()
-{
-    // 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);
-
-    if (updateStatusBarMsg) {
-        m_statusBar->setMessage(text, DolphinStatusBar::Default);
-    }
-}
-
-void DolphinView::requestActivation()
-{
-    m_mainWindow->setActiveView(this);
-}
-
-void DolphinView::changeSelection(const KFileItemList& selection)
-{
-    clearSelection();
-    if (selection.isEmpty()) {
-        return;
-    }
-    KUrl baseUrl = url();
+    const KUrl& baseUrl = url();
     KUrl url;
     QItemSelection new_selection;
-    foreach(KFileItem* item, selection) {
-        url = item->url().upUrl();
+    foreach(const KFileItem& item, selection) {
+        url = item.url().upUrl();
         if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
-            QModelIndex index = m_proxyModel->mapFromSource(m_dirModel->indexForItem(*item));
+            QModelIndex index = m_proxyModel->mapFromSource(m_dolphinModel->indexForItem(item));
             new_selection.select(index, index);
         }
     }
@@ -1050,78 +742,44 @@ void DolphinView::changeSelection(const KFileItemList& selection)
                                          | QItemSelectionModel::Current);
 }
 
-void DolphinView::changeNameFilter(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('*');
-
-    // Use the ProxyModel to filter:
-    // This code is #ifdefed as setNameFilter behaves
-    // slightly different than the QSortFilterProxyModel
-    // as it will not remove directories. I will ask
-    // our beloved usability experts for input
-    // -- z.
-#if 0
-    m_dirLister->setNameFilter(adjustedFilter);
-    m_dirLister->emitChanges();
-#else
-    m_proxyModel->setFilterRegExp(nameFilter);
-#endif
-}
-
 void DolphinView::openContextMenu(const QPoint& pos)
 {
-    KFileItem* item = 0;
+    KFileItem item;
 
     const QModelIndex index = itemView()->indexAt(pos);
-    if (isValidNameIndex(index)) {
+    if (index.isValid() && (index.column() == DolphinModel::Name)) {
         item = fileItem(index);
     }
 
-    DolphinContextMenu contextMenu(m_mainWindow, item, url());
-    contextMenu.open();
+    emit requestContextMenu(item, url());
 }
 
 void DolphinView::dropUrls(const KUrl::List& urls,
-                           const QModelIndex& index,
-                           QWidget* source)
-{
-    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;
-        }
+                           const KUrl& destPath,
+                           const KFileItem& destItem)
+{
+    Q_ASSERT(!urls.isEmpty());
+    const KUrl& destination = !destItem.isNull() && destItem.isDir() ?
+                              destItem.url() : destPath;
+    const KUrl sourceDir = KUrl(urls.first().directory());
+    if (sourceDir != destination) {
+        dropUrls(urls, destination);
     }
-
-    if ((directory == 0) && (source == itemView())) {
-        // The dropping is done into the same viewport where
-        // the dragging has been started. Just ignore this...
-        return;
-    }
-
-    const KUrl& destination = (directory == 0) ? url() :
-                              directory->url();
-    dropUrls(urls, destination);
 }
 
 void DolphinView::dropUrls(const KUrl::List& urls,
                            const KUrl& destination)
 {
-    m_mainWindow->dropUrls(urls, destination);
+    DolphinDropController dropController(this);
+    // forward doingOperation signal up to the mainwindow
+    connect(&dropController, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)),
+            this, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)));
+    dropController.dropUrls(urls, destination);
 }
 
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setSorting(sorting);
 
     m_proxyModel->setSorting(sorting);
@@ -1131,7 +789,7 @@ void DolphinView::updateSorting(DolphinView::Sorting sorting)
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
 {
-    ViewProperties props(url());
+    ViewProperties props(viewPropertiesUrl());
     props.setSortOrder(order);
 
     m_proxyModel->setSortOrder(order);
@@ -1139,19 +797,28 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
-void DolphinView::emitContentsMoved()
+void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)
 {
-    if (!m_blockContentsMovedSignal) {
-        emit contentsMoved(contentsX(), contentsY());
-    }
+    ViewProperties props(viewPropertiesUrl());
+    props.setAdditionalInfo(info);
+    props.save();
+
+    m_fileItemDelegate->setShowInformation(info);
+
+    emit additionalInfoChanged(info);
+
 }
 
-void DolphinView::updateActivationState()
+void DolphinView::emitContentsMoved()
 {
-    m_urlNavigator->setActive(isActive());
-    if (isActive()) {
-        emit urlChanged(url());
-        emit selectionChanged(selectedItems());
+    // only emit the contents moved signal if:
+    // - no directory loading is ongoing (this would reset the contents position
+    //   always to (0, 0))
+    // - if the Column View is active: the column view does an automatic
+    //   positioning during the loading operation, which must be remembered
+    if (!m_loadingDirectory || isColumnViewActive()) {
+        const QPoint pos(contentsPosition());
+        emit contentsMoved(pos.x(), pos.y());
     }
 }
 
@@ -1162,9 +829,9 @@ void DolphinView::updateCutItems()
     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);
+        const QModelIndex index = m_dolphinModel->indexForUrl((*it).url);
         if (index.isValid()) {
-            m_dirModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole);
+            m_dolphinModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole);
         }
         ++it;
     }
@@ -1174,36 +841,37 @@ void DolphinView::updateCutItems()
     applyCutItemEffect();
 }
 
-void DolphinView::createView()
+void DolphinView::showHoverInformation(const KFileItem& item)
 {
-    // delete current view
-    QAbstractItemView* view = itemView();
-    if (view != 0) {
-        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;
+    if (hasSelection() || !m_active) {
+        return;
+    }
+
+    emit requestItemInfo(item);
+}
+
+void DolphinView::clearHoverInformation()
+{
+    if (m_active) {
+        emit requestItemInfo(KFileItem());
     }
+}
+
 
+void DolphinView::createView()
+{
+    deleteView();
     Q_ASSERT(m_iconsView == 0);
     Q_ASSERT(m_detailsView == 0);
     Q_ASSERT(m_columnView == 0);
 
-    // ... and recreate it representing the current mode
+    QAbstractItemView* view = 0;
     switch (m_mode) {
-    case IconsView:
+    case IconsView: {
         m_iconsView = new DolphinIconsView(this, m_controller);
         view = m_iconsView;
         break;
+    }
 
     case DetailsView:
         m_detailsView = new DolphinDetailsView(this, m_controller);
@@ -1222,30 +890,42 @@ void DolphinView::createView()
     view->setItemDelegate(m_fileItemDelegate);
 
     view->setModel(m_proxyModel);
+    if (m_selectionModel != 0) {
+        view->setSelectionModel(m_selectionModel);
+    } else {
+        m_selectionModel = view->selectionModel();
+    }
+
+    // reparent the selection model, as it should not be deleted
+    // when deleting the model
+    m_selectionModel->setParent(this);
+
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-    new KMimeTypeResolver(view, m_dirModel);
+    new KMimeTypeResolver(view, m_dolphinModel);
     m_topLayout->insertWidget(1, view);
 
     connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
-            m_controller, SLOT(indicateSelectionChange()));
+            this, SLOT(emitSelectionChangedSignal()));
     connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
             this, SLOT(emitContentsMoved()));
     connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
             this, SLOT(emitContentsMoved()));
 }
 
-void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
+void DolphinView::deleteView()
 {
-    QItemSelectionModel* selectionModel = 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);
-
-    QItemSelection selection(topLeft, bottomRight);
-    selectionModel->select(selection, flags);
+    QAbstractItemView* view = itemView();
+    if (view != 0) {
+        m_topLayout->removeWidget(view);
+        view->close();
+        view->deleteLater();
+        view = 0;
+        m_iconsView = 0;
+        m_detailsView = 0;
+        m_columnView = 0;
+        m_fileItemDelegate = 0;
+    }
 }
 
 QAbstractItemView* DolphinView::itemView() const
@@ -1259,11 +939,6 @@ QAbstractItemView* DolphinView::itemView() const
     return m_iconsView;
 }
 
-bool DolphinView::isValidNameIndex(const QModelIndex& index) const
-{
-    return index.isValid() && (index.column() == KDirModel::Name);
-}
-
 bool DolphinView::isCutItem(const KFileItem& item) const
 {
     const QMimeData* mimeData = QApplication::clipboard()->mimeData();
@@ -1293,30 +968,286 @@ void DolphinView::applyCutItemEffect()
     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 KFileItem item = *it;
+        if (isCutItem(item)) {
+            const QModelIndex index = m_dolphinModel->indexForItem(item);
+            const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole);
+            if (value.type() == QVariant::Icon) {
                 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.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);
+                pixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
+                m_dolphinModel->setData(index, QIcon(pixmap), Qt::DecorationRole);
             }
         }
         ++it;
     }
 }
 
+KToggleAction* DolphinView::iconsModeAction(KActionCollection* actionCollection)
+{
+    KToggleAction* iconsView = actionCollection->add<KToggleAction>("icons");
+    iconsView->setText(i18nc("@action:inmenu View Mode", "Icons"));
+    iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
+    iconsView->setIcon(KIcon("view-list-icons"));
+    iconsView->setData(QVariant::fromValue(IconsView));
+    return iconsView;
+}
+
+KToggleAction* DolphinView::detailsModeAction(KActionCollection* actionCollection)
+{
+    KToggleAction* detailsView = actionCollection->add<KToggleAction>("details");
+    detailsView->setText(i18nc("@action:inmenu View Mode", "Details"));
+    detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
+    detailsView->setIcon(KIcon("view-list-details"));
+    detailsView->setData(QVariant::fromValue(DetailsView));
+    return detailsView;
+}
+
+KToggleAction* DolphinView::columnsModeAction(KActionCollection* actionCollection)
+{
+    KToggleAction* columnView = actionCollection->add<KToggleAction>("columns");
+    columnView->setText(i18nc("@action:inmenu View Mode", "Columns"));
+    columnView->setShortcut(Qt::CTRL | Qt::Key_3);
+    columnView->setIcon(KIcon("view-file-columns"));
+    columnView->setData(QVariant::fromValue(ColumnView));
+    return columnView;
+}
+
+QString DolphinView::currentViewModeActionName() const
+{
+    switch (m_mode) {
+    case DolphinView::IconsView:
+        return "icons";
+    case DolphinView::DetailsView:
+        return "details";
+    case DolphinView::ColumnView:
+        return "columns";
+    }
+    return QString(); // can't happen
+}
+
+void DolphinView::renameSelectedItems()
+{
+    const KFileItemList items = selectedItems();
+    if (items.count() > 1) {
+        // More than one item has been selected for renaming. Open
+        // a rename dialog and rename all items afterwards.
+        RenameDialog dialog(this, items);
+        if (dialog.exec() == QDialog::Rejected) {
+            return;
+        }
+
+        const QString newName = dialog.newName();
+        if (newName.isEmpty()) {
+            emit errorMessage(dialog.errorString());
+        } else {
+            // TODO: check how this can be integrated into KonqFileUndoManager/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;
+
+            KFileItemList::const_iterator it = items.begin();
+            const KFileItemList::const_iterator end = items.end();
+            while (it != end) {
+                const KUrl& oldUrl = (*it).url();
+                QString number;
+                number.setNum(index++);
+
+                QString name(newName);
+                name.replace(replaceIndex, 1, number);
+
+                if (oldUrl.fileName() != name) {
+                    KUrl newUrl = oldUrl;
+                    newUrl.setFileName(name);
+                    KonqOperations::rename(this, oldUrl, newUrl);
+                    emit doingOperation(KonqFileUndoManager::RENAME);
+                }
+                ++it;
+            }
+        }
+    } else {
+        // Only one item has been selected for renaming. Use the custom
+        // renaming mechanism from the views.
+        Q_ASSERT(items.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(this, items);
+        if (dialog.exec() == QDialog::Rejected) {
+            return;
+        }
+
+        const QString& newName = dialog.newName();
+        if (newName.isEmpty()) {
+            emit errorMessage(dialog.errorString());
+        } else {
+            const KUrl& oldUrl = items.first().url();
+            KUrl newUrl = oldUrl;
+            newUrl.setFileName(newName);
+            KonqOperations::rename(this, oldUrl, newUrl);
+            emit doingOperation(KonqFileUndoManager::RENAME);
+        }
+    }
+}
+
+void DolphinView::trashSelectedItems()
+{
+    emit doingOperation(KonqFileUndoManager::TRASH);
+    KonqOperations::del(this, KonqOperations::TRASH, selectedUrls());
+}
+
+void DolphinView::deleteSelectedItems()
+{
+    const KUrl::List list = selectedUrls();
+    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::slotDeleteFileFinished(KJob* job)
+{
+    if (job->error() == 0) {
+        emit operationCompletedMessage(i18nc("@info:status", "Delete operation completed."));
+    } else {
+        emit errorMessage(job->errorString());
+    }
+}
+
+void DolphinView::slotPreviewJobFinished(KJob* job)
+{
+    Q_ASSERT(job == m_previewJob);
+    m_previewJob = 0;
+}
+
+void DolphinView::cutSelectedItems()
+{
+    QMimeData* mimeData = new QMimeData();
+    const KUrl::List kdeUrls = selectedUrls();
+    const KUrl::List mostLocalUrls;
+    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
+    QApplication::clipboard()->setMimeData(mimeData);
+}
+
+void DolphinView::copySelectedItems()
+{
+    QMimeData* mimeData = new QMimeData();
+    const KUrl::List kdeUrls = selectedUrls();
+    const KUrl::List mostLocalUrls;
+    KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, false);
+    QApplication::clipboard()->setMimeData(mimeData);
+}
+
+void DolphinView::paste()
+{
+    QClipboard* clipboard = QApplication::clipboard();
+    const QMimeData* mimeData = clipboard->mimeData();
+
+    const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
+
+    // per default the pasting is done into the current Url of the view
+    KUrl destUrl(url());
+
+    // check whether the pasting should be done into a selected directory
+    const KUrl::List selectedUrls = this->selectedUrls();
+    if (selectedUrls.count() == 1) {
+        const KFileItem fileItem(S_IFDIR,
+                                 KFileItem::Unknown,
+                                 selectedUrls.first(),
+                                 true);
+        if (fileItem.isDir()) {
+            // only one item is selected which is a directory, hence paste
+            // into this directory
+            destUrl = selectedUrls.first();
+        }
+    }
+
+    if (KonqMimeData::decodeIsCutSelection(mimeData)) {
+        KonqOperations::copy(this, KonqOperations::MOVE, sourceUrls, destUrl);
+        emit doingOperation(KonqFileUndoManager::MOVE);
+        clipboard->clear();
+    } else {
+        KonqOperations::copy(this, KonqOperations::COPY, sourceUrls, destUrl);
+        emit doingOperation(KonqFileUndoManager::COPY);
+    }
+}
+
+QPair<bool, QString> DolphinView::pasteInfo() const
+{
+    QPair<bool, QString> ret;
+    QClipboard* clipboard = QApplication::clipboard();
+    const QMimeData* mimeData = clipboard->mimeData();
+
+    KUrl::List urls = KUrl::List::fromMimeData(mimeData);
+    if (!urls.isEmpty()) {
+        ret.first = true;
+        ret.second = i18ncp("@action:inmenu", "Paste One File", "Paste %1 Files", urls.count());
+    } else {
+        ret.first = false;
+        ret.second = i18nc("@action:inmenu", "Paste");
+    }
+
+    if (ret.first) {
+        const KFileItemList items = selectedItems();
+        const uint count = items.count();
+        if (count > 1) {
+            // pasting should not be allowed when more than one file
+            // is selected
+            ret.first = false;
+        } else if (count == 1) {
+            // Only one file is selected. Pasting is only allowed if this
+            // file is a directory.
+            ret.first = items.first().isDir();
+        }
+    }
+    return ret;
+}
+
+KAction* DolphinView::createRenameAction(KActionCollection* collection)
+{
+    KAction* rename = collection->addAction("rename");
+    rename->setText(i18nc("@action:inmenu File", "Rename..."));
+    rename->setShortcut(Qt::Key_F2);
+    return rename;
+}
+
+KAction* DolphinView::createMoveToTrashAction(KActionCollection* collection)
+{
+    KAction* moveToTrash = collection->addAction("move_to_trash");
+    moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash"));
+    moveToTrash->setIcon(KIcon("user-trash"));
+    moveToTrash->setShortcut(QKeySequence::Delete);
+    return moveToTrash;
+}
+
+KAction* DolphinView::createDeleteAction(KActionCollection* collection)
+{
+    KAction* deleteAction = collection->addAction("delete");
+    deleteAction->setIcon(KIcon("edit-delete"));
+    deleteAction->setText(i18nc("@action:inmenu File", "Delete"));
+    deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete);
+    return deleteAction;
+}
+
 #include "dolphinview.moc"