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