GUI - menu - add new items - colour themes

Author: samaaron

app/gui/qt/mainwindow.cpp

@@ -1986,6 +1986,23 @@ void MainWindow::cycleThemes() {
     updateColourTheme();
 }
 
+void MainWindow::colourThemeMenuChanged(int themeID) {
+  if (themeID == 2) {
+    piSettings->themeStyle = SonicPiTheme::DarkMode;
+  } else if (themeID == 3) {
+    piSettings->themeStyle = SonicPiTheme::LightProMode;
+  } else if (themeID == 4) {
+    piSettings->themeStyle = SonicPiTheme::DarkProMode;
+  } else if (themeID == 5) {
+    piSettings->themeStyle = SonicPiTheme::HighContrastMode;
+  } else {
+    piSettings->themeStyle = SonicPiTheme::LightMode;
+  }
+
+  emit settingsChanged();
+  updateColourTheme();
+}
+
 void MainWindow::logAutoScrollMenuChanged() {
   piSettings->log_auto_scroll = logAutoScrollAct->isChecked();
   emit settingsChanged();
@@ -2029,6 +2046,29 @@ void MainWindow::toggleIcons() {
 }
 
 void MainWindow::updateColourTheme(){
+  QSignalBlocker lightBlocker( lightThemeAct );
+  lightThemeAct->setChecked(false);
+  QSignalBlocker darkBlocker( darkThemeAct );
+  darkThemeAct->setChecked(false);
+  QSignalBlocker proLightBlocker( proLightThemeAct );
+  proLightThemeAct->setChecked(false);
+  QSignalBlocker proDarkBlocker( proDarkThemeAct );
+  proDarkThemeAct->setChecked(false);
+  QSignalBlocker highContrastBlocker( highContrastThemeAct );
+  highContrastThemeAct->setChecked(false);
+
+  if ( piSettings->themeStyle == SonicPiTheme::LightMode ) {
+    lightThemeAct->setChecked(true);
+  } else if ( piSettings->themeStyle == SonicPiTheme::DarkMode ) {
+    darkThemeAct->setChecked(true);
+  } else if ( piSettings->themeStyle == SonicPiTheme::LightProMode ) {
+    proLightThemeAct->setChecked(true);
+  } else if ( piSettings->themeStyle == SonicPiTheme::DarkProMode ) {
+    proDarkThemeAct->setChecked(true);
+  } else if ( piSettings->themeStyle == SonicPiTheme::HighContrastMode ) {
+    highContrastThemeAct->setChecked(true);
+  }
+
     theme->switchStyle( piSettings->themeStyle );
     statusBar()->showMessage(tr("Colour Theme: ")+theme->getName(), 2000);
 
@@ -2863,6 +2903,39 @@ void  MainWindow::createToolBar()
 
     viewMenu->addAction(fullScreenAct);
     viewMenu->addSeparator();
+
+    lightThemeAct = new QAction(tr("Light"));
+    lightThemeAct->setCheckable(true);
+    lightThemeAct->setChecked(false);
+    connect(lightThemeAct, &QAction::triggered, [this](){ colourThemeMenuChanged(1);});
+
+    darkThemeAct = new QAction(tr("Dark"));
+    darkThemeAct->setCheckable(true);
+    darkThemeAct->setChecked(false);
+    connect(darkThemeAct, &QAction::triggered, [this](){ colourThemeMenuChanged(2);});
+
+    proLightThemeAct = new QAction(tr("Pro Light"));
+    proLightThemeAct->setCheckable(true);
+    proLightThemeAct->setChecked(false);
+    connect(proLightThemeAct, &QAction::triggered, [this](){ colourThemeMenuChanged(3);});
+
+    proDarkThemeAct = new QAction(tr("Pro Dark"));
+    proDarkThemeAct->setCheckable(true);
+    proDarkThemeAct->setChecked(false);
+    connect(proDarkThemeAct, &QAction::triggered, [this](){ colourThemeMenuChanged(4);});
+
+    highContrastThemeAct = new QAction(tr("High Contrast"));
+    highContrastThemeAct->setCheckable(true);
+    highContrastThemeAct->setChecked(false);
+    connect(highContrastThemeAct, &QAction::triggered, [this](){ colourThemeMenuChanged(5);});
+
+    themeMenu = viewMenu->addMenu("Colour Theme");
+    themeMenu->addAction(lightThemeAct);
+    themeMenu->addAction(darkThemeAct);
+    themeMenu->addAction(proLightThemeAct);
+    themeMenu->addAction(proDarkThemeAct);
+    themeMenu->addAction(highContrastThemeAct);
+
     viewMenu->addAction(showLogAct);
     viewMenu->addAction(showCuesAct);
     viewMenu->addAction(showContextAct);

app/gui/qt/mainwindow.h

@@ -186,6 +186,7 @@ class MainWindow : public QMainWindow
         void changeAutoIndentOnRun();
         void cycleThemes();
         void updateColourTheme();
+        void colourThemeMenuChanged(int themeID);
         void updatePrefsIcon();
         void togglePrefs();
         void updateDocPane(QListWidgetItem *cur);
@@ -306,7 +307,7 @@ class MainWindow : public QMainWindow
 
         void addUniversalCopyShortcuts(QTextEdit *te);
 
-  QMenu *liveMenu, *codeMenu, *audioMenu, *displayMenu, *viewMenu, *ioMenu, *ioMidiInMenu, *ioMidiOutMenu, *ioMidiOutChannelMenu, *localIpAddressesMenu;
+  QMenu *liveMenu, *codeMenu, *audioMenu, *displayMenu, *viewMenu, *ioMenu, *ioMidiInMenu, *ioMidiOutMenu, *ioMidiOutChannelMenu, *localIpAddressesMenu, *themeMenu;
 
         SonicPiSettings *piSettings;
 
@@ -360,7 +361,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;
+  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;
   QShortcut *runSc, *stopSc, *saveAsSc, *loadFileSc, *recSc, *textAlignSc, *textIncSc, *textDecSc, *scopeSc, *infoSc, *helpSc, *prefsSc, *focusEditorSc, *focusLogsSc, *focusContextSc, *focusCuesSc, *focusPreferencesSc, *focusHelpListingSc, *focusHelpDetailsSc, *focusErrorsSc;
 
         SettingsWidget *settingsWidget;