merged with trunk (that is, pulled the fixes from release_2_0)

only quickly tested, seems okay on the first glance

1 files changed, 93 insertions, 46 deletions

diff --git a/muse2/muse/widgets/gensetbase.ui b/muse2/muse/widgets/gensetbase.ui
index 39dcd4c3..1abc3cd1 100644
--- a/muse2/muse/widgets/gensetbase.ui
+++ b/muse2/muse/widgets/gensetbase.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>556</width>
-    <height>527</height>
+    <height>552</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -23,14 +23,43 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="TabPage">
       <attribute name="title">
        <string>Application</string>
       </attribute>
       <layout class="QGridLayout">
-       <item row="1" column="0">
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="projDirGroupBox">
+         <property name="title">
+          <string>Project directory</string>
+         </property>
+         <layout class="QHBoxLayout" name="qhboxProjDir">
+          <item>
+           <widget class="QLabel" name="textLabel_ProjDir">
+            <property name="text">
+             <string>Projects:</string>
+            </property>
+            <property name="wordWrap">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="projDirEntry"/>
+          </item>
+          <item>
+           <widget class="QToolButton" name="projDirOpenToolButton">
+            <property name="text">
+             <string>...</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="0">
         <widget class="QGroupBox" name="groupBox4">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -413,14 +442,14 @@
          </layout>
         </widget>
        </item>
-       <item row="0" column="0">
+       <item row="1" column="0">
         <widget class="QGroupBox" name="groupBox3">
          <property name="title">
           <string>Start Muse</string>
          </property>
          <layout class="QGridLayout">
           <item row="0" column="0">
-           <layout class="QGridLayout">
+           <layout class="QGridLayout" name="gridLayout11">
             <item row="1" column="0">
              <spacer name="spacer7_2">
               <property name="orientation">
@@ -438,7 +467,7 @@
              </spacer>
             </item>
             <item row="2" column="0" colspan="2">
-             <layout class="QHBoxLayout">
+             <layout class="QHBoxLayout" name="qhboxStartSong">
               <item>
                <widget class="QLabel" name="textLabel1_2">
                 <property name="text">
@@ -811,9 +840,9 @@ Adjusts responsiveness of audio controls and
            <number>2</number>
           </property>
           <item row="0" column="0">
-           <layout class="QGridLayout">
+           <layout class="QGridLayout" name="gridLayoutwaveEditor">
             <item row="0" column="0">
-             <layout class="QHBoxLayout">
+             <layout class="QHBoxLayout" name="qhboxLayoutWaveEditor">
               <item>
                <widget class="QLabel" name="textLabel2_2">
                 <property name="sizePolicy">
@@ -995,13 +1024,7 @@ Adjusts responsiveness of audio controls and
       <attribute name="title">
        <string>Midi</string>
       </attribute>
-      <layout class="QVBoxLayout">
-       <property name="spacing">
-        <number>6</number>
-       </property>
-       <property name="margin">
-        <number>11</number>
-       </property>
+      <layout class="QVBoxLayout" name="verticalLayout_7">
        <item>
         <widget class="QGroupBox" name="GroupBox2">
          <property name="title">
@@ -1179,30 +1202,6 @@ Adjusts responsiveness of audio controls and
             </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>
@@ -1244,14 +1243,14 @@ Adjusts responsiveness of audio controls and
         </widget>
        </item>
        <item>
-        <spacer name="verticalSpacer_2">
+        <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>20</width>
-           <height>40</height>
+           <width>191</width>
+           <height>166</height>
           </size>
          </property>
         </spacer>
@@ -1260,7 +1259,7 @@ Adjusts responsiveness of audio controls and
      </widget>
      <widget class="QWidget" name="tab3">
       <attribute name="title">
-       <string>GUI</string>
+       <string>GUI Behaviour</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <property name="spacing">
@@ -1443,10 +1442,58 @@ left button behave like the middle button in such areas.</string>
             </property>
            </widget>
           </item>
+          <item row="9" 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>
+          <item row="7" column="1">
+           <widget class="QCheckBox" name="addHiddenCheckBox">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="text">
+             <string>Allow adding hidden tracks in track list menu</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="0">
+           <widget class="QLabel" name="label_5">
+            <property name="text">
+             <string>Unhide tracks when adding hidden tracks</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="1">
+           <widget class="QCheckBox" name="unhideTracksCheckBox">
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
-       <item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
+       <string>GUI Style</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayoutTab2">
+       <item row="0" column="0">
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
           <string>MDI-subwindowness and sharing menus</string>
@@ -1497,8 +1544,8 @@ left button behave like the middle button in such areas.</string>
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>482</width>
-               <height>143</height>
+               <width>96</width>
+               <height>26</height>
               </rect>
              </property>
              <layout class="QHBoxLayout" name="horizontalLayout_3">