remove slur box style

This commit is contained in:
lasconic 2013-07-31 12:02:12 +02:00
parent 20102629b0
commit ea4a8398ed
4 changed files with 5 additions and 31 deletions

View file

@ -162,7 +162,6 @@ static const StyleTypes2 styleTypes2[] = {
{ ST_SlurEndWidth, StyleType("slurEndWidth", ST_SPATIUM) }, { ST_SlurEndWidth, StyleType("slurEndWidth", ST_SPATIUM) },
{ ST_SlurMidWidth, StyleType("slurMidWidth", ST_SPATIUM) }, { ST_SlurMidWidth, StyleType("slurMidWidth", ST_SPATIUM) },
{ ST_SlurDottedWidth, StyleType("slurDottedWidth", ST_SPATIUM) }, { ST_SlurDottedWidth, StyleType("slurDottedWidth", ST_SPATIUM) },
{ ST_SlurBow, StyleType("slurBow", ST_SPATIUM) },
{ ST_SectionPause, StyleType("sectionPause", ST_DOUBLE) }, { ST_SectionPause, StyleType("sectionPause", ST_DOUBLE) },
{ ST_MusicalSymbolFont, StyleType("musicalSymbolFont", ST_STRING) }, { ST_MusicalSymbolFont, StyleType("musicalSymbolFont", ST_STRING) },
{ ST_showHeader, StyleType("showHeader", ST_BOOL) }, { ST_showHeader, StyleType("showHeader", ST_BOOL) },
@ -534,7 +533,6 @@ StyleData::StyleData()
{ ST_SlurEndWidth, StyleVal(Spatium(.07)) }, { ST_SlurEndWidth, StyleVal(Spatium(.07)) },
{ ST_SlurMidWidth, StyleVal(Spatium(.15)) }, { ST_SlurMidWidth, StyleVal(Spatium(.15)) },
{ ST_SlurDottedWidth, StyleVal(Spatium(.1)) }, { ST_SlurDottedWidth, StyleVal(Spatium(.1)) },
{ ST_SlurBow, StyleVal(Spatium(1.6)) },
{ ST_SectionPause, StyleVal(qreal(3.0)) }, { ST_SectionPause, StyleVal(qreal(3.0)) },
{ ST_MusicalSymbolFont, StyleVal(QString("Emmentaler")) }, { ST_MusicalSymbolFont, StyleVal(QString("Emmentaler")) },
{ ST_showHeader, StyleVal(false) }, { ST_showHeader, StyleVal(false) },

View file

@ -290,7 +290,6 @@ enum StyleIdx {
ST_SlurEndWidth, ST_SlurEndWidth,
ST_SlurMidWidth, ST_SlurMidWidth,
ST_SlurDottedWidth, ST_SlurDottedWidth,
ST_SlurBow,
ST_SectionPause, ST_SectionPause,
ST_MusicalSymbolFont, ST_MusicalSymbolFont,

View file

@ -310,7 +310,6 @@ void EditStyle::getValues()
lstyle.set(ST_SlurEndWidth, Spatium(slurEndLineWidth->value())); lstyle.set(ST_SlurEndWidth, Spatium(slurEndLineWidth->value()));
lstyle.set(ST_SlurMidWidth, Spatium(slurMidLineWidth->value())); lstyle.set(ST_SlurMidWidth, Spatium(slurMidLineWidth->value()));
lstyle.set(ST_SlurDottedWidth, Spatium(slurDottedLineWidth->value())); lstyle.set(ST_SlurDottedWidth, Spatium(slurDottedLineWidth->value()));
lstyle.set(ST_SlurBow, Spatium(slurBow->value()));
lstyle.set(ST_MusicalSymbolFont, musicalSymbolFont->currentText()); lstyle.set(ST_MusicalSymbolFont, musicalSymbolFont->currentText());
@ -585,7 +584,6 @@ void EditStyle::setValues()
slurEndLineWidth->setValue(lstyle.valueS(ST_SlurEndWidth).val()); slurEndLineWidth->setValue(lstyle.valueS(ST_SlurEndWidth).val());
slurMidLineWidth->setValue(lstyle.valueS(ST_SlurMidWidth).val()); slurMidLineWidth->setValue(lstyle.valueS(ST_SlurMidWidth).val());
slurDottedLineWidth->setValue(lstyle.valueS(ST_SlurDottedWidth).val()); slurDottedLineWidth->setValue(lstyle.valueS(ST_SlurDottedWidth).val());
slurBow->setValue(lstyle.valueS(ST_SlurBow).val());
musicalSymbolFont->setCurrentIndex(lstyle.valueSt(ST_MusicalSymbolFont) == "Emmentaler" ? 0 : 1); musicalSymbolFont->setCurrentIndex(lstyle.valueSt(ST_MusicalSymbolFont) == "Emmentaler" ? 0 : 1);
showHeader->setChecked(lstyle.valueB(ST_showHeader)); showHeader->setChecked(lstyle.valueB(ST_showHeader));

View file

@ -172,7 +172,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QStackedWidget" name="pageStack"> <widget class="QStackedWidget" name="pageStack">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>10</number>
</property> </property>
<widget class="QWidget" name="Seite1"> <widget class="QWidget" name="Seite1">
<layout class="QVBoxLayout" name="verticalLayout_20"> <layout class="QVBoxLayout" name="verticalLayout_20">
@ -2999,6 +2999,9 @@ p, li { white-space: pre-wrap; }
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QFormLayout" name="formLayout_9"> <layout class="QFormLayout" name="formLayout_9">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_30"> <widget class="QLabel" name="label_30">
<property name="text"> <property name="text">
@ -3046,36 +3049,13 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_32">
<property name="text">
<string>Bow</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="slurBow">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="suffix">
<string>sp</string>
</property>
<property name="singleStep">
<double>0.050000000000000</double>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_33"> <widget class="QLabel" name="label_33">
<property name="text"> <property name="text">
<string>Dotted line width</string> <string>Dotted line width</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="2" column="1">
<widget class="QDoubleSpinBox" name="slurDottedLineWidth"> <widget class="QDoubleSpinBox" name="slurDottedLineWidth">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -4654,7 +4634,6 @@ p, li { white-space: pre-wrap; }
<tabstop>beamMaxSlope</tabstop> <tabstop>beamMaxSlope</tabstop>
<tabstop>slurEndLineWidth</tabstop> <tabstop>slurEndLineWidth</tabstop>
<tabstop>slurMidLineWidth</tabstop> <tabstop>slurMidLineWidth</tabstop>
<tabstop>slurBow</tabstop>
<tabstop>slurDottedLineWidth</tabstop> <tabstop>slurDottedLineWidth</tabstop>
<tabstop>smallStaffSize</tabstop> <tabstop>smallStaffSize</tabstop>
<tabstop>smallNoteSize</tabstop> <tabstop>smallNoteSize</tabstop>