kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-21 09:20:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=1185522
This commit is contained in:
Peter Penz 2010-10-13 15:25:58 +00:00
parent 4ad4d4785c
commit 39f89141b0
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/dolphincontextmenu.cpp
View file

@ -486,8 +486,18 @@ void DolphinContextMenu::updateRemoveAction()
{
const KActionCollection* collection = m_mainWindow->actionCollection();
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->setShortcuts(action->shortcuts());
}