]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/dolphinview.cpp
don't lose the history of the URL navigator if the settings of the Icons View, Detail...
[dolphin.git] / src / dolphinview.cpp
index 6898d059ab1f6f4d3ae5def331f4ab15d0918988..84b765d4d8ecb307f0c3e474bbad332a0f9b9426 100644 (file)
 
 #include "dolphinview.h"
 
-#include <assert.h>
-
-#include <QApplication>
-#include <QDropEvent>
-#include <QItemSelectionModel>
-#include <QMouseEvent>
-#include <QVBoxLayout>
+#include <QtGui/QApplication>
+#include <QtGui/QClipboard>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QItemSelection>
+#include <QtGui/QBoxLayout>
+#include <QtCore/QTimer>
+#include <QtGui/QScrollBar>
 
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>
+#include <kfileplacesmodel.h>
 #include <klocale.h>
+#include <kiconeffect.h>
 #include <kio/netaccess.h>
 #include <kio/renamedialog.h>
 #include <kio/previewjob.h>
 #include <kmimetyperesolver.h>
+#include <konqmimedata.h>
 #include <konq_operations.h>
 #include <kurl.h>
 
+#include "dolphincolumnview.h"
 #include "dolphincontroller.h"
 #include "dolphinstatusbar.h"
 #include "dolphinmainwindow.h"
 #include "dolphindetailsview.h"
 #include "dolphiniconsview.h"
 #include "dolphincontextmenu.h"
+#include "dolphinitemcategorizer.h"
 #include "filterbar.h"
 #include "renamedialog.h"
-#include "urlnavigator.h"
+#include "kurlnavigator.h"
 #include "viewproperties.h"
+#include "dolphinsettings.h"
+#include "dolphin_generalsettings.h"
 
 DolphinView::DolphinView(DolphinMainWindow* mainWindow,
                          QWidget* parent,
@@ -58,6 +65,8 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
                          bool showHiddenFiles) :
     QWidget(parent),
     m_showProgress(false),
+    m_blockContentsMovedSignal(false),
+    m_initializeColumnView(false),
     m_mode(mode),
     m_iconSize(0),
     m_folderCount(0),
@@ -68,6 +77,8 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_controller(0),
     m_iconsView(0),
     m_detailsView(0),
+    m_columnView(0),
+    m_fileItemDelegate(0),
     m_filterBar(0),
     m_statusBar(0),
     m_dirModel(0),
@@ -83,16 +94,21 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     connect(m_mainWindow, SIGNAL(activeViewChanged()),
             this, SLOT(updateActivationState()));
 
-    m_urlNavigator = new UrlNavigator(url, this);
-    m_urlNavigator->setShowHiddenFiles(showHiddenFiles);
+    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&)));
+            this, SLOT(changeDirectory(const KUrl&)));
     connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
             this, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
     connect(m_urlNavigator, SIGNAL(activated()),
             this, SLOT(requestActivation()));
     connect(this, SIGNAL(contentsMoved(int, int)),
-            m_urlNavigator, SLOT(storeContentsPosition(int, int)));
+            m_urlNavigator, SLOT(savePosition(int, int)));
 
     m_statusBar = new DolphinStatusBar(this);
 
@@ -110,6 +126,8 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
             this, SLOT(updateStatusBar()));
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(updateItemCount()));
+    connect(m_dirLister, SIGNAL(completed()),
+            this, SLOT(updateCutItems()));
     connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
             this, SLOT(generatePreviews(const KFileItemList&)));
     connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
@@ -127,8 +145,8 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_controller = new DolphinController(this);
     connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
             this, SLOT(openContextMenu(const QPoint&)));
-    connect(m_controller, SIGNAL(urlsDropped(const KUrl::List&, const QPoint&)),
-            this, SLOT(dropUrls(const KUrl::List&, 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(sortingChanged(DolphinView::Sorting)),
             this, SLOT(updateSorting(DolphinView::Sorting)));
     connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)),
@@ -147,7 +165,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_filterBar = new FilterBar(this);
     m_filterBar->hide();
     connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
-           this, SLOT(changeNameFilter(const QString&)));
+            this, SLOT(changeNameFilter(const QString&)));
     connect(m_filterBar, SIGNAL(closeRequest()),
             this, SLOT(closeFilterBar()));
 
@@ -155,8 +173,6 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_topLayout->addWidget(itemView());
     m_topLayout->addWidget(m_filterBar);
     m_topLayout->addWidget(m_statusBar);
-
-    loadDirectory(m_urlNavigator->url());
 }
 
 DolphinView::~DolphinView()
@@ -189,6 +205,14 @@ void DolphinView::setMode(Mode mode)
 
     m_mode = mode;
 
+    if (isColumnViewActive()) {
+        // When changing the mode in the column view, it makes sense
+        // to go back to the root URL of the column view automatically.
+        // Otherwise there it would not be possible to turn off the column view
+        // without focusing the first column.
+        setUrl(m_dirLister->url());
+    }
+
     ViewProperties props(m_urlNavigator->url());
     props.setViewMode(m_mode);
 
@@ -209,9 +233,9 @@ void DolphinView::setShowPreview(bool show)
     props.setShowPreview(show);
 
     m_controller->setShowPreview(show);
-
     emit showPreviewChanged();
-    reload();
+
+    startDirLister(m_urlNavigator->url(), true);
 }
 
 bool DolphinView::showPreview() const
@@ -227,14 +251,11 @@ void DolphinView::setShowHiddenFiles(bool show)
 
     ViewProperties props(m_urlNavigator->url());
     props.setShowHiddenFiles(show);
-    props.save();
 
     m_dirLister->setShowingDotFiles(show);
-    m_urlNavigator->setShowHiddenFiles(show);
-
     emit showHiddenFilesChanged();
 
-    reload();
+    startDirLister(m_urlNavigator->url(), true);
 }
 
 bool DolphinView::showHiddenFiles() const
@@ -242,8 +263,47 @@ bool DolphinView::showHiddenFiles() const
     return m_dirLister->showingDotFiles();
 }
 
+void DolphinView::setCategorizedSorting(bool categorized)
+{
+    if (!supportsCategorizedSorting() || (categorized == categorizedSorting())) {
+        return;
+    }
+
+    Q_ASSERT(m_iconsView != 0);
+    if (categorized) {
+        Q_ASSERT(m_iconsView->itemCategorizer() == 0);
+        m_iconsView->setItemCategorizer(new DolphinItemCategorizer());
+    } else {
+        KItemCategorizer* categorizer = m_iconsView->itemCategorizer();
+        m_iconsView->setItemCategorizer(0);
+        delete categorizer;
+    }
+
+    ViewProperties props(m_urlNavigator->url());
+    props.setCategorizedSorting(categorized);
+    props.save();
+
+    emit categorizedSortingChanged();
+}
+
+bool DolphinView::categorizedSorting() const
+{
+    if (!supportsCategorizedSorting()) {
+        return false;
+    }
+
+    Q_ASSERT(m_iconsView != 0);
+    return m_iconsView->itemCategorizer() != 0;
+}
+
+bool DolphinView::supportsCategorizedSorting() const
+{
+    return m_iconsView != 0;
+}
+
 void DolphinView::renameSelectedItems()
 {
+    DolphinView* view = mainWindow()->activeView();
     const KUrl::List urls = selectedUrls();
     if (urls.count() > 1) {
         // More than one item has been selected for renaming. Open
@@ -253,80 +313,61 @@ void DolphinView::renameSelectedItems()
             return;
         }
 
-        DolphinView* view = mainWindow()->activeView();
         const QString& newName = dialog.newName();
         if (newName.isEmpty()) {
-            view->statusBar()->setMessage(i18n("The new item name is invalid."),
+            view->statusBar()->setMessage(dialog.errorString(),
                                           DolphinStatusBar::Error);
-        }
-        else {
+        } else {
             // TODO: check how this can be integrated into KonqUndoManager/KonqOperations
-
-            //UndoManager& undoMan = UndoManager::instance();
-            //undoMan.beginMacro();
-
-            assert(newName.contains('#'));
-
-            const int urlsCount = urls.count();
+            // 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('#');
-            assert(replaceIndex >= 0);
-            for (int i = 0; i < urlsCount; ++i) {
-                const KUrl& source = urls[i];
+            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(i + 1);
+                number.setNum(index++);
 
                 QString name(newName);
                 name.replace(replaceIndex, 1, number);
 
-                if (source.fileName() != name) {
-                    KUrl dest(source.upUrl());
-                    dest.addPath(name);
-
-                    const bool destExists = KIO::NetAccess::exists(dest, false, view);
-                    if (destExists) {
-                        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);
-                    }
+                if (oldUrl.fileName() != name) {
+                    KUrl newUrl = oldUrl;
+                    newUrl.setFileName(name);
+                    m_mainWindow->rename(oldUrl, newUrl);
                 }
+                ++it;
             }
-
-            //undoMan.endMacro();
         }
-    }
-    else {
+    } 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();
-            }
+        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);
         }
-        else {
-            KFileIconViewItem* item = static_cast<KFileIconViewItem*>(m_iconsView->firstItem());
-            while (item != 0) {
-                if (item->isSelected()) {
-                    item->rename();
-                    break;
-                }
-                item = static_cast<KFileIconViewItem*>(item->nextItem());
-            }
-        }*/
     }
 }
 
@@ -347,7 +388,6 @@ DolphinStatusBar* DolphinView::statusBar() const
 
 int DolphinView::contentsX() const
 {
-
     return itemView()->horizontalScrollBar()->value();
 }
 
@@ -356,11 +396,6 @@ int DolphinView::contentsY() const
     return itemView()->verticalScrollBar()->value();
 }
 
-void DolphinView::refreshSettings()
-{
-    startDirLister(m_urlNavigator->url());
-}
-
 void DolphinView::emitRequestItemInfo(const KUrl& url)
 {
     emit requestItemInfo(url);
@@ -368,7 +403,7 @@ void DolphinView::emitRequestItemInfo(const KUrl& url)
 
 bool DolphinView::isFilterBarVisible() const
 {
-  return m_filterBar->isVisible();
+    return m_filterBar->isVisible();
 }
 
 bool DolphinView::isUrlEditable() const
@@ -420,6 +455,22 @@ Qt::SortOrder DolphinView::sortOrder() const
     return m_proxyModel->sortOrder();
 }
 
+void DolphinView::setAdditionalInfo(KFileItemDelegate::AdditionalInformation info)
+{
+    ViewProperties props(m_urlNavigator->url());
+    props.setAdditionalInfo(info);
+
+    m_fileItemDelegate->setAdditionalInformation(info);
+
+    emit additionalInfoChanged(info);
+    startDirLister(m_urlNavigator->url(), true);
+}
+
+KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const
+{
+    return m_fileItemDelegate->additionalInformation();
+}
+
 void DolphinView::goBack()
 {
     m_urlNavigator->goBack();
@@ -442,17 +493,17 @@ void DolphinView::goHome()
 
 void DolphinView::setUrlEditable(bool editable)
 {
-    m_urlNavigator->editUrl(editable);
+    m_urlNavigator->setUrlEditable(editable);
 }
 
-const QLinkedList<UrlNavigator::HistoryElem> DolphinView::urlHistory(int& index) const
+bool DolphinView::hasSelection() const
 {
-    return m_urlNavigator->history(index);
+    return itemView()->selectionModel()->hasSelection();
 }
 
-bool DolphinView::hasSelection() const
+void DolphinView::clearSelection()
 {
-    return itemView()->selectionModel()->hasSelection();
+    itemView()->selectionModel()->clear();
 }
 
 KFileItemList DolphinView::selectedItems() const
@@ -514,8 +565,8 @@ void DolphinView::rename(const KUrl& source, const QString& newName)
     dest.addPath(newName);
 
     const bool destExists = KIO::NetAccess::exists(dest,
-                                                   false,
-                                                   mainWindow()->activeView());
+                            false,
+                            mainWindow()->activeView());
     if (destExists) {
         // the destination already exists, hence ask the user
         // how to proceed...
@@ -525,25 +576,23 @@ void DolphinView::rename(const KUrl& source, const QString& newName)
                                        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;
-            }
+        case KIO::R_OVERWRITE:
+            // the destination should be overwritten
+            ok = KIO::NetAccess::file_move(source, dest, -1, true);
+            break;
 
-            default:
-                // the renaming operation has been canceled
-                reload();
-                return;
+        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;
         }
-    }
-    else {
+
+        default:
+            // the renaming operation has been canceled
+            return;
+        }
+    } else {
         // no destination exists, hence just move the file to
         // do the renaming
         ok = KIO::NetAccess::file_move(source, dest);
@@ -551,21 +600,26 @@ void DolphinView::rename(const KUrl& source, const QString& newName)
 
     const QString destFileName = dest.fileName();
     if (ok) {
-        m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.",source.fileName(), destFileName),
+        m_statusBar->setMessage(i18n("Renamed file '%1' to '%2'.", source.fileName(), destFileName),
                                 DolphinStatusBar::OperationCompleted);
 
         KonqOperations::rename(this, source, destFileName);
-    }
-    else {
-        m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.",source.fileName(), destFileName),
+    } else {
+        m_statusBar->setMessage(i18n("Renaming of file '%1' to '%2' failed.", source.fileName(), destFileName),
                                 DolphinStatusBar::Error);
-        reload();
     }
 }
 
 void DolphinView::reload()
 {
-    startDirLister(m_urlNavigator->url(), true);
+    const KUrl& url = m_urlNavigator->url();
+    changeDirectory(url);
+    startDirLister(url, true);
+}
+
+void DolphinView::refresh()
+{
+    createView();
 }
 
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
@@ -579,15 +633,36 @@ DolphinMainWindow* DolphinView::mainWindow() const
     return m_mainWindow;
 }
 
-void DolphinView::loadDirectory(const KUrl& url)
+void DolphinView::changeDirectory(const KUrl& url)
 {
+    if (!isActive()) {
+        requestActivation();
+    }
+
     const ViewProperties props(url);
 
     const Mode mode = props.viewMode();
-    if (m_mode != mode) {
+    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();
+
+        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;
+        }
     }
 
     const bool showHiddenFiles = props.showHiddenFiles();
@@ -596,6 +671,22 @@ void DolphinView::loadDirectory(const KUrl& url)
         emit showHiddenFilesChanged();
     }
 
+    const bool categorized = props.categorizedSorting();
+    if (categorized != categorizedSorting()) {
+        if (supportsCategorizedSorting()) {
+            Q_ASSERT(m_iconsView != 0);
+            if (categorized) {
+                Q_ASSERT(m_iconsView->itemCategorizer() == 0);
+                m_iconsView->setItemCategorizer(new DolphinItemCategorizer());
+            } else {
+                KItemCategorizer* categorizer = m_iconsView->itemCategorizer();
+                m_iconsView->setItemCategorizer(0);
+                delete categorizer;
+            }
+        }
+        emit categorizedSortingChanged();
+    }
+
     const DolphinView::Sorting sorting = props.sorting();
     if (sorting != m_proxyModel->sorting()) {
         m_proxyModel->setSorting(sorting);
@@ -608,6 +699,13 @@ void DolphinView::loadDirectory(const KUrl& url)
         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);
@@ -638,34 +736,38 @@ void DolphinView::triggerItem(const QModelIndex& index)
         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).
-        const QString localPath(item->localPath());
-        if (localPath.isEmpty()) {
-            setUrl(item->url());
-        }
-        else {
-            setUrl(KUrl(localPath));
-        }
+    // 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;
     }
-    else if (item->isFile() && item->mimeTypePtr()->is("application/x-zip")) {
-        // allow to browse through ZIP files
-        const QString localPath(item->localPath());
-        KUrl url;
-        if (localPath.isEmpty()) {
-            url = item->url();
-        }
-        else {
-            url = localPath;
-        }
-        url.setProtocol("zip");
+
+    if (item->isDir()) {
         setUrl(url);
-    }
-    else {
+    } 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();
     }
 }
@@ -696,8 +798,7 @@ void DolphinView::updateItemCount()
         KFileItem* item = *it;
         if (item->isDir()) {
             ++m_folderCount;
-        }
-        else {
+        } else {
             ++m_fileCount;
         }
         ++it;
@@ -705,39 +806,56 @@ void DolphinView::updateItemCount()
 
     updateStatusBar();
 
+    m_blockContentsMovedSignal = false;
     QTimer::singleShot(0, this, SLOT(restoreContentsPos()));
 }
 
 void DolphinView::generatePreviews(const KFileItemList& items)
 {
     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&)));
+
+        // Must turn QList<KFileItem *> to QList<KFileItem>...
+        QList<KFileItem> itemsToPreview;
+        foreach( KFileItem* it, items )
+            itemsToPreview.append( *it );
+
+        KIO::PreviewJob* job = KIO::filePreview(itemsToPreview, 128);
+        connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
+                this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
     }
 }
 
-void DolphinView::showPreview(const KFileItem* item, const QPixmap& pixmap)
+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_dirModel->indexForItem(item);
     if (idx.isValid() && (idx.column() == 0)) {
-        m_dirModel->setData(idx, pixmap, Qt::DecorationRole);
+        const QMimeData* mimeData = QApplication::clipboard()->mimeData();
+        if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) {
+            KIconEffect iconEffect;
+            const QPixmap cutPixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState);
+            m_dirModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole);
+        } else {
+            m_dirModel->setData(idx, QIcon(pixmap), Qt::DecorationRole);
+        }
     }
 }
 
 void DolphinView::restoreContentsPos()
 {
-    int index = 0;
-    const QLinkedList<UrlNavigator::HistoryElem> history = urlHistory(index);
-    if (!history.isEmpty()) {
+    KUrl currentUrl = m_urlNavigator->url();
+    if (!currentUrl.isEmpty()) {
         QAbstractItemView* view = itemView();
-        // TODO: view->setCurrentItem(history[index].currentFileName());
-
-        QLinkedList<UrlNavigator::HistoryElem>::const_iterator it = history.begin();
-        it += index;
-        view->horizontalScrollBar()->setValue((*it).contentsX());
-        view->verticalScrollBar()->setValue((*it).contentsY());
+        // TODO: view->setCurrentItem(m_urlNavigator->currentFileName());
+        QPoint pos = m_urlNavigator->savedPosition();
+        view->horizontalScrollBar()->setValue(pos.x());
+        view->verticalScrollBar()->setValue(pos.y());
     }
 }
 
@@ -753,7 +871,7 @@ void DolphinView::showErrorMessage(const QString& msg)
 
 void DolphinView::emitSelectionChangedSignal()
 {
-    emit selectionChanged();
+    emit selectionChanged(DolphinView::selectedItems());
 }
 
 void DolphinView::closeFilterBar()
@@ -768,9 +886,8 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
         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),
+        } else {
+            m_statusBar->setMessage(i18n("The location '%1' is invalid.", location),
                                     DolphinStatusBar::Error);
         }
         return;
@@ -781,14 +898,52 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
     // the directory loading progress information has the lowest priority.
     const QString progressText(m_statusBar->progressText());
     m_showProgress = progressText.isEmpty() ||
-                     (progressText == i18n("Loading directory..."));
+                     (progressText == i18n("Loading folder..."));
     if (m_showProgress) {
-        m_statusBar->setProgressText(i18n("Loading directory..."));
+        m_statusBar->setProgressText(i18n("Loading folder..."));
         m_statusBar->setProgress(0);
     }
 
+    m_cutItemsCache.clear();
+    m_blockContentsMovedSignal = true;
     m_dirLister->stop();
-    m_dirLister->openUrl(url, false, reload);
+
+    bool openDir = true;
+    bool keepOldDirs = isColumnViewActive() && !m_initializeColumnView;
+    m_initializeColumnView = false;
+
+    if (keepOldDirs) {
+        if (reload) {
+            keepOldDirs = false;
+
+            const KUrl& dirListerUrl = m_dirLister->url();
+            if (dirListerUrl.isValid()) {
+                const KUrl::List dirs = m_dirLister->directories();
+                KUrl url;
+                foreach(url, dirs) {
+                    m_dirLister->updateDirectory(url);
+                }
+                openDir = false;
+            }
+        } else if (m_dirLister->directories().contains(url)) {
+            // The dir lister contains the directory already, so
+            // KDirLister::openUrl() may not been invoked twice.
+            m_dirLister->updateDirectory(url);
+            openDir = false;
+        } else {
+            const KUrl& dirListerUrl = m_dirLister->url();
+            if ((dirListerUrl == url) || !m_dirLister->url().isParentOf(url)) {
+                // The current URL is not a child of the dir lister
+                // URL. This may happen when e. g. a bookmark has been selected
+                // and hence the view must be reset.
+                keepOldDirs = false;
+            }
+        }
+    }
+
+    if (openDir) {
+        m_dirLister->openUrl(url, keepOldDirs, reload);
+    }
 }
 
 QString DolphinView::defaultStatusBarText() const
@@ -814,12 +969,11 @@ QString DolphinView::selectionStatusBarText() const
     KIO::filesize_t byteSize = 0;
     KFileItemList::const_iterator it = list.begin();
     const KFileItemList::const_iterator end = list.end();
-    while (it != end){
+    while (it != end) {
         KFileItem* item = *it;
         if (item->isDir()) {
             ++folderCount;
-        }
-        else {
+        } else {
             ++fileCount;
             byteSize += item->size();
         }
@@ -843,11 +997,10 @@ QString DolphinView::selectionStatusBarText() const
 
 void DolphinView::showFilterBar(bool show)
 {
-    assert(m_filterBar != 0);
+    Q_ASSERT(m_filterBar != 0);
     if (show) {
         m_filterBar->show();
-    }
-    else {
+    } else {
         m_filterBar->hide();
     }
 }
@@ -880,6 +1033,27 @@ void DolphinView::requestActivation()
     m_mainWindow->setActiveView(this);
 }
 
+void DolphinView::changeSelection(const KFileItemList& selection)
+{
+    clearSelection();
+    if (selection.isEmpty()) {
+        return;
+    }
+    KUrl baseUrl = url();
+    KUrl url;
+    QItemSelection new_selection;
+    foreach(KFileItem* item, selection) {
+        url = item->url().upUrl();
+        if (baseUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
+            QModelIndex index = m_proxyModel->mapFromSource(m_dirModel->indexForItem(*item));
+            new_selection.select(index, index);
+        }
+    }
+    itemView()->selectionModel()->select(new_selection,
+                                         QItemSelectionModel::ClearAndSelect
+                                         | QItemSelectionModel::Current);
+}
+
 void DolphinView::changeNameFilter(const QString& nameFilter)
 {
     // The name filter of KDirLister does a 'hard' filtering, which
@@ -901,7 +1075,7 @@ void DolphinView::changeNameFilter(const QString& nameFilter)
     m_dirLister->setNameFilter(adjustedFilter);
     m_dirLister->emitChanges();
 #else
-    m_proxyModel->setFilterRegExp( nameFilter );
+    m_proxyModel->setFilterRegExp(nameFilter);
 #endif
 }
 
@@ -914,26 +1088,32 @@ void DolphinView::openContextMenu(const QPoint& pos)
         item = fileItem(index);
     }
 
-    DolphinContextMenu contextMenu(this, item);
+    DolphinContextMenu contextMenu(m_mainWindow, item, url());
     contextMenu.open();
 }
 
 void DolphinView::dropUrls(const KUrl::List& urls,
-                           const QPoint& pos)
+                           const QModelIndex& index,
+                           QWidget* source)
 {
     KFileItem* directory = 0;
-    const QModelIndex index = itemView()->indexAt(pos);
     if (isValidNameIndex(index)) {
         KFileItem* item = fileItem(index);
-        assert(item != 0);
+        Q_ASSERT(item != 0);
         if (item->isDir()) {
             // the URLs are dropped above a directory
             directory = item;
         }
     }
 
+    if ((directory == 0) && (source == itemView())) {
+        // The dropping is done into the same viewport where
+        // the dragging has been started. Just ignore this...
+        return;
+    }
+
     const KUrl& destination = (directory == 0) ? url() :
-                                                 directory->url();
+                              directory->url();
     dropUrls(urls, destination);
 }
 
@@ -943,7 +1123,6 @@ void DolphinView::dropUrls(const KUrl::List& urls,
     m_mainWindow->dropUrls(urls, destination);
 }
 
-
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
     ViewProperties props(url());
@@ -966,12 +1145,37 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
 
 void DolphinView::emitContentsMoved()
 {
-    emit contentsMoved(contentsX(), contentsY());
+    if (!m_blockContentsMovedSignal) {
+        emit contentsMoved(contentsX(), contentsY());
+    }
 }
 
 void DolphinView::updateActivationState()
 {
     m_urlNavigator->setActive(isActive());
+    if (isActive()) {
+        emit urlChanged(url());
+        emit selectionChanged(selectedItems());
+    }
+}
+
+void DolphinView::updateCutItems()
+{
+    // restore the icons of all previously selected items to the
+    // original state...
+    QList<CutItem>::const_iterator it = m_cutItemsCache.begin();
+    QList<CutItem>::const_iterator end = m_cutItemsCache.end();
+    while (it != end) {
+        const QModelIndex index = m_dirModel->indexForUrl((*it).url);
+        if (index.isValid()) {
+            m_dirModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole);
+        }
+        ++it;
+    }
+    m_cutItemsCache.clear();
+
+    // ... and apply an item effect to all currently cut items
+    applyCutItemEffect();
 }
 
 void DolphinView::createView()
@@ -981,27 +1185,46 @@ void DolphinView::createView()
     if (view != 0) {
         m_topLayout->removeWidget(view);
         view->close();
+        if (view == m_iconsView) {
+            KItemCategorizer* categorizer = m_iconsView->itemCategorizer();
+            m_iconsView->setItemCategorizer(0);
+            delete categorizer;
+        }
         view->deleteLater();
+        view = 0;
         m_iconsView = 0;
         m_detailsView = 0;
+        m_columnView = 0;
+        m_fileItemDelegate = 0;
     }
 
-    assert(m_iconsView == 0);
-    assert(m_detailsView == 0);
+    Q_ASSERT(m_iconsView == 0);
+    Q_ASSERT(m_detailsView == 0);
+    Q_ASSERT(m_columnView == 0);
 
     // ... 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 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;
     }
 
+    Q_ASSERT(view != 0);
+
+    m_fileItemDelegate = new KFileItemDelegate(view);
+    view->setItemDelegate(m_fileItemDelegate);
+
     view->setModel(m_proxyModel);
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
@@ -1023,7 +1246,7 @@ void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
 
     const QModelIndex topLeft = itemModel->index(0, 0);
     const QModelIndex bottomRight = itemModel->index(itemModel->rowCount() - 1,
-                                                     itemModel->columnCount() - 1);
+                                    itemModel->columnCount() - 1);
 
     QItemSelection selection(topLeft, bottomRight);
     selectionModel->select(selection, flags);
@@ -1031,10 +1254,12 @@ void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
 
 QAbstractItemView* DolphinView::itemView() const
 {
-    Q_ASSERT((m_iconsView == 0) || (m_detailsView == 0));
     if (m_detailsView != 0) {
         return m_detailsView;
+    } else if (m_columnView != 0) {
+        return m_columnView;
     }
+
     return m_iconsView;
 }
 
@@ -1043,4 +1268,59 @@ bool DolphinView::isValidNameIndex(const QModelIndex& index) const
     return index.isValid() && (index.column() == KDirModel::Name);
 }
 
+bool DolphinView::isCutItem(const KFileItem& item) const
+{
+    const QMimeData* mimeData = QApplication::clipboard()->mimeData();
+    const KUrl::List cutUrls = KUrl::List::fromMimeData(mimeData);
+
+    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;
+    }
+
+    return false;
+}
+
+void DolphinView::applyCutItemEffect()
+{
+    const QMimeData* mimeData = QApplication::clipboard()->mimeData();
+    if (!KonqMimeData::decodeIsCutSelection(mimeData)) {
+        return;
+    }
+
+    KFileItemList items(m_dirLister->items());
+    KFileItemList::const_iterator it = items.begin();
+    const KFileItemList::const_iterator end = items.end();
+    while (it != end) {
+        KFileItem* item = *it;
+        if (isCutItem(*item)) {
+            const QModelIndex index = m_dirModel->indexForItem(*item);
+            const KFileItem* item = m_dirModel->itemForIndex(index);
+            const QVariant value = m_dirModel->data(index, Qt::DecorationRole);
+            if ((value.type() == QVariant::Icon) && (item != 0)) {
+                const QIcon icon(qvariant_cast<QIcon>(value));
+                QPixmap pixmap = icon.pixmap(128, 128);
+
+                // remember current pixmap for the item to be able
+                // to restore it when other items get cut
+                CutItem cutItem;
+                cutItem.url = item->url();
+                cutItem.pixmap = pixmap;
+                m_cutItemsCache.append(cutItem);
+
+                // apply icon effect to the cut item
+                KIconEffect iconEffect;
+                pixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState);
+                m_dirModel->setData(index, QIcon(pixmap), Qt::DecorationRole);
+            }
+        }
+        ++it;
+    }
+}
+
 #include "dolphinview.moc"