diff options
| author | Elvis Angelaccio <[email protected]> | 2017-03-10 19:31:33 +0100 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2017-03-13 19:40:07 +0100 |
| commit | 68bb0ec22af0290d298a87a15006f888b0aaf3b9 (patch) | |
| tree | 39ac14dadede61bc47b1024a962e2db790ca7a3a /src/dolphinremoveaction.cpp | |
| parent | 042b0c84099c062847fa2ed46a145624a96f90ca (diff) | |
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
Diffstat (limited to 'src/dolphinremoveaction.cpp')
| -rw-r--r-- | src/dolphinremoveaction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dolphinremoveaction.cpp b/src/dolphinremoveaction.cpp index 10ab25112..ad00f6286 100644 --- a/src/dolphinremoveaction.cpp +++ b/src/dolphinremoveaction.cpp @@ -46,7 +46,7 @@ void DolphinRemoveAction::update() // This is only done until the original action has been shown at least once. To // bypass this issue, the text and &-shortcut is applied manually. if (qApp->queryKeyboardModifiers() & Qt::ShiftModifier) { - m_action = m_collection ? m_collection->action(QStringLiteral("delete")) : 0; + m_action = m_collection ? m_collection->action(KStandardAction::name(KStandardAction::DeleteFile)) : 0; setText(i18nc("@action:inmenu", "&Delete")); } else { m_action = m_collection ? m_collection->action(QStringLiteral("move_to_trash")) : 0; |