diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphinpart.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index cd484ed1d..882e2f1d3 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -339,8 +339,6 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, 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; @@ -357,6 +355,8 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, 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; @@ -400,7 +400,6 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, 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. @@ -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() |