[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/akregator/src
From:       Teemu Rytilahti <tpr () d5k ! net>
Date:       2008-08-22 7:09:26
Message-ID: 1219388966.947690.13641.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 850719 by rytilahti:

add support for toggling the menubar with kstandardaction

CCBUGS:168070


 M  +2 -1      akregator_shell.rc  
 M  +9 -0      mainwindow.cpp  
 M  +1 -0      mainwindow.h  


--- trunk/KDE/kdepim/akregator/src/akregator_shell.rc #850718:850719
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="akregator_shell" version="391">
+<kpartgui name="akregator_shell" version="392">
 <MenuBar>
   <Menu noMerge="1" name="file"><text>&amp;File</text>
     <Merge/>
@@ -35,6 +35,7 @@
   <Menu noMerge="1" name="settings" >
    <text>&amp;Settings</text>
    <Merge name="StandardToolBarMenuHandler" />
+   <Action group="settings_configure" name="options_show_menubar" />
    <Action name="show_quick_filter" />
    <Separator/>
    <Action group="settings_configure" name="options_configure_keybinding" />
--- trunk/KDE/kdepim/akregator/src/mainwindow.cpp #850718:850719
@@ -48,6 +48,8 @@
 #include <ktoolbar.h>
 #include <kurl.h>
 
+#include <KMenuBar>
+
 #include "progressdialog.h"
 #include "statusbarprogresswidget.h"
 #include "trayicon.h"
@@ -155,6 +157,7 @@
 void MainWindow::setupActions()
 {
     KStandardAction::quit(kapp, SLOT(quit()), actionCollection());
+    KStandardAction::showMenubar(this, SLOT(toggleMenuBar()), actionCollection()); \
// options_show_menubar  
     setStandardToolBarMenuEnabled(true);
     createStandardStatusBarAction();
@@ -214,6 +217,12 @@
     applyMainWindowSettings(KGlobal::config()->group( autoSaveGroup()) );
 }
 
+void MainWindow::toggleMenuBar()
+{
+    QAction *act = actionCollection()->action("options_show_menubar");
+    if(act)
+        menuBar()->setVisible(act->isChecked());
+}
 KParts::BrowserExtension *MainWindow::browserExtension(KParts::ReadOnlyPart *p)
 {
     return KParts::BrowserExtension::childObject( p );
--- trunk/KDE/kdepim/akregator/src/mainwindow.h #850718:850719
@@ -127,6 +127,7 @@
     void optionsConfigureToolbars();
     
     void applyNewToolbarConfig();
+    void toggleMenuBar();
 
 private:
     BrowserInterface *m_browserIface;


[prev in list] [next in list] [prev in thread] [next in thread]