From 68bb0ec22af0290d298a87a15006f888b0aaf3b9 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Fri, 10 Mar 2017 19:31:33 +0100 Subject: Port to KStandardAction::DeleteFile Summary: It was introduced in kconfig 5.25 and it properly handles the shift+del shortcut (together with kxmlgui >= 5.30). This allows us to drop the custom delete shortcut as well as the shift+del workaround in DolphinMainWindow. Test Plan: Shift+Del still deletes files, without the 'ambiguous shortcut' warning dialog. Reviewers: emmanuelp Differential Revision: https://phabricator.kde.org/D5010 --- src/dolphinpart.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/dolphinpart.cpp') diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index b55bcabb2..352e9a44f 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -255,7 +255,7 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection) QAction* renameAction = actionCollection()->action(QStringLiteral("rename")); QAction* moveToTrashAction = actionCollection()->action(QStringLiteral("move_to_trash")); - QAction* deleteAction = actionCollection()->action(QStringLiteral("delete")); + QAction* deleteAction = actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile)); QAction* editMimeTypeAction = actionCollection()->action(QStringLiteral("editMimeType")); QAction* propertiesAction = actionCollection()->action(QStringLiteral("properties")); QAction* deleteWithTrashShortcut = actionCollection()->action(QStringLiteral("delete_shortcut")); // see DolphinViewActionHandler @@ -433,9 +433,9 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos, delete m_removeAction; m_removeAction = 0; editActions.append(actionCollection()->action(QStringLiteral("move_to_trash"))); - editActions.append(actionCollection()->action(QStringLiteral("delete"))); + editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile))); } else if (showDeleteAction && !showMoveToTrashAction) { - editActions.append(actionCollection()->action(QStringLiteral("delete"))); + editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile))); } else { if (!m_removeAction) m_removeAction = new DolphinRemoveAction(this, actionCollection()); -- cgit v1.3