Make sure we always have Shift+Del as shortcut

[dolphin.git] / src / dolphinremoveaction.cpp

diff --git a/src/dolphinremoveaction.cpp b/src/dolphinremoveaction.cpp
index 7d7c2f0439416f1e156ff1eabccc6de89b15dd80..79d6bed6021bee4dec7ba231cdcea1438de93073 100644 (file)
--- a/src/dolphinremoveaction.cpp
+++ b/src/dolphinremoveaction.cpp
@@ -29,7 +29,7 @@ DolphinRemoveAction::DolphinRemoveAction(QObject* parent, KActionCollection* col
     m_collection(collection)
 {
     update();
-    connect(this, SIGNAL(triggered()), this, SLOT(slotRemoveActionTriggered()));
+    connect(this, &DolphinRemoveAction::triggered, this, &DolphinRemoveAction::slotRemoveActionTriggered);
 }
 
 void DolphinRemoveAction::slotRemoveActionTriggered()
@@ -45,17 +45,22 @@ void DolphinRemoveAction::update()
     // Using setText(action->text()) does not apply the &-shortcut.
     // 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->keyboardModifiers() & Qt::ShiftModifier) {
-        m_action = m_collection ? m_collection->action("delete") : 0;
+    if (qApp->queryKeyboardModifiers() & Qt::ShiftModifier) {
+        m_action = m_collection ? m_collection->action(KStandardAction::name(KStandardAction::DeleteFile)) : 0;
         setText(i18nc("@action:inmenu", "&Delete"));
+        // Make sure we show Shift+Del in the context menu.
+        auto deleteShortcuts = m_action->shortcuts();
+        deleteShortcuts.removeAll(Qt::SHIFT | Qt::Key_Delete);
+        deleteShortcuts.prepend(Qt::SHIFT | Qt::Key_Delete);
+        m_collection->setDefaultShortcuts(this, deleteShortcuts);
     } else {
-        m_action = m_collection ? m_collection->action("move_to_trash") : 0;
+        m_action = m_collection ? m_collection->action(QStringLiteral("move_to_trash")) : 0;
         setText(i18nc("@action:inmenu", "&Move to Trash"));
+        m_collection->setDefaultShortcuts(this, m_action->shortcuts());
     }
 
     if (m_action) {
         setIcon(m_action->icon());
-        setShortcuts(m_action->shortcuts());
         setEnabled(m_action->isEnabled());
     }
 }