also provide revision control actions for the viewport-context-menu

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 69b551493c4077bce748fb4347892740579276a9..cd3195e9ae4bffc5ada6806674e1b43b554dbfc5 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -65,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();
 }
@@ -224,14 +224,7 @@ void DolphinContextMenu::openItemContextMenu()
     }
 
     // insert revision control actions
-    DolphinView* view = m_mainWindow->activeViewContainer()->view();
-    const QList<QAction*> revControlActions = view->revisionControlActions(m_selectedItems);
-    if (revControlActions.count() > 0) {
-        foreach (QAction* action, revControlActions) {
-            popup->addAction(action);
-        }
-        popup->addSeparator();
-    }
+    addRevisionControlActions(popup);
 
     // insert 'Copy To' and 'Move To' sub menus
     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
@@ -290,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"));
 
@@ -395,6 +390,18 @@ KFileItemListProperties& DolphinContextMenu::capabilities()
     return *m_capabilities;
 }
 
+void DolphinContextMenu::addRevisionControlActions(KMenu* menu)
+{
+    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+    const QList<QAction*> revControlActions = view->revisionControlActions(m_selectedItems);
+    if (revControlActions.count() > 0) {
+        foreach (QAction* action, revControlActions) {
+            menu->addAction(action);
+        }
+        menu->addSeparator();
+    }
+}
+
 void DolphinContextMenu::addCustomActions(KMenu* menu)
 {
     foreach (QAction* action, m_customActions) {