Fix keyboard shortcuts when menu bar is hidden. Patch by Robin Stocker. Affects other KDE applications as well. See discussion on konsole-devel - http://lists.kde.org/?l=konsole-devel&m=118529209602516&w=2

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=691938
This commit is contained in:
Robert Knight
2007-07-24 17:10:36 +00:00
parent c88bf4bc48
commit d30833dac7
3 changed files with 17 additions and 2 deletions

2
TODO
View File

@@ -84,8 +84,6 @@ The KDE 4.0 TODO List:
== BUGS ==
- Shortcuts do not work when the menu bar is hidden.
- Allow the user to over-ride the "no Ctrl+[Key] shortcuts" limitation with shortcuts
set in the configuration dialog, but warn the user if they try to do so. This is the
behaviour in KDE 3.

View File

@@ -81,6 +81,13 @@ MainWindow::MainWindow()
// replace standard shortcuts which cannot be used in a terminal
// (as they are reserved for use by terminal programs)
correctShortcuts();
// add all actions to this window, so that the keyboard shortcuts can be
// used even when the menu is hidden
//
// See comments in SessionController constructor about Qt 4 behaviour with
// hidden menu bars and shortcuts
addActions(actionCollection()->actions());
}
void MainWindow::correctShortcuts()

View File

@@ -87,6 +87,16 @@ SessionController::SessionController(Session* session , TerminalDisplay* view, Q
setXMLFile("konsole/sessionui.rc");
setupActions();
// add all actions to this window, so that the keyboard shortcuts can be
// used even when the main window's menu is hidden
//
// TODO: The Qt-4 behaviour of shortcuts not working when the menu bar is hidden
// affects other KDE applications as well. A kdelibs fix might be possible.
//
// See discussion:
// http://lists.kde.org/?l=konsole-devel&m=118529209602516&w=2
view->addActions(actionCollection()->actions());
setIdentifier(_session->sessionId());
sessionTitleChanged();