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

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 251da2c00..9b49f7c89 100644
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -41,7 +41,7 @@
 #include <knewmenu.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
-#include <konq_menuactions.h>
+#include <kfileitemactions.h>
 #include <klocale.h>
 #include <kpropertiesdialog.h>
 #include <krun.h>
@@ -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();
 }
@@ -88,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
     }
@@ -124,6 +124,11 @@ void DolphinContextMenu::openTrashContextMenu()
     QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
                                                   i18nc("@action:inmenu Add current folder to places", "Add to Places"));
 
+    // Don't show if url is already in places
+    if (placeExists(m_mainWindow->activeViewContainer()->url())) {
+        addToPlacesAction->setVisible(false);
+    }
+
     addCustomActions(popup);
 
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
@@ -184,7 +189,9 @@ void DolphinContextMenu::openItemContextMenu()
     if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
         // setup 'Create New' menu
         DolphinNewMenu* newMenu = new DolphinNewMenu(popup, m_mainWindow);
-        newMenu->slotCheckUpToDate();
+        const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+        newMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+        newMenu->checkUpToDate();
         newMenu->setPopupFiles(m_fileInfo.url());
         newMenu->setEnabled(capabilities().supportsWriting());
 
@@ -209,9 +216,13 @@ void DolphinContextMenu::openItemContextMenu()
     if (m_fileInfo.isDir() && (m_selectedUrls.count() == 1)) {
         addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
                                              i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
+        // Don't show if url is already in places
+        if (placeExists(m_fileInfo.url())) {
+            addToPlacesAction->setVisible(false);
+        }
     }
 
-    KonqMenuActions menuActions;
+    KFileItemActions menuActions;
     menuActions.setParentWidget(m_mainWindow);
     menuActions.setItemListProperties(m_selectedItems);
 
@@ -219,10 +230,13 @@ void DolphinContextMenu::openItemContextMenu()
     menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'");
 
     // insert 'Actions' sub menu
-    if (menuActions.addActionsTo(popup)) {
+    if (menuActions.addServiceActionsTo(popup)) {
         popup->addSeparator();
     }
 
+    // insert version control actions
+    addVersionControlActions(popup);
+
     // insert 'Copy To' and 'Move To' sub menus
     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
         m_copyToMenu.setItems(m_selectedItems);
@@ -255,8 +269,10 @@ void DolphinContextMenu::openViewportContextMenu()
     addShowMenubarAction(popup);
 
     // setup 'Create New' menu
-    KNewMenu* newMenu = m_mainWindow->newMenu();
-    newMenu->slotCheckUpToDate();
+    KNewFileMenu* newMenu = m_mainWindow->newMenu();
+    const DolphinView* view = m_mainWindow->activeViewContainer()->view();
+    newMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+    newMenu->checkUpToDate();
     newMenu->setPopupFiles(m_baseUrl);
     popup->addMenu(newMenu->menu());
     popup->addSeparator();
@@ -265,7 +281,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);
@@ -280,9 +296,16 @@ void DolphinContextMenu::openViewportContextMenu()
 
     popup->addSeparator();
 
+    addVersionControlActions(popup);
+
     QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
                                                   i18nc("@action:inmenu Add current folder to places", "Add to Places"));
 
+    // Don't show if url is already in places
+    if (placeExists(m_mainWindow->activeViewContainer()->url())) {
+        addToPlacesAction->setVisible(false);
+    }
+
     addCustomActions(popup);
 
     QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));
@@ -360,6 +383,21 @@ QString DolphinContextMenu::placesName(const KUrl& url) const
     return name;
 }
 
+bool DolphinContextMenu::placeExists(const KUrl& url) const
+{
+    const KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
+    const int count = placesModel->rowCount();
+
+    for (int i = 0; i < count; ++i) {
+        const QModelIndex index = placesModel->index(i, 0);
+
+        if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) {
+            return true;
+        }
+    }
+    return false;
+}
+
 QAction* DolphinContextMenu::createPasteAction()
 {
     QAction* action = 0;
@@ -385,6 +423,18 @@ KFileItemListProperties& DolphinContextMenu::capabilities()
     return *m_capabilities;
 }
 
+void DolphinContextMenu::addVersionControlActions(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) {