GUI - menu - new item - show scope labels

Author: samaaron

app/gui/qt/mainwindow.cpp

@@ -538,7 +538,7 @@ void MainWindow::setupWindowStructure() {
     connect(settingsWidget, SIGNAL(themeChanged()), this, SLOT(updateColourTheme()));
     connect(settingsWidget, SIGNAL(scopeChanged()), this, SLOT(scope()));
     connect(settingsWidget, SIGNAL(scopeChanged(QString)), this, SLOT(toggleScope(QString)));
-    connect(settingsWidget, SIGNAL(scopeLabelsChanged()), this, SLOT(toggleScopeLabels()));
+    connect(settingsWidget, SIGNAL(scopeLabelsChanged()), this, SLOT(changeScopeLabels()));
     connect(settingsWidget, SIGNAL(transparencyChanged(int)), this, SLOT(changeGUITransparency(int)));
 
     connect(settingsWidget, SIGNAL(checkUpdatesChanged()), this, SLOT(update_check_updates()));
@@ -1379,7 +1379,7 @@ void MainWindow::honourPrefs() {
     update_check_updates();
     updateLogAutoScroll();
     changeGUITransparency(piSettings->gui_transparency);
-    toggleScopeLabels();
+    changeScopeLabels();
     toggleMidi(1);
     toggleOSCServer(1);
     toggleIcons();
@@ -1965,8 +1965,16 @@ void MainWindow::toggleRightScope()
     //scopeInterface->enableScope("Right",show_right_scope->isChecked());
 }
 
-void MainWindow::toggleScopeLabels()
+void MainWindow::showScopeLabelsMenuChanged() {
+  piSettings->show_scope_labels = showScopeLabelsAct->isChecked();
+  emit settingsChanged();
+  changeScopeLabels();
+}
+
+void MainWindow::changeScopeLabels()
 {
+  QSignalBlocker blocker( showScopeLabelsAct );
+  showScopeLabelsAct->setChecked(piSettings->show_scope_labels);
   scopeInterface->SetScopeLabels(piSettings->show_scope_labels);
 }
 
@@ -2707,6 +2715,7 @@ void  MainWindow::createToolBar()
 
     displayMenu = menuBar()->addMenu(tr("Visuals"));
 
+
     lightThemeAct = new QAction(tr("Light"));
     lightThemeAct->setCheckable(true);
     lightThemeAct->setChecked(false);
@@ -2745,6 +2754,7 @@ void  MainWindow::createToolBar()
     themeMenu->addAction(highContrastThemeAct);
     displayMenu->addSeparator();
     displayMenu->addAction(scopeAct);
+    displayMenu->addAction(showScopeLabelsAct);
 
 
     ioMenu = menuBar()->addMenu(tr("IO"));

app/gui/qt/mainwindow.h

@@ -141,6 +141,7 @@ class MainWindow : public QMainWindow
         void about();
         void scope();
         void toggleScope();
+        void showScopeLabelsMenuChanged();
         void toggleIcons();
         void help();
         void toggleHelpIcon();
@@ -174,7 +175,7 @@ class MainWindow : public QMainWindow
         void toggleScope(QString name);
         void toggleLeftScope();
         void toggleRightScope();
-        void toggleScopeLabels();
+        void changeScopeLabels();
         void scopeVisibilityChanged();
         void logCuesMenuChanged();
         void changeLogCues();
@@ -361,7 +362,7 @@ class MainWindow : public QMainWindow
 
         QToolBar *toolBar;
 
-  QAction *exitAct, *runAct, *stopAct, *saveAsAct, *loadFileAct, *recAct, *textAlignAct, *textIncAct, *textDecAct, *scopeAct, *infoAct, *helpAct, *prefsAct, *focusEditorAct, *focusLogsAct, *focusContextAct, *focusCuesAct, *focusPreferencesAct, *focusHelpListingAct, *focusHelpDetailsAct, *focusErrorsAct, *showLineNumbersAct, *showAutoCompletionAct, *showContextAct, *audioSafeAct, *audioTimingGuaranteesAct, *enableExternalSynthsAct, *mixerInvertStereoAct, *mixerForceMonoAct, *midiEnabledAct, *enableOSCServerAct, *allowRemoteOSCAct, *showLogAct, *showCuesAct, *logAutoScrollAct, *logCuesAct, *logSynthsAct, *clearOutputOnRunAct, *autoIndentOnRunAct, *showButtonsAct, *showTabsAct, *fullScreenAct, *lightThemeAct, *darkThemeAct, *proLightThemeAct, *proDarkThemeAct, *highContrastThemeAct;
+  QAction *exitAct, *runAct, *stopAct, *saveAsAct, *loadFileAct, *recAct, *textAlignAct, *textIncAct, *textDecAct, *scopeAct, *infoAct, *helpAct, *prefsAct, *focusEditorAct, *focusLogsAct, *focusContextAct, *focusCuesAct, *focusPreferencesAct, *focusHelpListingAct, *focusHelpDetailsAct, *focusErrorsAct, *showLineNumbersAct, *showAutoCompletionAct, *showContextAct, *audioSafeAct, *audioTimingGuaranteesAct, *enableExternalSynthsAct, *mixerInvertStereoAct, *mixerForceMonoAct, *midiEnabledAct, *enableOSCServerAct, *allowRemoteOSCAct, *showLogAct, *showCuesAct, *logAutoScrollAct, *logCuesAct, *logSynthsAct, *clearOutputOnRunAct, *autoIndentOnRunAct, *showButtonsAct, *showTabsAct, *fullScreenAct, *lightThemeAct, *darkThemeAct, *proLightThemeAct, *proDarkThemeAct, *highContrastThemeAct, *showScopeLabelsAct;
   QShortcut *runSc, *stopSc, *saveAsSc, *loadFileSc, *recSc, *textAlignSc, *textIncSc, *textDecSc, *scopeSc, *infoSc, *helpSc, *prefsSc, *focusEditorSc, *focusLogsSc, *focusContextSc, *focusCuesSc, *focusPreferencesSc, *focusHelpListingSc, *focusHelpDetailsSc, *focusErrorsSc;
 
         SettingsWidget *settingsWidget;

app/gui/qt/widgets/settingswidget.cpp

@@ -394,7 +394,7 @@ QGroupBox* SettingsWidget::createVisualizationPrefsTab() {
     scopeSignalMap = new QSignalMapper(this);
     show_scopes = new QCheckBox(tr("Show Scopes"));
     show_scopes->setToolTip(tr("Toggle the visibility of the audio oscilloscopes."));
-    show_scope_labels = new QCheckBox(tr("Show Labels"));
+    show_scope_labels = new QCheckBox(tr("Show Scope Labels"));
     show_scope_labels->setToolTip(tr("Toggle the visibility of the labels for the audio oscilloscopes"));
     show_scope_labels->setChecked(true);
     scope_box_kinds->setLayout(scope_box_kinds_layout);