GUI - menu - add new items - scope kind visibility toggles

Author: samaaron

app/gui/qt/mainwindow.cpp

@@ -537,7 +537,7 @@ void MainWindow::setupWindowStructure() {
     connect(settingsWidget, SIGNAL(logAutoScrollChanged()), this, SLOT(updateLogAutoScroll()));
     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(scopeChanged(QString)), this, SLOT(changeScopeKindVisibility(QString)));
     connect(settingsWidget, SIGNAL(scopeLabelsChanged()), this, SLOT(changeScopeLabels()));
     connect(settingsWidget, SIGNAL(transparencyChanged(int)), this, SLOT(changeGUITransparency(int)));
 
@@ -1951,8 +1951,24 @@ void MainWindow::changeSystemPreAmp(int val, int silent)
 }
 
 
-void MainWindow::toggleScope(QString name) {
-    scopeInterface->EnableScope( name, piSettings->isScopeActive(name));
+void MainWindow::changeScopeKindVisibility(QString name) {
+  foreach (QAction *action, scopeKindVisibilityMenu->actions()) {
+    if (action->text() == name) {
+      QSignalBlocker blocker( action );
+      action->setChecked(piSettings->isScopeActive(name));
+    }
+  }
+
+  scopeInterface->EnableScope( name, piSettings->isScopeActive(name));
+}
+
+void MainWindow::scopeKindVisibilityMenuChanged() {
+  foreach (QAction *action, scopeKindVisibilityMenu->actions()) {
+    piSettings->setScopeState(action->text(), action->isChecked());
+    changeScopeKindVisibility(action->text());
+  }
+
+  emit settingsChanged();
 }
 
 void MainWindow::toggleLeftScope()
@@ -2716,6 +2732,7 @@ void  MainWindow::createToolBar()
     displayMenu = menuBar()->addMenu(tr("Visuals"));
 
 
+
     lightThemeAct = new QAction(tr("Light"));
     lightThemeAct->setCheckable(true);
     lightThemeAct->setChecked(false);
@@ -2755,6 +2772,15 @@ void  MainWindow::createToolBar()
     displayMenu->addSeparator();
     displayMenu->addAction(scopeAct);
     displayMenu->addAction(showScopeLabelsAct);
+    scopeKindVisibilityMenu = displayMenu->addMenu(tr("Show Scope Kinds"));
+
+    for( auto name : scopeInterface->GetScopeCategories()) {
+      QAction *act = new QAction(name);
+      act->setCheckable(true);
+      act->setChecked(piSettings->isScopeActive(name));
+      connect(act, SIGNAL(triggered()), this, SLOT(scopeKindVisibilityMenuChanged()));
+      scopeKindVisibilityMenu->addAction(act);
+    }
 
 
     ioMenu = menuBar()->addMenu(tr("IO"));

app/gui/qt/mainwindow.h

@@ -172,7 +172,8 @@ class MainWindow : public QMainWindow
         void showLogMenuChanged();
         void showCuesMenuChanged();
         void logAutoScrollMenuChanged();
-        void toggleScope(QString name);
+        void changeScopeKindVisibility(QString name);
+        void scopeKindVisibilityMenuChanged();
         void toggleLeftScope();
         void toggleRightScope();
         void changeScopeLabels();
@@ -308,7 +309,7 @@ class MainWindow : public QMainWindow
 
         void addUniversalCopyShortcuts(QTextEdit *te);
 
-  QMenu *liveMenu, *codeMenu, *audioMenu, *displayMenu, *viewMenu, *ioMenu, *ioMidiInMenu, *ioMidiOutMenu, *ioMidiOutChannelMenu, *localIpAddressesMenu, *themeMenu;
+  QMenu *liveMenu, *codeMenu, *audioMenu, *displayMenu, *viewMenu, *ioMenu, *ioMidiInMenu, *ioMidiOutMenu, *ioMidiOutChannelMenu, *localIpAddressesMenu, *themeMenu, *scopeKindVisibilityMenu;
 
         SonicPiSettings *piSettings;
 

app/gui/qt/widgets/settingswidget.cpp

@@ -485,6 +485,14 @@ void SettingsWidget::updateScopeNames( std::vector<QString> names ) {
     connect( scopeSignalMap, SIGNAL(mapped(QWidget*)), this, SLOT(toggleScope(QWidget*)));
 }
 
+void SettingsWidget::updateScopeKindVisibility() {
+  for (int i = 0; i < scope_box_kinds_layout->count(); ++i) {
+    QCheckBox *cb = qobject_cast<QCheckBox*>(scope_box_kinds_layout->itemAt(i)->widget());
+    cb->setChecked(piSettings->isScopeActive(cb->text()));
+  }
+
+}
+
 void SettingsWidget::toggleScope( QWidget* qw ) {
   QCheckBox* cb = static_cast<QCheckBox*>(qw);
   //QSettings settings(QSettings::IniFormat, QSettings::UserScope,    "sonic-pi.net", "gui-settings");
@@ -673,6 +681,7 @@ void SettingsWidget::updateSettings() {
 }
 
 void SettingsWidget::settingsChanged() {
+
     mixer_invert_stereo->setChecked(piSettings->mixer_invert_stereo);
     mixer_force_mono->setChecked(piSettings->mixer_force_mono);
     check_args->setChecked(piSettings->check_args);
@@ -711,6 +720,7 @@ void SettingsWidget::settingsChanged() {
     check_updates->setChecked(piSettings->check_updates);
     show_autocompletion->setChecked(piSettings->show_autocompletion);
     show_context->setChecked(piSettings->show_context);
+    updateScopeKindVisibility();
 }
 
 void SettingsWidget::connectAll() {

app/gui/qt/widgets/settingswidget.h

@@ -165,6 +165,8 @@ private slots:
     QString tooltipStrShiftMeta(char key, QString str);
 
     void connectAll();
+    void updateScopeKindVisibility();
+
 };
 
 #endif