GUI - menu - add new item - auto indent on run

Author: samaaron

app/gui/qt/mainwindow.cpp

@@ -551,6 +551,7 @@ void MainWindow::setupWindowStructure() {
     connect(settingsWidget, SIGNAL(logCuesChanged()), this, SLOT(changeLogCues()));
     connect(settingsWidget, SIGNAL(logSynthsChanged()), this, SLOT(changeLogSynths()));
     connect(settingsWidget, SIGNAL(clearOutputOnRunChanged()), this, SLOT(changeClearOutputOnRun()));
+    connect(settingsWidget, SIGNAL(autoIndentOnRunChanged()), this, SLOT(changeAutoIndentOnRun()));
 
     connect(this, SIGNAL(settingsChanged()), settingsWidget, SLOT(settingsChanged()));
 
@@ -1365,6 +1366,7 @@ void MainWindow::honourPrefs() {
     changeLogSynths();
     changeLogCues();
     changeClearOutputOnRun();
+    changeAutoIndentOnRun();
 }
 
 void MainWindow::setMessageBoxStyle() {
@@ -2155,6 +2157,16 @@ void MainWindow::changeClearOutputOnRun() {
   clearOutputOnRunAct->setChecked(piSettings->clear_output_on_run);
 }
 
+void MainWindow::autoIndentOnRunMenuChanged() {
+  piSettings->auto_indent_on_run = autoIndentOnRunAct->isChecked();
+  emit settingsChanged();
+}
+
+void MainWindow::changeAutoIndentOnRun() {
+  QSignalBlocker blocker( autoIndentOnRunAct );
+  autoIndentOnRunAct->setChecked(piSettings->auto_indent_on_run);
+}
+
 void MainWindow::changeMidiDefaultChannel() {
   int idx = piSettings->midi_default_channel;
 
@@ -2578,6 +2590,11 @@ void  MainWindow::createToolBar()
     clearOutputOnRunAct->setChecked(piSettings->log_cues);
     connect(clearOutputOnRunAct, SIGNAL(triggered()), this, SLOT(clearOutputOnRunMenuChanged()));
 
+    autoIndentOnRunAct = new QAction(tr("Auto Indent Code on Run"), this);
+    autoIndentOnRunAct->setCheckable(true);
+    autoIndentOnRunAct->setChecked(piSettings->auto_indent_on_run);
+    connect(autoIndentOnRunAct, SIGNAL(triggered()), this, SLOT(autoIndentOnRunMenuChanged()));
+
     logAutoScrollAct = new QAction(tr("Auto-Scroll Log"), this);
     logAutoScrollAct->setCheckable(true);
     logAutoScrollAct->setChecked(piSettings->log_auto_scroll);
@@ -2610,8 +2627,7 @@ void  MainWindow::createToolBar()
     codeMenu->addSeparator();
     codeMenu->addAction(showLineNumbersAct);
     codeMenu->addAction(showAutoCompletionAct);
-
-
+    codeMenu->addAction(autoIndentOnRunAct);
 
     audioMenu = menuBar()->addMenu(tr("Audio"));
     audioMenu->addAction(enableExternalSynthsAct);

app/gui/qt/mainwindow.h

@@ -182,6 +182,8 @@ class MainWindow : public QMainWindow
         void changeLogSynths();
         void clearOutputOnRunMenuChanged();
         void changeClearOutputOnRun();
+        void autoIndentOnRunMenuChanged();
+        void changeAutoIndentOnRun();
         void cycleThemes();
         void updateColourTheme();
         void updatePrefsIcon();
@@ -355,7 +357,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;
+  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;
   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

@@ -617,6 +617,11 @@ void SettingsWidget::clearOutputOnRun() {
   emit clearOutputOnRunChanged();
 }
 
+
+void SettingsWidget::autoIndentOnRun() {
+  emit autoIndentOnRunChanged();
+}
+
 void SettingsWidget::openSonicPiNet() {
   QDesktopServices::openUrl(QUrl("http://sonic-pi.net", QUrl::TolerantMode));
 }
@@ -786,4 +791,5 @@ void SettingsWidget::connectAll() {
     connect(log_cues, SIGNAL(clicked()), this, SLOT(logCues()));
     connect(log_synths, SIGNAL(clicked()), this, SLOT(logSynths()));
     connect(clear_output_on_run, SIGNAL(clicked()), this, SLOT(clearOutputOnRun()));
+    connect(auto_indent_on_run, SIGNAL(clicked()), this, SLOT(autoIndentOnRun()));
 }

app/gui/qt/widgets/settingswidget.h

@@ -65,6 +65,7 @@ private slots:
     void logCues();
     void logSynths();
     void clearOutputOnRun();
+    void autoIndentOnRun();
 
 signals:
     void mixerSettingsChanged();
@@ -95,6 +96,7 @@ private slots:
     void logCuesChanged();
     void logSynthsChanged();
     void clearOutputOnRunChanged();
+    void autoIndentOnRunChanged();
 
 private:
     SonicPiSettings* piSettings;