BUG: 191309

Don't show 'Add to Places' context-menu action for urls already in places.

svn path=/trunk/KDE/kdebase/apps/; revision=1048149

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index ed99a34e74fc669e41b0fb308236bf7397b3b32d..494d5e97cfb56d778c35b3ce6717ec18713ea943 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -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");
@@ -209,6 +214,10 @@ 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;
@@ -288,6 +297,11 @@ void DolphinContextMenu::openViewportContextMenu()
     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"));
@@ -365,6 +379,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;

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 613e4a43419acce2edc04141793059295f394ea1..93afb44812fdcd9de85b8dc7c3ae9ce7ffcaf130 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -92,6 +92,8 @@ private:
      */
     QString placesName(const KUrl& url) const;
 
+    bool placeExists(const KUrl& url) const;
+
     QAction* createPasteAction();
 
 private: