restoring of the column view must also be done if the column view is active

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 3b5610f60163bb6eb9faa6f83a7830953d108826..dc8c8dd87bdefab011cd430c8e645886ff3fb32e 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -22,16 +22,15 @@
 
 #include <QApplication>
 #include <QClipboard>
 
 #include <QApplication>
 #include <QClipboard>

-#include <QDropEvent>
-#include <QItemSelectionModel>
-#include <QMouseEvent>
-#include <QVBoxLayout>
+#include <QKeyEvent>
+#include <QItemSelection>
+#include <QBoxLayout>

 #include <QTimer>
 #include <QScrollBar>
 
 #include <QTimer>
 #include <QScrollBar>
 

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

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

-#include <kfileplacesmodel.h>

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


@@ -42,158 +41,110 @@
 #include <konq_operations.h>
 #include <kurl.h>
 
 #include <konq_operations.h>
 #include <kurl.h>
 

+#include "dolphinmodel.h"

 #include "dolphincolumnview.h"
 #include "dolphincontroller.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 "dolphinsortfilterproxymodel.h"
 #include "dolphindetailsview.h"
 #include "dolphiniconsview.h"

-#include "dolphincontextmenu.h"
-#include "filterbar.h"

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

-#include "kurlnavigator.h"

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

+#include "dolphincategorydrawer.h"

 
 

-DolphinView::DolphinView(DolphinMainWindow* mainWindow,
-                         QWidget* parent,
+DolphinView::DolphinView(QWidget* parent,

                          const KUrl& url,
                          const KUrl& url,

-                         Mode mode,
-                         bool showHiddenFiles) :
+                         KDirLister* dirLister,
+                         DolphinModel* dolphinModel,
+                         DolphinSortFilterProxyModel* proxyModel) :

     QWidget(parent),
     QWidget(parent),

-    m_showProgress(false),
-    m_blockContentsMovedSignal(false),
-    m_mode(mode),
-    m_iconSize(0),
-    m_folderCount(0),
-    m_fileCount(0),
-    m_mainWindow(mainWindow),
+    m_active(true),
+    m_loadingDirectory(false),
+    m_initializeColumnView(false),
+    m_mode(DolphinView::IconsView),

     m_topLayout(0),
     m_topLayout(0),

-    m_urlNavigator(0),

     m_controller(0),
     m_iconsView(0),
     m_detailsView(0),
     m_columnView(0),
     m_fileItemDelegate(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_dolphinModel(dolphinModel),
+    m_dirLister(dirLister),
+    m_proxyModel(proxyModel)

 {
 {

-    hide();

     setFocusPolicy(Qt::StrongFocus);
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
     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()));
 
     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(loadDirectory(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(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_proxyModel = new DolphinSortFilterProxyModel(this);
-    m_proxyModel->setSourceModel(m_dirModel);
+    connect(m_dirLister, SIGNAL(newItems(const QList<KFileItem>&)),
+            this, SLOT(generatePreviews(const QList<KFileItem>&)));

 
     m_controller = new DolphinController(this);
 
     m_controller = new DolphinController(this);

+    m_controller->setUrl(url);
+    connect(m_controller, SIGNAL(urlChanged(const KUrl&)),
+            this, SIGNAL(urlChanged(const KUrl&)));

     connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
             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 QModelIndex&, QWidget*)),
+            this, SLOT(dropUrls(const KUrl::List&, const KUrl&, const QModelIndex&, QWidget*)));

     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(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(activated()),
     connect(m_controller, SIGNAL(activated()),

-            this, SLOT(requestActivation()));
+            this, SLOT(activate()));
+    connect(m_controller, SIGNAL(itemEntered(const QModelIndex&)),
+            this, SLOT(showHoverInformation(const QModelIndex&)));
+    connect(m_controller, SIGNAL(viewportEntered()),
+            this, SLOT(clearHoverInformation()));

 
 

-    createView();
-
-    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(itemView());

-    m_topLayout->addWidget(m_filterBar);
-    m_topLayout->addWidget(m_statusBar);

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

-    delete m_dirLister;
-    m_dirLister = 0;

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

-const KUrl& DolphinView::url() const
+KUrl DolphinView::rootUrl() const
+{
+    return isColumnViewActive() ? m_dirLister->url() : url();
+}
+
+void DolphinView::setActive(bool active)

 {
 {

-    return m_urlNavigator->url();
+    if (active == m_active) {
+        return;
+    }
+
+    m_active = active;
+
+    updateViewportColor();
+    update();
+
+    if (active) {
+        emit activated();
+    }

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

-    return m_mainWindow->activeView() == this;
+    return m_active;

 }
 
 void DolphinView::setMode(Mode mode)
 }
 
 void DolphinView::setMode(Mode mode)


@@ -204,11 +155,21 @@ void DolphinView::setMode(Mode mode)
 
     m_mode = mode;
 
 
     m_mode = mode;
 

-    ViewProperties props(m_urlNavigator->url());
+    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.
+        setUrl(m_dirLister->url());
+        m_controller->setUrl(m_dirLister->url());
+    }
+
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);

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

-    startDirLister(m_urlNavigator->url());
+    startDirLister(viewPropsUrl);

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


@@ -220,13 +181,14 @@ DolphinView::Mode DolphinView::mode() const
 
 void DolphinView::setShowPreview(bool show)
 {
 
 void DolphinView::setShowPreview(bool show)
 {

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

     props.setShowPreview(show);
 
     m_controller->setShowPreview(show);
     props.setShowPreview(show);
 
     m_controller->setShowPreview(show);

-

     emit showPreviewChanged();
     emit showPreviewChanged();

-    reload();
+
+    startDirLister(viewPropsUrl, true);

 }
 
 bool DolphinView::showPreview() const
 }
 
 bool DolphinView::showPreview() const


@@ -240,14 +202,14 @@ void DolphinView::setShowHiddenFiles(bool show)
         return;
     }
 
         return;
     }
 

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

     props.setShowHiddenFiles(show);
     props.setShowHiddenFiles(show);

-    props.save();

 
     m_dirLister->setShowingDotFiles(show);
     emit showHiddenFilesChanged();
 
 
     m_dirLister->setShowingDotFiles(show);
     emit showHiddenFilesChanged();
 

-    reload();
+    startDirLister(viewPropsUrl, true);

 }
 
 bool DolphinView::showHiddenFiles() const
 }
 
 bool DolphinView::showHiddenFiles() const


@@ -255,117 +217,119 @@ bool DolphinView::showHiddenFiles() const
     return m_dirLister->showingDotFiles();
 }
 
     return m_dirLister->showingDotFiles();
 }
 

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

 {
 {

-    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);
-
-                if (oldUrl.fileName() != name) {
-                    KUrl newUrl = oldUrl;
-                    newUrl.setFileName(name);
-                    m_mainWindow->rename(oldUrl, newUrl);
-                }
-                ++it;
-            }
-        }
+    if (!supportsCategorizedSorting() || (categorized == categorizedSorting())) {
+        return;

     }
     }

-    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 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);
-        }
-    }
+    Q_ASSERT(m_iconsView != 0);
+
+    ViewProperties props(viewPropertiesUrl());
+    props.setCategorizedSorting(categorized);
+    props.save();
+
+    m_proxyModel->setCategorizedModel(categorized);
+    m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
+
+    emit categorizedSortingChanged();
+}
+
+bool DolphinView::categorizedSorting() const
+{
+    return m_proxyModel->isCategorizedModel();
+}
+
+bool DolphinView::supportsCategorizedSorting() const
+{
+    return m_iconsView != 0;

 }
 
 void DolphinView::selectAll()
 {
 }
 
 void DolphinView::selectAll()
 {

-    selectAll(QItemSelectionModel::Select);
+    itemView()->selectAll();

 }
 
 void DolphinView::invertSelection()
 {
 }
 
 void DolphinView::invertSelection()
 {

-    selectAll(QItemSelectionModel::Toggle);
+    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, QItemSelectionModel::Toggle);
+}
+
+bool DolphinView::hasSelection() const
+{
+    return itemView()->selectionModel()->hasSelection();

 }
 
 }
 

-DolphinStatusBar* DolphinView::statusBar() const
+void DolphinView::clearSelection()

 {
 {

-    return m_statusBar;
+    itemView()->selectionModel()->clear();

 }
 
 }
 

-int DolphinView::contentsX() const
+QList<KFileItem> DolphinView::selectedItems() const

 {
 {

-    return itemView()->horizontalScrollBar()->value();
+    const QAbstractItemView* view = itemView();
+
+    // 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());
+    QList<KFileItem> 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 QList<KFileItem> list = selectedItems();
+    for ( QList<KFileItem>::const_iterator it = list.begin(), end = list.end();
+          it != end; ++it ) {
+        urls.append((*it).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()
 }
 
 void DolphinView::zoomIn()


@@ -414,13 +378,15 @@ Qt::SortOrder DolphinView::sortOrder() const
 
 void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
 {
 
 void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
 {

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

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

+    m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation);

     m_fileItemDelegate->setAdditionalInformation(info);
 
     emit additionalInfoChanged(info);
     m_fileItemDelegate->setAdditionalInformation(info);
 
     emit additionalInfoChanged(info);

-    reload();
+    startDirLister(viewPropsUrl, true);

 }
 
 KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const
 }
 
 KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const


@@ -428,231 +394,65 @@ KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const
     return m_fileItemDelegate->additionalInformation();
 }
 
     return m_fileItemDelegate->additionalInformation();
 }
 

-void DolphinView::goBack()
-{
-    m_urlNavigator->goBack();
-}
-
-void DolphinView::goForward()
-{
-    m_urlNavigator->goForward();
-}
-
-void DolphinView::goUp()
-{
-    m_urlNavigator->goUp();
-}
-
-void DolphinView::goHome()
-{
-    m_urlNavigator->goHome();
-}
-
-void DolphinView::setUrlEditable(bool editable)
-{
-    m_urlNavigator->setUrlEditable(editable);
-}
-
-bool DolphinView::hasSelection() const
-{
-    return itemView()->selectionModel()->hasSelection();
-}
-
-void DolphinView::clearSelection()
-{
-    itemView()->selectionModel()->clear();
-}
-
-KFileItemList DolphinView::selectedItems() const
+void DolphinView::reload()

 {
 {

-    const QAbstractItemView* view = itemView();
-
-    // 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));
-
-    const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
-    KFileItemList itemList;
-
-    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());
-
-        KFileItem* item = m_dirModel->itemForIndex(*it);
-        if (item != 0) {
-            itemList.append(item);
-        }
-    }
-
-    return itemList;
+    setUrl(url());
+    startDirLister(url(), true);

 }
 
 }
 

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

 {
 {

-    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;
-    }
-
-    return urls;
-}
-
-KFileItem* DolphinView::fileItem(const QModelIndex index) const
-{
-    const QModelIndex dirModelIndex = m_proxyModel->mapToSource(index);
-    return m_dirModel->itemForIndex(dirModelIndex);
+    createView();
+    applyViewProperties(m_controller->url());
+    reload();
+    updateViewportColor();

 }
 
 }
 

-void DolphinView::rename(const KUrl& source, const QString& newName)
+void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)

 {
 {

-    bool ok = false;
-
-    if (newName.isEmpty() || (source.fileName() == newName)) {
+    if (m_controller->url() == url) {

         return;
     }
 
         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;
-            }
+    const bool restoreColumnView =  !rootUrl.isEmpty()
+                                    && !rootUrl.equals(url, KUrl::CompareWithoutTrailingSlash)
+                                    && rootUrl.isParentOf(url);

 
 

-            default:
-                // the renaming operation has been canceled
-                reload();
-                return;
-        }
-    }
-    else {
-        // no destination exists, hence just move the file to
-        // do the renaming
-        ok = KIO::NetAccess::file_move(source, dest);
+    m_controller->setUrl(url); // emits urlChanged, which we forward
+
+    if (restoreColumnView) {
+        applyViewProperties(rootUrl);
+        Q_ASSERT(itemView() == m_columnView);
+        startDirLister(rootUrl);
+        m_columnView->showColumn(url);
+    } else {
+        applyViewProperties(url);
+        startDirLister(url);

     }
 
     }
 

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

 
 

-        KonqOperations::rename(this, source, destFileName);
-    }
-    else {
-        m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.",source.fileName(), destFileName),
-                                DolphinStatusBar::Error);
-        reload();
-    }
+    emit startedPathLoading(url);

 }
 
 }
 

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

 {
 {

-    startDirLister(m_urlNavigator->url(), true);
+    updateView(url, KUrl());

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

-    mainWindow()->setActiveView(this);
+    setActive(true);

 }
 }

-
-DolphinMainWindow* DolphinView::mainWindow() const
-{
-    return m_mainWindow;
-}
-
-void DolphinView::loadDirectory(const KUrl& url)
+void DolphinView::activate()

 {
 {

-    if(!isActive()) {
-        requestActivation();
-    }
-
-    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) {
-        m_mode = mode;
-        createView();
-        emit modeChanged();
-    }
-
-    const bool showHiddenFiles = props.showHiddenFiles();
-    if (showHiddenFiles != m_dirLister->showingDotFiles()) {
-        m_dirLister->setShowingDotFiles(showHiddenFiles);
-        emit showHiddenFilesChanged();
-    }
-
-    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::AdditionalInformation info = props.additionalInfo();
-    if (info != m_fileItemDelegate->additionalInformation()) {
-        m_fileItemDelegate->setAdditionalInformation(info);
-
-        emit additionalInfoChanged(info);
-    }
-
-    const bool showPreview = props.showPreview();
-    if (showPreview != m_controller->showPreview()) {
-        m_controller->setShowPreview(showPreview);
-        emit showPreviewChanged();
-    }
-
-    startDirLister(url);
-    emit urlChanged(url);
-
-    m_statusBar->clear();
+    setActive(true);

 }
 
 void DolphinView::triggerItem(const QModelIndex& index)
 {
 }
 
 void DolphinView::triggerItem(const QModelIndex& index)
 {

-    if (!isValidNameIndex(index)) {
-        return;
-    }
+    Q_ASSERT(index.isValid());

 
     const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
     if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {
 
     const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
     if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {


@@ -661,319 +461,187 @@ void DolphinView::triggerItem(const QModelIndex& index)
         return;
     }
 
         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;
-    }
+    const KFileItem item = m_dolphinModel->itemForIndex(m_proxyModel->mapToSource(index));

 
 

-    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;
+    if (item.isNull()) {
+        return;

     }
 
     }
 

-    updateStatusBar();
-
-    m_blockContentsMovedSignal = false;
-    QTimer::singleShot(0, this, SLOT(restoreContentsPos()));
+    emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart

 }
 
 }
 

-void DolphinView::generatePreviews(const KFileItemList& items)
+void DolphinView::generatePreviews(const QList<KFileItem>& items)

 {
     if (m_controller->showPreview()) {
         KIO::PreviewJob* job = KIO::filePreview(items, 128);
 {
     if (m_controller->showPreview()) {
         KIO::PreviewJob* job = KIO::filePreview(items, 128);

-        connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)),
-                this, SLOT(showPreview(const KFileItem*, const QPixmap&)));
+        connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
+                this, SLOT(showPreview(const KFileItem&, const QPixmap&)));

     }
 }
 
     }
 }
 

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

 {
 {

-    Q_ASSERT(item != 0);
-    const QModelIndex idx = m_dirModel->indexForItem(*item);
+    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_dolphinModel->indexForItem(item);

     if (idx.isValid() && (idx.column() == 0)) {
         const QMimeData* mimeData = QApplication::clipboard()->mimeData();
     if (idx.isValid() && (idx.column() == 0)) {
         const QMimeData* mimeData = QApplication::clipboard()->mimeData();

-        if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(*item)) {
+        if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) {

             KIconEffect iconEffect;
             const QPixmap cutPixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState);
             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);
+            m_dolphinModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole);
+        } else {
+            m_dolphinModel->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::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()) {
 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);
+            emit errorMessage(i18nc("@info:status", "The location is empty."));
+        } else {
+            emit errorMessage(i18nc("@info:status", "The location '%1' is invalid.", location));

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

     m_cutItemsCache.clear();
     m_cutItemsCache.clear();

-    m_blockContentsMovedSignal = true;
+    m_loadingDirectory = true;
+

     m_dirLister->stop();
 
     m_dirLister->stop();
 

-    bool openDir = true;
-    bool keepOldDirs = isColumnViewActive();
+    bool keepOldDirs = isColumnViewActive() && !m_initializeColumnView;
+    m_initializeColumnView = false;
+

     if (keepOldDirs) {
     if (keepOldDirs) {

+        // keeping old directories is only necessary for hierarchical views
+        // like the column view

         if (reload) {
         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)) {
+            // for the column view it is not enough to reload the directory lister,
+            // so this task is delegated to the column view directly
+            m_columnView->reload();
+        } else if (m_dirLister->directories().contains(url)) {

             // The dir lister contains the directory already, so
             // The dir lister contains the directory already, so

-            // KDirLister::openUrl() may not been invoked twice.
+            // KDirLister::openUrl() may not get invoked twice.

             m_dirLister->updateDirectory(url);
             m_dirLister->updateDirectory(url);

-            openDir = false;
-        }
-        else {
+        } 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
             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
+                // URL. This may happen when e. g. a place has been selected

                 // and hence the view must be reset.
                 // and hence the view must be reset.

-                keepOldDirs = false;
+                m_dirLister->openUrl(url, false, false);

             }
         }
             }
         }

-    }
-
-    if (openDir) {
-        m_dirLister->openUrl(url, keepOldDirs, reload);
+    } else {
+        m_dirLister->openUrl(url, false, reload);

     }
 }
 
     }
 }
 

-QString DolphinView::defaultStatusBarText() const
+KUrl DolphinView::viewPropertiesUrl() const

 {
 {

-    return KIO::itemsSummaryString(m_fileCount + m_folderCount,
-                                   m_fileCount,
-                                   m_folderCount,
-                                   0, false);
+    if (isColumnViewActive()) {
+        return m_dirLister->url();
+    }
+
+    return url();

 }
 
 }
 

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

 {
 {

-    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();
+    if (isColumnViewActive() && m_dirLister->url().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;

     }
 
     }
 

-    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;
-    }
+    const ViewProperties props(url);
+
+    const Mode mode = props.viewMode();
+    if (m_mode != mode) {
+        m_mode = mode;
+        createView();
+        emit modeChanged();

 
 

-    if (folderCount > 0) {
-        text = i18np("1 Folder selected", "%1 Folders selected", folderCount);
-        if (fileCount > 0) {
-            text += ", ";
+        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);

 
 

-    if (fileCount > 0) {
-        const QString sizeText(KIO::convertSize(byteSize));
-        text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText);
+    const bool showHiddenFiles = props.showHiddenFiles();
+    if (showHiddenFiles != m_dirLister->showingDotFiles()) {
+        m_dirLister->setShowingDotFiles(showHiddenFiles);
+        emit showHiddenFilesChanged();

     }
 
     }
 

-    return text;
-}
+    const bool categorized = props.categorizedSorting();
+    if (categorized != categorizedSorting()) {
+        m_proxyModel->setCategorizedModel(categorized);
+        emit categorizedSortingChanged();
+    }

 
 

-void DolphinView::showFilterBar(bool show)
-{
-    Q_ASSERT(m_filterBar != 0);
-    if (show) {
-        m_filterBar->show();
+    const DolphinView::Sorting sorting = props.sorting();
+    if (sorting != m_proxyModel->sorting()) {
+        m_proxyModel->setSorting(sorting);
+        emit sortingChanged(sorting);

     }
     }

-    else {
-        m_filterBar->hide();
+
+    const Qt::SortOrder sortOrder = props.sortOrder();
+    if (sortOrder != m_proxyModel->sortOrder()) {
+        m_proxyModel->setSortOrder(sortOrder);
+        emit sortOrderChanged(sortOrder);

     }
     }

-}

 
 

-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);
+    KFileItemDelegate::AdditionalInformation info = props.additionalInfo();
+    if (info != m_fileItemDelegate->additionalInformation()) {
+        m_controller->setShowAdditionalInfo(info != KFileItemDelegate::NoInformation);
+        m_fileItemDelegate->setAdditionalInformation(info);
+        emit additionalInfoChanged(info);

     }
     }

-}

 
 

-void DolphinView::requestActivation()
-{
-    m_mainWindow->setActiveView(this);
+    const bool showPreview = props.showPreview();
+    if (showPreview != m_controller->showPreview()) {
+        m_controller->setShowPreview(showPreview);
+        emit showPreviewChanged();
+    }

 }
 
 }
 

-void DolphinView::changeSelection(const KFileItemList& selection)
+void DolphinView::changeSelection(const QList<KFileItem>& selection)

 {
     clearSelection();
     if (selection.isEmpty()) {
         return;
     }
 {
     clearSelection();
     if (selection.isEmpty()) {
         return;
     }

-    KUrl baseUrl = url();
+    const KUrl& baseUrl = url();

     KUrl url;
     QItemSelection new_selection;
     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)) {
         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);
         }
     }
             new_selection.select(index, index);
         }
     }


@@ -982,78 +650,53 @@ void DolphinView::changeSelection(const KFileItemList& selection)
                                          | QItemSelectionModel::Current);
 }
 
                                          | 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)
 {
 void DolphinView::openContextMenu(const QPoint& pos)
 {

-    KFileItem* item = 0;
+    KFileItem item;

 
     const QModelIndex index = itemView()->indexAt(pos);
     if (isValidNameIndex(index)) {
         item = fileItem(index);
     }
 
 
     const QModelIndex index = itemView()->indexAt(pos);
     if (isValidNameIndex(index)) {
         item = fileItem(index);
     }
 

-    DolphinContextMenu contextMenu(m_mainWindow, item, url());
-    contextMenu.open();
+    emit requestContextMenu(item, url());

 }
 
 void DolphinView::dropUrls(const KUrl::List& urls,
 }
 
 void DolphinView::dropUrls(const KUrl::List& urls,

-                           const QModelIndex& index,
+                           const KUrl& destPath,
+                           const QModelIndex& destIndex,

                            QWidget* source)
 {
                            QWidget* source)
 {

-    KFileItem* directory = 0;
-    if (isValidNameIndex(index)) {
-        KFileItem* item = fileItem(index);
-        Q_ASSERT(item != 0);
-        if (item->isDir()) {
+    KFileItem directory;
+    if (isValidNameIndex(destIndex)) {
+        KFileItem item = fileItem(destIndex);
+        Q_ASSERT(!item.isNull());
+        if (item.isDir()) {

             // the URLs are dropped above a directory
             directory = item;
         }
     }
 
             // the URLs are dropped above a directory
             directory = item;
         }
     }
 

-    if ((directory == 0) && (source == itemView())) {
+    if ((directory.isNull()) && (source == itemView())) {

         // The dropping is done into the same viewport where
         // the dragging has been started. Just ignore this...
         return;
     }
 
         // 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();
+    const KUrl& destination = (directory.isNull()) ?
+                              destPath : directory.url();

     dropUrls(urls, destination);
 }
 
 void DolphinView::dropUrls(const KUrl::List& urls,
                            const KUrl& destination)
 {
     dropUrls(urls, destination);
 }
 
 void DolphinView::dropUrls(const KUrl::List& urls,
                            const KUrl& destination)
 {

-    m_mainWindow->dropUrls(urls, destination);
+    emit urlsDropped(urls, destination);

 }
 
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
 }
 
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {

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

     props.setSorting(sorting);
 
     m_proxyModel->setSorting(sorting);
     props.setSorting(sorting);
 
     m_proxyModel->setSorting(sorting);


@@ -1063,7 +706,7 @@ void DolphinView::updateSorting(DolphinView::Sorting sorting)
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
 {
 
 void DolphinView::updateSortOrder(Qt::SortOrder order)
 {

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

     props.setSortOrder(order);
 
     m_proxyModel->setSortOrder(order);
     props.setSortOrder(order);
 
     m_proxyModel->setSortOrder(order);


@@ -1073,17 +716,14 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
 
 void DolphinView::emitContentsMoved()
 {
 
 void DolphinView::emitContentsMoved()
 {

-    if (!m_blockContentsMovedSignal) {
-        emit contentsMoved(contentsX(), contentsY());
-    }
-}
-
-void DolphinView::updateActivationState()
-{
-    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());

     }
 }
 
     }
 }
 


@@ -1094,9 +734,9 @@ void DolphinView::updateCutItems()
     QList<CutItem>::const_iterator it = m_cutItemsCache.begin();
     QList<CutItem>::const_iterator end = m_cutItemsCache.end();
     while (it != end) {
     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()) {
         if (index.isValid()) {

-            m_dirModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole);
+            m_dolphinModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole);

         }
         ++it;
     }
         }
         ++it;
     }


@@ -1106,6 +746,24 @@ void DolphinView::updateCutItems()
     applyCutItemEffect();
 }
 
     applyCutItemEffect();
 }
 

+void DolphinView::showHoverInformation(const QModelIndex& index)
+{
+    if (hasSelection()) {
+        return;
+    }
+
+    const KFileItem item = fileItem(index);
+    if (!item.isNull()) {
+        emit requestItemInfo(item);
+    }
+}
+
+void DolphinView::clearHoverInformation()
+{
+    emit requestItemInfo(KFileItem());
+}
+
+

 void DolphinView::createView()
 {
     // delete current view
 void DolphinView::createView()
 {
     // delete current view


@@ -1127,20 +785,21 @@ void DolphinView::createView()
 
     // ... and recreate it representing the current mode
     switch (m_mode) {
 
     // ... and recreate it representing the current mode
     switch (m_mode) {

-        case IconsView:
-            m_iconsView = new DolphinIconsView(this, m_controller);
-            view = m_iconsView;
-            break;
-
-        case DetailsView:
-            m_detailsView = new DolphinDetailsView(this, m_controller);
-            view = m_detailsView;
-            break;
-
-        case ColumnView:
-            m_columnView = new DolphinColumnView(this, m_controller);
-            view = m_columnView;
-            break;
+    case IconsView:
+        m_iconsView = new DolphinIconsView(this, m_controller);
+        m_iconsView->setCategoryDrawer(new DolphinCategoryDrawer());
+        view = m_iconsView;
+        break;
+
+    case DetailsView:
+        m_detailsView = new DolphinDetailsView(this, m_controller);
+        view = m_detailsView;
+        break;
+
+    case ColumnView:
+        m_columnView = new DolphinColumnView(this, m_controller);
+        view = m_columnView;
+        break;

     }
 
     Q_ASSERT(view != 0);
     }
 
     Q_ASSERT(view != 0);


@@ -1151,36 +810,23 @@ void DolphinView::createView()
     view->setModel(m_proxyModel);
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
     view->setModel(m_proxyModel);
     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_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()));
     connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
             this, SLOT(emitContentsMoved()));
     connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
             this, SLOT(emitContentsMoved()));

-}
-
-void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
-{
-    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);
+    view->setFocus();

 }
 
 QAbstractItemView* DolphinView::itemView() const
 {
     if (m_detailsView != 0) {
         return m_detailsView;
 }
 
 QAbstractItemView* DolphinView::itemView() const
 {
     if (m_detailsView != 0) {
         return m_detailsView;

-    }
-    else if (m_columnView != 0) {
+    } else if (m_columnView != 0) {

         return m_columnView;
     }
 
         return m_columnView;
     }
 


@@ -1189,7 +835,7 @@ QAbstractItemView* DolphinView::itemView() const
 
 bool DolphinView::isValidNameIndex(const QModelIndex& index) const
 {
 
 bool DolphinView::isValidNameIndex(const QModelIndex& index) const
 {

-    return index.isValid() && (index.column() == KDirModel::Name);
+    return index.isValid() && (index.column() == DolphinModel::Name);

 }
 
 bool DolphinView::isCutItem(const KFileItem& item) const
 }
 
 bool DolphinView::isCutItem(const KFileItem& item) const


@@ -1200,7 +846,7 @@ bool DolphinView::isCutItem(const KFileItem& item) const
     const KUrl& itemUrl = item.url();
     KUrl::List::const_iterator it = cutUrls.begin();
     const KUrl::List::const_iterator end = cutUrls.end();
     const KUrl& itemUrl = item.url();
     KUrl::List::const_iterator it = cutUrls.begin();
     const KUrl::List::const_iterator end = cutUrls.end();

-    while (it != end){
+    while (it != end) {

         if (*it == itemUrl) {
             return true;
         }
         if (*it == itemUrl) {
             return true;
         }


@@ -1223,10 +869,11 @@ void DolphinView::applyCutItemEffect()
     while (it != end) {
         KFileItem* item = *it;
         if (isCutItem(*item)) {
     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 QModelIndex index = m_dolphinModel->indexForItem(*item);
+            // Huh? the item is already known
+            //const KFileItem item = m_dolphinModel->itemForIndex(index);
+            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);
 
                 const QIcon icon(qvariant_cast<QIcon>(value));
                 QPixmap pixmap = icon.pixmap(128, 128);
 


@@ -1240,11 +887,27 @@ void DolphinView::applyCutItemEffect()
                 // apply icon effect to the cut item
                 KIconEffect iconEffect;
                 pixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState);
                 // 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);
+                m_dolphinModel->setData(index, QIcon(pixmap), Qt::DecorationRole);

             }
         }
         ++it;
     }
 }
 
             }
         }
         ++it;
     }
 }
 

+void DolphinView::updateViewportColor()
+{
+    QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
+    if (m_active) {
+        emit urlChanged(url()); // Hmm, this is a hack; the url hasn't really changed.
+        emit selectionChanged(selectedItems());
+    } else {
+        color.setAlpha(0);
+    }
+
+    QWidget* viewport = itemView()->viewport();
+    QPalette palette;
+    palette.setColor(viewport->backgroundRole(), color);
+    viewport->setPalette(palette);
+}
+

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