Commit b0831510 authored by Alexander Lohnau's avatar Alexander Lohnau 💬 Committed by Nate Graham
Browse files

Remove defunct check for proxyAction in foldermodel

If we press the shortcut directly on the desktop the proxy action is still the del action,
because the context menu was not opened and the selection did not change after we pressed shift.

If we have the context menu open the proxyAction is properly updated.

TestPlan:
Pressing delete with selected fle opens "Move to trash" dialog
Pressing shift+delete with selected file opens "Delete Permanently" dialog

Same with the context menu open.

BUG: 444128


(cherry picked from commit 2a7c1c73)
parent 9e1a0670
......@@ -2029,14 +2029,6 @@ void FolderModel::deleteSelected()
return;
}
if (!isDeleteCommandShown()) {
if (RemoveAction *action = qobject_cast<RemoveAction *>(m_actionCollection.action(QStringLiteral("remove")))) {
if (action->proxyAction() != m_actionCollection.action(QStringLiteral("del"))) {
return;
}
}
}
if (QAction *action = m_actionCollection.action(QStringLiteral("del"))) {
if (!action->isEnabled()) {
return;
......
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