X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f034356d7462f23b8a2f5820af4d020c745280cf..9340a52cf8b310545fdb06f1f5aeec0f6a32d539:/src/dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 251da2c00..cd3195e9a 100644
--- 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();
 }
@@ -223,6 +223,9 @@ void DolphinContextMenu::openItemContextMenu()
         popup->addSeparator();
     }
 
+    // insert revision control actions
+    addRevisionControlActions(popup);
+
     // insert 'Copy To' and 'Move To' sub menus
     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
         m_copyToMenu.setItems(m_selectedItems);
@@ -280,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"));
 
@@ -385,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) {