X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bfcf764b69b9375b1b458d0a0c8ee95f3cb650ac..b5cc2a6924cfd8f59611d3cec2edbb00a08b4ff1:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index dc46a9429..e0a0a5633 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -528,11 +528,32 @@ void DolphinMainWindow::undo()
 
 void DolphinMainWindow::cut()
 {
+    QClipboard* clipboard = QApplication::clipboard();
+    const QMimeData* currentMimeData = clipboard->mimeData();
+    const bool hadCutSelection = KonqMimeData::decodeIsCutSelection(currentMimeData);
+
     QMimeData* mimeData = new QMimeData();
     const KUrl::List kdeUrls = m_activeView->selectedUrls();
     const KUrl::List mostLocalUrls;
     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);
     QApplication::clipboard()->setMimeData(mimeData);
+
+    if (hadCutSelection) {
+        // If an old cut selection has been applied, the view must
+        // be reloaded to get the original icons of the items without an
+        // applied item effect.
+        m_view[PrimaryIdx]->reload();
+        if (m_view[SecondaryIdx] != 0) {
+            m_view[SecondaryIdx]->reload();
+        }
+    }
+    else {
+        // apply an item effect for the icons of all cut items
+        m_view[PrimaryIdx]->updateCutItems();
+        if (m_view[SecondaryIdx] != 0) {
+            m_view[SecondaryIdx]->updateCutItems();
+        }
+    }
 }
 
 void DolphinMainWindow::copy()
@@ -595,13 +616,7 @@ void DolphinMainWindow::updatePasteAction()
     if (!urls.isEmpty()) {
         pasteAction->setEnabled(true);
 
-        const int count = urls.count();
-        if (count == 1) {
-            pasteAction->setText(i18n("Paste 1 File"));
-        }
-        else {
-            pasteAction->setText(i18n("Paste %1 Files", count));
-        }
+        pasteAction->setText(i18np("Paste One File", "Paste %1 Files", urls.count()));
     }
     else {
         pasteAction->setEnabled(false);