diff --git a/libmscore/style.cpp b/libmscore/style.cpp index f64d9b98d9..a7fb467309 100644 --- a/libmscore/style.cpp +++ b/libmscore/style.cpp @@ -162,7 +162,6 @@ static const StyleTypes2 styleTypes2[] = { { ST_SlurEndWidth, StyleType("slurEndWidth", ST_SPATIUM) }, { ST_SlurMidWidth, StyleType("slurMidWidth", ST_SPATIUM) }, { ST_SlurDottedWidth, StyleType("slurDottedWidth", ST_SPATIUM) }, - { ST_SlurBow, StyleType("slurBow", ST_SPATIUM) }, { ST_SectionPause, StyleType("sectionPause", ST_DOUBLE) }, { ST_MusicalSymbolFont, StyleType("musicalSymbolFont", ST_STRING) }, { ST_showHeader, StyleType("showHeader", ST_BOOL) }, @@ -534,7 +533,6 @@ StyleData::StyleData() { ST_SlurEndWidth, StyleVal(Spatium(.07)) }, { ST_SlurMidWidth, StyleVal(Spatium(.15)) }, { ST_SlurDottedWidth, StyleVal(Spatium(.1)) }, - { ST_SlurBow, StyleVal(Spatium(1.6)) }, { ST_SectionPause, StyleVal(qreal(3.0)) }, { ST_MusicalSymbolFont, StyleVal(QString("Emmentaler")) }, { ST_showHeader, StyleVal(false) }, diff --git a/libmscore/style.h b/libmscore/style.h index a43986e2a1..9e139a1374 100644 --- a/libmscore/style.h +++ b/libmscore/style.h @@ -290,7 +290,6 @@ enum StyleIdx { ST_SlurEndWidth, ST_SlurMidWidth, ST_SlurDottedWidth, - ST_SlurBow, ST_SectionPause, ST_MusicalSymbolFont, diff --git a/mscore/editstyle.cpp b/mscore/editstyle.cpp index 2cfa905963..58f1ba8d94 100644 --- a/mscore/editstyle.cpp +++ b/mscore/editstyle.cpp @@ -310,7 +310,6 @@ void EditStyle::getValues() lstyle.set(ST_SlurEndWidth, Spatium(slurEndLineWidth->value())); lstyle.set(ST_SlurMidWidth, Spatium(slurMidLineWidth->value())); lstyle.set(ST_SlurDottedWidth, Spatium(slurDottedLineWidth->value())); - lstyle.set(ST_SlurBow, Spatium(slurBow->value())); lstyle.set(ST_MusicalSymbolFont, musicalSymbolFont->currentText()); @@ -585,7 +584,6 @@ void EditStyle::setValues() slurEndLineWidth->setValue(lstyle.valueS(ST_SlurEndWidth).val()); slurMidLineWidth->setValue(lstyle.valueS(ST_SlurMidWidth).val()); slurDottedLineWidth->setValue(lstyle.valueS(ST_SlurDottedWidth).val()); - slurBow->setValue(lstyle.valueS(ST_SlurBow).val()); musicalSymbolFont->setCurrentIndex(lstyle.valueSt(ST_MusicalSymbolFont) == "Emmentaler" ? 0 : 1); showHeader->setChecked(lstyle.valueB(ST_showHeader)); diff --git a/mscore/editstyle.ui b/mscore/editstyle.ui index 2ebd56e4dc..eb876eb3f5 100644 --- a/mscore/editstyle.ui +++ b/mscore/editstyle.ui @@ -172,7 +172,7 @@ - 0 + 10 @@ -2999,6 +2999,9 @@ p, li { white-space: pre-wrap; } + + QFormLayout::AllNonFixedFieldsGrow + @@ -3046,36 +3049,13 @@ p, li { white-space: pre-wrap; } - - - Bow - - - - - - - - 0 - 0 - - - - sp - - - 0.050000000000000 - - - - Dotted line width - + @@ -4654,7 +4634,6 @@ p, li { white-space: pre-wrap; } beamMaxSlope slurEndLineWidth slurMidLineWidth - slurBow slurDottedLineWidth smallStaffSize smallNoteSize