mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
The &-shortcut from another action is not set until the action has been shown at least once. To bypass this issue in the context-menu when pressing SHIFT, the text and &-shortcut is applied manually.
svn path=/trunk/KDE/kdebase/apps/; revision=1185522
This commit is contained in:
parent
4ad4d4785c
commit
39f89141b0
|
@ -486,8 +486,18 @@ void DolphinContextMenu::updateRemoveAction()
|
||||||
{
|
{
|
||||||
const KActionCollection* collection = m_mainWindow->actionCollection();
|
const KActionCollection* collection = m_mainWindow->actionCollection();
|
||||||
const bool moveToTrash = capabilities().isLocal() && !m_shiftPressed;
|
const bool moveToTrash = capabilities().isLocal() && !m_shiftPressed;
|
||||||
const QAction* action = moveToTrash ? collection->action("move_to_trash") : collection->action("delete");
|
|
||||||
m_removeAction->setText(action->text());
|
// Using m_removeAction->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.
|
||||||
|
const QAction* action = 0;
|
||||||
|
if (moveToTrash) {
|
||||||
|
action = collection->action("move_to_trash");
|
||||||
|
m_removeAction->setText(i18nc("@action:inmenu", "&Move to Trash"));
|
||||||
|
} else {
|
||||||
|
action = collection->action("delete");
|
||||||
|
m_removeAction->setText(i18nc("@action:inmenu", "&Delete"));
|
||||||
|
}
|
||||||
m_removeAction->setIcon(action->icon());
|
m_removeAction->setIcon(action->icon());
|
||||||
m_removeAction->setShortcuts(action->shortcuts());
|
m_removeAction->setShortcuts(action->shortcuts());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue