Patch by Luca Gugelmann: get rid of any mainwindow dependency from the sidebars.

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 86b864583dd7c41c6e80b8f76ab55e24b963c443..99757bac7510015391bd6c6bc5340e34b847a258 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -20,9 +20,8 @@
 
 #include "dolphinview.h"
 
 
 #include "dolphinview.h"
 

-#include <assert.h>
-

 #include <QApplication>
 #include <QApplication>

+#include <QClipboard>

 #include <QDropEvent>
 #include <QItemSelectionModel>
 #include <QMouseEvent>
 #include <QDropEvent>
 #include <QItemSelectionModel>
 #include <QMouseEvent>


@@ -31,9 +30,12 @@
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>
 #include <klocale.h>
 #include <kdirmodel.h>
 #include <kfileitemdelegate.h>
 #include <klocale.h>

+#include <kiconeffect.h>

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

+#include <kio/previewjob.h>

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

+#include <konqmimedata.h>

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


@@ -57,6 +59,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
                          bool showHiddenFiles) :
     QWidget(parent),
     m_showProgress(false),
                          bool showHiddenFiles) :
     QWidget(parent),
     m_showProgress(false),

+    m_blockContentsMovedSignal(false),

     m_mode(mode),
     m_iconSize(0),
     m_folderCount(0),
     m_mode(mode),
     m_iconSize(0),
     m_folderCount(0),


@@ -67,6 +70,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_controller(0),
     m_iconsView(0),
     m_detailsView(0),
     m_controller(0),
     m_iconsView(0),
     m_detailsView(0),

+    m_fileItemDelegate(0),

     m_filterBar(0),
     m_statusBar(0),
     m_dirModel(0),
     m_filterBar(0),
     m_statusBar(0),
     m_dirModel(0),


@@ -82,7 +86,12 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     connect(m_mainWindow, SIGNAL(activeViewChanged()),
             this, SLOT(updateActivationState()));
 
     connect(m_mainWindow, SIGNAL(activeViewChanged()),
             this, SLOT(updateActivationState()));
 

+    QClipboard* clipboard = QApplication::clipboard();
+    connect(clipboard, SIGNAL(dataChanged()),
+            this, SLOT(updateCutItems()));
+

     m_urlNavigator = new UrlNavigator(url, this);
     m_urlNavigator = new UrlNavigator(url, this);

+    m_urlNavigator->setShowHiddenFiles(showHiddenFiles);

     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(loadDirectory(const KUrl&)));
     connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(loadDirectory(const KUrl&)));
     connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),


@@ -108,6 +117,10 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
             this, SLOT(updateStatusBar()));
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(updateItemCount()));
             this, SLOT(updateStatusBar()));
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(updateItemCount()));

+    connect(m_dirLister, SIGNAL(completed()),
+            this, SLOT(updateCutItems()));
+    connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
+            this, SLOT(generatePreviews(const KFileItemList&)));

     connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
             this, SLOT(showInfoMessage(const QString&)));
     connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
     connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
             this, SLOT(showInfoMessage(const QString&)));
     connect(m_dirLister, SIGNAL(errorMessage(const QString&)),


@@ -123,8 +136,8 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_controller = new DolphinController(this);
     connect(m_controller, SIGNAL(requestContextMenu(const QPoint&)),
             this, SLOT(openContextMenu(const QPoint&)));
     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)),
     connect(m_controller, SIGNAL(sortingChanged(DolphinView::Sorting)),
             this, SLOT(updateSorting(DolphinView::Sorting)));
     connect(m_controller, SIGNAL(sortOrderChanged(Qt::SortOrder)),


@@ -151,8 +164,6 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_topLayout->addWidget(itemView());
     m_topLayout->addWidget(m_filterBar);
     m_topLayout->addWidget(m_statusBar);
     m_topLayout->addWidget(itemView());
     m_topLayout->addWidget(m_filterBar);
     m_topLayout->addWidget(m_statusBar);

-
-    loadDirectory(m_urlNavigator->url());

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


@@ -204,15 +215,15 @@ void DolphinView::setShowPreview(bool show)
     ViewProperties props(m_urlNavigator->url());
     props.setShowPreview(show);
 
     ViewProperties props(m_urlNavigator->url());
     props.setShowPreview(show);
 

-    // TODO: wait until previews are possible with KFileItemDelegate
+    m_controller->setShowPreview(show);

 
     emit showPreviewChanged();
 
     emit showPreviewChanged();

+    reload();

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

-    // TODO: wait until previews are possible with KFileItemDelegate
-    return true;
+    return m_controller->showPreview();

 }
 
 void DolphinView::setShowHiddenFiles(bool show)
 }
 
 void DolphinView::setShowHiddenFiles(bool show)


@@ -226,6 +237,7 @@ void DolphinView::setShowHiddenFiles(bool show)
     props.save();
 
     m_dirLister->setShowingDotFiles(show);
     props.save();
 
     m_dirLister->setShowingDotFiles(show);

+    m_urlNavigator->setShowHiddenFiles(show);

 
     emit showHiddenFilesChanged();
 
 
     emit showHiddenFilesChanged();
 


@@ -239,6 +251,7 @@ bool DolphinView::showHiddenFiles() const
 
 void DolphinView::renameSelectedItems()
 {
 
 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
     const KUrl::List urls = selectedUrls();
     if (urls.count() > 1) {
         // More than one item has been selected for renaming. Open


@@ -248,80 +261,64 @@ void DolphinView::renameSelectedItems()
             return;
         }
 
             return;
         }
 

-        DolphinView* view = mainWindow()->activeView();

         const QString& newName = dialog.newName();
         if (newName.isEmpty()) {
         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 {
             // TODO: check how this can be integrated into KonqUndoManager/KonqOperations
                                           DolphinStatusBar::Error);
         }
         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('#');
 
             // 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;
                 QString number;

-                number.setNum(i + 1);
+                number.setNum(index++);

 
                 QString name(newName);
                 name.replace(replaceIndex, 1, number);
 
 
                 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.upUrl());
+                    newUrl.addPath(name);
+                    m_mainWindow->rename(oldUrl, newUrl);

                 }
                 }

+                ++it;

             }
             }

-
-            //undoMan.endMacro();

         }
     }
     else {
         // Only one item has been selected for renaming. Use the custom
         // renaming mechanism from the views.
         }
     }
     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 {
         }
         else {

-            KFileIconViewItem* item = static_cast<KFileIconViewItem*>(m_iconsView->firstItem());
-            while (item != 0) {
-                if (item->isSelected()) {
-                    item->rename();
-                    break;
-                }
-                item = static_cast<KFileIconViewItem*>(item->nextItem());
-            }
-        }*/
+            const KUrl& oldUrl = urls.first();
+            KUrl newUrl = oldUrl.upUrl();
+            newUrl.addPath(newName);
+            m_mainWindow->rename(oldUrl, newUrl);
+        }

     }
 }
 
     }
 }
 


@@ -373,22 +370,22 @@ bool DolphinView::isUrlEditable() const
 
 void DolphinView::zoomIn()
 {
 
 void DolphinView::zoomIn()
 {

-    //itemEffectsManager()->zoomIn();
+    m_controller->triggerZoomIn();

 }
 
 void DolphinView::zoomOut()
 {
 }
 
 void DolphinView::zoomOut()
 {

-    //itemEffectsManager()->zoomOut();
+    m_controller->triggerZoomOut();

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

-    return false; //itemEffectsManager()->isZoomInPossible();
+    return m_controller->isZoomInPossible();

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

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

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


@@ -415,6 +412,22 @@ Qt::SortOrder DolphinView::sortOrder() const
     return m_proxyModel->sortOrder();
 }
 
     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);
+    reload();
+}
+
+KFileItemDelegate::AdditionalInformation DolphinView::additionalInfo() const
+{
+    return m_fileItemDelegate->additionalInformation();
+}
+

 void DolphinView::goBack()
 {
     m_urlNavigator->goBack();
 void DolphinView::goBack()
 {
     m_urlNavigator->goBack();


@@ -450,13 +463,18 @@ bool DolphinView::hasSelection() const
     return itemView()->selectionModel()->hasSelection();
 }
 
     return itemView()->selectionModel()->hasSelection();
 }
 

+void DolphinView::clearSelection()
+{
+    itemView()->selectionModel()->clear();
+}
+

 KFileItemList DolphinView::selectedItems() const
 {
     const QAbstractItemView* view = itemView();
 
     // Our view has a selection, we will map them back to the DirModel
     // and then fill the KFileItemList.
 KFileItemList DolphinView::selectedItems() const
 {
     const QAbstractItemView* view = itemView();
 
     // Our view has a selection, we will map them back to the DirModel
     // and then fill the KFileItemList.

-    assert((view != 0) && (view->selectionModel() != 0));
+    Q_ASSERT((view != 0) && (view->selectionModel() != 0));

 
     const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
     KFileItemList itemList;
 
     const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
     KFileItemList itemList;


@@ -464,7 +482,7 @@ KFileItemList DolphinView::selectedItems() const
     const QModelIndexList indexList = selection.indexes();
     QModelIndexList::const_iterator end = indexList.end();
     for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) {
     const QModelIndexList indexList = selection.indexes();
     QModelIndexList::const_iterator end = indexList.end();
     for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) {

-        assert((*it).isValid());
+        Q_ASSERT((*it).isValid());

 
         KFileItem* item = m_dirModel->itemForIndex(*it);
         if (item != 0) {
 
         KFileItem* item = m_dirModel->itemForIndex(*it);
         if (item != 0) {


@@ -576,6 +594,10 @@ DolphinMainWindow* DolphinView::mainWindow() const
 
 void DolphinView::loadDirectory(const KUrl& url)
 {
 
 void DolphinView::loadDirectory(const KUrl& url)
 {

+    if(!isActive()) {
+        requestActivation();
+    }
+

     const ViewProperties props(url);
 
     const Mode mode = props.viewMode();
     const ViewProperties props(url);
 
     const Mode mode = props.viewMode();


@@ -603,7 +625,18 @@ void DolphinView::loadDirectory(const KUrl& url)
         emit sortOrderChanged(sortOrder);
     }
 
         emit sortOrderChanged(sortOrder);
     }
 

-    // TODO: handle previews (props.showPreview())
+    KFileItemDelegate::AdditionalInformation info = props.additionalInfo();
+    if (info != m_fileItemDelegate->additionalInformation()) {
+        m_fileItemDelegate->setAdditionalInformation(info);
+
+        emit additionalInfoChanged(info);
+    }
+
+    const bool showPreview = props.showPreview();
+    if (showPreview != m_controller->showPreview()) {
+        m_controller->setShowPreview(showPreview);
+        emit showPreviewChanged();
+    }

 
     startDirLister(url);
     emit urlChanged(url);
 
     startDirLister(url);
     emit urlChanged(url);


@@ -613,6 +646,10 @@ void DolphinView::loadDirectory(const KUrl& url)
 
 void DolphinView::triggerItem(const QModelIndex& index)
 {
 
 void DolphinView::triggerItem(const QModelIndex& index)
 {

+    if (!isValidNameIndex(index)) {
+        return;
+    }
+

     const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
     if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {
         // items are selected by the user, hence don't trigger the
     const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
     if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {
         // items are selected by the user, hence don't trigger the


@@ -625,18 +662,40 @@ void DolphinView::triggerItem(const QModelIndex& index)
         return;
     }
 
         return;
     }
 

+    // Prefer the local path over the URL. This assures that the
+    // volume space information is correct. Assuming that the URL is media:/sda1,
+    // and the local path is /windows/C: For the URL the space info is related
+    // to the root partition (and hence wrong) and for the local path the space
+    // info is related to the windows partition (-> correct).
+    const QString localPath(item->localPath());
+    KUrl url;
+    if (localPath.isEmpty()) {
+        url = item->url();
+    }
+    else {
+        url = localPath;
+    }
+

     if (item->isDir()) {
     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());
+        setUrl(url);
+    }
+    else if (item->isFile()) {
+        // allow to browse through ZIP and tar files
+        KMimeType::Ptr mime = item->mimeTypePtr();
+        if (mime->is("application/zip")) {
+            url.setProtocol("zip");
+            setUrl(url);
+        }
+        else if (mime->is("application/x-tar") ||
+                 mime->is("application/x-tarz") ||
+                 mime->is("application/x-bzip-compressed-tar") ||
+                 mime->is("application/x-compressed-tar") ||
+                 mime->is("application/x-tzo")) {
+            url.setProtocol("tar");
+            setUrl(url);

         }
         else {
         }
         else {

-            setUrl(KUrl(localPath));
+            item->run();

         }
     }
     else {
         }
     }
     else {


@@ -654,7 +713,7 @@ void DolphinView::updateProgress(int percent)
 void DolphinView::updateItemCount()
 {
     if (m_showProgress) {
 void DolphinView::updateItemCount()
 {
     if (m_showProgress) {

-        m_statusBar->setProgressText(QString::null);
+        m_statusBar->setProgressText(QString());

         m_statusBar->setProgress(100);
         m_showProgress = false;
     }
         m_statusBar->setProgress(100);
         m_showProgress = false;
     }


@@ -679,9 +738,36 @@ void DolphinView::updateItemCount()
 
     updateStatusBar();
 
 
     updateStatusBar();
 

+    m_blockContentsMovedSignal = false;

     QTimer::singleShot(0, this, SLOT(restoreContentsPos()));
 }
 
     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&)));
+    }
+}
+
+void DolphinView::showPreview(const KFileItem* item, const QPixmap& pixmap)
+{
+    Q_ASSERT(item != 0);
+    const QModelIndex idx = m_dirModel->indexForItem(*item);
+    if (idx.isValid() && (idx.column() == 0)) {
+        const QMimeData* mimeData = QApplication::clipboard()->mimeData();
+        if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(*item)) {
+            KIconEffect iconEffect;
+            const QPixmap cutPixmap = iconEffect.apply(pixmap, K3Icon::Desktop, K3Icon::DisabledState);
+            m_dirModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole);
+        }
+        else {
+            m_dirModel->setData(idx, QIcon(pixmap), Qt::DecorationRole);
+        }
+    }
+}
+

 void DolphinView::restoreContentsPos()
 {
     int index = 0;
 void DolphinView::restoreContentsPos()
 {
     int index = 0;


@@ -709,7 +795,7 @@ void DolphinView::showErrorMessage(const QString& msg)
 
 void DolphinView::emitSelectionChangedSignal()
 {
 
 void DolphinView::emitSelectionChangedSignal()
 {

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

 }
 
 void DolphinView::closeFilterBar()
 }
 
 void DolphinView::closeFilterBar()


@@ -743,6 +829,8 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
         m_statusBar->setProgress(0);
     }
 
         m_statusBar->setProgress(0);
     }
 

+    m_cutItemsCache.clear();
+    m_blockContentsMovedSignal = true;

     m_dirLister->stop();
     m_dirLister->openUrl(url, false, reload);
 }
     m_dirLister->stop();
     m_dirLister->openUrl(url, false, reload);
 }


@@ -799,7 +887,7 @@ QString DolphinView::selectionStatusBarText() const
 
 void DolphinView::showFilterBar(bool show)
 {
 
 void DolphinView::showFilterBar(bool show)
 {

-    assert(m_filterBar != 0);
+    Q_ASSERT(m_filterBar != 0);

     if (show) {
         m_filterBar->show();
     }
     if (show) {
         m_filterBar->show();
     }


@@ -836,6 +924,27 @@ void DolphinView::requestActivation()
     m_mainWindow->setActiveView(this);
 }
 
     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
 void DolphinView::changeNameFilter(const QString& nameFilter)
 {
     // The name filter of KDirLister does a 'hard' filtering, which


@@ -866,28 +975,34 @@ void DolphinView::openContextMenu(const QPoint& pos)
     KFileItem* item = 0;
 
     const QModelIndex index = itemView()->indexAt(pos);
     KFileItem* item = 0;
 
     const QModelIndex index = itemView()->indexAt(pos);

-    if (index.isValid()) {
+    if (isValidNameIndex(index)) {

         item = fileItem(index);
     }
 
         item = fileItem(index);
     }
 

-    DolphinContextMenu contextMenu(this, item);
+    DolphinContextMenu contextMenu(m_mainWindow, item, url());

     contextMenu.open();
 }
 
 void DolphinView::dropUrls(const KUrl::List& urls,
     contextMenu.open();
 }
 
 void DolphinView::dropUrls(const KUrl::List& urls,

-                           const QPoint& pos)
+                           const QModelIndex& index,
+                           QWidget* source)

 {
     KFileItem* directory = 0;
 {
     KFileItem* directory = 0;

-    const QModelIndex index = itemView()->indexAt(pos);
-    if (index.isValid()) {
+    if (isValidNameIndex(index)) {

         KFileItem* item = fileItem(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 (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();
     dropUrls(urls, destination);
     const KUrl& destination = (directory == 0) ? url() :
                                                  directory->url();
     dropUrls(urls, destination);


@@ -899,7 +1014,6 @@ void DolphinView::dropUrls(const KUrl::List& urls,
     m_mainWindow->dropUrls(urls, destination);
 }
 
     m_mainWindow->dropUrls(urls, destination);
 }
 

-

 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
     ViewProperties props(url());
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
     ViewProperties props(url());


@@ -922,12 +1036,37 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
 
 void DolphinView::emitContentsMoved()
 {
 
 void DolphinView::emitContentsMoved()
 {

-    emit contentsMoved(contentsX(), contentsY());
+    if (!m_blockContentsMovedSignal) {
+        emit contentsMoved(contentsX(), contentsY());
+    }

 }
 
 void DolphinView::updateActivationState()
 {
     m_urlNavigator->setActive(isActive());
 }
 
 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()
 }
 
 void DolphinView::createView()


@@ -938,12 +1077,14 @@ void DolphinView::createView()
         m_topLayout->removeWidget(view);
         view->close();
         view->deleteLater();
         m_topLayout->removeWidget(view);
         view->close();
         view->deleteLater();

+        view = 0;

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

+        m_fileItemDelegate = 0;

     }
 
     }
 

-    assert(m_iconsView == 0);
-    assert(m_detailsView == 0);
+    Q_ASSERT(m_iconsView == 0);
+    Q_ASSERT(m_detailsView == 0);

 
     // ... and recreate it representing the current mode
     switch (m_mode) {
 
     // ... and recreate it representing the current mode
     switch (m_mode) {


@@ -958,13 +1099,14 @@ void DolphinView::createView()
             break;
     }
 
             break;
     }
 

+    Q_ASSERT(view != 0);
+
+    m_fileItemDelegate = new KFileItemDelegate(view);
+    view->setItemDelegate(m_fileItemDelegate);
+

     view->setModel(m_proxyModel);
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
     view->setModel(m_proxyModel);
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 

-    KFileItemDelegate* delegate = new KFileItemDelegate(this);
-    delegate->setAdditionalInformation(KFileItemDelegate::FriendlyMimeType);
-    view->setItemDelegate(delegate);
-

     new KMimeTypeResolver(view, m_dirModel);
     m_topLayout->insertWidget(1, view);
 
     new KMimeTypeResolver(view, m_dirModel);
     m_topLayout->insertWidget(1, view);
 


@@ -991,11 +1133,71 @@ void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
 
 QAbstractItemView* DolphinView::itemView() const
 {
 
 QAbstractItemView* DolphinView::itemView() const
 {

-    assert((m_iconsView == 0) || (m_detailsView == 0));
+    Q_ASSERT((m_iconsView == 0) || (m_detailsView == 0));

     if (m_detailsView != 0) {
         return m_detailsView;
     }
     return m_iconsView;
 }
 
     if (m_detailsView != 0) {
         return m_detailsView;
     }
     return m_iconsView;
 }
 

+bool DolphinView::isValidNameIndex(const QModelIndex& index) const
+{
+    return index.isValid() && (index.column() == KDirModel::Name);
+}
+
+bool DolphinView::isCutItem(const KFileItem& item) const
+{
+    const QMimeData* mimeData = QApplication::clipboard()->mimeData();
+    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"
 #include "dolphinview.moc"