X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/39cfd051ef25f3a90fdfa411325829ca119a421c..d74f62208caf110a501ccc2243ba05eef4df4ae7:/src/dolphinremoveaction.cpp

diff --git a/src/dolphinremoveaction.cpp b/src/dolphinremoveaction.cpp
index 1ce292604..c471b2df6 100644
--- a/src/dolphinremoveaction.cpp
+++ b/src/dolphinremoveaction.cpp
@@ -42,20 +42,16 @@ void DolphinRemoveAction::slotRemoveActionTriggered()
 void DolphinRemoveAction::update()
 {
     Q_ASSERT(m_collection);
-    // 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;
-        setText(i18nc("@action:inmenu", "&Delete"));
+    if (qApp->queryKeyboardModifiers() & Qt::ShiftModifier) {
+        m_action = m_collection ? m_collection->action(KStandardAction::name(KStandardAction::DeleteFile)) : 0;
     } else {
-        m_action = m_collection ? m_collection->action("move_to_trash") : 0;
-        setText(i18nc("@action:inmenu", "&Move to Trash"));
+        m_action = m_collection ? m_collection->action(KStandardAction::name(KStandardAction::MoveToTrash)) : 0;
     }
 
     if (m_action) {
+        setText(m_action->text());
         setIcon(m_action->icon());
-        setShortcuts(m_action->shortcuts());
+        m_collection->setDefaultShortcuts(this, m_action->shortcuts());
         setEnabled(m_action->isEnabled());
     }
 }