BUG: 175658

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 777d96a04e007f8c94f6d19544994bdc429b8e56..e26a2bb16b7e18e3776d4e4809a1c11afa46a21e 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -22,12 +22,13 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenu.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinview.h"
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 
 #include <kactioncollection.h>
+#include <kfileitemlistproperties.h>
 #include <kfileplacesmodel.h>
 #include <kdesktopfile.h>
 #include <kglobal.h>
@@ -42,7 +43,6 @@
 #include <konq_fileitemcapabilities.h>
 #include <konq_operations.h>
 #include <konq_menuactions.h>
-#include <konq_popupmenuinformation.h>
 #include <klocale.h>
 #include <kpropertiesdialog.h>
 #include <krun.h>
@@ -60,7 +60,9 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
     m_capabilities(0),
     m_fileInfo(fileInfo),
     m_baseUrl(baseUrl),
-    m_context(NoContext)
+    m_context(NoContext),
+    m_copyToMenu(parent),
+    m_customActions()
 {
     // The context menu either accesses the URLs of the selected items
     // or the items itself. To increase the performance both lists are cached.
@@ -75,6 +77,11 @@ DolphinContextMenu::~DolphinContextMenu()
     m_capabilities = 0;
 }
 
+void DolphinContextMenu::setCustomActions(const QList<QAction*>& actions)
+{
+    m_customActions = actions;
+}
+
 void DolphinContextMenu::open()
 {
     // get the context information
@@ -118,6 +125,8 @@ void DolphinContextMenu::openTrashContextMenu()
     QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
                                                   i18nc("@action:inmenu Add current folder to places", "Add to Places"));
 
+    addCustomActions(popup);
+
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     popup->addAction(propertiesAction);
 
@@ -178,13 +187,14 @@ void DolphinContextMenu::openItemContextMenu()
         DolphinNewMenu* newMenu = new DolphinNewMenu(popup, m_mainWindow);
         newMenu->slotCheckUpToDate();
         newMenu->setPopupFiles(m_fileInfo.url());
-        
+        newMenu->setEnabled(capabilities().supportsWriting());
+
         KMenu* menu = newMenu->menu();
         menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
         menu->setIcon(KIcon("document-new"));
         popup->addMenu(newMenu->menu());
         popup->addSeparator();
-    
+
         // insert 'Open in new window' and 'Open in new tab' entries
         popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_window"));
         popup->addAction(m_mainWindow->actionCollection()->action("open_in_new_tab"));
@@ -202,21 +212,19 @@ void DolphinContextMenu::openItemContextMenu()
                                              i18nc("@action:inmenu Add selected folder to places", "Add to Places"));
     }
 
-    KonqPopupMenuInformation popupInfo;
-    popupInfo.setItems(m_selectedItems);
-    popupInfo.setParentWidget(m_mainWindow);
     KonqMenuActions menuActions;
-    menuActions.setPopupMenuInfo(popupInfo);
+    menuActions.setParentWidget(m_mainWindow);
+    menuActions.setItemListProperties(m_selectedItems);
 
-    // Insert 'Open With...' action or sub menu
+    // insert 'Open With...' action or sub menu
     menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'");
 
-    // Insert 'Actions' sub menu
+    // insert 'Actions' sub menu
     if (menuActions.addActionsTo(popup)) {
         popup->addSeparator();
     }
 
-    // Insert 'Copy To' and 'Move To' sub menus
+    // insert 'Copy To' and 'Move To' sub menus
     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
         m_copyToMenu.setItems(m_selectedItems);
         m_copyToMenu.setReadOnly(!capabilities().supportsWriting());
@@ -275,19 +283,18 @@ void DolphinContextMenu::openViewportContextMenu()
 
     QAction* addToPlacesAction = popup->addAction(KIcon("bookmark-new"),
                                                   i18nc("@action:inmenu Add current folder to places", "Add to Places"));
-    popup->addSeparator();
 
-    QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));
+    addCustomActions(popup);
 
+    QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));
+    propertiesAction->setIcon(KIcon("document-properties"));
     QAction* action = popup->exec(QCursor::pos());
     if (action == propertiesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
-                
+
         KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
-        dialog->raise();
-        dialog->activateWindow();
     } else if (action == addToPlacesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {
@@ -321,7 +328,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
     KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
     KConfigGroup configGroup(globalConfig, "KDE");
     bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
-    
+
     const KUrl& url = m_mainWindow->activeViewContainer()->url();
     if (url.isLocalFile()) {
         QAction* moveToTrashAction = collection->action("move_to_trash");
@@ -379,4 +386,11 @@ KonqFileItemCapabilities& DolphinContextMenu::capabilities()
     return *m_capabilities;
 }
 
+void DolphinContextMenu::addCustomActions(KMenu* menu)
+{
+    foreach (QAction* action, m_customActions) {
+        menu->addAction(action);
+    }
+}
+
 #include "dolphincontextmenu.moc"