summaryrefslogtreecommitdiff
path: root/muse2/muse/widgets
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2013-01-28 19:05:39 +0000
committerRobert Jonsson <spamatica@gmail.com>2013-01-28 19:05:39 +0000
commita5f6b9055120d906130a1193e79e0877ab5ae688 (patch)
treeaa7fe0092d78d034751d7bcd59b0209bf162c016 /muse2/muse/widgets
parent3f99f3410d57b4377c38662b02e36186a019ad66 (diff)
added setting for default track height
Diffstat (limited to 'muse2/muse/widgets')
-rw-r--r--muse2/muse/widgets/genset.cpp5
-rw-r--r--muse2/muse/widgets/gensetbase.ui31
2 files changed, 31 insertions, 5 deletions
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">