Commit b73c3c5c authored by Robert Knight's avatar Robert Knight

Correct method of making shortcuts work with hidden menu bar, now possible with kdelibs changes.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=693130
parent 10c88b4f
......@@ -59,6 +59,8 @@ MainWindow::MainWindow()
// the directory ('konsole') is included in the path here so that the XML
// file can be found when this code is being used in the Konsole part.
setXMLFile("konsole/konsoleui.rc");
actionCollection()->setAssociatedWidget(this);
setupActions();
// create view manager
......@@ -81,13 +83,6 @@ 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()
......
......@@ -85,18 +85,9 @@ SessionController::SessionController(Session* session , TerminalDisplay* view, Q
// handle user interface related to session (menus etc.)
setXMLFile("konsole/sessionui.rc");
actionCollection()->setAssociatedWidget(view);
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();
......
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