Merge remote-tracking branch 'origin/feature/7582_toolbar_menu'

Code/Mantid/MantidPlot/src/ApplicationWindow.cpp

@@ -416,6 +416,7 @@ void ApplicationWindow::init(bool factorySettings, const QStringList& args)
   createActions();
   initToolBars();
   initMainMenu();
+  makeToolbarsMenu();
   d_workspace = new QMdiArea();
   d_workspace->setOption(QMdiArea::DontMaximizeSubWindowOnActivation);
@@ -497,7 +498,7 @@ void ApplicationWindow::init(bool factorySettings, const QStringList& args)
   createLanguagesList();
   insertTranslatedStrings();
   disableToolbars();
-
+  displayToolbars();
   actionNextWindow = new QAction(QIcon(getQPixmap("next_xpm")), tr("&Next","next window"), this);
   actionNextWindow->setShortcut( tr("F5","next window shortcut") );
   connect(actionNextWindow, SIGNAL(activated()), d_workspace, SLOT(activateNextSubWindow()));
@@ -1158,7 +1159,7 @@ void ApplicationWindow::initMainMenu()
   mantidUI->addMenuItems(view);
   view->insertSeparator();
-  view->addAction(actionToolBars);
+  toolbarsMenu = view->addMenu(tr("&Toolbars"));
   view->addAction(actionShowConfigureDialog);
   view->insertSeparator();
   view->addAction(actionCustomActionDialog);
@@ -13348,11 +13349,7 @@ void ApplicationWindow::createActions()
   actionEditFunction = new QAction(tr("&Edit Function..."), this);
   connect(actionEditFunction, SIGNAL(activated()), this, SLOT(showFunctionDialog()));
-
-  actionToolBars = new QAction(tr("&Toolbars..."), this);
-  actionToolBars->setShortcut(tr("Ctrl+Shift+T"));
-  connect(actionToolBars, SIGNAL(activated()), this, SLOT(showToolBarsMenu()));
-
+  
   actionFontBold = new QAction("B", this);
   actionFontBold->setToolTip(tr("Bold"));
   QFont font = appFont;
@@ -13586,10 +13583,6 @@ void ApplicationWindow::translateActionsStrings()
   actionCloseAllWindows->setShortcut(tr("Ctrl+Q"));
   actionDeleteFitTables->setMenuText(tr("Delete &Fit Tables"));
-
-  actionToolBars->setMenuText(tr("&Toolbars..."));
-  actionToolBars->setShortcut(tr("Ctrl+Shift+T"));
-
   actionShowPlotWizard->setMenuText(tr("Plot &Wizard"));
   actionShowPlotWizard->setShortcut(tr("Ctrl+Alt+W"));
@@ -16688,51 +16681,52 @@ void ApplicationWindow::scriptsDirPathChanged(const QString& path)
 //  }
 }
-void ApplicationWindow::showToolBarsMenu()
+void ApplicationWindow::makeToolbarsMenu()
+// cppcheck-suppress publicAllocationError
 {
-  QMenu toolBarsMenu;
-
-  QAction *actionFileTools = new QAction(standardTools->windowTitle(), this);
+  actionFileTools = new QAction(standardTools->windowTitle(), toolbarsMenu);
   actionFileTools->setCheckable(true);
-  actionFileTools->setChecked(standardTools->isVisible());
-  connect(actionFileTools, SIGNAL(toggled(bool)), standardTools, SLOT(setVisible(bool)));
-  toolBarsMenu.addAction(actionFileTools);
-  QAction *actionPlotTools = new QAction(plotTools->windowTitle(), this);
+  toolbarsMenu->addAction(actionFileTools);
+  actionPlotTools = new QAction(plotTools->windowTitle(), toolbarsMenu);
   actionPlotTools->setCheckable(true);
-  actionPlotTools->setChecked(plotTools->isVisible());
-  connect(actionPlotTools, SIGNAL(toggled(bool)), plotTools, SLOT(setVisible(bool)));
-  toolBarsMenu.addAction(actionPlotTools);
-  QAction *actionDisplayBar = new QAction(displayBar->windowTitle(), this);
+  toolbarsMenu->addAction(actionPlotTools);
+  actionDisplayBar = new QAction(displayBar->windowTitle(), toolbarsMenu);
   actionDisplayBar->setCheckable(true);
-  actionDisplayBar->setChecked(displayBar->isVisible());
-  connect(actionDisplayBar, SIGNAL(toggled(bool)), displayBar, SLOT(setVisible(bool)));
-  toolBarsMenu.addAction(actionDisplayBar);
-  QAction *actionFormatToolBar = new QAction(formatToolBar->windowTitle(), this);
+  toolbarsMenu->addAction(actionDisplayBar);
+  actionFormatToolBar = new QAction(formatToolBar->windowTitle(), toolbarsMenu);
   actionFormatToolBar->setCheckable(true);
-  actionFormatToolBar->setChecked(formatToolBar->isVisible());
-  connect(actionFormatToolBar, SIGNAL(toggled(bool)), formatToolBar, SLOT(setVisible(bool)));
-  toolBarsMenu.addAction(actionFormatToolBar);
-  QAction *action = toolBarsMenu.exec(QCursor::pos());
-  if (!action)
-    return;
+  toolbarsMenu->addAction(actionFormatToolBar);
+}
+void ApplicationWindow::displayToolbars()
+{
+  actionFileTools->setChecked(d_standard_tool_bar);
+  actionPlotTools->setChecked(d_plot_tool_bar);
+  actionDisplayBar->setChecked(d_display_tool_bar);
+  actionFormatToolBar->setChecked(d_format_tool_bar);
+  connect(actionFileTools, SIGNAL(toggled(bool)), this, SLOT(setToolbars()));
+  connect(actionPlotTools, SIGNAL(toggled(bool)), this, SLOT(setToolbars()));
+  connect(actionDisplayBar, SIGNAL(toggled(bool)), this, SLOT(setToolbars()));
+  connect(actionFormatToolBar, SIGNAL(toggled(bool)), this, SLOT(setToolbars()));
+  setToolbars();
+}
+void ApplicationWindow::setToolbars()
+{
+  d_standard_tool_bar = actionFileTools->isChecked();
+  d_plot_tool_bar = actionPlotTools->isChecked();
+  d_display_tool_bar = actionDisplayBar->isChecked();
+  d_format_tool_bar = actionFormatToolBar->isChecked();
   MdiSubWindow *w = activeWindow();
-  if (action->text() == plotTools->windowTitle()){
-    d_plot_tool_bar = action->isChecked();
-    plotTools->setEnabled(w && w->isA("MultiLayer"));
-  }
-  else if (action->text() == standardTools->windowTitle()){
-    d_standard_tool_bar = action->isChecked();
-  } else if (action->text() == displayBar->windowTitle()){
-    d_display_tool_bar = action->isChecked();
-  } else if (action->text() == formatToolBar->windowTitle()){
-    d_format_tool_bar = action->isChecked();
-  }
+  standardTools->setVisible(d_standard_tool_bar);
+  plotTools->setVisible(d_plot_tool_bar);
+  displayBar->setVisible(d_display_tool_bar);
+  formatToolBar->setVisible(d_format_tool_bar);
+  plotTools->setEnabled(w && w->isA("MultiLayer"));
 }
 void ApplicationWindow::saveFitFunctions(const QStringList& lst)

Code/Mantid/MantidPlot/src/ApplicationWindow.h

@@ -1029,8 +1029,8 @@ public slots:
 
   void scriptsDirPathChanged(const QString& path);
   //@}
-
-  void showToolBarsMenu();
+  
+  void makeToolbarsMenu();
   void savetoNexusFile();
 
   //Slot for writing to log window
@@ -1095,6 +1095,9 @@ private:
   private slots:
   //! \name Initialization
   //@{
+  
+  void setToolbars();
+  void displayToolbars();
   void insertTranslatedStrings();
   void translateActionsStrings();
   void init(bool factorySettings, const QStringList& args);
@@ -1395,8 +1398,9 @@ private:
   
   QMenu *help, *plot2DMenu, *analysisMenu, *multiPeakMenu, *icat;
   QMenu *matrixMenu, *plot3DMenu, *plotDataMenu, *tablesDepend, *scriptingMenu;
-  QMenu *tableMenu, *fillMenu, *normMenu, *newMenu, *exportPlotMenu, *smoothMenu, *filterMenu, *decayMenu,*saveMenu,*openMenu;
+  QMenu *tableMenu, *fillMenu, *normMenu, *newMenu, *exportPlotMenu, *smoothMenu, *filterMenu, *decayMenu,*saveMenu,*openMenu, *toolbarsMenu;
 
+  QAction *actionFileTools,*actionPlotTools,*actionDisplayBar,*actionFormatToolBar;
   QAction *actionEditCurveRange, *actionCurveFullRange, *actionShowAllCurves, *actionHideCurve, *actionHideOtherCurves;
   QAction *actionEditFunction, *actionRemoveCurve, *actionShowCurveWorksheet, *actionShowCurvePlotDialog;
   QAction *actionNewProject, *actionNewNote, *actionNewTable, *actionNewFunctionPlot,*actionSaveFile;
@@ -1458,7 +1462,7 @@ private:
   QAction *actionFlipMatrixVertically, *actionFlipMatrixHorizontally, *actionRotateMatrix;
   QAction *actionViewMatrixImage, *actionViewMatrix, *actionExportMatrix;
   QAction *actionMatrixGrayScale, *actionMatrixRainbowScale, *actionMatrixCustomScale, *actionRotateMatrixMinus;
-  QAction *actionMatrixXY, *actionMatrixColumnRow, *actionImagePlot, *actionToolBars;
+  QAction *actionMatrixXY, *actionMatrixColumnRow, *actionImagePlot;
   QAction *actionMatrixFFTDirect, *actionMatrixFFTInverse;
   QAction *actionFontBold, *actionFontItalic, *actionFontBox, *actionFontSize;
   QAction *actionSuperscript, *actionSubscript, *actionUnderline, *actionGreekSymbol, *actionCustomActionDialog, *actionManageDirs, *actionFirstTimeSetup, *actionSetupParaview;