Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit f2030025 authored by Elvis Angelaccio's avatar Elvis Angelaccio

Make sure we always have the Del shortcut

Same fix as in D7655, but this time for the MoveToTrash standard action.

Differential Revision: https://phabricator.kde.org/D7860
parent c58226ce
......@@ -61,10 +61,15 @@ void DolphinRemoveAction::update(ShiftState shiftState)
m_collection->setDefaultShortcuts(this, deleteShortcuts);
break;
}
case ShiftState::Released:
case ShiftState::Released: {
m_action = m_collection->action(KStandardAction::name(KStandardAction::MoveToTrash));
m_collection->setDefaultShortcuts(this, m_action->shortcuts());
// 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;
}
case ShiftState::Unknown:
Q_UNREACHABLE();
break;
......
......@@ -109,7 +109,13 @@ void DolphinViewActionHandler::createActions()
KStandardAction::renameFile(this, &DolphinViewActionHandler::slotRename, m_actionCollection);
KStandardAction::moveToTrash(this, &DolphinViewActionHandler::slotTrashActivated, m_actionCollection);
auto trashAction = KStandardAction::moveToTrash(this, &DolphinViewActionHandler::slotTrashActivated, m_actionCollection);
auto trashShortcuts = trashAction->shortcuts();
if (!trashShortcuts.contains(QKeySequence::Delete)) {
trashShortcuts.append(QKeySequence::Delete);
m_actionCollection->setDefaultShortcuts(trashAction, trashShortcuts);
}
auto deleteAction = KStandardAction::deleteFile(this, &DolphinViewActionHandler::slotDeleteItems, m_actionCollection);
auto deleteShortcuts = deleteAction->shortcuts();
if (!deleteShortcuts.contains(Qt::SHIFT | Qt::Key_Delete)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment