Commit of the beast. User instruments path is made user configurable. Removed env. variables usage.

3 files changed, 52 insertions, 9 deletions

diff --git a/muse2/muse/widgets/genset.cpp b/muse2/muse/widgets/genset.cpp
index 24e58855..0d81d846 100644
--- a/muse2/muse/widgets/genset.cpp
+++ b/muse2/muse/widgets/genset.cpp
@@ -8,7 +8,7 @@
 
 #include <stdio.h>
 
-#include <QDialog>
+#include <QFileDialog>
 #include <QRect>
 #include <QShowEvent>
 
@@ -17,6 +17,7 @@
 #include "gconfig.h"
 #include "midiseq.h"
 #include "globals.h"
+#include "icons.h"
 
 static int rtcResolutions[] = {
       1024, 2048, 4096, 8192, 16384, 32768
@@ -64,7 +65,13 @@ GlobalSettingsConfig::GlobalSettingsConfig(QWidget* parent)
                   break;
                   }
             }
-      
+
+      userInstrumentsPath->setText(config.userInstrumentsDir);
+      selectInstrumentsDirButton->setIcon(*openIcon);
+      defaultInstrumentsDirButton->setIcon(*undoIcon);
+      connect(selectInstrumentsDirButton, SIGNAL(clicked()), SLOT(selectInstrumentsPath()));
+      connect(defaultInstrumentsDirButton, SIGNAL(clicked()), SLOT(defaultInstrumentsPath()));
+
       guiRefreshSelect->setValue(config.guiRefresh);
       minSliderSelect->setValue(int(config.minSlider));
       minMeterSelect->setValue(config.minMeter);
@@ -256,6 +263,7 @@ void GlobalSettingsConfig::apply()
       config.useOutputLimiter = outputLimiterCheckBox->isChecked();
       config.vstInPlace  = vstInPlaceCheckBox->isChecked();
       config.rtcTicks    = rtcResolutions[rtcticks];
+      config.userInstrumentsDir = userInstrumentsPath->text();
       config.startSong   = startSongEntry->text();
       config.startMode   = startSongGroup->checkedId();
       int das = dummyAudioSize->currentIndex();
@@ -340,6 +348,8 @@ void GlobalSettingsConfig::apply()
       muse->resize(config.geometryMain.size());
       muse->move(config.geometryMain.topLeft());
 
+      museUserInstruments = config.userInstrumentsDir;
+
       muse->setHeartBeat();        // set guiRefresh
       midiSeq->msgSetRtc();        // set midi tick rate
       muse->changeConfig(true);    // save settings
@@ -439,3 +449,16 @@ void GlobalSettingsConfig::transportCurrent()
       transportY->setValue(r.y());
       }
 
+void GlobalSettingsConfig::selectInstrumentsPath()
+      {
+      QString dir = QFileDialog::getExistingDirectory(this, 
+                                                      tr("Selects instruments directory"), 
+                                                      config.userInstrumentsDir);
+      userInstrumentsPath->setText(dir);
+      }
+
+void GlobalSettingsConfig::defaultInstrumentsPath()
+      {
+      QString dir = configPath + "/instruments";
+      userInstrumentsPath->setText(dir);
+      }
diff --git a/muse2/muse/widgets/genset.h b/muse2/muse/widgets/genset.h
index e0494b2f..ea094296 100644
--- a/muse2/muse/widgets/genset.h
+++ b/muse2/muse/widgets/genset.h
@@ -30,6 +30,8 @@ class GlobalSettingsConfig : public QDialog, public Ui::GlobalSettingsDialogBase
       void bigtimeCurrent();
       void arrangerCurrent();
       void transportCurrent();
+      void selectInstrumentsPath();
+      void defaultInstrumentsPath();
 
     protected:
       void showEvent(QShowEvent*);
diff --git a/muse2/muse/widgets/gensetbase.ui b/muse2/muse/widgets/gensetbase.ui
index 9885f97f..9fb4e6f2 100644
--- a/muse2/muse/widgets/gensetbase.ui
+++ b/muse2/muse/widgets/gensetbase.ui
@@ -907,13 +907,7 @@ Shorter periods are desirable.</string>
          <property name="title">
           <string>Ticks</string>
          </property>
-         <layout class="QGridLayout">
-          <property name="margin">
-           <number>11</number>
-          </property>
-          <property name="spacing">
-           <number>6</number>
-          </property>
+         <layout class="QGridLayout" name="gridLayout9">
           <item row="0" column="0">
            <widget class="QLabel" name="TextLabel3">
             <property name="text">
@@ -1085,6 +1079,30 @@ Shorter periods are desirable.</string>
             </item>
            </widget>
           </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="TextLabel3_4">
+            <property name="text">
+             <string>Instruments Directory</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="userInstrumentsPath"/>
+          </item>
+          <item row="3" column="2">
+           <widget class="QPushButton" name="selectInstrumentsDirButton">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="3">
+           <widget class="QPushButton" name="defaultInstrumentsDirButton">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>