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

List:       kde-commits
Subject:    KDE/kdebase/apps/konsole/src
From:       Robert Knight <robertknight () gmail ! com>
Date:       2007-12-30 16:50:58
Message-ID: 1199033458.974840.26536.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 754736 by knight:

Sync the state of the 'Show Menu Bar' action with the visibility of the menu bar when \
it is changed as a result of applying a profile setting.

 M  +2 -1      MainWindow.cpp  
 M  +3 -0      MainWindow.h  


--- trunk/KDE/kdebase/apps/konsole/src/MainWindow.cpp #754735:754736
@@ -96,10 +96,11 @@
 
 void MainWindow::setMenuBarVisibleOnce(bool visible)
 {
-	if (_menuBarVisibilitySet)
+	if (_menuBarVisibilitySet || menuBar()->isTopLevelMenu() )
 		return;
 
 	menuBar()->setVisible(visible);
+	_toggleMenuBarAction->setChecked(visible);
 
 	_menuBarVisibilitySet = true;	
 }
--- trunk/KDE/kdebase/apps/konsole/src/MainWindow.h #754735:754736
@@ -143,6 +143,9 @@
         void sessionListChanged(const QList<QAction*>& actions);
         void viewFullScreen(bool fullScreen);
         void configureNotifications();
+
+		// single shot call to set the visibility of the menu bar.  Has no 
+		// effect if the menu bar is a MacOS-style top-level menu
 		void setMenuBarVisibleOnce(bool visible);
 
     private:


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