Added the menu to toggle toolbar visibility to the 'view' menu

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6972 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · May 31, 2007 · 550b681 · 550b681
1 parent 6d09a3c
commit 550b681
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -861,13 +861,11 @@ void QgisApp::createMenus()
   mViewMenu->addAction(mActionShowBookmarks);
   mViewMenu->addAction(mActionNewBookmark);
   mViewMenu->addSeparator();
-  mToolbarMenu = mViewMenu->addMenu(QIcon(myIconPath+"/mActionOptions.png"),
-                                    tr("&Toolbars..."));
 
   //
   // View:toolbars menu
-  mToolbarMenu->addAction(mActionShowAllToolbars);
-  mToolbarMenu->addAction(mActionHideAllToolbars);
+  mViewMenu->addAction(mActionShowAllToolbars);
+  mViewMenu->addAction(mActionHideAllToolbars);
 
   //
   // Layers Menu
@@ -1012,6 +1010,16 @@ void QgisApp::createToolBars()
   mPluginToolBar = addToolBar(tr("Plugins"));
   mPluginToolBar->setIconSize(QSize(24,24));
   mPluginToolBar->setObjectName("Plugins");
+
+  //Add the menu for toolbar visibility here
+  //because createPopupMenu() would return 0
+  //before the toolbars are created
+  QMenu* toolbarVisibilityMenu = createPopupMenu();
+  if(toolbarVisibilityMenu)
+    {
+      toolbarVisibilityMenu->setTitle(tr("Toolbar Visibility..."));
+      mViewMenu->addMenu(toolbarVisibilityMenu);
+    }
 }
 
 void QgisApp::createStatusBar()