X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/85aec92f819eae5a6189bd3ec25cff44dce3ae19..ed0df8dc1fc9576e36c920882e7f4b00a2811113:/src/dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 455b978eb..8d014fc2c 100644
--- 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>
@@ -39,10 +40,9 @@
 #include <kmimetypetrader.h>
 #include <knewmenu.h>
 #include <konqmimedata.h>
-#include <konq_fileitemcapabilities.h>
+#include <kfileitemlistproperties.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);
 
@@ -203,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());
@@ -276,10 +283,11 @@ 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();
@@ -287,8 +295,6 @@ void DolphinContextMenu::openViewportContextMenu()
         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()) {
@@ -372,12 +378,19 @@ QAction* DolphinContextMenu::createPasteAction()
     return action;
 }
 
-KonqFileItemCapabilities& DolphinContextMenu::capabilities()
+KFileItemListProperties& DolphinContextMenu::capabilities()
 {
     if (m_capabilities == 0) {
-        m_capabilities = new KonqFileItemCapabilities(m_selectedItems);
+        m_capabilities = new KFileItemListProperties(m_selectedItems);
     }
     return *m_capabilities;
 }
 
+void DolphinContextMenu::addCustomActions(KMenu* menu)
+{
+    foreach (QAction* action, m_customActions) {
+        menu->addAction(action);
+    }
+}
+
 #include "dolphincontextmenu.moc"