Create a SidebarTreeView which will include support for drag & drop in later releases...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index dc46a942984bf539eec0c3be440331d570af488d..e0a0a5633ac67d546b8e9a328cc191b19c3c7b19 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -528,11 +528,32 @@ void DolphinMainWindow::undo()
 \r
 void DolphinMainWindow::cut()\r
 {\r
 \r
 void DolphinMainWindow::cut()\r
 {\r

+    QClipboard* clipboard = QApplication::clipboard();\r
+    const QMimeData* currentMimeData = clipboard->mimeData();\r
+    const bool hadCutSelection = KonqMimeData::decodeIsCutSelection(currentMimeData);\r
+\r

     QMimeData* mimeData = new QMimeData();\r
     const KUrl::List kdeUrls = m_activeView->selectedUrls();\r
     const KUrl::List mostLocalUrls;\r
     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);\r
     QApplication::clipboard()->setMimeData(mimeData);\r
     QMimeData* mimeData = new QMimeData();\r
     const KUrl::List kdeUrls = m_activeView->selectedUrls();\r
     const KUrl::List mostLocalUrls;\r
     KonqMimeData::populateMimeData(mimeData, kdeUrls, mostLocalUrls, true);\r
     QApplication::clipboard()->setMimeData(mimeData);\r

+\r
+    if (hadCutSelection) {\r
+        // If an old cut selection has been applied, the view must\r
+        // be reloaded to get the original icons of the items without an\r
+        // applied item effect.\r
+        m_view[PrimaryIdx]->reload();\r
+        if (m_view[SecondaryIdx] != 0) {\r
+            m_view[SecondaryIdx]->reload();\r
+        }\r
+    }\r
+    else {\r
+        // apply an item effect for the icons of all cut items\r
+        m_view[PrimaryIdx]->updateCutItems();\r
+        if (m_view[SecondaryIdx] != 0) {\r
+            m_view[SecondaryIdx]->updateCutItems();\r
+        }\r
+    }\r

 }\r
 \r
 void DolphinMainWindow::copy()\r
 }\r
 \r
 void DolphinMainWindow::copy()\r


@@ -595,13 +616,7 @@ void DolphinMainWindow::updatePasteAction()
     if (!urls.isEmpty()) {\r
         pasteAction->setEnabled(true);\r
 \r
     if (!urls.isEmpty()) {\r
         pasteAction->setEnabled(true);\r
 \r

-        const int count = urls.count();\r
-        if (count == 1) {\r
-            pasteAction->setText(i18n("Paste 1 File"));\r
-        }\r
-        else {\r
-            pasteAction->setText(i18n("Paste %1 Files", count));\r
-        }\r
+        pasteAction->setText(i18np("Paste One File", "Paste %1 Files", urls.count()));\r

     }\r
     else {\r
         pasteAction->setEnabled(false);\r
     }\r
     else {\r
         pasteAction->setEnabled(false);\r