Commit 32597af7 authored by Michael Pyne's avatar Michael Pyne

Enable the standard "show menu bar" action.

As nicely requested in bug 391308.

BUG:391308
FIXED-IN:18.04
parent 9c5596fe
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <QKeyEvent> #include <QKeyEvent>
#include <QDir> #include <QDir>
#include <QDirIterator> #include <QDirIterator>
#include <QMenuBar>
#include <QTime> #include <QTime>
#include <QTimer> #include <QTimer>
#include <QDesktopWidget> #include <QDesktopWidget>
...@@ -192,6 +193,7 @@ void JuK::setupActions() ...@@ -192,6 +193,7 @@ void JuK::setupActions()
QAction *clear = KStandardAction::clear(collection); QAction *clear = KStandardAction::clear(collection);
KStandardAction::selectAll(collection); KStandardAction::selectAll(collection);
KStandardAction::keyBindings(this, SLOT(slotEditKeys()), collection); KStandardAction::keyBindings(this, SLOT(slotEditKeys()), collection);
KStandardAction::showMenubar(menuBar(), SLOT(setVisible(bool)), collection);
// Setup the menu which handles the random play options. // Setup the menu which handles the random play options.
KActionMenu *actionMenu = collection->add<KActionMenu>("actionMenu"); KActionMenu *actionMenu = collection->add<KActionMenu>("actionMenu");
......
<!DOCTYPE kpartgui> <!DOCTYPE kpartgui>
<kpartgui name="juk" version="14"> <kpartgui name="juk" version="15">
<MenuBar> <MenuBar>
<Menu name="file" noMerge="1"><text>&amp;File</text> <Menu name="file" noMerge="1"><text>&amp;File</text>
<Action name="file_new"/> <Action name="file_new"/>
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
<Action name="renameFile"/> <Action name="renameFile"/>
</Menu> </Menu>
<Menu name="settings"><text>&amp;Settings</text> <Menu name="settings"><text>&amp;Settings</text>
<Action name="options_show_menubar"/>
<Action name="toggleSystemTray" append="show_merge"/> <Action name="toggleSystemTray" append="show_merge"/>
<Action name="dockOnClose" append="show_merge"/> <Action name="dockOnClose" append="show_merge"/>
<Action name="togglePopups" append="show_merge"/> <Action name="togglePopups" append="show_merge"/>
......
<!-- PLEASE UPDATE jukui-rtl.rc WHEN UPDATING THIS FILE --> <!-- PLEASE UPDATE jukui-rtl.rc WHEN UPDATING THIS FILE -->
<!DOCTYPE kpartgui> <!DOCTYPE kpartgui>
<kpartgui name="juk" version="14"> <kpartgui name="juk" version="15">
<MenuBar> <MenuBar>
<Menu name="file" noMerge="1"><text>&amp;File</text> <Menu name="file" noMerge="1"><text>&amp;File</text>
<Action name="file_new"/> <Action name="file_new"/>
...@@ -67,6 +67,7 @@ ...@@ -67,6 +67,7 @@
<Action name="renameFile"/> <Action name="renameFile"/>
</Menu> </Menu>
<Menu name="settings"><text>&amp;Settings</text> <Menu name="settings"><text>&amp;Settings</text>
<Action name="options_show_menubar"/>
<Action name="toggleSystemTray" append="show_merge"/> <Action name="toggleSystemTray" append="show_merge"/>
<Action name="dockOnClose" append="show_merge"/> <Action name="dockOnClose" append="show_merge"/>
<Action name="togglePopups" append="show_merge"/> <Action name="togglePopups" append="show_merge"/>
......
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