added setting for default track height

7 files changed, 44 insertions, 6 deletions

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 18261e01..d4bb902e 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,5 @@
+28.01.2013:
+         - Added setting for default track height (rj)
 27.01.2013:
          * Feature: Shortcuts dialog modeless + has default global shortcut Ctl+Shift+F1 + "Printable file" button. (Tim)
          - Memory leaks! Many widgets and dialogs had no parent and were not deleted!  (Tim)
@@ -35,6 +37,8 @@
          - Don't play midi parts if track is off.   
 13.01.2013:
          - remote should depend on widgets through #including app.h otherwise Python bindings don't compile (Orcan)
+06.01.2013:
+         - MusE 2.1 released!
 03.01.2013:
          - Fixed SimpleDrums GUI issues on AVLinux (and supposedly other debian based distros) (rj)
 01.01.2013: Happy new year!
diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp
index aa096bc6..0d92b239 100644
--- a/muse2/muse/conf.cpp
+++ b/muse2/muse/conf.cpp
@@ -519,6 +519,8 @@ void readConfiguration(Xml& xml, bool doReadMidiPortConfig, bool doReadGlobalCon
                               }
                         else if (tag == "geometryMain")
                               MusEGlobal::config.geometryMain = readGeometry(xml, tag);
+                        else if (tag == "trackHeight")
+                                 MusEGlobal::config.trackHeight = xml.parseInt();
 
 
                         else if (doReadMidiPortConfig==false) {
@@ -1297,6 +1299,7 @@ void MusE::writeGlobalConfiguration(int level, MusECore::Xml& xml) const
       xml.intTag(level, "inputTracksVisible",  MusECore::AudioInput::visible());
       xml.intTag(level, "outputTracksVisible",  MusECore::AudioOutput::visible());
       xml.intTag(level, "synthTracksVisible",  MusECore::SynthI::visible());
+      xml.intTag(level, "trackHeight",  MusEGlobal::config.trackHeight);
 
       for (int i = 0; i < NUM_FONTS; ++i) {
             char buffer[32];
diff --git a/muse2/muse/gconfig.cpp b/muse2/muse/gconfig.cpp
index 0da8ccf7..ab743572 100644
--- a/muse2/muse/gconfig.cpp
+++ b/muse2/muse/gconfig.cpp
@@ -205,7 +205,8 @@ GlobalConfigValues config = {
       true,                         // addHiddenTracks
       true,                         // unhideTracks
       MusEGlobal::PREFER_NEW,       // drumTrackPreference
-      true                          // smartFocus
+      true,                         // smartFocus
+      20,                           // trackHeight
     };
 
 } // namespace MusEGlobal
diff --git a/muse2/muse/gconfig.h b/muse2/muse/gconfig.h
index af45ed92..d8e52e6e 100644
--- a/muse2/muse/gconfig.h
+++ b/muse2/muse/gconfig.h
@@ -211,6 +211,8 @@ struct GlobalConfigValues {
       bool unhideTracks;
       drumTrackPreference_t drumTrackPreference;
       bool smartFocus;
+      int trackHeight;
+
       };
 
 
diff --git a/muse2/muse/main.cpp b/muse2/muse/main.cpp
index af3e2f0f..feb14324 100644
--- a/muse2/muse/main.cpp
+++ b/muse2/muse/main.cpp
@@ -575,10 +575,12 @@ int main(int argc, char* argv[])
                      Qt::WindowStaysOnTopHint);           
                   muse_splash->setAttribute(Qt::WA_DeleteOnClose);  // Possibly also Qt::X11BypassWindowManagerHint
                   muse_splash->show();
+                  muse_splash->showMessage("MusE " + QString(VERSION) );
                   QTimer* stimer = new QTimer(0);
                   muse_splash->connect(stimer, SIGNAL(timeout()), muse_splash, SLOT(close()));
                   stimer->setSingleShot(true);
                   stimer->start(6000);
+                  QApplication::processEvents();
                   }
             }
 
diff --git a/muse2/muse/widgets/genset.cpp b/muse2/muse/widgets/genset.cpp
index 7063b960..0f07428e 100644
--- a/muse2/muse/widgets/genset.cpp
+++ b/muse2/muse/widgets/genset.cpp
@@ -234,6 +234,8 @@ void GlobalSettingsConfig::updateSettings()
         case MusEGlobal::PREFER_OLD: preferOldDrumBtn->setChecked(true); break;
       }
 
+      trackHeight->setValue(MusEGlobal::config.trackHeight);
+
       updateMdiSettings();
 }
 
@@ -383,7 +385,8 @@ void GlobalSettingsConfig::apply()
       else if (preferNewDrumBtn->isChecked())
         MusEGlobal::config.drumTrackPreference=MusEGlobal::PREFER_NEW;
 
-      
+      MusEGlobal::config.trackHeight = trackHeight->value();
+
       applyMdiSettings();
       
       MusEGlobal::muse->changeConfig(true);    // save settings
diff --git a/muse2/muse/widgets/gensetbase.ui b/muse2/muse/widgets/gensetbase.ui
index 35c2d2b2..021272bd 100644
--- a/muse2/muse/widgets/gensetbase.ui
+++ b/muse2/muse/widgets/gensetbase.ui
@@ -23,7 +23,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="TabPage">
       <attribute name="title">
@@ -1574,7 +1574,7 @@ left button behave like the middle button in such areas.</string>
             </property>
            </widget>
           </item>
-          <item row="11" column="1">
+          <item row="12" column="1">
            <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -1587,6 +1587,29 @@ left button behave like the middle button in such areas.</string>
             </property>
            </spacer>
           </item>
+          <item row="11" column="0">
+           <widget class="QLabel" name="label_7">
+            <property name="text">
+             <string>Track height</string>
+            </property>
+           </widget>
+          </item>
+          <item row="11" column="2">
+           <widget class="QSpinBox" name="trackHeight">
+            <property name="suffix">
+             <string> px</string>
+            </property>
+            <property name="minimum">
+             <number>20</number>
+            </property>
+            <property name="maximum">
+             <number>2000</number>
+            </property>
+            <property name="value">
+             <number>20</number>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -1698,8 +1721,8 @@ left button behave like the middle button in such areas.</string>
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>474</width>
-               <height>410</height>
+               <width>72</width>
+               <height>16</height>
               </rect>
              </property>
              <layout class="QHBoxLayout" name="horizontalLayout_3">