Add toolbar menu

nyalldawson · nyalldawson · commit 76beef42c8a7 · 2017-07-11T14:41:01.000+10:00
diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp
@@ -211,6 +211,17 @@ QgsLayoutDesignerDialog::QgsLayoutDesignerDialog( QWidget *parent, Qt::WindowFla
   connect( mHorizontalRuler, &QgsLayoutRuler::cursorPosChanged, this, &QgsLayoutDesignerDialog::updateStatusCursorPos );
   connect( mVerticalRuler, &QgsLayoutRuler::cursorPosChanged, this, &QgsLayoutDesignerDialog::updateStatusCursorPos );
 
+  // Panel and toolbar submenus
+  QMenu *toolbarMenu = new QMenu( tr( "&Toolbars" ), this );
+  toolbarMenu->setObjectName( QStringLiteral( "mToolbarMenu" ) );
+  mMenuView->addSeparator();
+  mMenuView->addMenu( toolbarMenu );
+
+  // toolBar already exists, add other widgets as they are created
+  toolbarMenu->addAction( mLayoutToolbar->toggleViewAction() );
+  toolbarMenu->addAction( mNavigationToolbar->toggleViewAction() );
+  toolbarMenu->addAction( mToolsToolbar->toggleViewAction() );
+
   restoreWindowState();
 }
 
diff --git a/src/ui/layout/qgslayoutdesignerbase.ui b/src/ui/layout/qgslayoutdesignerbase.ui
@@ -54,7 +54,7 @@
   <widget class="QStatusBar" name="mStatusBar"/>
   <widget class="QToolBar" name="mLayoutToolbar">
    <property name="windowTitle">
-    <string>Composer</string>
+    <string>Layout</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
@@ -115,7 +115,7 @@
   </widget>
   <widget class="QToolBar" name="mNavigationToolbar">
    <property name="windowTitle">
-    <string>toolBar</string>
+    <string>Navigation</string>
    </property>
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
