* Use Nepomuk for getting the meta data instead of KFileMetaInfo.

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index cc22c1fd962619ecb1307743cea670965f7a4ad4..4fc3248c81a5085ee2e58224ba10f557ff3f6d5b 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -20,156 +20,227 @@
 
 #include "dolphinview.h"
 
 
 #include "dolphinview.h"
 

-#include <QItemSelectionModel>
-#include <Q3ValueList>
-#include <QDropEvent>
-#include <QMouseEvent>
-#include <QVBoxLayout>
-
-#include <kdirmodel.h>
-#include <kfileitemdelegate.h>
-#include <kurl.h>
+#include <QApplication>
+#include <QClipboard>
+#include <QKeyEvent>
+#include <QItemSelection>
+#include <QBoxLayout>
+#include <QTimer>
+#include <QScrollBar>
+
+#include <kactioncollection.h>
+#include <kcolorscheme.h>
+#include <kdirlister.h>
+#include <kfilepreviewgenerator.h>
+#include <kiconeffect.h>
+#include <kfileitem.h>

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

+#include <kio/deletejob.h>

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

-#include <kio/renamedialog.h>
+#include <kio/previewjob.h>
+#include <kjob.h>
+#include <kmenu.h>
+#include <kmessagebox.h>

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

-#include <assert.h>
+#include <konq_fileitemcapabilities.h>
+#include <konq_operations.h>
+#include <konqmimedata.h>
+#include <kstringhandler.h>
+#include <ktoggleaction.h>
+#include <kurl.h>

 
 

-#include "urlnavigator.h"
-#include "dolphinstatusbar.h"
-#include "dolphinmainwindow.h"
-#include "dolphindirlister.h"
+#include "dolphinmodel.h"
+#include "dolphincolumnview.h"
+#include "dolphincontroller.h"
+#include "dolphinfileitemdelegate.h"

 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinsortfilterproxymodel.h"

-#include "viewproperties.h"

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

+#include "dolphin_detailsmodesettings.h"

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

-#include "dolphincontextmenu.h"
-#include "undomanager.h"
+#include "settings/dolphinsettings.h"
+#include "dolphin_generalsettings.h"
+#include "draganddrophelper.h"
+#include "folderexpander.h"

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

-#include "progressindicator.h"
-#include "filterbar.h"
+#include "tooltips/tooltipmanager.h"
+#include "viewproperties.h"
+#include "zoomlevelinfo.h"

 
 

-DolphinView::DolphinView(DolphinMainWindow *mainWindow,
-                         QWidget *parent,
+/**
+ * Helper function for sorting items with qSort() in
+ * DolphinView::renameSelectedItems().
+ */
+bool lessThan(const KFileItem& item1, const KFileItem& item2)
+{
+    return KStringHandler::naturalCompare(item1.name(), item2.name()) < 0;
+}
+
+DolphinView::DolphinView(QWidget* parent,

                          const KUrl& url,
                          const KUrl& url,

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

     QWidget(parent),
     QWidget(parent),

-    m_refreshing(false),
-    m_showProgress(false),
-    m_mode(mode),
-    m_iconSize(0),
-    m_folderCount(0),
-    m_fileCount(0),
-    m_mainWindow(mainWindow),
+    m_active(true),
+    m_showPreview(false),
+    m_loadingDirectory(false),
+    m_storedCategorizedSorting(false),
+    m_tabsForFiles(false),
+    m_isContextMenuOpen(false),
+    m_ignoreViewProperties(false),
+    m_mode(DolphinView::IconsView),

     m_topLayout(0),
     m_topLayout(0),

-    m_urlNavigator(0),
+    m_controller(0),

     m_iconsView(0),
     m_detailsView(0),
     m_iconsView(0),
     m_detailsView(0),

-    m_filterBar(0),
-    m_statusBar(0),
-    m_dirModel(0),
-    m_dirLister(0),
-    m_proxyModel(0)
-{
-    hide();
-    setFocusPolicy(Qt::StrongFocus);
+    m_columnView(0),
+    m_fileItemDelegate(0),
+    m_selectionModel(0),
+    m_dolphinModel(dolphinModel),
+    m_dirLister(dirLister),
+    m_proxyModel(proxyModel),
+    m_previewGenerator(0),
+    m_toolTipManager(0),
+    m_rootUrl(),
+    m_currentItemUrl(),
+    m_expandedDragSource(0)
+{

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

-    m_urlNavigator = new UrlNavigator(url, this);
-    connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(loadDirectory(const KUrl&)));
-
-    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(slotClear()));
-    connect(m_dirLister, SIGNAL(percent(int)),
-            this, SLOT(slotPercent(int)));
-    connect(m_dirLister, SIGNAL(deleteItem(KFileItem*)),
-            this, SLOT(slotDeleteItem(KFileItem*)));
+    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&, const QList<QAction*>&)),
+            this, SLOT(openContextMenu(const QPoint&, const QList<QAction*>&)));
+    connect(m_controller, SIGNAL(urlsDropped(const KFileItem&, const KUrl&, QDropEvent*)),
+            this, SLOT(dropUrls(const KFileItem&, const KUrl&, QDropEvent*)));
+    connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)),
+            this, SLOT(updateSorting(DolphinView::Sorting)));
+    connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)),
+            this, SLOT(updateSortOrder(Qt::SortOrder)));
+    connect(m_controller, SIGNAL(additionalInfoChanged(const KFileItemDelegate::InformationList&)),
+            this, SLOT(updateAdditionalInfo(const KFileItemDelegate::InformationList&)));
+    connect(m_controller, SIGNAL(itemTriggered(const KFileItem&)),
+            this, SLOT(triggerItem(const KFileItem&)));
+    connect(m_controller, SIGNAL(tabRequested(const KUrl&)),
+            this, SIGNAL(tabRequested(const KUrl&)));
+    connect(m_controller, SIGNAL(activated()),
+            this, SLOT(activate()));
+    connect(m_controller, SIGNAL(itemEntered(const KFileItem&)),
+            this, SLOT(showHoverInformation(const KFileItem&)));
+    connect(m_controller, SIGNAL(viewportEntered()),
+            this, SLOT(clearHoverInformation()));
+
+    connect(m_dirLister, SIGNAL(redirection(KUrl, KUrl)),
+            this, SIGNAL(redirection(KUrl, KUrl)));

     connect(m_dirLister, SIGNAL(completed()),
     connect(m_dirLister, SIGNAL(completed()),

-            this, SLOT(slotCompleted()));
-    connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
-            this, SLOT(slotInfoMessage(const QString&)));
-    connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
-            this, SLOT(slotErrorMessage(const QString&)));
-
-    m_dirModel = new KDirModel();
-    m_dirModel->setDirLister(m_dirLister);
-    m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory);
-
-    m_proxyModel = new DolphinSortFilterProxyModel(this);
-    m_proxyModel->setSourceModel(m_dirModel);
-
-    createView();
+            this, SLOT(restoreCurrentItem()));

 
 

-    m_iconSize = K3Icon::SizeMedium;
-
-    m_filterBar = new FilterBar(this);
-    m_filterBar->hide();
-    connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
-           this, SLOT(slotChangeNameFilter(const QString&)));
-    connect(m_filterBar, SIGNAL(closed()),
-            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);
-
-    loadDirectory(m_urlNavigator->url());

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

-    delete m_dirLister;
-    m_dirLister = 0;
+    kDebug() << "Deleted view " << m_expandedDragSource;
+    delete m_expandedDragSource;
+    m_expandedDragSource = 0;

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

-    mainWindow()->setActiveView(this);
+    if (active == m_active) {
+        return;
+    }
+
+    m_active = active;
+
+    QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
+    if (active) {
+        // TODO: emitting urlChanged() is a hack, as the URL hasn't really changed. It
+        // bypasses the problem when having a split view and changing the active view to
+        // update the some URL dependent states. A nicer approach should be no big deal...
+        emit urlChanged(url());
+        emit selectionChanged(selectedItems());
+    } else {
+        color.setAlpha(150);
+    }
+
+    QWidget* viewport = itemView()->viewport();
+    QPalette palette;
+    palette.setColor(viewport->backgroundRole(), color);
+    viewport->setPalette(palette);
+
+    update();
+
+    if (active) {
+        itemView()->setFocus();
+        emit activated();
+    }
+
+    m_controller->indicateActivationChange(active);

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

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

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

-        return;         // the wished mode is already set
+        return; // the wished mode is already set

     }
 
     }
 

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

     m_mode = mode;
 
     m_mode = mode;
 

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

 
 

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

     createView();
     createView();

-    startDirLister(m_urlNavigator->url());
+
+    // the file item delegate has been recreated, apply the current
+    // additional information manually
+    const KFileItemDelegate::InformationList infoList = props.additionalInfo();
+    m_fileItemDelegate->setShowInformation(infoList);
+    emit additionalInfoChanged();
+
+    // 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();

+
+    updateZoomLevel(oldZoomLevel);
+    if (m_showPreview) {
+        loadDirectory(viewPropsUrl);
+    }

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


@@ -177,37 +248,9 @@ DolphinView::Mode DolphinView::mode() const
     return m_mode;
 }
 
     return m_mode;
 }
 

-void DolphinView::setShowPreview(bool show)
-{
-    ViewProperties props(m_urlNavigator->url());
-    props.setShowPreview(show);
-
-    // TODO: wait until previews are possible with KFileItemDelegate
-
-    emit showPreviewChanged();
-}
-

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

-    // TODO: wait until previews are possible with KFileItemDelegate
-    return true;
-}
-
-void DolphinView::setShowHiddenFiles(bool show)
-{
-    if (m_dirLister->showingDotFiles() == show) {
-        return;
-    }
-
-    ViewProperties props(m_urlNavigator->url());
-    props.setShowHiddenFiles(show);
-    props.save();
-
-    m_dirLister->setShowingDotFiles(show);
-
-    emit showHiddenFilesChanged();
-
-    reload();
+    return m_showPreview;

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


@@ -215,198 +258,157 @@ bool DolphinView::showHiddenFiles() const
     return m_dirLister->showingDotFiles();
 }
 
     return m_dirLister->showingDotFiles();
 }
 

-void DolphinView::renameSelectedItems()
+bool DolphinView::categorizedSorting() const

 {
 {

-    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;
-        }
-
-        DolphinView* view = mainWindow()->activeView();
-        const QString& newName = dialog.newName();
-        if (newName.isEmpty()) {
-            view->statusBar()->setMessage(i18n("The new item name is invalid."),
-                                          DolphinStatusBar::Error);
-        }
-        else {
-            UndoManager& undoMan = UndoManager::instance();
-            undoMan.beginMacro();
-
-            assert(newName.contains('#'));
-
-            const int urlsCount = urls.count();
-            ProgressIndicator* progressIndicator =
-                new  ProgressIndicator(mainWindow(),
-                                       i18n("Renaming items..."),
-                                       i18n("Renaming finished."),
-                                       urlsCount);
-
-            // iterate through all selected items and rename them...
-            const int replaceIndex = newName.indexOf('#');
-            assert(replaceIndex >= 0);
-            for (int i = 0; i < urlsCount; ++i) {
-                const KUrl& source = urls[i];
-                QString name(newName);
-                name.replace(replaceIndex, 1, renameIndexPresentation(i + 1, urlsCount));
-
-                if (source.fileName() != name) {
-                    KUrl dest(source.upUrl());
-                    dest.addPath(name);
-
-                    const bool destExists = KIO::NetAccess::exists(dest, false, view);
-                    if (destExists) {
-                        delete progressIndicator;
-                        progressIndicator = 0;
-                        view->statusBar()->setMessage(i18n("Renaming failed (item '%1' already exists).",name),
-                                                      DolphinStatusBar::Error);
-                        break;
-                    }
-                    else if (KIO::NetAccess::file_move(source, dest)) {
-                        // TODO: From the users point of view he executed one 'rename n files' operation,
-                        // but internally we store it as n 'rename 1 file' operations for the undo mechanism.
-                        DolphinCommand command(DolphinCommand::Rename, source, dest);
-                        undoMan.addCommand(command);
-                    }
-                }
-
-                progressIndicator->execOperation();
-            }
-            delete progressIndicator;
-            progressIndicator = 0;
+    // If all view modes would support categorized sorting, returning
+    // m_proxyModel->isCategorizedModel() would be the way to go. As
+    // currently only the icons view supports caterized sorting, we remember
+    // the stored view properties state in m_storedCategorizedSorting and
+    // return this state. The application takes care to disable the corresponding
+    // checkbox by checking DolphinView::supportsCategorizedSorting() to indicate
+    // that this setting is not applied to the current view mode.
+    return m_storedCategorizedSorting;
+}

 
 

-            undoMan.endMacro();
-        }
-    }
-    else {
-        // Only one item has been selected for renaming. Use the custom
-        // renaming mechanism from the views.
-        assert(urls.count() == 1);
-        // TODO:
-        /*if (m_mode == DetailsView) {
-            Q3ListViewItem* item = m_iconsView->firstChild();
-            while (item != 0) {
-                if (item->isSelected()) {
-                    m_iconsView->rename(item, DolphinDetailsView::NameColumn);
-                    break;
-                }
-                item = item->nextSibling();
-            }
-        }
-        else {
-            KFileIconViewItem* item = static_cast<KFileIconViewItem*>(m_iconsView->firstItem());
-            while (item != 0) {
-                if (item->isSelected()) {
-                    item->rename();
-                    break;
-                }
-                item = static_cast<KFileIconViewItem*>(item->nextItem());
-            }
-        }*/
-    }
+bool DolphinView::supportsCategorizedSorting() const
+{
+    return m_iconsView != 0;

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

-    selectAll(QItemSelectionModel::Select);
+    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();

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

-    selectAll(QItemSelectionModel::Toggle);
+    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 {
+        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);
+
+        const QItemSelection selection(topLeft, bottomRight);
+        selectionModel->select(selection, QItemSelectionModel::Toggle);
+    }

 }
 
 }
 

-DolphinStatusBar* DolphinView::statusBar() const
+bool DolphinView::hasSelection() const

 {
 {

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

 }
 
 }
 

-int DolphinView::contentsX() const
+void DolphinView::clearSelection()

 {
 {

-
-    return 0; //scrollView()->contentsX();
+    itemView()->selectionModel()->clear();

 }
 
 }
 

-int DolphinView::contentsY() const
+KFileItemList DolphinView::selectedItems() const

 {
 {

-    return 0; //scrollView()->contentsY();
-}
+    if (isColumnViewActive()) {
+        return m_columnView->selectedItems();
+    }

 
 

-void DolphinView::refreshSettings()
-{
-    startDirLister(m_urlNavigator->url());
-}
+    const QAbstractItemView* view = itemView();

 
 

-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);
+    // 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 QString text(hasSelection() ? selectionStatusBarText() : defaultStatusBarText());
-    m_statusBar->setDefaultText(text);
+    const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
+    KFileItemList itemList;

 
 

-    if (updateStatusBarMsg) {
-        m_statusBar->setMessage(text, DolphinStatusBar::Default);
+    const QModelIndexList indexList = selection.indexes();
+    foreach (const QModelIndex &index, indexList) {
+        KFileItem item = m_dolphinModel->itemForIndex(index);
+        if (!item.isNull()) {
+            itemList.append(item);
+        }

     }
     }

-}

 
 

-void DolphinView::emitRequestItemInfo(const KUrl& url)
-{
-    emit requestItemInfo(url);
+    return itemList;

 }
 
 }
 

-bool DolphinView::isFilterBarVisible() const
+KUrl::List DolphinView::selectedUrls() const

 {
 {

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

 }
 
 }
 

-bool DolphinView::isUrlEditable() const
+int DolphinView::selectedItemsCount() const

 {
 {

-    return m_urlNavigator->isUrlEditable();
+    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();

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

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

 }
 
 }
 

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

 {
 {

-    return false; //itemEffectsManager()->isZoomOutPossible();
+    return m_controller->zoomLevel();

 }
 
 void DolphinView::setSorting(Sorting sorting)
 {
     if (sorting != this->sorting()) {
 }
 
 void DolphinView::setSorting(Sorting sorting)
 {
     if (sorting != this->sorting()) {

-        ViewProperties props(url());
-        props.setSorting(sorting);
-
-        m_proxyModel->setSorting(sorting);
-
-        emit sortingChanged(sorting);
+        updateSorting(sorting);

     }
 }
 
     }
 }
 


@@ -418,12 +420,7 @@ DolphinView::Sorting DolphinView::sorting() const
 void DolphinView::setSortOrder(Qt::SortOrder order)
 {
     if (sortOrder() != order) {
 void DolphinView::setSortOrder(Qt::SortOrder order)
 {
     if (sortOrder() != order) {

-        ViewProperties props(url());
-        props.setSortOrder(order);
-
-        m_proxyModel->setSortOrder(order);
-
-        emit sortOrderChanged(order);
+        updateSortOrder(order);

     }
 }
 
     }
 }
 


@@ -432,627 +429,1034 @@ Qt::SortOrder DolphinView::sortOrder() const
     return m_proxyModel->sortOrder();
 }
 
     return m_proxyModel->sortOrder();
 }
 

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

 {
 {

-    m_urlNavigator->goBack();
+    const KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setAdditionalInfo(info);
+    m_fileItemDelegate->setShowInformation(info);
+
+    emit additionalInfoChanged();
+
+    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);
+    }

 }
 
 }
 

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

 {
 {

-    m_urlNavigator->goForward();
+    return m_fileItemDelegate->showInformation();

 }
 
 }
 

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

 {
 {

-    m_urlNavigator->goUp();
+    setUrl(url());
+    loadDirectory(url(), true);

 }
 
 }
 

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

 {
 {

-    m_urlNavigator->goHome();
+    m_ignoreViewProperties = false;
+
+    const bool oldActivationState = m_active;
+    const int oldZoomLevel = m_controller->zoomLevel();
+    m_active = true;
+
+    createView();
+    applyViewProperties(m_controller->url());
+    reload();
+
+    setActive(oldActivationState);
+    updateZoomLevel(oldZoomLevel);

 }
 
 }
 

-void DolphinView::setUrlEditable(bool editable)
+void DolphinView::updateView(const KUrl& url, const KUrl& rootUrl)

 {
 {

-    m_urlNavigator->editUrl(editable);
+    if (m_controller->url() == url) {
+        return;
+    }
+
+    m_previewGenerator->cancelPreviews();
+    m_controller->setUrl(url); // emits urlChanged, which we forward
+
+    if (!rootUrl.isEmpty() && rootUrl.isParentOf(url)) {
+        applyViewProperties(rootUrl);
+        loadDirectory(rootUrl);
+        if (itemView() == m_columnView) {
+            m_columnView->setRootUrl(rootUrl);
+            m_columnView->showColumn(url);
+        }
+    } else {
+        applyViewProperties(url);
+        loadDirectory(url);
+    }
+
+    emit startedPathLoading(url);

 }
 
 }
 

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

 {
 {

-    return m_urlNavigator->history(index);
+    m_proxyModel->setFilterRegExp(nameFilter);
+
+    if (isColumnViewActive()) {
+        // adjusting the directory lister is not enough in the case of the
+        // column view, as each column has its own directory lister internally...
+        m_columnView->setNameFilter(nameFilter);
+    }

 }
 
 }
 

-bool DolphinView::hasSelection() const
+void DolphinView::calculateItemCount(int& fileCount,
+                                     int& folderCount,
+                                     KIO::filesize_t& totalFileSize) const

 {
 {

-    return itemView()->selectionModel()->hasSelection();
+    foreach (const KFileItem& item, m_dirLister->items()) {
+        if (item.isDir()) {
+            ++folderCount;
+        } else {
+            ++fileCount;
+            totalFileSize += item.size();
+        }
+    }

 }
 
 }
 

-KFileItemList DolphinView::selectedItems() const
+QString DolphinView::statusBarText() const

 {
 {

-    const QAbstractItemView* view = itemView();
+    QString text;
+    int folderCount = 0;
+    int fileCount = 0;
+    KIO::filesize_t totalFileSize = 0;
+
+    if (hasSelection()) {
+        // give a summary of the status of the selected files
+        const KFileItemList list = selectedItems();
+        if (list.isEmpty()) {
+            // when an item is triggered, it is temporary selected but selectedItems()
+            // will return an empty list
+            return text;
+        }

 
 

-    // Our view has a selection, we will map them back to the DirModel
-    // and then fill the KFileItemList.
-    assert((view != 0) && (view->selectionModel() != 0));
+        KFileItemList::const_iterator it = list.begin();
+        const KFileItemList::const_iterator end = list.end();
+        while (it != end) {
+            const KFileItem& item = *it;
+            if (item.isDir()) {
+                ++folderCount;
+            } else {
+                ++fileCount;
+                totalFileSize += item.size();
+            }
+            ++it;
+        }

 
 

-    const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
-    KFileItemList itemList;
+        if (folderCount + fileCount == 1) {
+            // if only one item is selected, show the filename
+            const QString name = list.first().name();
+            text = (folderCount == 1) ? i18nc("@info:status", "<filename>%1</filename> selected", name) :
+                                        i18nc("@info:status", "<filename>%1</filename> selected (%2)",
+                                              name, KIO::convertSize(totalFileSize));
+        } else {
+            // at least 2 items are selected
+            const QString foldersText = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
+            const QString filesText = i18ncp("@info:status", "1 File selected", "%1 Files selected", fileCount);
+            if ((folderCount > 0) && (fileCount > 0)) {
+                text = i18nc("@info:status folders, files (size)", "%1, %2 (%3)",
+                             foldersText, filesText, KIO::convertSize(totalFileSize));
+            } else if (fileCount > 0) {
+                text = i18nc("@info:status files (size)", "%1 (%2)", filesText, KIO::convertSize(totalFileSize));
+            } else {
+                Q_ASSERT(folderCount > 0);
+                text = foldersText;
+            }
+        }
+    } else {
+        calculateItemCount(fileCount, folderCount, totalFileSize);
+        text = KIO::itemsSummaryString(fileCount + folderCount,
+                                       fileCount, folderCount,
+                                       totalFileSize, true);
+    }

 
 

-    const QModelIndexList indexList = selection.indexes();
-    QModelIndexList::const_iterator end = indexList.end();
-    for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) {
-        assert((*it).isValid());
+    return text;
+}

 
 

-        KFileItem* item = m_dirModel->itemForIndex(*it);
-        if (item != 0) {
-            itemList.append(item);
+void DolphinView::setUrl(const KUrl& url)
+{
+    // remember current item candidate (see restoreCurrentItem())
+    m_currentItemUrl = url;
+    updateView(url, KUrl());
+}
+
+void DolphinView::changeSelection(const KFileItemList& selection)
+{
+    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);
+}

 
 

-    return itemList;
+void DolphinView::renameSelectedItems()
+{
+    KFileItemList items = selectedItems();
+    const int itemCount = items.count();
+    if (itemCount < 1) {
+        return;
+    }
+
+    if (itemCount > 1) {
+        // More than one item has been selected for renaming. Open
+        // a rename dialog and rename all items afterwards.
+        RenameDialog dialog(this, items);
+        if (dialog.exec() == QDialog::Rejected) {
+            return;
+        }
+
+        const QString newName = dialog.newName();
+        if (newName.isEmpty()) {
+            emit errorMessage(dialog.errorString());
+        } else {
+            // TODO: check how this can be integrated into KIO::FileUndoManager/KonqOperations
+            // as one operation instead of n rename operations like it is done now...
+            Q_ASSERT(newName.contains('#'));
+
+            // currently the items are sorted by the selection order, resort
+            // them by the file name
+            qSort(items.begin(), items.end(), lessThan);
+
+            // iterate through all selected items and rename them...
+            int index = 1;
+            foreach (const KFileItem& item, items) {
+                const KUrl& oldUrl = item.url();
+                QString number;
+                number.setNum(index++);
+
+                QString name = newName;
+                name.replace('#', number);
+
+                if (oldUrl.fileName() != name) {
+                    KUrl newUrl = oldUrl;
+                    newUrl.setFileName(name);
+                    KonqOperations::rename(this, oldUrl, newUrl);
+                }
+            }
+        }
+    } else if (DolphinSettings::instance().generalSettings()->renameInline()) {
+        Q_ASSERT(itemCount == 1);
+
+        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 {
+        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);
+        }
+    }

 }
 
 }
 

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

 {
 {

-    KUrl::List urls;
+    const KUrl::List list = simplifiedSelectedUrls();
+    KonqOperations::del(this, KonqOperations::TRASH, list);
+}

 
 

-    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;
+void DolphinView::deleteSelectedItems()
+{
+    const KUrl::List list = simplifiedSelectedUrls();
+    const bool del = KonqOperations::askDeleteConfirmation(list,
+                     KonqOperations::DEL,
+                     KonqOperations::DEFAULT_CONFIRMATION,
+                     this);
+
+    if (del) {
+        KIO::Job* job = KIO::del(list);
+        connect(job, SIGNAL(result(KJob*)),
+                this, SLOT(slotDeleteFileFinished(KJob*)));

     }
     }

+}

 
 

-    return urls;
+void DolphinView::cutSelectedItems()
+{
+    QMimeData* mimeData = selectionMimeData();
+    KonqMimeData::addIsCutSelection(mimeData, true);
+    QApplication::clipboard()->setMimeData(mimeData);

 }
 
 }
 

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

 {
 {

-    return 0; // fileView()->currentFileItem();
+    QMimeData* mimeData = selectionMimeData();
+    QApplication::clipboard()->setMimeData(mimeData);

 }
 
 }
 

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

 {
 {

-    DolphinContextMenu contextMenu(this, fileInfo, pos);
-    contextMenu.open();
+    pasteToUrl(url());

 }
 
 }
 

-void DolphinView::rename(const KUrl& source, const QString& newName)
+void DolphinView::pasteIntoFolder()

 {
 {

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

 
 

-    if (newName.isEmpty() || (source.fileName() == newName)) {
+void DolphinView::setShowPreview(bool show)
+{
+    if (m_showPreview == show) {

         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 KUrl viewPropsUrl = viewPropertiesUrl();
+    ViewProperties props(viewPropsUrl);
+    props.setShowPreview(show);

 
 

-            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_showPreview = show;
+    m_previewGenerator->setPreviewShown(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);

 
 

-    if (ok) {
-        m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.",source.fileName(), dest.fileName()),
-                                DolphinStatusBar::OperationCompleted);
+    loadDirectory(viewPropsUrl);
+}

 
 

-        DolphinCommand command(DolphinCommand::Rename, source, dest);
-        UndoManager::instance().addCommand(command);
+void DolphinView::setShowHiddenFiles(bool show)
+{
+    if (m_dirLister->showingDotFiles() == show) {
+        return;

     }
     }

-    else {
-        m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.",source.fileName(), dest.fileName()),
-                                DolphinStatusBar::Error);
-        reload();
+
+    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;

     }
     }

+
+    // 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::reload()
+void DolphinView::toggleSortOrder()

 {
 {

-    startDirLister(m_urlNavigator->url(), true);
+    const Qt::SortOrder order = (sortOrder() == Qt::AscendingOrder) ?
+                                Qt::DescendingOrder :
+                                Qt::AscendingOrder;
+    setSortOrder(order);

 }
 
 }
 

-void DolphinView::slotUrlListDropped(QDropEvent* /* event */,
-                                     const KUrl::List& urls,
-                                     const KUrl& url)
+void DolphinView::toggleAdditionalInfo(QAction* action)

 {
 {

-    KUrl destination(url);
-    if (destination.isEmpty()) {
-        destination = m_urlNavigator->url();
-    }
-    else {
-        // Check whether the destination Url is a directory. If this is not the
-        // case, use the navigator Url as destination (otherwise the destination,
-        // which represents a file, would be replaced by a copy- or move-operation).
-        KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, destination);
-        if (!fileItem.isDir()) {
-            destination = m_urlNavigator->url();
-        }
-    }
+    const KFileItemDelegate::Information info =
+        static_cast<KFileItemDelegate::Information>(action->data().toInt());
+
+    KFileItemDelegate::InformationList list = additionalInfo();
+
+    const bool show = action->isChecked();

 
 

-    mainWindow()->dropUrls(urls, destination);
+    const int index = list.indexOf(info);
+    const bool containsInfo = (index >= 0);
+    if (show && !containsInfo) {
+        list.append(info);
+        setAdditionalInfo(list);
+    } else if (!show && containsInfo) {
+        list.removeAt(index);
+        setAdditionalInfo(list);
+        Q_ASSERT(list.indexOf(info) < 0);
+    }

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

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

 }
 
 }
 

-DolphinMainWindow* DolphinView::mainWindow() const
+void DolphinView::wheelEvent(QWheelEvent* event)

 {
 {

-    return m_mainWindow;
+    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::loadDirectory(const KUrl& url)
+bool DolphinView::eventFilter(QObject* watched, QEvent* event)

 {
 {

-    const ViewProperties props(url);
-
-    const Mode mode = props.viewMode();
-    if (m_mode != mode) {
-        m_mode = mode;
-        createView();
-        emit modeChanged();
-    }
+    switch (event->type()) {
+    case QEvent::FocusIn:
+        if (watched == itemView()) {
+            m_controller->requestActivation();
+        }
+        break;
+
+    case QEvent::MouseButtonPress:
+        kDebug() << "m_expandedDragSource = " << m_expandedDragSource;
+        if ((watched == itemView()->viewport()) && (m_expandedDragSource != 0)) {
+            // Listening to a mousebutton press event to delete expanded views is a
+            // workaround, as it seems impossible for the FolderExpander to know when
+            // a dragging outside a view has been finished. However it works quite well:
+            // A mousebutton press event indicates that a drag operation must be
+            // finished already.
+            kDebug() << "Deleted view " << m_expandedDragSource;
+            m_expandedDragSource->deleteLater();
+            m_expandedDragSource = 0;
+        }
+        break;

 
 

-    const bool showHiddenFiles = props.showHiddenFiles();
-    if (showHiddenFiles != m_dirLister->showingDotFiles()) {
-        m_dirLister->setShowingDotFiles(showHiddenFiles);
-        emit showHiddenFilesChanged();
-    }
+    case QEvent::DragEnter:
+        if (watched == itemView()->viewport()) {
+            setActive(true);
+        }
+        break;

 
 

-    const DolphinView::Sorting sorting = props.sorting();
-    if (sorting != m_proxyModel->sorting()) {
-        m_proxyModel->setSorting(sorting);
-        emit sortingChanged(sorting);
-    }
+    case QEvent::KeyPress:
+        if ((watched == itemView()) && (m_toolTipManager != 0)) {
+            m_toolTipManager->hideTip();
+        }
+        break;

 
 

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

     }
 
     }
 

-    // TODO: handle previews (props.showPreview())
+    return QWidget::eventFilter(watched, event);
+}

 
 

-    startDirLister(url);
-    emit urlChanged(url);
+void DolphinView::activate()
+{
+    setActive(true);

 }
 
 }
 

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

 {
 {

-    KFileItem* item = m_dirModel->itemForIndex(m_proxyModel->mapToSource(index));
-    if (item == 0) {
+    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;
     }
 

-    if (item->isDir()) {
-        // Prefer the local path over the Url. This assures that the
-        // volume space information is correct. Assuming that the Url is media:/sda1,
-        // and the local path is /windows/C: For the Url the space info is related
-        // to the root partition (and hence wrong) and for the local path the space
-        // info is related to the windows partition (-> correct).
-        //m_dirLister->stop();
-        //m_dirLister->openUrl(item->url());
-        //return;
+    // TODO: the m_isContextMenuOpen check is a workaround for Qt-issue 207192
+    if (item.isNull() || m_isContextMenuOpen) {
+        return;
+    }

 
 

-        const QString localPath(item->localPath());
-        if (localPath.isEmpty()) {
-            setUrl(item->url());
-        }
-        else {
-            setUrl(KUrl(localPath));
+    if (m_toolTipManager != 0) {
+        m_toolTipManager->hideTip();
+    }
+    emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
+}
+
+void DolphinView::emitSelectionChangedSignal()
+{
+    emit selectionChanged(DolphinView::selectedItems());
+}
+
+void DolphinView::openContextMenu(const QPoint& pos,
+                                  const QList<QAction*>& customActions)
+{
+    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);

         }
     }
         }
     }

-    else {
-        item->run();
+
+    if (m_toolTipManager != 0) {
+        m_toolTipManager->hideTip();

     }
     }

+
+    m_isContextMenuOpen = true; // TODO: workaround for Qt-issue 207192
+    emit requestContextMenu(item, url(), customActions);
+    m_isContextMenuOpen = false;

 }
 
 }
 

-void DolphinView::slotPercent(int percent)
+void DolphinView::dropUrls(const KFileItem& destItem,
+                           const KUrl& destPath,
+                           QDropEvent* event)

 {
 {

-    if (m_showProgress) {
-        m_statusBar->setProgress(percent);
-    }
+    DragAndDropHelper::instance().dropUrls(destItem, destPath, event, this);

 }
 
 }
 

-void DolphinView::slotClear()
+void DolphinView::updateSorting(DolphinView::Sorting sorting)

 {
 {

-    //fileView()->clearView();
-    updateStatusBar();
+    ViewProperties props(viewPropertiesUrl());
+    props.setSorting(sorting);
+
+    m_proxyModel->setSorting(sorting);
+
+    emit sortingChanged(sorting);

 }
 
 }
 

-void DolphinView::slotDeleteItem(KFileItem* item)
+void DolphinView::updateSortOrder(Qt::SortOrder order)

 {
 {

-    //fileView()->removeItem(item);
-    updateStatusBar();
+    ViewProperties props(viewPropertiesUrl());
+    props.setSortOrder(order);
+
+    m_proxyModel->setSortOrder(order);
+
+    emit sortOrderChanged(order);

 }
 
 }
 

-void DolphinView::slotCompleted()
+void DolphinView::updateAdditionalInfo(const KFileItemDelegate::InformationList& info)

 {
 {

-    m_refreshing = true;
+    ViewProperties props(viewPropertiesUrl());
+    props.setAdditionalInfo(info);
+    props.save();

 
 

-    //KFileView* view = fileView();
-    //view->clearView();
+    m_fileItemDelegate->setShowInformation(info);

 
 

-    // TODO: in Qt4 the code should get a lot
-    // simpler and nicer due to Interview...
-    /*if (m_iconsView != 0) {
-        m_iconsView->beginItemUpdates();
-    }
-    if (m_iconsView != 0) {
-        m_iconsView->beginItemUpdates();
-    }*/
+    emit additionalInfoChanged();
+}

 
 

-    if (m_showProgress) {
-        m_statusBar->setProgressText(QString::null);
-        m_statusBar->setProgress(100);
-        m_showProgress = false;
-    }
+void DolphinView::updateAdditionalInfoActions(KActionCollection* collection)
+{
+    const bool enable = (m_mode == DolphinView::DetailsView) ||
+                        (m_mode == DolphinView::IconsView);

 
 

-    KFileItemList items(m_dirLister->items());
-    KFileItemList::const_iterator it = items.begin();
-    const KFileItemList::const_iterator end = items.end();
+    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");

 
 

-    m_fileCount = 0;
-    m_folderCount = 0;
+    showSizeInfo->setChecked(false);
+    showDateInfo->setChecked(false);
+    showPermissionsInfo->setChecked(false);
+    showOwnerInfo->setChecked(false);
+    showGroupInfo->setChecked(false);
+    showMimeInfo->setChecked(false);

 
 

-    while (it != end) {
-        KFileItem* item = *it;
-        //view->insertItem(item);
-        if (item->isDir()) {
-            ++m_folderCount;
-        }
-        else {
-            ++m_fileCount;
+    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;

         }
         }

-        ++it;

     }
     }

+}

 
 

-    updateStatusBar();
+QPair<bool, QString> DolphinView::pasteInfo() const
+{
+    QPair<bool, QString> ret;
+    QClipboard* clipboard = QApplication::clipboard();
+    const QMimeData* mimeData = clipboard->mimeData();
+
+    KUrl::List urls = KUrl::List::fromMimeData(mimeData);
+    if (!urls.isEmpty()) {
+        // disable the paste action if no writing is supported
+        KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url());
+        ret.first = KonqFileItemCapabilities(KFileItemList() << item).supportsWriting();

 
 

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

 }
 
 }
 

-void DolphinView::slotInfoMessage(const QString& msg)
+void DolphinView::setTabsForFilesEnabled(bool tabsForFiles)

 {
 {

-    m_statusBar->setMessage(msg, DolphinStatusBar::Information);
+    m_tabsForFiles = tabsForFiles;

 }
 
 }
 

-void DolphinView::slotErrorMessage(const QString& msg)
+bool DolphinView::isTabsForFilesEnabled() const

 {
 {

-    m_statusBar->setMessage(msg, DolphinStatusBar::Error);
+    return m_tabsForFiles;

 }
 
 }
 

-void DolphinView::slotGrabActivation()
+bool DolphinView::itemsExpandable() const

 {
 {

-    mainWindow()->setActiveView(this);
+    return (m_detailsView != 0) && m_detailsView->itemsExpandable();

 }
 
 }
 

-void DolphinView::emitSelectionChangedSignal()
+void DolphinView::deleteWhenNotDragSource(QAbstractItemView *view)

 {
 {

-    emit selectionChanged();
+    if (view == 0)
+        return;
+
+    if (DragAndDropHelper::instance().isDragSource(view)) {
+        kDebug() << "Is current drag source";
+        // We must store for later deletion.
+        if (m_expandedDragSource != 0) {
+            // The old stored view is obviously not the drag source anymore.
+            kDebug() << "Deleted old view " << m_expandedDragSource;
+            m_expandedDragSource->deleteLater();
+            m_expandedDragSource = 0;
+        }
+        view->hide();
+        m_expandedDragSource = view;
+    }
+    else {
+        kDebug() << "Deleted new view " << view;
+        view->deleteLater();
+    }

 }
 
 }
 

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

 {
 {

-    m_filterBar->hide();
-    emit showFilterBarChanged(false);
+    // 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::slotContentsMoving(int x, int y)
+void DolphinView::showHoverInformation(const KFileItem& item)

 {
 {

-    if (!m_refreshing) {
-        // Only emit a 'contents moved' signal if the user
-        // moved the content by adjusting the sliders. Adjustments
-        // resulted by refreshing a directory should not be respected.
-        emit contentsMoved(x, y);
+    emit requestItemInfo(item);
+}
+
+void DolphinView::clearHoverInformation()
+{
+    emit requestItemInfo(KFileItem());
+}
+
+void DolphinView::slotDeleteFileFinished(KJob* job)
+{
+    if (job->error() == 0) {
+        emit operationCompletedMessage(i18nc("@info:status", "Delete operation completed."));
+    } else if (job->error() != KIO::ERR_USER_CANCELED) {
+        emit errorMessage(job->errorString());
+    }
+}
+
+void DolphinView::slotRequestUrlChange(const KUrl& url)
+{
+    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();
+        }

     }
 }
 
     }
 }
 

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

 {
     if (!url.isValid()) {
         const QString location(url.pathOrUrl());
         if (location.isEmpty()) {
 {
     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_loadingDirectory = true;

 
 

-    m_refreshing = true;

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

-    m_dirLister->openUrl(url, false, reload);
+    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);
+        }
+    }

 }
 
 }
 

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

 {
 {

-    // TODO: the following code is not suitable for languages where multiple forms
-    // of plurals are given (e. g. in Poland three forms of plurals exist).
-    const int itemCount = m_folderCount + m_fileCount;
-
-    QString text;
-    if (itemCount == 1) {
-        text = i18n("1 Item");
-    }
-    else {
-        text = i18n("%1 Items",itemCount);
+    if (isColumnViewActive()) {
+        return m_columnView->rootUrl();

     }
 
     }
 

-    text += " (";
+    return url();
+}

 
 

-    if (m_folderCount == 1) {
-        text += i18n("1 Folder");
-    }
-    else {
-        text += i18n("%1 Folders",m_folderCount);
+void DolphinView::applyViewProperties(const KUrl& url)
+{
+    if (m_ignoreViewProperties) {
+        return;

     }
 
     }
 

-    text += ", ";
-
-    if (m_fileCount == 1) {
-        text += i18n("1 File");
-    }
-    else {
-        text += i18n("%1 Files",m_fileCount);
+    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;

     }
 
     }
 

-    text += ")";
+    const ViewProperties props(url);

 
 

-    return text;
-}
+    const Mode mode = props.viewMode();
+    if (m_mode != mode) {
+        const int oldZoomLevel = m_controller->zoomLevel();

 
 

-QString DolphinView::selectionStatusBarText() const
-{
-    // TODO: the following code is not suitable for languages where multiple forms
-    // of plurals are given (e. g. in Poland three forms of plurals exist).
-    QString text;
-    const KFileItemList list = selectedItems();
-    if (list.isEmpty()) {
-        // TODO: assert(!list.isEmpty()) should be used, as this method is only invoked if
-        // DolphinView::hasSelection() is true. Inconsistent behavior?
-        return QString();
+        m_mode = mode;
+        createView();
+        emit modeChanged();
+
+        updateZoomLevel(oldZoomLevel);

     }
     }

+    if (itemView() == 0) {
+        createView();
+    }
+    Q_ASSERT(itemView() != 0);
+    Q_ASSERT(m_fileItemDelegate != 0);

 
 

-    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 bool showHiddenFiles = props.showHiddenFiles();
+    if (showHiddenFiles != m_dirLister->showingDotFiles()) {
+        m_dirLister->setShowingDotFiles(showHiddenFiles);
+        emit showHiddenFilesChanged();

     }
 
     }
 

-    if (folderCount == 1) {
-        text = i18n("1 Folder selected");
+    m_storedCategorizedSorting = props.categorizedSorting();
+    const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
+    if (categorized != m_proxyModel->isCategorizedModel()) {
+        m_proxyModel->setCategorizedModel(categorized);
+        emit categorizedSortingChanged();

     }
     }

-    else if (folderCount > 1) {
-        text = i18n("%1 Folders selected",folderCount);
+
+    const DolphinView::Sorting sorting = props.sorting();
+    if (sorting != m_proxyModel->sorting()) {
+        m_proxyModel->setSorting(sorting);
+        emit sortingChanged(sorting);

     }
 
     }
 

-    if ((fileCount > 0) && (folderCount > 0)) {
-        text += ", ";
+    const Qt::SortOrder sortOrder = props.sortOrder();
+    if (sortOrder != m_proxyModel->sortOrder()) {
+        m_proxyModel->setSortOrder(sortOrder);
+        emit sortOrderChanged(sortOrder);

     }
 
     }
 

-    const QString sizeText(KIO::convertSize(byteSize));
-    if (fileCount == 1) {
-        text += i18n("1 File selected (%1)",sizeText);
+    KFileItemDelegate::InformationList info = props.additionalInfo();
+    if (info != m_fileItemDelegate->showInformation()) {
+        m_fileItemDelegate->setShowInformation(info);
+        emit additionalInfoChanged();

     }
     }

-    else if (fileCount > 1) {
-        text += i18n("%1 Files selected (%1)",fileCount,sizeText);
+
+    const bool showPreview = props.showPreview();
+    if (showPreview != m_showPreview) {
+        m_showPreview = showPreview;
+        m_previewGenerator->setPreviewShown(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);

     }
 
     }
 

-    return text;
+    if (DolphinSettings::instance().generalSettings()->globalViewProps()) {
+        // During the lifetime of a DolphinView instance the global view properties
+        // should not be changed. This allows e. g. to split a view and use different
+        // view properties for each view.
+        m_ignoreViewProperties = true;
+    }

 }
 
 }
 

-QString DolphinView::renameIndexPresentation(int index, int itemCount) const
+void DolphinView::createView()

 {
 {

-    // assure that the string reprentation for all indicess have the same
-    // number of characters based on the given number of items
-    QString str(QString::number(index));
-    int chrCount = 1;
-    while (itemCount >= 10) {
-        ++chrCount;
-        itemCount /= 10;
+    deleteView();
+    Q_ASSERT(m_iconsView == 0);
+    Q_ASSERT(m_detailsView == 0);
+    Q_ASSERT(m_columnView == 0);
+
+    QAbstractItemView* view = 0;
+    switch (m_mode) {
+    case IconsView: {
+        m_iconsView = new DolphinIconsView(this, m_controller);
+        view = m_iconsView;
+        break;

     }
     }

-    str.reserve(chrCount);

 
 

-    const int insertCount = chrCount - str.length();
-    for (int i = 0; i < insertCount; ++i) {
-        str.insert(0, '0');
+    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;

     }
     }

-    return str;
-}

 
 

-void DolphinView::slotShowFilterBar(bool show)
-{
-    assert(m_filterBar != 0);
-    if (show) {
-        m_filterBar->show();
+    Q_ASSERT(view != 0);
+    view->installEventFilter(this);
+    view->viewport()->installEventFilter(this);
+    setFocusProxy(view);
+
+    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&)));

     }
     else {
     }
     else {

-        m_filterBar->hide();
+        // Listen out for requests to delete the current column.
+        connect(m_columnView, SIGNAL(requestColumnDeletion(QAbstractItemView*)),
+                this, SLOT(deleteWhenNotDragSource(QAbstractItemView*)));

     }
     }

-}

 
 

-void DolphinView::declareViewActive()
-{
-    mainWindow()->setActiveView( this );
-}
+    m_controller->setItemView(view);

 
 

-void DolphinView::slotChangeNameFilter(const QString& nameFilter)
-{
-    // The name filter of KDirLister does a 'hard' filtering, which
-    // means that only the items are shown where the names match
-    // exactly the filter. This is non-transparent for the user, which
-    // just wants to have a 'soft' filtering: does the name contain
-    // the filter string?
-    QString adjustedFilter(nameFilter);
-    adjustedFilter.insert(0, '*');
-    adjustedFilter.append('*');
+    m_fileItemDelegate = new DolphinFileItemDelegate(view);
+    m_fileItemDelegate->setShowToolTipWhenElided(false);
+    m_fileItemDelegate->setMinimizedNameColumn(m_mode == DetailsView);
+    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);
+
+    m_previewGenerator = new KFilePreviewGenerator(view);
+    m_previewGenerator->setPreviewShown(m_showPreview);
+
+    if (DolphinSettings::instance().generalSettings()->showToolTips()) {
+        m_toolTipManager = new ToolTipManager(view, m_proxyModel);
+        connect(m_controller, SIGNAL(hideToolTip()),
+                m_toolTipManager, SLOT(hideTip()));
+    }
+
+    m_topLayout->insertWidget(1, view);

 
 

-    // 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
+    connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
+            this, SLOT(emitSelectionChangedSignal()));
+    connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
+            this, SLOT(emitContentsMoved()));
+    connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
+            this, SLOT(emitContentsMoved()));

 }
 
 }
 

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

 {
 {

-    // delete current view

     QAbstractItemView* view = itemView();
     if (view != 0) {
     QAbstractItemView* view = itemView();
     if (view != 0) {

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

         view->close();
         view->close();

-        view->deleteLater();
+
+        // m_previewGenerator's parent is not always destroyed, and we
+        // don't want two active at once - manually delete.
+        delete m_previewGenerator;
+        m_previewGenerator = 0;
+
+        disconnect(view);
+        m_controller->disconnect(view);
+        view->disconnect();
+
+        deleteWhenNotDragSource(view);
+        view = 0;
+

         m_iconsView = 0;
         m_detailsView = 0;
         m_iconsView = 0;
         m_detailsView = 0;

+        m_columnView = 0;
+        m_fileItemDelegate = 0;
+        m_toolTipManager = 0;

     }
     }

+}

 
 

-    assert(m_iconsView == 0);
-    assert(m_detailsView == 0);
-
-    // ... and recreate it representing the current mode
-    switch (m_mode) {
-        case IconsView:
-            m_iconsView = new DolphinIconsView(this);
-            m_iconsView->setViewMode(QListView::IconMode);
-            m_iconsView->setSpacing(32);
-            view = m_iconsView;
-            // TODO: read out view settings
-            break;
-
-        case DetailsView:
-            m_detailsView = new DolphinDetailsView(this);
-            view = m_detailsView;
-            // TODO: read out view settings
-            break;
+QAbstractItemView* DolphinView::itemView() const
+{
+    if (m_detailsView != 0) {
+        return m_detailsView;
+    } else if (m_columnView != 0) {
+        return m_columnView;

     }
 
     }
 

-    view->setModel(m_proxyModel);
+    return m_iconsView;
+}

 
 

-    view->setSelectionMode(QAbstractItemView::ExtendedSelection);
+bool DolphinView::isCutItem(const KFileItem& item) const
+{
+    const QMimeData* mimeData = QApplication::clipboard()->mimeData();
+    const KUrl::List cutUrls = KUrl::List::fromMimeData(mimeData);

 
 

-    KFileItemDelegate* delegate = new KFileItemDelegate(this);
-    delegate->setAdditionalInformation(KFileItemDelegate::FriendlyMimeType);
-    view->setItemDelegate(delegate);
+    const KUrl& itemUrl = item.url();
+    KUrl::List::const_iterator it = cutUrls.begin();
+    const KUrl::List::const_iterator end = cutUrls.end();
+    while (it != end) {
+        if (*it == itemUrl) {
+            return true;
+        }
+        ++it;
+    }

 
 

-    new KMimeTypeResolver(view, m_dirModel);
+    return false;
+}

 
 

-    connect(view, SIGNAL(clicked(const QModelIndex&)),
-            this, SLOT(triggerItem(const QModelIndex&)));
-    connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
-            this, SLOT(emitSelectionChangedSignal()));
+void DolphinView::pasteToUrl(const KUrl& url)
+{
+    QClipboard* clipboard = QApplication::clipboard();
+    const QMimeData* mimeData = clipboard->mimeData();

 
 

-    m_topLayout->insertWidget(1, view);
+    const KUrl::List sourceUrls = KUrl::List::fromMimeData(mimeData);
+    if (KonqMimeData::decodeIsCutSelection(mimeData)) {
+        KonqOperations::copy(this, KonqOperations::MOVE, sourceUrls, url);
+        clipboard->clear();
+    } else {
+        KonqOperations::copy(this, KonqOperations::COPY, sourceUrls, url);
+    }

 }
 
 }
 

-int DolphinView::columnIndex(Sorting sorting) const
+void DolphinView::updateZoomLevel(int oldZoomLevel)

 {
 {

-    int index = 0;
-    switch (sorting) {
-        case SortByName: index = KDirModel::Name; break;
-        case SortBySize: index = KDirModel::Size; break;
-        case SortByDate: index = KDirModel::ModifiedTime; break;
-        default: assert(false);
+    const int newZoomLevel = ZoomLevelInfo::zoomLevelForIconSize(itemView()->iconSize());
+    if (oldZoomLevel != newZoomLevel) {
+        m_controller->setZoomLevel(newZoomLevel);
+        emit zoomLevelChanged(newZoomLevel);

     }
     }

-    return index;

 }
 
 }
 

-void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
+KUrl::List DolphinView::simplifiedSelectedUrls() const

 {
 {

-    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);
+    KUrl::List list = selectedUrls();
+    if (itemsExpandable() ) {
+        list = KDirModel::simplifiedUrlList(list);
+    }
+    return list;

 }
 
 }
 

-QAbstractItemView* DolphinView::itemView() const
+QMimeData* DolphinView::selectionMimeData() const

 {
 {

-    assert((m_iconsView == 0) || (m_detailsView == 0));
-    if (m_detailsView != 0) {
-        return m_detailsView;
+    if (isColumnViewActive()) {
+        return m_columnView->selectionMimeData();

     }
     }

-    return m_iconsView;
+
+    const QAbstractItemView* view = itemView();
+    Q_ASSERT((view != 0) && (view->selectionModel() != 0));
+    const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
+    return m_dolphinModel->mimeData(selection.indexes());

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