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

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index cd484ed1d7dca0d7fee1673dfbe7e659b84d8d33..882e2f1d3f5dd0fc0056327d37c1f027780f825f 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -339,8 +339,6 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
                                       const KUrl&,
                                       const QList<QAction*>& customActions)
 {
                                       const KUrl&,
                                       const QList<QAction*>& customActions)
 {

-    Q_UNUSED(customActions); // TODO: should be added to the context menu
-

     KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems
                                                       | KParts::BrowserExtension::ShowProperties
                                                       | KParts::BrowserExtension::ShowUrlOperations;
     KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems
                                                       | KParts::BrowserExtension::ShowProperties
                                                       | KParts::BrowserExtension::ShowUrlOperations;


@@ -357,6 +355,8 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
     KParts::BrowserExtension::ActionGroupMap actionGroups;
     QList<QAction *> editActions;
 
     KParts::BrowserExtension::ActionGroupMap actionGroups;
     QList<QAction *> editActions;
 

+    editActions += customActions;
+

     if (!_item.isNull()) { // only for context menu on one or more items
         bool sDeleting = true;
         bool sMoving = true;
     if (!_item.isNull()) { // only for context menu on one or more items
         bool sDeleting = true;
         bool sMoving = true;


@@ -400,7 +400,6 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
             editActions.append(actionCollection()->action("move_to_trash"));
         if (addDel)
             editActions.append(actionCollection()->action("delete"));
             editActions.append(actionCollection()->action("move_to_trash"));
         if (addDel)
             editActions.append(actionCollection()->action("delete"));

-        actionGroups.insert("editactions", editActions);

 
         // Normally KonqPopupMenu only shows the "Create new" subdir in the current view
         // since otherwise the created file would not be visible.
 
         // Normally KonqPopupMenu only shows the "Create new" subdir in the current view
         // since otherwise the created file would not be visible.


@@ -410,6 +409,8 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
 
     }
 
 
     }
 

+    actionGroups.insert("editactions", editActions);
+

     // TODO: We should change the signature of the slots (and signals) for being able
     //       to tell for which items we want a popup.
     KFileItemList items = (m_view->selectedItems().count() ? m_view->selectedItems()
     // TODO: We should change the signature of the slots (and signals) for being able
     //       to tell for which items we want a popup.
     KFileItemList items = (m_view->selectedItems().count() ? m_view->selectedItems()