When hovering over a file on the not-focus view panel, the information panel gets...

[dolphin.git] / src / dolphinremoveaction.cpp

diff --git a/src/dolphinremoveaction.cpp b/src/dolphinremoveaction.cpp
index ce305993474efc832ead079983f11615062ac8d2..078aa3dd42f75e564304cd3ea0f5a41dd8f6231a 100644 (file)
--- a/src/dolphinremoveaction.cpp
+++ b/src/dolphinremoveaction.cpp
@@ -22,9 +22,6 @@
 
 #include <QApplication>
 
 
 #include <QApplication>
 

-#include <KLocalizedString>
-
-

 DolphinRemoveAction::DolphinRemoveAction(QObject* parent, KActionCollection* collection) :
     QAction(parent),
     m_collection(collection)
 DolphinRemoveAction::DolphinRemoveAction(QObject* parent, KActionCollection* collection) :
     QAction(parent),
     m_collection(collection)


@@ -52,12 +49,24 @@ void DolphinRemoveAction::update(ShiftState shiftState)
     }
 
     switch (shiftState) {
     }
 
     switch (shiftState) {

-    case ShiftState::Pressed:
+    case ShiftState::Pressed: {

         m_action = m_collection->action(KStandardAction::name(KStandardAction::DeleteFile));
         m_action = m_collection->action(KStandardAction::name(KStandardAction::DeleteFile));

+        // 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);

         break;
         break;

-    case ShiftState::Released:
+    }
+    case ShiftState::Released: {

         m_action = m_collection->action(KStandardAction::name(KStandardAction::MoveToTrash));
         m_action = m_collection->action(KStandardAction::name(KStandardAction::MoveToTrash));

+        // Make sure we show Del in the context menu.
+        auto trashShortcuts = m_action->shortcuts();
+        trashShortcuts.removeAll(QKeySequence::Delete);
+        trashShortcuts.prepend(QKeySequence::Delete);
+        m_collection->setDefaultShortcuts(this, trashShortcuts);

         break;
         break;

+    }

     case ShiftState::Unknown:
         Q_UNREACHABLE();
         break;
     case ShiftState::Unknown:
         Q_UNREACHABLE();
         break;


@@ -66,7 +75,6 @@ void DolphinRemoveAction::update(ShiftState shiftState)
     if (m_action) {
         setText(m_action->text());
         setIcon(m_action->icon());
     if (m_action) {
         setText(m_action->text());
         setIcon(m_action->icon());

-        m_collection->setDefaultShortcuts(this, m_action->shortcuts());

         setEnabled(m_action->isEnabled());
     }
 }
         setEnabled(m_action->isEnabled());
     }
 }