Fix dolphin to only enable the Cut context menu option if the file capabilites suppor...

[dolphin.git] / src / iconmanager.cpp

diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp
index 78bb89cf80e35023eeab3a24b12fc4bb52e5cdcb..a8ccc9ed1d090ac9b018162117a96dbce2e95955 100644 (file)
--- a/src/iconmanager.cpp
+++ b/src/iconmanager.cpp
@@ -84,8 +84,9 @@ void IconManager::updatePreviews()
     }
 
     killJobs();
-    KFileItemList itemList;
+    m_cutItemsCache.clear();
 
+    KFileItemList itemList;
     const int rowCount = m_dolphinModel->rowCount();
     for (int row = 0; row < rowCount; ++row) {
         const QModelIndex index = m_dolphinModel->index(row, 0);
@@ -94,6 +95,7 @@ void IconManager::updatePreviews()
     }
 
     generatePreviews(itemList);
+    updateCutItems();
 }
 
 void IconManager::generatePreviews(const KFileItemList& items)
@@ -232,6 +234,20 @@ void IconManager::replaceIcon(const KUrl& url, const QPixmap& pixmap)
 
         const QMimeData* mimeData = QApplication::clipboard()->mimeData();
         if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) {
+            // Remember the current icon in the cache for cut items before
+            // the disabled effect is applied. This makes it possible restoring
+            // the uncut version again when cutting other items.
+            QList<ItemInfo>::iterator begin = m_cutItemsCache.begin();
+            QList<ItemInfo>::iterator end   = m_cutItemsCache.end();
+            for (QList<ItemInfo>::iterator it = begin; it != end; ++it) {
+                if ((*it).url == item.url()) {
+                    (*it).pixmap = icon;
+                    break;
+                }
+            }
+
+            // apply the disabled effect to the icon for marking it as "cut item"
+            // and apply the icon to the item
             KIconEffect iconEffect;
             icon = iconEffect.apply(icon, KIconLoader::Desktop, KIconLoader::DisabledState);
             m_dolphinModel->setData(idx, QIcon(icon), Qt::DecorationRole);