project dialog optional and rec wave bug fixed

3 files changed, 52 insertions, 13 deletions

diff --git a/muse2/muse/widgets/genset.cpp b/muse2/muse/widgets/genset.cpp
index 0d81d846..68405f9b 100644
--- a/muse2/muse/widgets/genset.cpp
+++ b/muse2/muse/widgets/genset.cpp
@@ -132,6 +132,7 @@ GlobalSettingsConfig::GlobalSettingsConfig(QWidget* parent)
       externalWavEditorSelect->setText(config.externalWavEditor);
       oldStyleStopCheckBox->setChecked(config.useOldStyleStopShortCut);
       moveArmedCheckBox->setChecked(config.moveArmedCheckBox);
+      projectSaveCheckBox->setChecked(config.useProjectSaveDialog);
       
       //updateSettings();    // TESTING
       
@@ -236,6 +237,7 @@ void GlobalSettingsConfig::updateSettings()
       externalWavEditorSelect->setText(config.externalWavEditor);
       oldStyleStopCheckBox->setChecked(config.useOldStyleStopShortCut);
       moveArmedCheckBox->setChecked(config.moveArmedCheckBox);
+      projectSaveCheckBox->setChecked(config.useProjectSaveDialog);
 }
 
 //---------------------------------------------------------
@@ -314,6 +316,8 @@ void GlobalSettingsConfig::apply()
       config.externalWavEditor = externalWavEditorSelect->text();
       config.useOldStyleStopShortCut = oldStyleStopCheckBox->isChecked();
       config.moveArmedCheckBox = moveArmedCheckBox->isChecked();
+      config.useProjectSaveDialog = projectSaveCheckBox->isChecked();
+
       //muse->showMixer(config.mixerVisible);
       muse->showMixer1(config.mixer1Visible);
       muse->showMixer2(config.mixer2Visible);
diff --git a/muse2/muse/widgets/gensetbase.ui b/muse2/muse/widgets/gensetbase.ui
index 44261c87..4d937ecb 100644
--- a/muse2/muse/widgets/gensetbase.ui
+++ b/muse2/muse/widgets/gensetbase.ui
@@ -29,7 +29,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="TabPage">
       <attribute name="title">
@@ -1124,13 +1124,7 @@ Shorter periods are desirable.</string>
          <property name="title">
           <string>Behavior</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_2" columnminimumwidth="280,0,0">
-          <property name="margin">
-           <number>11</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
+         <layout class="QGridLayout" name="gridLayout">
           <item row="0" column="0">
            <widget class="QLabel" name="TextLabel1">
             <property name="text">
@@ -1141,7 +1135,7 @@ Shorter periods are desirable.</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" colspan="2">
+          <item row="0" column="1">
            <widget class="QSpinBox" name="guiRefreshSelect">
             <property name="suffix">
              <string>/sec</string>
@@ -1167,6 +1161,19 @@ Shorter periods are desirable.</string>
             </property>
            </widget>
           </item>
+          <item row="1" column="1">
+           <widget class="QCheckBox" name="oldStyleStopCheckBox">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
           <item row="2" column="0">
            <widget class="QLabel" name="textLabel1_4_2">
             <property name="text">
@@ -1190,8 +1197,18 @@ Shorter periods are desirable.</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QCheckBox" name="oldStyleStopCheckBox">
+          <item row="3" column="0">
+           <widget class="QLabel" name="textLabel1_4_3">
+            <property name="text">
+             <string>Use project save dialog</string>
+            </property>
+            <property name="wordWrap">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QCheckBox" name="projectSaveCheckBox">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -1203,6 +1220,19 @@ Shorter periods are desirable.</string>
             </property>
            </widget>
           </item>
+          <item row="4" column="0">
+           <spacer name="verticalSpacer_2">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/muse2/muse/widgets/projectcreateimpl.cpp b/muse2/muse/widgets/projectcreateimpl.cpp
index a019df95..c7aa0fdb 100644
--- a/muse2/muse/widgets/projectcreateimpl.cpp
+++ b/muse2/muse/widgets/projectcreateimpl.cpp
@@ -41,10 +41,15 @@ void ProjectCreateImpl::selectDirectory()
 
 void ProjectCreateImpl::updateDirectoryPath()
 {
+  QString name = "";
   if (createFolderCheckbox->isChecked()) {
-    storageDirEdit->setText(directoryPath + projectNameEdit->text() + "/" + projectNameEdit->text() + ".med");
+    if (!projectNameEdit->text().isEmpty())
+      name = projectNameEdit->text() + "/" + projectNameEdit->text() + ".med";
+    storageDirEdit->setText(directoryPath + name );
   }  else {
-    storageDirEdit->setText(directoryPath + projectNameEdit->text() + ".med");
+    if (!projectNameEdit->text().isEmpty())
+      name = projectNameEdit->text() + ".med";
+    storageDirEdit->setText(directoryPath + projectNameEdit->text() + name);
   }
 }