X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ba84cf3c69118e605e3d303f4f741f0fceab51ec..abb6807645598e8117e98bbf232cd9cd90fe019a:/src/dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index e26a2bb16..ed99a34e7 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -28,9 +28,9 @@
 #include "dolphin_generalsettings.h"
 
 #include <kactioncollection.h>
+#include <kdesktopfile.h>
 #include <kfileitemlistproperties.h>
 #include <kfileplacesmodel.h>
-#include <kdesktopfile.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kio/netaccess.h>
@@ -40,7 +40,6 @@
 #include <kmimetypetrader.h>
 #include <knewmenu.h>
 #include <konqmimedata.h>
-#include <konq_fileitemcapabilities.h>
 #include <konq_operations.h>
 #include <konq_menuactions.h>
 #include <klocale.h>
@@ -66,7 +65,7 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
 {
     // The context menu either accesses the URLs of the selected items
     // or the items itself. To increase the performance both lists are cached.
-    DolphinView* view = m_mainWindow->activeViewContainer()->view();
+    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     m_selectedUrls = view->selectedUrls();
     m_selectedItems = view->selectedItems();
 }
@@ -89,7 +88,7 @@ void DolphinContextMenu::open()
         m_context |= TrashContext;
     }
 
-    if (!m_fileInfo.isNull() && (m_selectedItems.count() > 0)) {
+    if (!m_fileInfo.isNull() && !m_selectedItems.isEmpty()) {
         m_context |= ItemContext;
         // TODO: handle other use cases like devices + desktop files
     }
@@ -224,6 +223,9 @@ void DolphinContextMenu::openItemContextMenu()
         popup->addSeparator();
     }
 
+    // insert version control actions
+    addRevisionControlActions(popup);
+
     // insert 'Copy To' and 'Move To' sub menus
     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
         m_copyToMenu.setItems(m_selectedItems);
@@ -266,7 +268,7 @@ void DolphinContextMenu::openViewportContextMenu()
     popup->addAction(pasteAction);
 
     // setup 'View Mode' menu
-    KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"));
+    KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"), popup);
 
     QAction* iconsMode = m_mainWindow->actionCollection()->action("icons");
     viewModeMenu->addAction(iconsMode);
@@ -281,6 +283,8 @@ void DolphinContextMenu::openViewportContextMenu()
 
     popup->addSeparator();
 
+    addRevisionControlActions(popup);
+
     QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
                                                   i18nc("@action:inmenu Add current folder to places", "Add to Places"));
 
@@ -378,14 +382,26 @@ QAction* DolphinContextMenu::createPasteAction()
     return action;
 }
 
-KonqFileItemCapabilities& DolphinContextMenu::capabilities()
+KFileItemListProperties& DolphinContextMenu::capabilities()
 {
     if (m_capabilities == 0) {
-        m_capabilities = new KonqFileItemCapabilities(m_selectedItems);
+        m_capabilities = new KFileItemListProperties(m_selectedItems);
     }
     return *m_capabilities;
 }
 
+void DolphinContextMenu::addRevisionControlActions(KMenu* menu)
+{
+    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+    const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);
+    if (!versionControlActions.isEmpty()) {
+        foreach (QAction* action, versionControlActions) {
+            menu->addAction(action);
+        }
+        menu->addSeparator();
+    }
+}
+
 void DolphinContextMenu::addCustomActions(KMenu* menu)
 {
     foreach (QAction* action, m_customActions) {