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

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 102e54404..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);
@@ -919,11 +934,11 @@ void DolphinMainWindow::init()
     assert(manager != 0);
     KBookmarkGroup root = manager->root();
     if (root.first().isNull()) {
-        root.addBookmark(manager, i18n("Home"), settings.generalSettings()->homeUrl(), "user-home");
-        root.addBookmark(manager, i18n("Storage Media"), KUrl("media:/"), "blockdevice");
-        root.addBookmark(manager, i18n("Network"), KUrl("remote:/"), "network-workgroup");
-        root.addBookmark(manager, i18n("Root"), KUrl("/"), "folder_red");
-        root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "user-trash-full");
+        root.addBookmark(manager, i18n("Home"), settings.generalSettings()->homeUrl(), "folder-home");
+        root.addBookmark(manager, i18n("Storage Media"), KUrl("media:/"), "hdd-mount");
+        root.addBookmark(manager, i18n("Network"), KUrl("remote:/"), "network-local");
+        root.addBookmark(manager, i18n("Root"), KUrl("/"), "folder-red");
+        root.addBookmark(manager, i18n("Trash"), KUrl("trash:/"), "user-trash");
     }
 
     setupActions();
@@ -1063,7 +1078,7 @@ void DolphinMainWindow::setupActions()
     KToggleAction* iconsView = actionCollection()->add<KToggleAction>("icons");
     iconsView->setText(i18n("Icons"));
     iconsView->setShortcut(Qt::CTRL | Qt::Key_1);
-    iconsView->setIcon(KIcon("view_icon"));
+    iconsView->setIcon(KIcon("view-icon"));
     connect(iconsView, SIGNAL(triggered()), this, SLOT(setIconsView()));
 
     KToggleAction* detailsView = actionCollection()->add<KToggleAction>("details");
@@ -1113,7 +1128,8 @@ void DolphinMainWindow::setupActions()
     connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
 
     KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
-    showPreview->setText(i18n("Show Preview"));
+    showPreview->setText(i18n("Preview"));
+    showPreview->setIcon(KIcon("thumbnail-show"));
     connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
 
     KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("show_hidden_files");
@@ -1122,9 +1138,9 @@ void DolphinMainWindow::setupActions()
     connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles()));
 
     KToggleAction* split = actionCollection()->add<KToggleAction>("split_view");
-    split->setText(i18n("Split View"));
+    split->setText(i18n("Split"));
     split->setShortcut(Qt::Key_F10);
-    split->setIcon(KIcon("view_left_right"));
+    split->setIcon(KIcon("view-left-right"));
     connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
 
     QAction* reload = actionCollection()->addAction("reload");