* Use Nepomuk for getting the meta data instead of KFileMetaInfo.

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 107c2b24ac9db54f39764b5b1bb6c2703f03d5b4..f633fb945165c7f54ac6f0923f56b39159b14bea 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -22,7 +22,7 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenu.h"
 
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenu.h"

-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"

 #include "dolphinview.h"
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
 #include "dolphinview.h"
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"


@@ -60,7 +60,9 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
     m_capabilities(0),
     m_fileInfo(fileInfo),
     m_baseUrl(baseUrl),
     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.
 {
     // 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;
 }
 
     m_capabilities = 0;
 }
 

+void DolphinContextMenu::setCustomActions(const QList<QAction*>& actions)
+{
+    m_customActions = actions;
+}
+

 void DolphinContextMenu::open()
 {
     // get the context information
 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"));
 
     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);
 
     QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
     popup->addAction(propertiesAction);
 


@@ -179,13 +188,13 @@ void DolphinContextMenu::openItemContextMenu()
         newMenu->slotCheckUpToDate();
         newMenu->setPopupFiles(m_fileInfo.url());
         newMenu->setEnabled(capabilities().supportsWriting());
         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();
         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"));
         // 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"));


@@ -209,15 +218,15 @@ void DolphinContextMenu::openItemContextMenu()
     KonqMenuActions menuActions;
     menuActions.setPopupMenuInfo(popupInfo);
 
     KonqMenuActions menuActions;
     menuActions.setPopupMenuInfo(popupInfo);
 

-    // Insert 'Open With...' action or sub menu
+    // insert 'Open With...' action or sub menu

     menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'");
 
     menuActions.addOpenWithActionsTo(popup, "DesktopEntryName != 'dolphin'");
 

-    // Insert 'Actions' sub menu
+    // insert 'Actions' sub menu

     if (menuActions.addActionsTo(popup)) {
         popup->addSeparator();
     }
 
     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());
     if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
         m_copyToMenu.setItems(m_selectedItems);
         m_copyToMenu.setReadOnly(!capabilities().supportsWriting());


@@ -276,19 +285,18 @@ void DolphinContextMenu::openViewportContextMenu()
 
     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"));

-    popup->addSeparator();
+
+    addCustomActions(popup);

 
     QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "Properties"));
 
     QAction* action = popup->exec(QCursor::pos());
     if (action == propertiesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
 
     QAction* propertiesAction = popup->addAction(i18nc("@action:inmenu", "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();
         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()) {
     } else if (action == addToPlacesAction) {
         const KUrl& url = m_mainWindow->activeViewContainer()->url();
         if (url.isValid()) {


@@ -322,7 +330,7 @@ void DolphinContextMenu::insertDefaultItemActions(KMenu* popup)
     KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
     KConfigGroup configGroup(globalConfig, "KDE");
     bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
     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");
     const KUrl& url = m_mainWindow->activeViewContainer()->url();
     if (url.isLocalFile()) {
         QAction* moveToTrashAction = collection->action("move_to_trash");


@@ -380,4 +388,11 @@ KonqFileItemCapabilities& DolphinContextMenu::capabilities()
     return *m_capabilities;
 }
 
     return *m_capabilities;
 }
 

+void DolphinContextMenu::addCustomActions(KMenu* menu)
+{
+    foreach (QAction* action, m_customActions) {
+        menu->addAction(action);
+    }
+}
+

 #include "dolphincontextmenu.moc"
 #include "dolphincontextmenu.moc"