LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix timesig wizard

Browse source
This commit is contained in:
Werner Schweer 2012-07-26 14:55:30 +02:00
parent bb9a10e3b9
commit 0e5beae309
2 changed files with 54 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mscore/newwizard.cpp
View file

@ -450,7 +450,7 @@ int TimesigWizard::measures() const
Fraction TimesigWizard::timesig() const Fraction TimesigWizard::timesig() const
{ {
if (tsFraction->isChecked()) if (tsFraction->isChecked())
return Fraction(timesigZ->value(), timesigN->value()); return Fraction(timesigZ->value(), 1 << timesigN->currentIndex());
else if (tsCommonTime->isChecked()) else if (tsCommonTime->isChecked())
return Fraction(4, 4); return Fraction(4, 4);
else else
@ -464,7 +464,7 @@ Fraction TimesigWizard::timesig() const
bool TimesigWizard::pickup(int* z, int* n) const bool TimesigWizard::pickup(int* z, int* n) const
{ {
*z = pickupTimesigZ->value(); *z = pickupTimesigZ->value();
*n = pickupTimesigN->value(); *n = 1 << timesigN->currentIndex();
return pickupMeasure->isChecked(); return pickupMeasure->isChecked();
} }

95
mscore/timesigwizard.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>613</width> <width>426</width>
<height>322</height> <height>311</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -74,39 +74,47 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="TimesigN"> <widget class="QComboBox" name="timesigN">
<item> <property name="currentIndex">
<property name="text"> <number>2</number>
<string>1</string> </property>
</property> <item>
<property name="text">
<string>1</string>
</property>
</item>
<item>
<property name="text">
<string>2</string>
</property>
</item>
<item>
<property name="text">
<string>4</string>
</property>
</item>
<item>
<property name="text">
<string>8</string>
</property>
</item>
<item>
<property name="text">
<string>16</string>
</property>
</item>
<item>
<property name="text">
<string>32</string>
</property>
</item>
<item>
<property name="text">
<string>64</string>
</property>
</item>
</widget>
</item> </item>
<item>
<property name="text">
<string>2</string>
</property>
</item>
<item>
<property name="text">
<string>4</string>
</property>
</item>
<item>
<property name="text">
<string>8</string>
</property>
</item>
<item>
<property name="text">
<string>16</string>
</property>
</item>
<item>
<property name="text">
<string>32</string>
</property>
</item>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
@ -192,6 +200,9 @@
</item> </item>
<item> <item>
<widget class="QComboBox" name="pickupTimesigN"> <widget class="QComboBox" name="pickupTimesigN">
<property name="currentIndex">
<number>2</number>
</property>
<item> <item>
<property name="text"> <property name="text">
<string>1</string> <string>1</string>
@ -212,16 +223,21 @@
<string>8</string> <string>8</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>16</string> <string>16</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>32</string> <string>32</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>64</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item> <item>
@ -318,13 +334,6 @@ p, li { white-space: pre-wrap; }
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>Awl::DenominatorSpinBox</class>
<extends>QSpinBox</extends>
<header>awl/denomspinbox.h</header>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>