Fix for show_filter_bar action of tools-menu, which is not correctly set (when the...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 8d3bf1e2f7fa783732193e358da201d4bc24645a..610a6d1ffe802fa6a4cf24a28c94126b75f5aac3 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -28,89 +28,108 @@
 #include <QTimer>
 #include <QScrollBar>
 
 #include <QTimer>
 #include <QScrollBar>
 

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

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

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

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

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

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

-#include <kio/renamedialog.h>

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

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

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

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

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

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

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

+#include "dolphindropcontroller.h"
+#include "dolphinmodel.h"

 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphindetailsview.h"
 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphindetailsview.h"

+#include "dolphin_detailsmodesettings.h"

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

-#include "dolphinitemcategorizer.h"
-#include "renamedialog.h"
-#include "viewproperties.h"

 #include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"

+#include "folderexpander.h"
+#include "iconmanager.h"
+#include "renamedialog.h"
+#include "tooltipmanager.h"
+#include "viewproperties.h"

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

-                         KDirModel* dirModel,
-                         DolphinSortFilterProxyModel* proxyModel,
-                         Mode mode,
-                         bool showHiddenFiles) :
+                         DolphinModel* dolphinModel,
+                         DolphinSortFilterProxyModel* proxyModel) :

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

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

     m_topLayout(0),
     m_controller(0),
     m_iconsView(0),
     m_detailsView(0),
     m_columnView(0),
     m_fileItemDelegate(0),
     m_topLayout(0),
     m_controller(0),
     m_iconsView(0),
     m_detailsView(0),
     m_columnView(0),
     m_fileItemDelegate(0),

-    m_dirModel(dirModel),
+    m_selectionModel(0),
+    m_dolphinModel(dolphinModel),

     m_dirLister(dirLister),
     m_dirLister(dirLister),

-    m_proxyModel(proxyModel)
+    m_proxyModel(proxyModel),
+    m_iconManager(0),
+    m_toolTipManager(0),
+    m_rootUrl(),
+    m_currentItemUrl()

 {
 {

-    setFocusPolicy(Qt::StrongFocus);

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

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

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

+
+    connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
+            this, SIGNAL(urlChanged(const KUrl&)));
+    connect(m_controller, SIGNAL(requestUrlChange(const KUrl&)),
+            this, SLOT(slotRequestUrlChange(const KUrl&)));
+

     connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
             this, SLOT(openContextMenu(const QPoint&)));
     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(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(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
+            this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&)));
+    connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)),
+            this, SLOT(triggerItem(const KFileItem&)));
+    connect(m_controller, SIGNAL(tabRequested(const KUrl&)),
+            this, SIGNAL(tabRequested(const KUrl&)));

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

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

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

-    createView();
+    connect(m_dirLister, SIGNAL(redirection(KUrl, KUrl)),
+            this, SLOT(slotRedirection(KUrl, KUrl)));
+    connect(m_dirLister, SIGNAL(completed()),
+            this, SLOT(restoreCurrentItem()));
+
+    applyViewProperties(url);

     m_topLayout->addWidget(itemView());
 }
 
     m_topLayout->addWidget(itemView());
 }
 


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

-    return isColumnViewActive() ? m_dirLister->url() : url();
+    return isColumnViewActive() ? m_columnView->rootUrl() : url();

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


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

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

     if (active) {
     if (active) {

+        // 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 {
         emit urlChanged(url());
         emit selectionChanged(selectedItems());
     } else {

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

     }
 
     QWidget* viewport = itemView()->viewport();
     }
 
     QWidget* viewport = itemView()->viewport();


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

+        itemView()->setFocus();

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

+
+    m_controller->indicateActivationChange(active);

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


@@ -169,21 +194,28 @@ void DolphinView::setMode(Mode mode)
 
     m_mode = mode;
 
 
     m_mode = mode;
 

-    if (isColumnViewActive()) {
-        // When changing the mode in the column view, it makes sense
-        // to go back to the root URL of the column view automatically.
-        // Otherwise there it would not be possible to turn off the column view
-        // without focusing the first column.
-        // TODO: reactivate again after DolphinView/DolphinViewController split works
-        //setUrl(m_dirLister->url());
-        //m_controller->setUrl(m_dirLister->url());
-    }
+    deleteView();

 
 

-    ViewProperties props(url());
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);

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

-

     createView();
     createView();

-    startDirLister(url());
+
+    // the file item delegate has been recreated, apply the current
+    // additional information manually
+    const KFileItemDelegate::InformationList infoList = props.additionalInfo();
+    m_fileItemDelegate->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_proxyModel->isCategorizedModel()) {
+        m_proxyModel->setCategorizedModel(categorized);
+        emit categorizedSortingChanged();
+    }

 
     emit modeChanged();
 }
 
     emit modeChanged();
 }


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

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

 {
 {

-    ViewProperties props(url());
-    props.setShowPreview(show);
-
-    m_controller->setShowPreview(show);
-    emit showPreviewChanged();
-
-    startDirLister(url(), true);
+    return m_showPreview;

 }
 
 }
 

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

 {
 {

-    return m_controller->showPreview();
+    return m_dirLister->showingDotFiles();

 }
 
 }
 

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

 {
 {

-    if (m_dirLister->showingDotFiles() == show) {
-        return;
-    }
-
-    ViewProperties props(url());
-    props.setShowHiddenFiles(show);
-
-    m_dirLister->setShowingDotFiles(show);
-    emit showHiddenFilesChanged();
-
-    startDirLister(url(), true);
+    // 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::showHiddenFiles() const
+bool DolphinView::supportsCategorizedSorting() const

 {
 {

-    return m_dirLister->showingDotFiles();
+    return m_iconsView != 0;

 }
 
 }
 

-void DolphinView::setCategorizedSorting(bool categorized)
+void DolphinView::selectAll()

 {
 {

-    if (!supportsCategorizedSorting() || (categorized == categorizedSorting())) {
-        return;
-    }
+    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();
+}

 
 

-    Q_ASSERT(m_iconsView != 0);
-    if (categorized) {
-        Q_ASSERT(m_iconsView->itemCategorizer() == 0);
-        m_iconsView->setItemCategorizer(new DolphinItemCategorizer());
+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 {
     } else {

-        KItemCategorizer* categorizer = m_iconsView->itemCategorizer();
-        m_iconsView->setItemCategorizer(0);
-        delete categorizer;
-    }
+        QItemSelectionModel* selectionModel = itemView()->selectionModel();
+        const QAbstractItemModel* itemModel = selectionModel->model();

 
 

-    ViewProperties props(url());
-    props.setCategorizedSorting(categorized);
-    props.save();
+        const QModelIndex topLeft = itemModel->index(0, 0);
+        const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
+                                                         itemModel->columnCount() - 1);

 
 

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

 }
 
 }
 

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

 {
 {

-    if (!supportsCategorizedSorting()) {
-        return false;
-    }
-
-    Q_ASSERT(m_iconsView != 0);
-    return m_iconsView->itemCategorizer() != 0;
+    return itemView()->selectionModel()->hasSelection();

 }
 
 }
 

-bool DolphinView::supportsCategorizedSorting() const
+void DolphinView::clearSelection()

 {
 {

-    return m_iconsView != 0;
+    itemView()->selectionModel()->clear();

 }
 
 }
 

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

 {
 {

-    // TODO: temporary deactivate due to DolphinView/DolphinViewController split
-
-    /*DolphinView* view = 0; //mainWindow()->activeView();
-    const KUrl::List urls = selectedUrls();
-    if (urls.count() > 1) {
-        // More than one item has been selected for renaming. Open
-        // a rename dialog and rename all items afterwards.
-        RenameDialog dialog(urls);
-        if (dialog.exec() == QDialog::Rejected) {
-            return;
-        }
-
-        const 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('#'));
+    if (isColumnViewActive()) {
+        return m_columnView->selectedItems();
+    }

 
 

-            // iterate through all selected items and rename them...
-            const int replaceIndex = newName.indexOf('#');
-            Q_ASSERT(replaceIndex >= 0);
-            int index = 1;
+    const QAbstractItemView* view = itemView();

 
 

-            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++);
+    // 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));

 
 

-                QString name(newName);
-                name.replace(replaceIndex, 1, number);
+    const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
+    KFileItemList itemList;

 
 

-                if (oldUrl.fileName() != name) {
-                    KUrl newUrl = oldUrl;
-                    newUrl.setFileName(name);
-                    m_mainWindow->rename(oldUrl, newUrl);
-                }
-                ++it;
-            }
-        }
-    } else {
-        // Only one item has been selected for renaming. Use the custom
-        // renaming mechanism from the views.
-        Q_ASSERT(urls.count() == 1);
-
-        // TODO: Think about using KFileItemDelegate as soon as it supports editing.
-        // Currently the RenameDialog is used, but I'm not sure whether inline renaming
-        // is a benefit for the user at all -> let's wait for some input first...
-        RenameDialog dialog(urls);
-        if (dialog.exec() == QDialog::Rejected) {
-            return;
+    const QModelIndexList indexList = selection.indexes();
+    foreach (const QModelIndex &index, indexList) {
+        KFileItem item = m_dolphinModel->itemForIndex(index);
+        if (!item.isNull()) {
+            itemList.append(item);

         }
         }

+    }

 
 

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

-    selectAll(QItemSelectionModel::Toggle);
+    if (isColumnViewActive()) {
+        // TODO: get rid of this special case by adjusting the dir lister
+        // to the current column
+        return m_columnView->selectedItems().count();
+    }
+
+    return itemView()->selectionModel()->selection().count();

 }
 
 }
 

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

 {
 {

-    return itemView()->horizontalScrollBar()->value();
+    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;

 }
 
 }
 

-int DolphinView::contentsY() const
+QPoint DolphinView::contentsPosition() const

 {
 {

-    return itemView()->verticalScrollBar()->value();
+    const int x = itemView()->horizontalScrollBar()->value();
+    const int y = itemView()->verticalScrollBar()->value();
+    return QPoint(x, y);

 }
 
 }
 

-void DolphinView::zoomIn()
+void DolphinView::setZoomLevel(int level)

 {
 {

-    m_controller->triggerZoomIn();
+    if (level < zoomLevelMinimum()) {
+        level = zoomLevelMinimum();
+    } else if (level > zoomLevelMaximum()) {
+        level = zoomLevelMaximum();
+    }
+    
+    if (level != zoomLevel()) {
+        m_controller->setZoomLevel(level);
+        m_iconManager->updatePreviews();
+        emit zoomLevelChanged(level);
+    }

 }
 
 }
 

-void DolphinView::zoomOut()
+int DolphinView::zoomLevel() const

 {
 {

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

 }
 
 }
 

-bool DolphinView::isZoomInPossible() const
+int DolphinView::zoomLevelMinimum() const

 {
 {

-    return m_controller->isZoomInPossible();
+    return m_controller->zoomLevelMinimum();

 }
 
 }
 

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

 {
 {

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

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


@@ -403,591 +416,731 @@ Qt::SortOrder DolphinView::sortOrder() const
     return m_proxyModel->sortOrder();
 }
 
     return m_proxyModel->sortOrder();
 }
 

-void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
+void DolphinView::setAdditionalInfo(KFileItemDelegate::InformationList info)

 {
 {

-    ViewProperties props(url());
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);

     props.setAdditionalInfo(info);
     props.setAdditionalInfo(info);

+    m_fileItemDelegate->setShowInformation(info);

 
 

-    m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation);
-    m_fileItemDelegate->setAdditionalInformation(info);
+    emit additionalInfoChanged();

 
 

-    emit additionalInfoChanged(info);
-    startDirLister(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);
+    }

 }
 
 }
 

-KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const
+KFileItemDelegate::InformationList DolphinView::additionalInfo() const

 {
 {

-    return m_fileItemDelegate->additionalInformation();
+    return m_fileItemDelegate->showInformation();

 }
 
 }
 

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

 {
 {

-    return itemView()->selectionModel()->hasSelection();
+    setUrl(url());
+    loadDirectory(url(), true);

 }
 
 }
 

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

 {
 {

-    itemView()->selectionModel()->clear();
-}
+    const bool oldActivationState = m_active;
+    m_active = true;

 
 

-KFileItemList DolphinView::selectedItems() const
-{
-    const QAbstractItemView* view = itemView();
+    createView();
+    applyViewProperties(m_controller->url());
+    reload();

 
 

-    // 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));
+    setActive(oldActivationState);
+}

 
 

-    const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
-    KFileItemList itemList;
+void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)
+{
+    if (m_controller->url() == url) {
+        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());
+    m_iconManager->cancelPreviews();
+    m_controller->setUrl(url); // emits urlChanged, which we forward

 
 

-        KFileItem* item = m_dirModel->itemForIndex(*it);
-        if (item != 0) {
-            itemList.append(item);
+    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);

     }
 
     }
 

-    return itemList;
+    emit startedPathLoading(url);

 }
 
 }
 

-KUrl::List DolphinView::selectedUrls() const
+void DolphinView::setNameFilter(const QString& nameFilter)

 {
 {

-    KUrl::List urls;
+    m_proxyModel->setFilterRegExp(nameFilter);

 
 

-    const KFileItemList list = selectedItems();
-    KFileItemList::const_iterator it = list.begin();
-    const KFileItemList::const_iterator end = list.end();
-    while (it != end) {
-        KFileItem* item = *it;
-        urls.append(item->url());
-        ++it;
+    if (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);

     }
     }

+}

 
 

-    return urls;
+void DolphinView::calculateItemCount(int& fileCount, int& folderCount)
+{
+    foreach (const KFileItem &item, m_dirLister->items()) {
+        if (item.isDir()) {
+            ++folderCount;
+        } else {
+            ++fileCount;
+        }
+    }

 }
 
 }
 

-KFileItem* DolphinView::fileItem(const QModelIndex index) const
+void DolphinView::setUrl(const KUrl& url)

 {
 {

-    const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
-    return m_dirModel->itemForIndex(dirModelIndex);
+    // remember current item candidate (see restoreCurrentItem())
+    m_currentItemUrl = url;
+    updateView(url, KUrl());

 }
 
 }
 

-void DolphinView::rename(const KUrl& source, const QString& newName)
+void DolphinView::changeSelection(const KFileItemList& selection)

 {
 {

-    bool ok = false;
+    clearSelection();
+    if (selection.isEmpty()) {
+        return;
+    }
+    const KUrl& baseUrl = url();
+    KUrl url;
+    QItemSelection new_selection;
+    foreach(const KFileItem& item, selection) {
+        url = item.url().upUrl();
+        if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
+            QModelIndex index = m_proxyModel->mapFromSource(m_dolphinModel->indexForItem(item));
+            new_selection.select(index, index);
+        }
+    }
+    itemView()->selectionModel()->select(new_selection,
+                                         QItemSelectionModel::ClearAndSelect
+                                         | QItemSelectionModel::Current);
+}

 
 

-    if (newName.isEmpty() || (source.fileName() == newName)) {
+void DolphinView::renameSelectedItems()
+{
+    const KFileItemList items = selectedItems();
+    const int itemCount = items.count();
+    if (itemCount < 1) {

         return;
     }
         return;
     }

+    
+    if (itemCount > 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;
+        }

 
 

-    KUrl dest(source.upUrl());
-    dest.addPath(newName);
-
-    const bool destExists = KIO::NetAccess::exists(dest, false, this);
-    if (destExists) {
-        // the destination already exists, hence ask the user
-        // how to proceed...
-        KIO::RenameDialog renameDialog(this,
-                                       i18n("File Already Exists"),
-                                       source.path(),
-                                       dest.path(),
-                                       KIO::M_OVERWRITE);
-        switch (renameDialog.exec()) {
-        case KIO::R_OVERWRITE:
-            // the destination should be overwritten
-            ok = KIO::NetAccess::file_move(source, dest, -1, true);
-            break;
+        const QString newName = dialog.newName();
+        if (newName.isEmpty()) {
+            emit errorMessage(dialog.errorString());
+        } else {
+            // 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('#'));

 
 

-        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;
-        }
+            // 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++);

 
 

-        default:
-            // the renaming operation has been canceled
-            return;
+                QString name = newName;
+                name.replace('#', number);
+
+                if (oldUrl.fileName() != name) {
+                    KUrl newUrl = oldUrl;
+                    newUrl.setFileName(name);
+                    KonqOperations::rename(this, oldUrl, newUrl);
+                    emit doingOperation(KIO::FileUndoManager::Rename);
+                }
+            }
+        }
+    } else if (DolphinSettings::instance().generalSettings()->renameInline()) {
+        Q_ASSERT(itemCount == 1);
+        
+        if (isColumnViewActive()) {
+            m_columnView->editItem(items.first());
+        } else {
+            const QModelIndex dirIndex = m_dolphinModel->indexForItem(items.first());
+            const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+            itemView()->edit(proxyIndex);

         }
     } else {
         }
     } else {

-        // no destination exists, hence just move the file to
-        // do the renaming
-        ok = KIO::NetAccess::file_move(source, dest);
+        Q_ASSERT(itemCount == 1);
+        
+        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(KIO::FileUndoManager::Rename);
+        }

     }
     }

+}

 
 

-    const QString destFileName = dest.fileName();
-    if (ok) {
-        // XYDZ
-        //m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.", source.fileName(), destFileName),
-        //                        DolphinStatusBar::OperationCompleted);
+void DolphinView::trashSelectedItems()
+{
+    emit doingOperation(KIO::FileUndoManager::Trash);
+    KonqOperations::del(this, KonqOperations::TRASH, selectedUrls());
+}

 
 

-        KonqOperations::rename(this, source, destFileName);
-    } else {
-        // XYDZ
-        //m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.", source.fileName(), destFileName),
-        //                        DolphinStatusBar::Error);
+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::reload()
+void DolphinView::cutSelectedItems()

 {
 {

-    setUrl(url());
-    startDirLister(url(), true);
+    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::refresh()
+void DolphinView::copySelectedItems()

 {
 {

-    createView();
-    reload();
+    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::mouseReleaseEvent(QMouseEvent* event)
+void DolphinView::paste()

 {
 {

-    QWidget::mouseReleaseEvent(event);
-    setActive(true);;
+    pasteToUrl(url());

 }
 }

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

 {
 {

-    setActive(true);
+    const KFileItemList items = selectedItems();
+    if ((items.count() == 1) && items.first().isDir()) {
+        pasteToUrl(items.first().url());
+    }

 }
 
 }
 

-void DolphinView::triggerItem(const QModelIndex& index)
+void DolphinView::setShowPreview(bool show)

 {
 {

-    if (!isValidNameIndex(index)) {
-        clearSelection();
-        showHoverInformation(index);
+    if (m_showPreview == show) {

         return;
     }
 
         return;
     }
 

-    const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
-    if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {
-        // items are selected by the user, hence don't trigger the
-        // item specified by 'index'
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setShowPreview(show);
+
+    m_showPreview = show;
+    m_iconManager->setShowPreview(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);
+
+    loadDirectory(viewPropsUrl);
+}
+
+void DolphinView::setShowHiddenFiles(bool show)
+{
+    if (m_dirLister->showingDotFiles() == show) {

         return;
     }
 
         return;
     }
 

-    KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index));
-    if (item == 0) {
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setShowHiddenFiles(show);
+
+    m_dirLister->setShowingDotFiles(show);
+    emit showHiddenFilesChanged();
+
+    loadDirectory(viewPropsUrl);
+}
+
+void DolphinView::setCategorizedSorting(bool categorized)
+{
+    if (categorized == categorizedSorting()) {

         return;
     }
 
         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();
-    }
+    // setCategorizedSorting(true) may only get invoked
+    // if the view supports categorized sorting
+    Q_ASSERT(!categorized || supportsCategorizedSorting());
+
+    ViewProperties props(viewPropertiesUrl());
+    props.setCategorizedSorting(categorized);
+    props.save();
+
+    m_storedCategorizedSorting = categorized;
+    m_proxyModel->setCategorizedModel(categorized);
+
+    emit categorizedSortingChanged();

 }
 
 }
 

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

 {
 {

-    if (m_controller->showPreview()) {
-
-        // Must turn QList<KFileItem *> to QList<KFileItem>...
-        QList<KFileItem> itemsToPreview;
-        foreach( KFileItem* it, items )
-            itemsToPreview.append( *it );
+    const Qt::SortOrder order = (sortOrder() == Qt::AscendingOrder) ?
+                                Qt::DescendingOrder :
+                                Qt::AscendingOrder;
+    setSortOrder(order);
+}

 
 

-        KIO::PreviewJob* job = KIO::filePreview(itemsToPreview, 128);
-        connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
-                this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
+void DolphinView::toggleAdditionalInfo(QAction* action)
+{
+    const KFileItemDelegate::Information info =
+        static_cast<KFileItemDelegate::Information>(action->data().toInt());
+
+    KFileItemDelegate::InformationList list = additionalInfo();
+
+    const bool show = action->isChecked();
+
+    const int index = list.indexOf(info);
+    const bool containsInfo = (index >= 0);
+    if (show && !containsInfo) {
+        list.append(info);
+        setAdditionalInfo(list);
+    } else if (!show && containsInfo) {
+        list.removeAt(index);
+        setAdditionalInfo(list);
+        Q_ASSERT(list.indexOf(info) < 0);

     }
 }
 
     }
 }
 

-void DolphinView::showPreview(const KFileItem& item, const QPixmap& pixmap)
+void DolphinView::mouseReleaseEvent(QMouseEvent* event)

 {
 {

-    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;
-    }
+    QWidget::mouseReleaseEvent(event);
+    setActive(true);
+}

 
 

-    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::wheelEvent(QWheelEvent* event)
+{
+    if (event->modifiers() & Qt::ControlModifier) {
+        const int delta = event->delta();
+        const int level = zoomLevel();
+        if (delta > 0) {
+            setZoomLevel(level + 1);
+        } else if (delta < 0) {
+            setZoomLevel(level - 1);

         }
         }

+        event->accept();

     }
 }
 
     }
 }
 

-void DolphinView::restoreContentsPos()
+bool DolphinView::eventFilter(QObject* watched, QEvent* event)

 {
 {

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

     }
     }

+
+    return QWidget::eventFilter(watched, event);

 }
 
 }
 

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

 {
 {

-    emit selectionChanged(DolphinView::selectedItems());
+    setActive(true);

 }
 
 }
 

-void DolphinView::startDirLister(const KUrl& url, bool reload)
+void DolphinView::triggerItem(const KFileItem& item)

 {
 {

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

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

     }
 
     }
 

-    if (openDir) {
-        m_dirLister->openUrl(url, keepOldDirs, reload);
+    if (m_toolTipManager != 0) {
+        m_toolTipManager->hideTip();

     }
     }

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

 }
 
 }
 

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

 {
 {

-    if (m_controller->url() == url) {
-        return;
-    }
-
-    m_controller->setUrl(url);
-
-    const ViewProperties props(url);
+    emit selectionChanged(DolphinView::selectedItems());
+}

 
 

-    const Mode mode = props.viewMode();
-    bool changeMode = (m_mode != mode);
-    if (changeMode && isColumnViewActive()) {
-        // The column view is active. Only change the
-        // mode if the current URL is no child of the column view.
-        if (m_dirLister->url().isParentOf(url)) {
-            changeMode = false;
+void DolphinView::openContextMenu(const QPoint& pos)
+{
+    KFileItem item;
+    if (isColumnViewActive()) {
+        item = m_columnView->itemAt(pos);
+    } else {
+        const QModelIndex index = itemView()->indexAt(pos);
+        if (index.isValid() && (index.column() == DolphinModel::Name)) {
+            const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
+            item = m_dolphinModel->itemForIndex(dolphinModelIndex);

         }
     }
 
         }
     }
 

-    if (changeMode) {
-        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 (m_toolTipManager != 0) {
+        m_toolTipManager->hideTip();

     }
 
     }
 

-    const bool showHiddenFiles = props.showHiddenFiles();
-    if (showHiddenFiles != m_dirLister->showingDotFiles()) {
-        m_dirLister->setShowingDotFiles(showHiddenFiles);
-        emit showHiddenFilesChanged();
-    }
+    m_isContextMenuOpen = true; // TODO: workaround for Qt-issue 207192
+    emit requestContextMenu(item, url());
+    m_isContextMenuOpen = false;
+}

 
 

-    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;
-            }
-        }
-        emit categorizedSortingChanged();
+void DolphinView::dropUrls(const KUrl::List& urls,
+                           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) {
+        DolphinDropController dropController(this);
+        // forward doingOperation signal up to the mainwindow
+        connect(&dropController, SIGNAL(doingOperation(KIO::FileUndoManager::CommandType)),
+                this, SIGNAL(doingOperation(KIO::FileUndoManager::CommandType)));
+        dropController.dropUrls(urls, destination);

     }
     }

+}

 
 

-    const DolphinView::Sorting sorting = props.sorting();
-    if (sorting != m_proxyModel->sorting()) {
-        m_proxyModel->setSorting(sorting);
-        emit sortingChanged(sorting);
-    }
+void DolphinView::updateSorting(DolphinView::Sorting sorting)
+{
+    ViewProperties props(viewPropertiesUrl());
+    props.setSorting(sorting);

 
 

-    const Qt::SortOrder sortOrder = props.sortOrder();
-    if (sortOrder != m_proxyModel->sortOrder()) {
-        m_proxyModel->setSortOrder(sortOrder);
-        emit sortOrderChanged(sortOrder);
-    }
+    m_proxyModel->setSorting(sorting);

 
 

-    KFileItemDelegate::AdditionalInformation info = props.additionalInfo();
-    if (info != m_fileItemDelegate->additionalInformation()) {
-        m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation);
-        m_fileItemDelegate->setAdditionalInformation(info);
-        emit additionalInfoChanged(info);
-    }
+    emit sortingChanged(sorting);
+}

 
 

-    const bool showPreview = props.showPreview();
-    if (showPreview != m_controller->showPreview()) {
-        m_controller->setShowPreview(showPreview);
-        emit showPreviewChanged();
-    }
+void DolphinView::updateSortOrder(Qt::SortOrder order)
+{
+    ViewProperties props(viewPropertiesUrl());
+    props.setSortOrder(order);

 
 

-    startDirLister(url);
-    emit urlChanged(url);
+    m_proxyModel->setSortOrder(order);

 
 

-    // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-    //m_statusBar->clear();
+    emit sortOrderChanged(order);

 }
 
 }
 

-void DolphinView::changeSelection(const KFileItemList& selection)
+void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)

 {
 {

-    clearSelection();
-    if (selection.isEmpty()) {
-        return;
-    }
-    const KUrl& baseUrl = url();
-    KUrl url;
-    QItemSelection new_selection;
-    foreach(KFileItem* item, selection) {
-        url = item->url().upUrl();
-        if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
-            QModelIndex index = m_proxyModel->mapFromSource(m_dirModel->indexForItem(*item));
-            new_selection.select(index, index);
+    ViewProperties props(viewPropertiesUrl());
+    props.setAdditionalInfo(info);
+    props.save();
+
+    m_fileItemDelegate->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_fileItemDelegate->showInformation()) {
+        switch (info) {
+        case KFileItemDelegate::Size:
+            showSizeInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::ModificationTime:
+            showDateInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::Permissions:
+            showPermissionsInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::Owner:
+            showOwnerInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::OwnerAndGroup:
+            showGroupInfo->setChecked(true);
+            break;
+        case KFileItemDelegate::FriendlyMimeType:
+            showMimeInfo->setChecked(true);
+            break;
+        default:
+            break;

         }
     }
         }
     }

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

 }
 
 }
 

-void DolphinView::openContextMenu(const QPoint& pos)
+QPair<bool, QString> DolphinView::pasteInfo() const

 {
 {

-    KFileItem* item = 0;
+    QPair<bool, QString> ret;
+    QClipboard* clipboard = QApplication::clipboard();
+    const QMimeData* mimeData = clipboard->mimeData();

 
 

-    const QModelIndex index = itemView()->indexAt(pos);
-    if (isValidNameIndex(index)) {
-        item = fileItem(index);
-    }
+    KUrl::List urls = KUrl::List::fromMimeData(mimeData);
+    if (!urls.isEmpty()) {
+        // disable the paste action if no writing is supported
+        KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url());
+        ret.first = KonqFileItemCapabilities(KFileItemList() << item).supportsWriting();

 
 

-    emit requestContextMenu(item, url());
-}
+        if (urls.count() == 1) {
+            const KFileItem item(KFileItem::Unknown, KFileItem::Unknown, urls.first(), true);
+            ret.second = item.isDir() ? i18nc("@action:inmenu", "Paste One Folder") :
+                                        i18nc("@action:inmenu", "Paste One File");

 
 

-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;
+        } else {
+            ret.second = i18ncp("@action:inmenu", "Paste One Item", "Paste %1 Items", urls.count());

         }
         }

+    } else {
+        ret.first = false;
+        ret.second = i18nc("@action:inmenu", "Paste");

     }
 
     }
 

-    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);
+    return ret;

 }
 
 }
 

-void DolphinView::dropUrls(const KUrl::List& urls,
-                           const KUrl& destination)
+void DolphinView::setTabsForFilesEnabled(bool tabsForFiles)

 {
 {

-    emit urlsDropped(urls, destination);
+    m_tabsForFiles = tabsForFiles;

 }
 
 }
 

-void DolphinView::updateSorting(DolphinView::Sorting sorting)
+bool DolphinView::isTabsForFilesEnabled() const

 {
 {

-    ViewProperties props(url());
-    props.setSorting(sorting);
-
-    m_proxyModel->setSorting(sorting);
+    return m_tabsForFiles;
+}

 
 

-    emit sortingChanged(sorting);
+void DolphinView::emitContentsMoved()
+{
+    // 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());
+    }

 }
 
 }
 

-void DolphinView::updateSortOrder(Qt::SortOrder order)
+void DolphinView::showHoverInformation(const KFileItem& item)

 {
 {

-    ViewProperties props(url());
-    props.setSortOrder(order);
+    emit requestItemInfo(item);
+}

 
 

-    m_proxyModel->setSortOrder(order);
+void DolphinView::clearHoverInformation()
+{
+    emit requestItemInfo(KFileItem());
+}

 
 

-    emit sortOrderChanged(order);
+void DolphinView::slotDeleteFileFinished(KJob* job)
+{
+    if (job->error() == 0) {
+        emit operationCompletedMessage(i18nc("@info:status", "Delete operation completed."));
+    } else {
+        emit errorMessage(job->errorString());
+    }

 }
 
 }
 

-void DolphinView::emitContentsMoved()
+void DolphinView::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)

 {
 {

-    if (!m_blockContentsMovedSignal) {
-        emit contentsMoved(contentsX(), contentsY());
+    if (oldUrl == m_controller->url()) {
+        m_controller->setUrl(newUrl);

     }
 }
 
     }
 }
 

-void DolphinView::updateCutItems()
+void DolphinView::slotRequestUrlChange(const KUrl& url)

 {
 {

-    // restore the icons of all previously selected items to the
-    // original state...
-    QList<CutItem>::const_iterator it = m_cutItemsCache.begin();
-    QList<CutItem>::const_iterator end = m_cutItemsCache.end();
-    while (it != end) {
-        const QModelIndex index = m_dirModel->indexForUrl((*it).url);
-        if (index.isValid()) {
-            m_dirModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole);
+    emit requestUrlChange(url);
+    m_controller->setUrl(url);
+}
+
+void DolphinView::restoreCurrentItem()
+{
+    const QModelIndex dirIndex = m_dolphinModel->indexForUrl(m_currentItemUrl);
+    if (dirIndex.isValid()) {
+        const QModelIndex proxyIndex = m_proxyModel->mapFromSource(dirIndex);
+        QAbstractItemView* view = itemView();
+        const bool clearSelection = !hasSelection();
+        view->setCurrentIndex(proxyIndex);
+        if (clearSelection) {
+            view->clearSelection();

         }
         }

-        ++it;

     }
     }

-    m_cutItemsCache.clear();
-
-    // ... and apply an item effect to all currently cut items
-    applyCutItemEffect();

 }
 
 }
 

-void DolphinView::showHoverInformation(const QModelIndex& index)
+void DolphinView::loadDirectory(const KUrl& url, bool reload)

 {
 {

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

-    const KFileItem* item = fileItem(index);
-    if (item != 0) {
-        // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-        //m_statusBar->setMessage(item->getStatusBarInfo(), DolphinStatusBar::Default);
-        emit requestItemInfo(item->url());
+    m_loadingDirectory = true;
+
+    m_dirLister->stop();
+    m_dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
+
+    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::clearHoverInformation()
+KUrl DolphinView::viewPropertiesUrl() const

 {
 {

-    // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-    //m_statusBar->clear();
-    emit requestItemInfo(KUrl());
-}
+    if (isColumnViewActive()) {
+        return m_columnView->rootUrl();
+    }

 
 

+    return url();
+}

 
 

-void DolphinView::createView()
+void DolphinView::applyViewProperties(const KUrl& url)

 {
 {

-    // 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 (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();
+    if (m_mode != mode) {
+        m_mode = mode;
+        createView();
+        emit modeChanged();
+    }
+    if (itemView() == 0) {
+        createView();
+    }
+    Q_ASSERT(itemView() != 0);
+    Q_ASSERT(m_fileItemDelegate != 0);
+
+    const bool showHiddenFiles = props.showHiddenFiles();
+    if (showHiddenFiles != m_dirLister->showingDotFiles()) {
+        m_dirLister->setShowingDotFiles(showHiddenFiles);
+        emit showHiddenFilesChanged();
+    }
+
+    m_storedCategorizedSorting = props.categorizedSorting();
+    const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
+    if (categorized != m_proxyModel->isCategorizedModel()) {
+        m_proxyModel->setCategorizedModel(categorized);
+        emit categorizedSortingChanged();
+    }
+
+    const DolphinView::Sorting sorting = props.sorting();
+    if (sorting != m_proxyModel->sorting()) {
+        m_proxyModel->setSorting(sorting);
+        emit sortingChanged(sorting);
+    }
+
+    const Qt::SortOrder sortOrder = props.sortOrder();
+    if (sortOrder != m_proxyModel->sortOrder()) {
+        m_proxyModel->setSortOrder(sortOrder);
+        emit sortOrderChanged(sortOrder);
+    }
+
+    KFileItemDelegate::InformationList info = props.additionalInfo();
+    if (info != m_fileItemDelegate->showInformation()) {
+        m_fileItemDelegate->setShowInformation(info);
+        emit additionalInfoChanged();
+    }
+
+    const bool showPreview = props.showPreview();
+    if (showPreview != m_showPreview) {
+        m_showPreview = showPreview;
+        m_iconManager->setShowPreview(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);
+    }
+}
+
+void DolphinView::createView()
+{
+    deleteView();

     Q_ASSERT(m_iconsView == 0);
     Q_ASSERT(m_detailsView == 0);
     Q_ASSERT(m_columnView == 0);
 
     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) {
     switch (m_mode) {

-    case IconsView:
+    case IconsView: {

         m_iconsView = new DolphinIconsView(this, m_controller);
         view = m_iconsView;
         break;
         m_iconsView = new DolphinIconsView(this, m_controller);
         view = m_iconsView;
         break;

+    }

 
     case DetailsView:
         m_detailsView = new DolphinDetailsView(this, m_controller);
 
     case DetailsView:
         m_detailsView = new DolphinDetailsView(this, m_controller);


@@ -1001,14 +1154,47 @@ void DolphinView::createView()
     }
 
     Q_ASSERT(view != 0);
     }
 
     Q_ASSERT(view != 0);

+    view->installEventFilter(this);
+
+    if (m_mode != ColumnView) {
+        // Give the view the ability to auto-expand its directories on hovering
+        // (the column view takes care about this itself). If the details view
+        // uses expandable folders, the auto-expanding should be used always.
+        DolphinSettings& settings = DolphinSettings::instance();
+        const bool enabled = settings.generalSettings()->autoExpandFolders() ||
+                            ((m_detailsView != 0) && settings.detailsModeSettings()->expandableFolders());
+
+        FolderExpander* folderExpander = new FolderExpander(view, m_proxyModel);
+        folderExpander->setEnabled(enabled);
+        connect(folderExpander, SIGNAL(enterDir(const QModelIndex&)),
+                m_controller, SLOT(triggerItem(const QModelIndex&)));
+    }
+
+    m_controller->setItemView(view);

 
     m_fileItemDelegate = new KFileItemDelegate(view);
     view->setItemDelegate(m_fileItemDelegate);
 
     view->setModel(m_proxyModel);
 
     m_fileItemDelegate = new KFileItemDelegate(view);
     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);
 
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 

-    new KMimeTypeResolver(view, m_dirModel);
+    m_iconManager = new IconManager(view, m_proxyModel);
+    m_iconManager->setShowPreview(m_showPreview);
+
+    if (DolphinSettings::instance().generalSettings()->showToolTips()) {
+        m_toolTipManager = new ToolTipManager(view, m_proxyModel);
+    }
+

     m_topLayout->insertWidget(1, view);
 
     connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
     m_topLayout->insertWidget(1, view);
 
     connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),


@@ -1019,17 +1205,27 @@ void DolphinView::createView()
             this, SLOT(emitContentsMoved()));
 }
 
             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);
+    QAbstractItemView* view = 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()).
+        setFocus();

 
 

-    QItemSelection selection(topLeft, bottomRight);
-    selectionModel->select(selection, flags);
+        m_topLayout->removeWidget(view);
+        view->close();
+        view->deleteLater();
+        view = 0;
+        m_iconsView = 0;
+        m_detailsView = 0;
+        m_columnView = 0;
+        m_fileItemDelegate = 0;
+        m_iconManager = 0;
+        m_toolTipManager = 0;
+    }

 }
 
 QAbstractItemView* DolphinView::itemView() const
 }
 
 QAbstractItemView* DolphinView::itemView() const


@@ -1043,11 +1239,6 @@ QAbstractItemView* DolphinView::itemView() const
     return m_iconsView;
 }
 
     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();
 bool DolphinView::isCutItem(const KFileItem& item) const
 {
     const QMimeData* mimeData = QApplication::clipboard()->mimeData();


@@ -1066,40 +1257,28 @@ bool DolphinView::isCutItem(const KFileItem& item) const
     return false;
 }
 
     return false;
 }
 

-void DolphinView::applyCutItemEffect()
+void DolphinView::pasteToUrl(const KUrl& url)

 {
 {

-    const QMimeData* mimeData = QApplication::clipboard()->mimeData();
-    if (!KonqMimeData::decodeIsCutSelection(mimeData)) {
-        return;
+    QClipboard* clipboard = QApplication::clipboard();
+    const QMimeData* mimeData = clipboard->mimeData();
+
+    const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
+    if (KonqMimeData::decodeIsCutSelection(mimeData)) {
+        KonqOperations::copy(this, KonqOperations::MOVE, sourceUrls, url);
+        emit doingOperation(KIO::FileUndoManager::Move);
+        clipboard->clear();
+    } else {
+        KonqOperations::copy(this, KonqOperations::COPY, sourceUrls, url);
+        emit doingOperation(KIO::FileUndoManager::Copy);

     }
     }

+}

 
 

-    KFileItemList items(m_dirLister->items());
-    KFileItemList::const_iterator it = items.begin();
-    const KFileItemList::const_iterator end = items.end();
-    while (it != end) {
-        KFileItem* item = *it;
-        if (isCutItem(*item)) {
-            const QModelIndex index = m_dirModel->indexForItem(*item);
-            const KFileItem* item = m_dirModel->itemForIndex(index);
-            const QVariant value = m_dirModel->data(index, Qt::DecorationRole);
-            if ((value.type() == QVariant::Icon) && (item != 0)) {
-                const QIcon icon(qvariant_cast<QIcon>(value));
-                QPixmap pixmap = icon.pixmap(128, 128);
-
-                // remember current pixmap for the item to be able
-                // to restore it when other items get cut
-                CutItem cutItem;
-                cutItem.url = item->url();
-                cutItem.pixmap = pixmap;
-                m_cutItemsCache.append(cutItem);
-
-                // apply icon effect to the cut item
-                KIconEffect iconEffect;
-                pixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState);
-                m_dirModel->setData(index, QIcon(pixmap), Qt::DecorationRole);
-            }
-        }
-        ++it;
+void DolphinView::updateZoomLevel(int oldZoomLevel)
+{       
+    const int newZoomLevel = DolphinController::zoomLevelForIconSize(itemView()->iconSize());
+    if (oldZoomLevel != newZoomLevel) {
+        m_controller->setZoomLevel(newZoomLevel);
+        emit zoomLevelChanged(newZoomLevel);

     }
 }
 
     }
 }