Skip to content

Commit

Permalink
fix #25966 Create time signature for all systems does not work
Browse files Browse the repository at this point in the history
  • Loading branch information
@wschweer
wschweer committed Feb 16, 2015
1 parent 31ac382 commit a0a53a6
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 62 deletions.
4 changes: 2 additions & 2 deletions libmscore/style.cpp
View file
Expand Up @@ -136,7 +136,7 @@ static const StyleTypes2 styleTypes2[] = {
{ StyleIdx::smallClefMag, StyleType("smallClefMag", StyleValueType::DOUBLE) },
{ StyleIdx::genClef, StyleType("genClef", StyleValueType::BOOL) }, // create clef for all systems, not only for first
{ StyleIdx::genKeysig, StyleType("genKeysig", StyleValueType::BOOL) }, // create key signature for all systems
{ StyleIdx::genTimesig, StyleType("genTimesig", StyleValueType::BOOL) },
// { StyleIdx::genTimesig, StyleType("genTimesig", StyleValueType::BOOL) },
{ StyleIdx::genCourtesyTimesig, StyleType("genCourtesyTimesig", StyleValueType::BOOL) },
{ StyleIdx::genCourtesyKeysig, StyleType("genCourtesyKeysig", StyleValueType::BOOL) },
{ StyleIdx::genCourtesyClef, StyleType("genCourtesyClef", StyleValueType::BOOL) },
Expand Down Expand Up @@ -486,7 +486,7 @@ StyleData::StyleData()
{ StyleIdx::smallClefMag, QVariant(0.8) },
{ StyleIdx::genClef, QVariant(true) },
{ StyleIdx::genKeysig, QVariant(true) },
{ StyleIdx::genTimesig, QVariant(true) },
// { StyleIdx::genTimesig, QVariant(true) },
{ StyleIdx::genCourtesyTimesig, QVariant(true) },
{ StyleIdx::genCourtesyKeysig, QVariant(true) },
{ StyleIdx::genCourtesyClef, QVariant(true) },
Expand Down
2 changes: 0 additions & 2 deletions mscore/editstyle.cpp
View file
Expand Up @@ -426,7 +426,6 @@ void EditStyle::getValues()
lstyle.set(StyleIdx::lastSystemFillLimit, lastSystemFillThreshold->value() / 100.0);
lstyle.set(StyleIdx::genClef, genClef->isChecked());
lstyle.set(StyleIdx::genKeysig, genKeysig->isChecked());
lstyle.set(StyleIdx::genTimesig, genTimesig->isChecked());
lstyle.set(StyleIdx::genCourtesyTimesig, genCourtesyTimesig->isChecked());
lstyle.set(StyleIdx::genCourtesyKeysig, genCourtesyKeysig->isChecked());
lstyle.set(StyleIdx::genCourtesyClef, genCourtesyClef->isChecked());
Expand Down Expand Up @@ -648,7 +647,6 @@ void EditStyle::setValues()

genClef->setChecked(lstyle.value(StyleIdx::genClef).toBool());
genKeysig->setChecked(lstyle.value(StyleIdx::genKeysig).toBool());
genTimesig->setChecked(lstyle.value(StyleIdx::genTimesig).toBool());
genCourtesyTimesig->setChecked(lstyle.value(StyleIdx::genCourtesyTimesig).toBool());
genCourtesyKeysig->setChecked(lstyle.value(StyleIdx::genCourtesyKeysig).toBool());
genCourtesyClef->setChecked(lstyle.value(StyleIdx::genCourtesyClef).toBool());
Expand Down
98 changes: 40 additions & 58 deletions mscore/editstyle.ui
View file
Expand Up @@ -763,59 +763,6 @@
</property>
</spacer>
</item>
<item row="10" column="2">
<widget class="QCheckBox" name="genCourtesyClef">
<property name="text">
<string>Create courtesy clefs</string>
</property>
</widget>
</item>
<item row="11" column="0" colspan="2">
<widget class="QCheckBox" name="genTimesig">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Create time signature for all systems</string>
</property>
</widget>
</item>
<item row="11" column="2" colspan="2">
<widget class="QCheckBox" name="genCourtesyTimesig">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Create courtesy time signatures</string>
</property>
</widget>
</item>
<item row="12" column="0" colspan="2">
<widget class="QCheckBox" name="genKeysig">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Create key signature for all systems</string>
</property>
</widget>
</item>
<item row="12" column="2" colspan="2">
<widget class="QCheckBox" name="genCourtesyKeysig">
<property name="text">
<string>Create courtesy key signatures</string>
</property>
</widget>
</item>
<item row="9" column="0">
<spacer name="verticalSpacer_9">
<property name="orientation">
Expand Down Expand Up @@ -947,6 +894,46 @@
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QCheckBox" name="genKeysig">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Create key signature for all systems</string>
</property>
</widget>
</item>
<item row="12" column="0">
<widget class="QCheckBox" name="genCourtesyClef">
<property name="text">
<string>Create courtesy clefs</string>
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QCheckBox" name="genCourtesyTimesig">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Create courtesy time signatures</string>
</property>
</widget>
</item>
<item row="11" column="2">
<widget class="QCheckBox" name="genCourtesyKeysig">
<property name="text">
<string>Create courtesy key signatures</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -5689,11 +5676,6 @@
<tabstop>frameSystemDistance</tabstop>
<tabstop>lastSystemFillThreshold</tabstop>
<tabstop>genClef</tabstop>
<tabstop>genCourtesyClef</tabstop>
<tabstop>genTimesig</tabstop>
<tabstop>genCourtesyTimesig</tabstop>
<tabstop>genKeysig</tabstop>
<tabstop>genCourtesyKeysig</tabstop>
<tabstop>showHeader</tabstop>
<tabstop>showHeaderFirstPage</tabstop>
<tabstop>headerOddEven</tabstop>
Expand Down

0 comments on commit a0a53a6

Please sign in to comment.