Get back names, and use "using" keyword to keep GCC silent on "method foo on base...

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index ed99a34e74fc669e41b0fb308236bf7397b3b32d..9b49f7c89fa0bfadf1e0b4e9351cf1e10679b279 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -41,7 +41,7 @@
 #include <knewmenu.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
 #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>
 #include <klocale.h>
 #include <kpropertiesdialog.h>
 #include <krun.h>


@@ -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"));
 
     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");
     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);
     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());
 
         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"));
     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);
 
     menuActions.setParentWidget(m_mainWindow);
     menuActions.setItemListProperties(m_selectedItems);
 


@@ -219,12 +230,12 @@ void DolphinContextMenu::openItemContextMenu()
     menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'");
 
     // insert 'Actions' sub menu
     menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'");
 
     // insert 'Actions' sub menu

-    if (menuActions.addActionsTo(popup)) {
+    if (menuActions.addServiceActionsTo(popup)) {

         popup->addSeparator();
     }
 
     // insert version control actions
         popup->addSeparator();
     }
 
     // insert version control actions

-    addRevisionControlActions(popup);
+    addVersionControlActions(popup);

 
     // insert 'Copy To' and 'Move To' sub menus
     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
 
     // insert 'Copy To' and 'Move To' sub menus
     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {


@@ -258,8 +269,10 @@ void DolphinContextMenu::openViewportContextMenu()
     addShowMenubarAction(popup);
 
     // setup 'Create New' menu
     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();
     newMenu->setPopupFiles(m_baseUrl);
     popup->addMenu(newMenu->menu());
     popup->addSeparator();


@@ -283,11 +296,16 @@ void DolphinContextMenu::openViewportContextMenu()
 
     popup->addSeparator();
 
 
     popup->addSeparator();
 

-    addRevisionControlActions(popup);
+    addVersionControlActions(popup);

 
     QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
                                                   i18nc("@action:inmenu Add current folder to places", "Add to Places"));
 
 
     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"));
     addCustomActions(popup);
 
     QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));


@@ -365,6 +383,21 @@ QString DolphinContextMenu::placesName(const KUrl& url) const
     return name;
 }
 
     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;
 QAction* DolphinContextMenu::createPasteAction()
 {
     QAction* action = 0;


@@ -390,7 +423,7 @@ KFileItemListProperties& DolphinContextMenu::capabilities()
     return *m_capabilities;
 }
 
     return *m_capabilities;
 }
 

-void DolphinContextMenu::addRevisionControlActions(KMenu* menu)
+void DolphinContextMenu::addVersionControlActions(KMenu* menu)

 {
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);
 {
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);