diff --git a/libmscore/style.cpp b/libmscore/style.cpp index 2ceb01077f1e..490571d7a84e 100644 --- a/libmscore/style.cpp +++ b/libmscore/style.cpp @@ -99,6 +99,7 @@ static const StyleType styleTypes[] { { Sid::lyricsOddFontSize, "lyricsOddFontSize", 11.0 }, { Sid::lyricsOddFontSpatiumDependent, "lyricsOddFontSpatiumDependent", true }, { Sid::lyricsOddFontStyle, "lyricsOddFontStyle", int(FontStyle::Normal) }, + { Sid::lyricsOddColor, "lyricsOddColor", QColor(0, 0, 0, 255) }, { Sid::lyricsOddAlign, "lyricsOddAlign", QVariant::fromValue(Align::HCENTER | Align::BASELINE) }, { Sid::lyricsOddFrameType, "lyricsOddFrameType", int(FrameType::NO_FRAME) }, { Sid::lyricsOddFramePadding, "lyricsOddFramePadding", 0.2 }, @@ -111,6 +112,7 @@ static const StyleType styleTypes[] { { Sid::lyricsEvenFontSize, "lyricsEvenFontSize", 11.0 }, { Sid::lyricsEvenFontSpatiumDependent, "lyricsEvenFontSpatiumDependent", true }, { Sid::lyricsEvenFontStyle, "lyricsEvenFontStyle", int(FontStyle::Normal) }, + { Sid::lyricsEvenColor, "lyricsEvenColor", QColor(0, 0, 0, 255) }, { Sid::lyricsEvenAlign, "lyricsEvenAlign", QVariant::fromValue(Align::HCENTER | Align::BASELINE) }, { Sid::lyricsEvenFrameType, "lyricsOddFrameType", int(FrameType::NO_FRAME) }, { Sid::lyricsEvenFramePadding, "lyricsOddFramePadding", 0.2 }, @@ -216,6 +218,7 @@ static const StyleType styleTypes[] { { Sid::hairpinFontSize, "hairpinFontSize", 12.0 }, { Sid::hairpinFontSpatiumDependent, "hairpinFontSpatiumDependent", true }, { Sid::hairpinFontStyle, "hairpinFontStyle", int(FontStyle::Italic) }, + { Sid::hairpinColor, "hairpinColor", QColor(0, 0, 0, 255) }, { Sid::hairpinTextAlign, "hairpinTextAlign", QVariant::fromValue(Align::LEFT | Align::BASELINE) }, { Sid::hairpinFrameType, "hairpinFrameType", int(FrameType::NO_FRAME) }, { Sid::hairpinFramePadding, "hairpinFramePadding", 0.2 }, @@ -242,6 +245,7 @@ static const StyleType styleTypes[] { { Sid::pedalFontSize, "pedalFontSize", 12.0 }, { Sid::pedalFontSpatiumDependent, "pedalFontSpatiumDependent", true }, { Sid::pedalFontStyle, "pedalFontStyle", int(FontStyle::Normal) }, + { Sid::pedalColor, "pedalColor", QColor(0, 0, 0, 255) }, { Sid::pedalTextAlign, "pedalTextAlign", QVariant::fromValue(Align::LEFT | Align::BASELINE) }, { Sid::pedalFrameType, "pedalFrameType", int(FrameType::NO_FRAME) }, { Sid::pedalFramePadding, "pedalFramePadding", 0.2 }, @@ -273,6 +277,7 @@ static const StyleType styleTypes[] { { Sid::chordSymbolAFontSize, "chordSymbolAFontSize", 12.0 }, { Sid::chordSymbolAFontSpatiumDependent, "chordSymbolAFontSpatiumDependent", true }, { Sid::chordSymbolAFontStyle, "chordSymbolAFontStyle", int(FontStyle::Normal) }, + { Sid::chordSymbolAColor, "chordSymbolAColor", QColor(0, 0, 0, 255) }, { Sid::chordSymbolAAlign, "chordSymbolAAlign", QVariant::fromValue(Align::LEFT | Align::BASELINE) }, { Sid::chordSymbolAFrameType, "chordSymbolAFrameType", int(FrameType::NO_FRAME) }, { Sid::chordSymbolAFramePadding, "chordSymbolAFramePadding", 0.2 }, @@ -285,6 +290,7 @@ static const StyleType styleTypes[] { { Sid::chordSymbolBFontSize, "chordSymbolBFontSize", 12.0 }, { Sid::chordSymbolBFontSpatiumDependent, "chordSymbolBFontSpatiumDependent", true }, { Sid::chordSymbolBFontStyle, "chordSymbolBFontStyle", int(FontStyle::Italic) }, + { Sid::chordSymbolBColor, "chordSymbolBColor", QColor(0, 0, 0, 255) }, { Sid::chordSymbolBAlign, "chordSymbolBAlign", QVariant::fromValue(Align::LEFT | Align::BASELINE) }, { Sid::chordSymbolBFrameType, "chordSymbolBFrameType", int(FrameType::NO_FRAME) }, { Sid::chordSymbolBFramePadding, "chordSymbolBFramePadding", 0.2 }, @@ -394,6 +400,7 @@ static const StyleType styleTypes[] { { Sid::voltaFontSize, "voltaFontSize", 11.0 }, { Sid::voltaFontSpatiumDependent, "voltaFontSpatiumDependent", true }, { Sid::voltaFontStyle, "voltaFontStyle", int(FontStyle::Bold) }, + { Sid::voltaColor, "voltaColor", QColor(0, 0, 0, 255) }, { Sid::voltaAlign, "voltaAlign", QVariant::fromValue(Align::LEFT | Align::BASELINE) }, { Sid::voltaOffset, "voltaOffset", QPointF(0.5, 1.9) }, { Sid::voltaFrameType, "voltaFrameType", int(FrameType::NO_FRAME) }, @@ -435,6 +442,7 @@ static const StyleType styleTypes[] { { Sid::ottavaFontSize, "ottavaFontSize", 12.0 }, { Sid::ottavaFontSpatiumDependent, "ottavaFontSpatiumDependent", true }, { Sid::ottavaFontStyle, "ottavaFontStyle", int(FontStyle::Normal) }, + { Sid::ottavaColor, "ottavaColor", QColor(0, 0, 0, 255) }, { Sid::ottavaTextAlign, "ottavaTextAlign", QVariant::fromValue(Align::LEFT | Align::VCENTER) }, { Sid::ottavaFrameType, "ottavaFrameType", int(FrameType::NO_FRAME) }, { Sid::ottavaFramePadding, "ottavaFramePadding", 0.2 }, @@ -470,6 +478,7 @@ static const StyleType styleTypes[] { { Sid::tupletFontSize, "tupletFontSize", 10.0 }, { Sid::tupletFontSpatiumDependent, "tupletFontSpatiumDependent", true }, { Sid::tupletFontStyle, "tupletFontStyle", int(FontStyle::Italic) }, + { Sid::tupletColor, "tupletColor", QColor(0, 0, 0, 255) }, { Sid::tupletAlign, "tupletAlign", QVariant::fromValue(Align::CENTER) }, { Sid::tupletBracketHookHeight, "tupletBracketHookHeight", Spatium(1.0) }, { Sid::tupletOffset, "tupletOffset", QPointF() }, @@ -514,6 +523,7 @@ static const StyleType styleTypes[] { { Sid::defaultFontSize, "defaultFontSize", 10.0 }, { Sid::defaultFontSpatiumDependent, "defaultFontSpatiumDependent", true }, { Sid::defaultFontStyle, "defaultFontStyle", int(FontStyle::Normal) }, + { Sid::defaultColor, "defaultColor", QColor(0, 0, 0, 255) }, { Sid::defaultAlign, "defaultAlign", QVariant::fromValue(Align::LEFT) }, { Sid::defaultFrameType, "defaultFrameType", int(FrameType::NO_FRAME) }, { Sid::defaultFramePadding, "defaultFramePadding", 0.2 }, @@ -530,6 +540,7 @@ static const StyleType styleTypes[] { { Sid::titleFontSize, "titleFontSize", 24.0 }, { Sid::titleFontSpatiumDependent, "titleFontSpatiumDependent", false }, { Sid::titleFontStyle, "titleFontStyle", int(FontStyle::Normal) }, + { Sid::titleColor, "titleColor", QColor(0, 0, 0, 255) }, { Sid::titleAlign, "titleAlign", QVariant::fromValue(Align::HCENTER | Align::TOP) }, { Sid::titleOffset, "titleOffset", QPointF() }, { Sid::titleOffsetType, "titleOffsetType", int(OffsetType::ABS) }, @@ -544,6 +555,7 @@ static const StyleType styleTypes[] { { Sid::subTitleFontSize, "subTitleFontSize", 14.0 }, { Sid::subTitleFontSpatiumDependent, "subTitleFontSpatiumDependent", false }, { Sid::subTitleFontStyle, "subTitleFontStyle", int(FontStyle::Normal) }, + { Sid::subTitleColor, "subTitleColor", QColor(0, 0, 0, 255) }, { Sid::subTitleAlign, "subTitleAlign", QVariant::fromValue(Align::HCENTER | Align::TOP) }, { Sid::subTitleOffset, "subTitleOffset", QPointF(0.0, 10.0) }, { Sid::subTitleOffsetType, "subTitleOffsetType", int(OffsetType::ABS) }, @@ -558,6 +570,7 @@ static const StyleType styleTypes[] { { Sid::composerFontSize, "composerFontSize", 12.0 }, { Sid::composerFontSpatiumDependent, "composerFontSpatiumDependent", false }, { Sid::composerFontStyle, "composerFontStyle", int(FontStyle::Normal) }, + { Sid::composerColor, "composerColor", QColor(0, 0, 0, 255) }, { Sid::composerAlign, "composerAlign", QVariant::fromValue(Align::RIGHT | Align::BOTTOM) }, { Sid::composerOffset, "composerOffset", QPointF() }, { Sid::composerOffsetType, "composerOffsetType", int(OffsetType::ABS) }, @@ -572,6 +585,7 @@ static const StyleType styleTypes[] { { Sid::lyricistFontSize, "lyricistFontSize", 12.0 }, { Sid::lyricistFontSpatiumDependent, "lyricistFontSpatiumDependent", false }, { Sid::lyricistFontStyle, "lyricistFontStyle", int(FontStyle::Normal) }, + { Sid::lyricistColor, "lyricistColor", QColor(0, 0, 0, 255) }, { Sid::lyricistAlign, "lyricistAlign", QVariant::fromValue(Align::LEFT | Align::BOTTOM) }, { Sid::lyricistOffset, "lyricistOffset", QPointF() }, { Sid::lyricistOffsetType, "lyricistOffsetType", int(OffsetType::ABS) }, @@ -586,6 +600,7 @@ static const StyleType styleTypes[] { { Sid::fingeringFontSize, "fingeringFontSize", 8.0 }, { Sid::fingeringFontSpatiumDependent, "fingeringFontSpatiumDependent", true }, { Sid::fingeringFontStyle, "fingeringFontStyle", int(FontStyle::Normal) }, + { Sid::fingeringColor, "fingeringColor", QColor(0, 0, 0, 255) }, { Sid::fingeringAlign, "fingeringAlign", QVariant::fromValue(Align::CENTER) }, { Sid::fingeringFrameType, "fingeringFrameType", int(FrameType::NO_FRAME) }, { Sid::fingeringFramePadding, "fingeringFramePadding", 0.2 }, @@ -599,6 +614,7 @@ static const StyleType styleTypes[] { { Sid::lhGuitarFingeringFontSize, "lhGuitarFingeringFontSize", 8.0 }, { Sid::lhGuitarFingeringFontSpatiumDependent, "lhGuitarFingeringFontSpatiumDependent", true }, { Sid::lhGuitarFingeringFontStyle, "lhGuitarFingeringFontStyle", int(FontStyle::Normal) }, + { Sid::lhGuitarFingeringColor, "lhGuitarFingeringColor", QColor(0, 0, 0, 255) }, { Sid::lhGuitarFingeringAlign, "lhGuitarFingeringAlign", QVariant::fromValue(Align::CENTER | Align::VCENTER) }, { Sid::lhGuitarFingeringFrameType, "lhGuitarFingeringFrameType", int(FrameType::NO_FRAME) }, { Sid::lhGuitarFingeringFramePadding, "lhGuitarFingeringFramePadding", 0.2 }, @@ -612,6 +628,7 @@ static const StyleType styleTypes[] { { Sid::rhGuitarFingeringFontSize, "rhGuitarFingeringFontSize", 8.0 }, { Sid::rhGuitarFingeringFontSpatiumDependent, "rhGuitarFingeringFontSpatiumDependent", true }, { Sid::rhGuitarFingeringFontStyle, "rhGuitarFingeringFontStyle", int(FontStyle::Normal) }, + { Sid::rhGuitarFingeringColor, "rhGuitarFingeringColor", QColor(0, 0, 0, 255) }, { Sid::rhGuitarFingeringAlign, "rhGuitarFingeringAlign", QVariant::fromValue(Align::CENTER) }, { Sid::rhGuitarFingeringFrameType, "rhGuitarFingeringFrameType", int(FrameType::NO_FRAME) }, { Sid::rhGuitarFingeringFramePadding, "rhGuitarFingeringFramePadding", 0.2 }, @@ -625,6 +642,7 @@ static const StyleType styleTypes[] { { Sid::stringNumberFontSize, "stringNumberFontSize", 8.0 }, { Sid::stringNumberFontSpatiumDependent, "stringNumberFontSpatiumDependent", true }, { Sid::stringNumberFontStyle, "stringNumberFontStyle", int(FontStyle::Normal) }, + { Sid::stringNumberColor, "stringNumberColor", QColor(0, 0, 0, 255) }, { Sid::stringNumberAlign, "stringNumberAlign", QVariant::fromValue(Align::CENTER) }, { Sid::stringNumberFrameType, "stringNumberFrameType", int(FrameType::CIRCLE) }, { Sid::stringNumberFramePadding, "stringNumberFramePadding", 0.2 }, @@ -638,6 +656,7 @@ static const StyleType styleTypes[] { { Sid::longInstrumentFontSize, "longInstrumentFontSize", 12.0 }, { Sid::longInstrumentFontSpatiumDependent, "longInstrumentFontSpatiumDependent", true }, { Sid::longInstrumentFontStyle, "longInstrumentFontStyle", int(FontStyle::Normal) }, + { Sid::longInstrumentColor, "longInstrumentColor", QColor(0, 0, 0, 255) }, { Sid::longInstrumentAlign, "longInstrumentAlign", QVariant::fromValue(Align::RIGHT | Align::VCENTER) }, { Sid::longInstrumentOffset, "longInstrumentOffset", QPointF(.0, .0) }, { Sid::longInstrumentFrameType, "longInstrumentFrameType", int(FrameType::NO_FRAME) }, @@ -651,6 +670,7 @@ static const StyleType styleTypes[] { { Sid::shortInstrumentFontSize, "shortInstrumentFontSize", 12.0 }, { Sid::shortInstrumentFontSpatiumDependent, "shortInstrumentFontSpatiumDependent", true }, { Sid::shortInstrumentFontStyle, "shortInstrumentFontStyle", int(FontStyle::Normal) }, + { Sid::shortInstrumentColor, "shortInstrumentColor", QColor(0, 0, 0, 255) }, { Sid::shortInstrumentAlign, "shortInstrumentAlign", QVariant::fromValue(Align::RIGHT | Align::VCENTER) }, { Sid::shortInstrumentOffset, "shortInstrumentOffset", QPointF(.0, .0) }, { Sid::shortInstrumentFrameType, "shortInstrumentFrameType", int(FrameType::NO_FRAME) }, @@ -664,6 +684,7 @@ static const StyleType styleTypes[] { { Sid::partInstrumentFontSize, "partInstrumentFontSize", 18.0 }, { Sid::partInstrumentFontSpatiumDependent, "partInstrumentFontSpatiumDependent", false }, { Sid::partInstrumentFontStyle, "partInstrumentFontStyle", int(FontStyle::Normal) }, + { Sid::partInstrumentColor, "partInstrumentColor", QColor(0, 0, 0, 255) }, { Sid::partInstrumentAlign, "partInstrumentAlign", QVariant::fromValue(Align::LEFT) }, { Sid::partInstrumentOffset, "partInstrumentOffset", QPointF() }, { Sid::partInstrumentFrameType, "partInstrumentFrameType", int(FrameType::NO_FRAME) }, @@ -677,6 +698,7 @@ static const StyleType styleTypes[] { { Sid::dynamicsFontSize, "dynamicsFontSize", 12.0 }, { Sid::dynamicsFontSpatiumDependent, "dynamicsFontSpatiumDependent", true }, { Sid::dynamicsFontStyle, "dynamicsFontStyle", int(FontStyle::Italic) }, + { Sid::dynamicsColor, "dynamicsColor", QColor(0, 0, 0, 255) }, { Sid::dynamicsAlign, "dynamicsAlign", QVariant::fromValue(Align::HCENTER | Align::BASELINE) }, { Sid::dynamicsFrameType, "dynamicsFrameType", int(FrameType::NO_FRAME) }, { Sid::dynamicsFramePadding, "dynamicsFramePadding", 0.2 }, @@ -689,6 +711,7 @@ static const StyleType styleTypes[] { { Sid::expressionFontSize, "expressionFontSize", 11.0 }, { Sid::expressionFontSpatiumDependent, "expressionFontSpatiumDependent", true }, { Sid::expressionFontStyle, "expressionFontStyle", int(FontStyle::Italic) }, + { Sid::expressionColor, "expressionColor", QColor(0, 0, 0, 255) }, { Sid::expressionAlign, "expressionAlign", QVariant::fromValue(Align::LEFT | Align::BASELINE) }, { Sid::expressionPlacement, "expressionPlacement", int(Placement::BELOW) }, { Sid::expressionOffset, "expressionOffset", QPointF(.0, 3.5) }, @@ -703,6 +726,7 @@ static const StyleType styleTypes[] { { Sid::tempoFontSize, "tempoFontSize", 12.0 }, { Sid::tempoFontSpatiumDependent, "tempoFontSpatiumDependent", true }, { Sid::tempoFontStyle, "tempoFontStyle", int(FontStyle::Bold) }, + { Sid::tempoColor, "tempoColor", QColor(0, 0, 0, 255) }, { Sid::tempoAlign, "tempoAlign", QVariant::fromValue(Align::LEFT | Align::BASELINE) }, { Sid::tempoSystemFlag, "tempoSystemFlag", true }, { Sid::tempoPlacement, "tempoPlacement", int(Placement::ABOVE) }, @@ -720,6 +744,7 @@ static const StyleType styleTypes[] { { Sid::metronomeFontSize, "metronomeFontSize", 12.0 }, { Sid::metronomeFontSpatiumDependent, "metronomeFontSpatiumDependent", false }, { Sid::metronomeFontStyle, "metronomeFontStyle", int(FontStyle::Bold) }, + { Sid::metronomeColor, "metronomeColor", QColor(0, 0, 0, 255) }, { Sid::metronomePlacement, "metronomePlacement", int(Placement::ABOVE) }, { Sid::metronomeAlign, "metronomeAlign", QVariant::fromValue(Align::LEFT) }, { Sid::metronomeOffset, "metronomeOffset", QPointF() }, @@ -734,6 +759,7 @@ static const StyleType styleTypes[] { { Sid::measureNumberFontSize, "measureNumberFontSize", 8.0 }, { Sid::measureNumberFontSpatiumDependent, "measureNumberFontSpatiumDependent", true }, { Sid::measureNumberFontStyle, "measureNumberFontStyle", int(FontStyle::Normal) }, + { Sid::measureNumberColor, "measureNumberColor", QColor(0, 0, 0, 255) }, { Sid::measureNumberOffset, "measureNumberOffset", QPointF(0.0, -2.0) }, { Sid::measureNumberOffsetType, "measureNumberOffsetType", int(OffsetType::SPATIUM) }, { Sid::measureNumberAlign, "measureNumberAlign", QVariant::fromValue(Align::HCENTER | Align::BASELINE) }, @@ -748,6 +774,7 @@ static const StyleType styleTypes[] { { Sid::translatorFontSize, "translatorFontSize", 11.0 }, { Sid::translatorFontSpatiumDependent, "translatorFontSpatiumDependent", false }, { Sid::translatorFontStyle, "translatorFontStyle", int(FontStyle::Normal) }, + { Sid::translatorColor, "translatorColor", QColor(0, 0, 0, 255) }, { Sid::translatorAlign, "translatorAlign", QVariant::fromValue(Align::LEFT) }, { Sid::translatorOffset, "translatorOffset", QPointF() }, { Sid::translatorFrameType, "translatorFrameType", int(FrameType::NO_FRAME) }, @@ -761,6 +788,7 @@ static const StyleType styleTypes[] { { Sid::systemTextFontSize, "systemFontSize", 10.0 }, { Sid::systemTextFontSpatiumDependent, "systemFontSpatiumDependent", true }, { Sid::systemTextFontStyle, "systemFontStyle", int(FontStyle::Normal) }, + { Sid::systemTextColor, "systemTextColor", QColor(0, 0, 0, 255) }, { Sid::systemTextAlign, "systemAlign", QVariant::fromValue(Align::LEFT | Align::BASELINE) }, { Sid::systemTextOffsetType, "systemOffsetType", int(OffsetType::SPATIUM) }, { Sid::systemTextPlacement, "systemPlacement", int(Placement::ABOVE) }, @@ -778,6 +806,7 @@ static const StyleType styleTypes[] { { Sid::staffTextFontSize, "staffFontSize", 10.0 }, { Sid::staffTextFontSpatiumDependent, "staffFontSpatiumDependent", true }, { Sid::staffTextFontStyle, "staffFontStyle", int(FontStyle::Normal) }, + { Sid::staffTextColor, "staffTextColor", QColor(0, 0, 0, 255) }, { Sid::staffTextAlign, "staffAlign", QVariant::fromValue(Align::LEFT | Align::BASELINE) }, { Sid::staffTextOffsetType, "systemOffsetType", int(OffsetType::SPATIUM) }, { Sid::staffTextPlacement, "staffPlacement", int(Placement::ABOVE) }, @@ -795,6 +824,7 @@ static const StyleType styleTypes[] { { Sid::rehearsalMarkFontSize, "rehearsalMarkFontSize", 14.0 }, { Sid::rehearsalMarkFontSpatiumDependent, "rehearsalMarkFontSpatiumDependent", true }, { Sid::rehearsalMarkFontStyle, "rehearsalMarkFontStyle", int(FontStyle::Bold) }, + { Sid::rehearsalMarkColor, "rehearsalMarkColor", QColor(0, 0, 0, 255) }, { Sid::rehearsalMarkAlign, "rehearsalMarkAlign", QVariant::fromValue(Align::HCENTER | Align::BASELINE) }, { Sid::rehearsalMarkFrameType, "rehearsalMarkFrameType", int(FrameType::SQUARE) }, { Sid::rehearsalMarkFramePadding, "rehearsalMarkFramePadding", 0.5 }, @@ -811,6 +841,7 @@ static const StyleType styleTypes[] { { Sid::repeatLeftFontSize, "repeatLeftFontSize", 20.0 }, { Sid::repeatLeftFontSpatiumDependent, "repeatLeftFontSpatiumDependent", true }, { Sid::repeatLeftFontStyle, "repeatLeftFontStyle", int(FontStyle::Normal) }, + { Sid::repeatLeftColor, "repeatLeftColor", QColor(0, 0, 0, 255) }, { Sid::repeatLeftAlign, "repeatLeftAlign", QVariant::fromValue(Align::LEFT | Align::BASELINE) }, { Sid::repeatLeftPlacement, "repeatLeftPlacement", int(Placement::ABOVE) }, { Sid::repeatLeftFrameType, "repeatLeftFrameType", int(FrameType::NO_FRAME) }, @@ -824,6 +855,7 @@ static const StyleType styleTypes[] { { Sid::repeatRightFontSize, "repeatRightFontSize", 12.0 }, { Sid::repeatRightFontSpatiumDependent, "repeatRightFontSpatiumDependent", true }, { Sid::repeatRightFontStyle, "repeatRightFontStyle", int(FontStyle::Normal) }, + { Sid::repeatRightColor, "repeatRightColor", QColor(0, 0, 0, 255) }, { Sid::repeatRightAlign, "repeatRightAlign", QVariant::fromValue(Align::RIGHT | Align::BASELINE) }, { Sid::repeatRightPlacement, "repeatRightPlacement", int(Placement::ABOVE) }, { Sid::repeatRightFrameType, "repeatRightFrameType", int(FrameType::NO_FRAME) }, @@ -837,6 +869,7 @@ static const StyleType styleTypes[] { { Sid::frameFontSize, "frameFontSize", 12.0 }, { Sid::frameFontSpatiumDependent, "frameFontSpatiumDependent", false }, { Sid::frameFontStyle, "frameFontStyle", int(FontStyle::Normal) }, + { Sid::frameColor, "frameColor", QColor(0, 0, 0, 255) }, { Sid::frameAlign, "frameAlign", QVariant::fromValue(Align::LEFT) }, { Sid::frameOffset, "frameOffset", QPointF() }, { Sid::frameFrameType, "frameFrameType", int(FrameType::NO_FRAME) }, @@ -850,12 +883,14 @@ static const StyleType styleTypes[] { { Sid::textLineFontSize, "textLineFontSize", 12.0 }, { Sid::textLineFontSpatiumDependent, "textLineFontSpatiumDependent", true }, { Sid::textLineFontStyle, "textLineFontStyle", int(FontStyle::Normal) }, + { Sid::textLineColor, "textLineColor", QColor(0, 0, 0, 255) }, { Sid::textLineTextAlign, "textLineTextAlign", QVariant::fromValue(Align::LEFT | Align::VCENTER) }, { Sid::glissandoFontFace, "glissandoFontFace", "FreeSerif" }, { Sid::glissandoFontSize, "glissandoFontSize", QVariant(8.0) }, { Sid::glissandoFontSpatiumDependent, "glissandoFontSpatiumDependent", true }, { Sid::glissandoFontStyle, "glissandoFontStyle", int(FontStyle::Italic) }, + { Sid::glissandoColor, "glissandoColor", QColor(0, 0, 0, 255) }, { Sid::glissandoAlign, "glissandoAlign", QVariant::fromValue(Align::LEFT) }, { Sid::glissandoOffset, "glissandoOffset", QPointF() }, { Sid::glissandoFrameType, "glissandoFrameType", int(FrameType::NO_FRAME) }, @@ -871,6 +906,7 @@ static const StyleType styleTypes[] { { Sid::bendFontSize, "bendFontSize", 8.0 }, { Sid::bendFontSpatiumDependent, "bendFontSpatiumDependent", true }, { Sid::bendFontStyle, "bendFontStyle", int(FontStyle::Normal) }, + { Sid::bendColor, "bendColor", QColor(0, 0, 0, 255) }, { Sid::bendAlign, "bendAlign", QVariant::fromValue(Align::LEFT | Align::BASELINE) }, { Sid::bendOffset, "bendOffset", QPointF() }, { Sid::bendFrameType, "bendFrameType", int(FrameType::NO_FRAME) }, @@ -886,6 +922,7 @@ static const StyleType styleTypes[] { { Sid::headerFontSize, "headerFontSize", 8.0 }, { Sid::headerFontSpatiumDependent, "headerFontSpatiumDependent", false }, { Sid::headerFontStyle, "headerFontStyle", int(FontStyle::Normal) }, + { Sid::headerColor, "headerColor", QColor(0, 0, 0, 255) }, { Sid::headerAlign, "headerAlign", QVariant::fromValue(Align::LEFT) }, { Sid::headerOffset, "headerOffset", QPointF() }, { Sid::headerFrameType, "headerFrameType", int(FrameType::NO_FRAME) }, @@ -899,6 +936,7 @@ static const StyleType styleTypes[] { { Sid::footerFontSize, "footerFontSize", 8.0 }, { Sid::footerFontSpatiumDependent, "footerFontSpatiumDependent", false }, { Sid::footerFontStyle, "footerFontStyle", int(FontStyle::Normal) }, + { Sid::footerColor, "footerColor", QColor(0, 0, 0, 255) }, { Sid::footerAlign, "footerAlign", QVariant::fromValue(Align::LEFT) }, { Sid::footerOffset, "footerOffset", QPointF() }, { Sid::footerFrameType, "footerFrameType", int(FrameType::NO_FRAME) }, @@ -912,6 +950,7 @@ static const StyleType styleTypes[] { { Sid::instrumentChangeFontSize, "instrumentChangeFontSize", 12.0 }, { Sid::instrumentChangeFontSpatiumDependent, "instrumentChangeFontSpatiumDependent", true }, { Sid::instrumentChangeFontStyle, "instrumentChangeFontStyle", int(FontStyle::Bold) }, + { Sid::instrumentChangeColor, "instrumentChangeColor", QColor(0, 0, 0, 255) }, { Sid::instrumentChangeAlign, "instrumentChangeAlign", QVariant::fromValue(Align::LEFT | Align::BASELINE) }, { Sid::instrumentChangeOffset, "instrumentChangeOffset", QPointF() }, { Sid::instrumentChangePlacement, "instrumentChangePlacement", int(Placement::ABOVE) }, @@ -929,12 +968,14 @@ static const StyleType styleTypes[] { { Sid::figuredBassFontSize, "figuredBassFontSize", 8.0 }, { Sid::figuredBassFontSpatiumDependent, "figuredBassFontSpatiumDependent", true }, { Sid::figuredBassFontStyle, "figuredBassFontStyle", int(FontStyle::Normal) }, + { Sid::figuredBassColor, "figuredBassColor", QColor(0, 0, 0, 255) }, { Sid::user1Name, "user1Name", "" }, { Sid::user1FontFace, "user1FontFace", "FreeSerif" }, { Sid::user1FontSize, "user1FontSize", 10.0 }, { Sid::user1FontSpatiumDependent, "user1FontSpatiumDependent", true }, { Sid::user1FontStyle, "user1FontStyle", int(FontStyle::Normal) }, + { Sid::user1Color, "user1Color", QColor(0, 0, 0, 255) }, { Sid::user1Align, "user1Align", QVariant::fromValue(Align::LEFT | Align::TOP) }, { Sid::user1Offset, "user1Offset", 0.0 }, { Sid::user1OffsetType, "user1OffsetType", int(OffsetType::SPATIUM) }, @@ -950,6 +991,7 @@ static const StyleType styleTypes[] { { Sid::user2FontSize, "user2FontSize", 10.0 }, { Sid::user2FontSpatiumDependent, "user2FontSpatiumDependent", true }, { Sid::user2FontStyle, "user2FontStyle", int(FontStyle::Normal) }, + { Sid::user2Color, "user2Color", QColor(0, 0, 0, 255) }, { Sid::user2Align, "user2Align", QVariant::fromValue(Align::LEFT | Align::TOP) }, { Sid::user2Offset, "user2Offset", 0.0 }, { Sid::user2OffsetType, "user2OffsetType", int(OffsetType::SPATIUM) }, @@ -965,6 +1007,7 @@ static const StyleType styleTypes[] { { Sid::user3FontSize, "user3FontSize", 10.0 }, { Sid::user3FontSpatiumDependent, "user3FontSpatiumDependent", true }, { Sid::user3FontStyle, "user3FontStyle", int(FontStyle::Normal) }, + { Sid::user3Color, "user3Color", QColor(0, 0, 0, 255) }, { Sid::user3Align, "user3Align", QVariant::fromValue(Align::LEFT | Align::TOP) }, { Sid::user3Offset, "user3Offset", 0.0 }, { Sid::user3OffsetType, "user3OffsetType", int(OffsetType::SPATIUM) }, @@ -980,6 +1023,7 @@ static const StyleType styleTypes[] { { Sid::user4FontSize, "user4FontSize", 10.0 }, { Sid::user4FontSpatiumDependent, "user4FontSpatiumDependent", true }, { Sid::user4FontStyle, "user4FontStyle", int(FontStyle::Normal) }, + { Sid::user4Color, "user4Color", QColor(0, 0, 0, 255) }, { Sid::user4Align, "user4Align", QVariant::fromValue(Align::LEFT | Align::TOP) }, { Sid::user4Offset, "user4Offset", 0.0 }, { Sid::user4OffsetType, "user4OffsetType", int(OffsetType::SPATIUM) }, @@ -995,6 +1039,7 @@ static const StyleType styleTypes[] { { Sid::user5FontSize, "user5FontSize", 10.0 }, { Sid::user5FontSpatiumDependent, "user5FontSpatiumDependent", true }, { Sid::user5FontStyle, "user5FontStyle", int(FontStyle::Normal) }, + { Sid::user5Color, "user5Color", QColor(0, 0, 0, 255) }, { Sid::user5Align, "user5Align", QVariant::fromValue(Align::LEFT | Align::TOP) }, { Sid::user5Offset, "user5Offset", 0.0 }, { Sid::user5OffsetType, "user5OffsetType", int(OffsetType::SPATIUM) }, @@ -1010,6 +1055,7 @@ static const StyleType styleTypes[] { { Sid::user6FontSize, "user6FontSize", 10.0 }, { Sid::user6FontSpatiumDependent, "user6FontSpatiumDependent", true }, { Sid::user6FontStyle, "user6FontStyle", int(FontStyle::Normal) }, + { Sid::user6Color, "user6Color", QColor(0, 0, 0, 255) }, { Sid::user6Align, "user6Align", QVariant::fromValue(Align::LEFT | Align::TOP) }, { Sid::user6Offset, "user6Offset", 0.0 }, { Sid::user6OffsetType, "user6OffsetType", int(OffsetType::SPATIUM) }, @@ -1023,7 +1069,8 @@ static const StyleType styleTypes[] { { Sid::letRingFontFace, "letRingFontFace", "FreeSerif" }, { Sid::letRingFontSize, "letRingFontSize", 10.0 }, { Sid::letRingFontSpatiumDependent, "letRingFontSpatiumDependent", true }, - { Sid::letRingFontStyle, "letRingFontStyle", false }, + { Sid::letRingFontStyle, "letRingFontStyle", int(FontStyle::Normal) }, + { Sid::letRingColor, "letRingColor", QColor(0, 0, 0, 255) }, { Sid::letRingTextAlign, "letRingTextAlign", QVariant::fromValue(Align::LEFT | Align::VCENTER) }, { Sid::letRingHookHeight, "letRingHookHeight", Spatium(0.6) }, { Sid::letRingPlacement, "letRingPlacement", int(Placement::BELOW) }, @@ -1043,7 +1090,8 @@ static const StyleType styleTypes[] { { Sid::palmMuteFontFace, "palmMuteFontFace", "FreeSerif" }, { Sid::palmMuteFontSize, "palmMuteFontSize", 10.0 }, { Sid::palmMuteFontSpatiumDependent, "palmMuteFontSpatiumDependent", true }, - { Sid::palmMuteFontStyle, "palmMuteFontStyle", false }, + { Sid::palmMuteFontStyle, "palmMuteFontStyle", int(FontStyle::Normal) }, + { Sid::palmMuteColor, "palmMuteColor", QColor(0, 0, 0, 255) }, { Sid::palmMuteTextAlign, "palmMuteTextAlign", QVariant::fromValue(Align::LEFT | Align::VCENTER) }, { Sid::palmMuteHookHeight, "palmMuteHookHeight", Spatium(0.6) }, { Sid::palmMutePlacement, "palmMutePlacement", int(Placement::BELOW) }, @@ -1077,6 +1125,7 @@ const TextStyle defaultTextStyle {{ { Sid::defaultFontSize, Pid::FONT_SIZE }, { Sid::defaultFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::defaultFontStyle, Pid::FONT_STYLE }, + { Sid::defaultColor, Pid::COLOR }, { Sid::defaultAlign, Pid::ALIGN }, { Sid::defaultOffset, Pid::OFFSET }, { Sid::defaultFrameType, Pid::FRAME_TYPE }, @@ -1092,6 +1141,7 @@ const TextStyle titleTextStyle {{ { Sid::titleFontSize, Pid::FONT_SIZE }, { Sid::titleFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::titleFontStyle, Pid::FONT_STYLE }, + { Sid::titleColor, Pid::COLOR }, { Sid::titleAlign, Pid::ALIGN }, { Sid::titleOffset, Pid::OFFSET }, { Sid::titleFrameType, Pid::FRAME_TYPE }, @@ -1107,6 +1157,7 @@ const TextStyle subTitleTextStyle {{ { Sid::subTitleFontSize, Pid::FONT_SIZE }, { Sid::subTitleFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::subTitleFontStyle, Pid::FONT_STYLE }, + { Sid::subTitleColor, Pid::COLOR }, { Sid::subTitleAlign, Pid::ALIGN }, { Sid::subTitleOffset, Pid::OFFSET }, { Sid::subTitleFrameType, Pid::FRAME_TYPE }, @@ -1122,6 +1173,7 @@ const TextStyle composerTextStyle {{ { Sid::composerFontSize, Pid::FONT_SIZE }, { Sid::composerFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::composerFontStyle, Pid::FONT_STYLE }, + { Sid::composerColor, Pid::COLOR }, { Sid::composerAlign, Pid::ALIGN }, { Sid::composerOffset, Pid::OFFSET }, { Sid::composerFrameType, Pid::FRAME_TYPE }, @@ -1137,6 +1189,7 @@ const TextStyle lyricistTextStyle {{ { Sid::lyricistFontSize, Pid::FONT_SIZE }, { Sid::lyricistFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::lyricistFontStyle, Pid::FONT_STYLE }, + { Sid::lyricistColor, Pid::COLOR }, { Sid::lyricistAlign, Pid::ALIGN }, { Sid::lyricistOffset, Pid::OFFSET }, { Sid::lyricistFrameType, Pid::FRAME_TYPE }, @@ -1152,6 +1205,7 @@ const TextStyle lyricsEvenTextStyle {{ { Sid::lyricsEvenFontSize, Pid::FONT_SIZE }, { Sid::lyricsEvenFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::lyricsEvenFontStyle, Pid::FONT_STYLE }, + { Sid::lyricsEvenColor, Pid::COLOR }, { Sid::lyricsEvenAlign, Pid::ALIGN }, { Sid::lyricsPosBelow, Pid::OFFSET }, { Sid::lyricsEvenFrameType, Pid::FRAME_TYPE }, @@ -1167,6 +1221,7 @@ const TextStyle lyricsOddTextStyle {{ { Sid::lyricsOddFontSize, Pid::FONT_SIZE }, { Sid::lyricsOddFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::lyricsOddFontStyle, Pid::FONT_STYLE }, + { Sid::lyricsOddColor, Pid::COLOR }, { Sid::lyricsOddAlign, Pid::ALIGN }, { Sid::lyricsPosBelow, Pid::OFFSET }, { Sid::lyricsOddFrameType, Pid::FRAME_TYPE }, @@ -1182,6 +1237,7 @@ const TextStyle fingeringTextStyle {{ { Sid::fingeringFontSize, Pid::FONT_SIZE }, { Sid::fingeringFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::fingeringFontStyle, Pid::FONT_STYLE }, + { Sid::fingeringColor, Pid::COLOR }, { Sid::fingeringAlign, Pid::ALIGN }, { Sid::fingeringOffset, Pid::OFFSET }, { Sid::fingeringFrameType, Pid::FRAME_TYPE }, @@ -1193,33 +1249,35 @@ const TextStyle fingeringTextStyle {{ }}; const TextStyle lhGuitarFingeringTextStyle {{ - { Sid::lhGuitarFingeringFontFace, Pid::FONT_FACE }, - { Sid::lhGuitarFingeringFontSize, Pid::FONT_SIZE }, + { Sid::lhGuitarFingeringFontFace, Pid::FONT_FACE }, + { Sid::lhGuitarFingeringFontSize, Pid::FONT_SIZE }, { Sid::lhGuitarFingeringFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, - { Sid::lhGuitarFingeringFontStyle, Pid::FONT_STYLE }, - { Sid::lhGuitarFingeringAlign, Pid::ALIGN }, - { Sid::lhGuitarFingeringOffset, Pid::OFFSET }, - { Sid::lhGuitarFingeringFrameType, Pid::FRAME_TYPE }, - { Sid::lhGuitarFingeringFramePadding, Pid::FRAME_PADDING }, - { Sid::lhGuitarFingeringFrameWidth, Pid::FRAME_WIDTH }, - { Sid::lhGuitarFingeringFrameRound, Pid::FRAME_ROUND }, - { Sid::lhGuitarFingeringFrameFgColor, Pid::FRAME_FG_COLOR }, - { Sid::lhGuitarFingeringFrameBgColor, Pid::FRAME_BG_COLOR }, + { Sid::lhGuitarFingeringFontStyle, Pid::FONT_STYLE }, + { Sid::lhGuitarFingeringColor, Pid::COLOR }, + { Sid::lhGuitarFingeringAlign, Pid::ALIGN }, + { Sid::lhGuitarFingeringOffset, Pid::OFFSET }, + { Sid::lhGuitarFingeringFrameType, Pid::FRAME_TYPE }, + { Sid::lhGuitarFingeringFramePadding, Pid::FRAME_PADDING }, + { Sid::lhGuitarFingeringFrameWidth, Pid::FRAME_WIDTH }, + { Sid::lhGuitarFingeringFrameRound, Pid::FRAME_ROUND }, + { Sid::lhGuitarFingeringFrameFgColor, Pid::FRAME_FG_COLOR }, + { Sid::lhGuitarFingeringFrameBgColor, Pid::FRAME_BG_COLOR }, }}; const TextStyle rhGuitarFingeringTextStyle {{ - { Sid::rhGuitarFingeringFontFace, Pid::FONT_FACE }, - { Sid::rhGuitarFingeringFontSize, Pid::FONT_SIZE }, + { Sid::rhGuitarFingeringFontFace, Pid::FONT_FACE }, + { Sid::rhGuitarFingeringFontSize, Pid::FONT_SIZE }, { Sid::rhGuitarFingeringFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, - { Sid::rhGuitarFingeringFontStyle, Pid::FONT_STYLE }, - { Sid::rhGuitarFingeringAlign, Pid::ALIGN }, - { Sid::rhGuitarFingeringOffset, Pid::OFFSET }, - { Sid::rhGuitarFingeringFrameType, Pid::FRAME_TYPE }, - { Sid::rhGuitarFingeringFramePadding, Pid::FRAME_PADDING }, - { Sid::rhGuitarFingeringFrameWidth, Pid::FRAME_WIDTH }, - { Sid::rhGuitarFingeringFrameRound, Pid::FRAME_ROUND }, - { Sid::rhGuitarFingeringFrameFgColor, Pid::FRAME_FG_COLOR }, - { Sid::rhGuitarFingeringFrameBgColor, Pid::FRAME_BG_COLOR }, + { Sid::rhGuitarFingeringFontStyle, Pid::FONT_STYLE }, + { Sid::rhGuitarFingeringColor, Pid::COLOR }, + { Sid::rhGuitarFingeringAlign, Pid::ALIGN }, + { Sid::rhGuitarFingeringOffset, Pid::OFFSET }, + { Sid::rhGuitarFingeringFrameType, Pid::FRAME_TYPE }, + { Sid::rhGuitarFingeringFramePadding, Pid::FRAME_PADDING }, + { Sid::rhGuitarFingeringFrameWidth, Pid::FRAME_WIDTH }, + { Sid::rhGuitarFingeringFrameRound, Pid::FRAME_ROUND }, + { Sid::rhGuitarFingeringFrameFgColor, Pid::FRAME_FG_COLOR }, + { Sid::rhGuitarFingeringFrameBgColor, Pid::FRAME_BG_COLOR }, }}; const TextStyle stringNumberTextStyle {{ @@ -1227,6 +1285,7 @@ const TextStyle stringNumberTextStyle {{ { Sid::stringNumberFontSize, Pid::FONT_SIZE }, { Sid::stringNumberFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::stringNumberFontStyle, Pid::FONT_STYLE }, + { Sid::stringNumberColor, Pid::COLOR }, { Sid::stringNumberAlign, Pid::ALIGN }, { Sid::stringNumberOffset, Pid::OFFSET }, { Sid::stringNumberFrameType, Pid::FRAME_TYPE }, @@ -1242,6 +1301,7 @@ const TextStyle longInstrumentTextStyle {{ { Sid::longInstrumentFontSize, Pid::FONT_SIZE }, { Sid::longInstrumentFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::longInstrumentFontStyle, Pid::FONT_STYLE }, + { Sid::longInstrumentColor, Pid::COLOR }, { Sid::longInstrumentAlign, Pid::ALIGN }, { Sid::longInstrumentOffset, Pid::OFFSET }, { Sid::longInstrumentFrameType, Pid::FRAME_TYPE }, @@ -1253,18 +1313,19 @@ const TextStyle longInstrumentTextStyle {{ }}; const TextStyle shortInstrumentTextStyle {{ - { Sid::shortInstrumentFontFace, Pid::FONT_FACE }, - { Sid::shortInstrumentFontSize, Pid::FONT_SIZE }, + { Sid::shortInstrumentFontFace, Pid::FONT_FACE }, + { Sid::shortInstrumentFontSize, Pid::FONT_SIZE }, { Sid::shortInstrumentFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, - { Sid::shortInstrumentFontStyle, Pid::FONT_STYLE }, - { Sid::shortInstrumentAlign, Pid::ALIGN }, - { Sid::shortInstrumentOffset, Pid::OFFSET }, - { Sid::shortInstrumentFrameType, Pid::FRAME_TYPE }, - { Sid::shortInstrumentFramePadding, Pid::FRAME_PADDING }, - { Sid::shortInstrumentFrameWidth, Pid::FRAME_WIDTH }, - { Sid::shortInstrumentFrameRound, Pid::FRAME_ROUND }, - { Sid::shortInstrumentFrameFgColor, Pid::FRAME_FG_COLOR }, - { Sid::shortInstrumentFrameBgColor, Pid::FRAME_BG_COLOR }, + { Sid::shortInstrumentFontStyle, Pid::FONT_STYLE }, + { Sid::shortInstrumentColor, Pid::COLOR }, + { Sid::shortInstrumentAlign, Pid::ALIGN }, + { Sid::shortInstrumentOffset, Pid::OFFSET }, + { Sid::shortInstrumentFrameType, Pid::FRAME_TYPE }, + { Sid::shortInstrumentFramePadding, Pid::FRAME_PADDING }, + { Sid::shortInstrumentFrameWidth, Pid::FRAME_WIDTH }, + { Sid::shortInstrumentFrameRound, Pid::FRAME_ROUND }, + { Sid::shortInstrumentFrameFgColor, Pid::FRAME_FG_COLOR }, + { Sid::shortInstrumentFrameBgColor, Pid::FRAME_BG_COLOR }, }}; const TextStyle partInstrumentTextStyle {{ @@ -1272,6 +1333,7 @@ const TextStyle partInstrumentTextStyle {{ { Sid::partInstrumentFontSize, Pid::FONT_SIZE }, { Sid::partInstrumentFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::partInstrumentFontStyle, Pid::FONT_STYLE }, + { Sid::partInstrumentColor, Pid::COLOR }, { Sid::partInstrumentAlign, Pid::ALIGN }, { Sid::partInstrumentOffset, Pid::OFFSET }, { Sid::partInstrumentFrameType, Pid::FRAME_TYPE }, @@ -1287,6 +1349,7 @@ const TextStyle dynamicsTextStyle {{ { Sid::dynamicsFontSize, Pid::FONT_SIZE }, { Sid::dynamicsFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::dynamicsFontStyle, Pid::FONT_STYLE }, + { Sid::dynamicsColor, Pid::COLOR }, { Sid::dynamicsAlign, Pid::ALIGN }, { Sid::dynamicsPosBelow, Pid::OFFSET }, { Sid::dynamicsFrameType, Pid::FRAME_TYPE }, @@ -1302,6 +1365,7 @@ const TextStyle expressionTextStyle {{ { Sid::expressionFontSize, Pid::FONT_SIZE }, { Sid::expressionFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::expressionFontStyle, Pid::FONT_STYLE }, + { Sid::expressionColor, Pid::COLOR }, { Sid::expressionAlign, Pid::ALIGN }, { Sid::expressionOffset, Pid::OFFSET }, { Sid::expressionFrameType, Pid::FRAME_TYPE }, @@ -1317,6 +1381,7 @@ const TextStyle tempoTextStyle {{ { Sid::tempoFontSize, Pid::FONT_SIZE }, { Sid::tempoFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::tempoFontStyle, Pid::FONT_STYLE }, + { Sid::tempoColor, Pid::COLOR }, { Sid::tempoAlign, Pid::ALIGN }, { Sid::tempoPosAbove, Pid::OFFSET }, { Sid::tempoFrameType, Pid::FRAME_TYPE }, @@ -1332,6 +1397,7 @@ const TextStyle metronomeTextStyle {{ { Sid::metronomeFontSize, Pid::FONT_SIZE }, { Sid::metronomeFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::metronomeFontStyle, Pid::FONT_STYLE }, + { Sid::metronomeColor, Pid::COLOR }, { Sid::metronomeAlign, Pid::ALIGN }, { Sid::metronomeOffset, Pid::OFFSET }, { Sid::metronomeFrameType, Pid::FRAME_TYPE }, @@ -1347,6 +1413,7 @@ const TextStyle measureNumberTextStyle {{ { Sid::measureNumberFontSize, Pid::FONT_SIZE }, { Sid::measureNumberFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::measureNumberFontStyle, Pid::FONT_STYLE }, + { Sid::measureNumberColor, Pid::COLOR }, { Sid::measureNumberAlign, Pid::ALIGN }, { Sid::measureNumberOffset, Pid::OFFSET }, { Sid::measureNumberFrameType, Pid::FRAME_TYPE }, @@ -1362,6 +1429,7 @@ const TextStyle translatorTextStyle {{ { Sid::translatorFontSize, Pid::FONT_SIZE }, { Sid::translatorFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::translatorFontStyle, Pid::FONT_STYLE }, + { Sid::translatorColor, Pid::COLOR }, { Sid::translatorAlign, Pid::ALIGN }, { Sid::translatorOffset, Pid::OFFSET }, { Sid::translatorFrameType, Pid::FRAME_TYPE }, @@ -1373,11 +1441,12 @@ const TextStyle translatorTextStyle {{ }}; const TextStyle tupletTextStyle {{ - { Sid::tupletFontFace, Pid::FONT_FACE }, - { Sid::tupletFontSize, Pid::FONT_SIZE }, + { Sid::tupletFontFace, Pid::FONT_FACE }, + { Sid::tupletFontSize, Pid::FONT_SIZE }, { Sid::tupletFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, - { Sid::tupletFontStyle, Pid::FONT_STYLE }, - { Sid::tupletAlign, Pid::ALIGN }, + { Sid::tupletFontStyle, Pid::FONT_STYLE }, + { Sid::tupletColor, Pid::COLOR }, + { Sid::tupletAlign, Pid::ALIGN }, { Sid::tupletOffset, Pid::OFFSET }, { Sid::tupletFrameType, Pid::FRAME_TYPE }, { Sid::tupletFramePadding, Pid::FRAME_PADDING }, @@ -1392,6 +1461,7 @@ const TextStyle systemTextStyle {{ { Sid::systemTextFontSize, Pid::FONT_SIZE }, { Sid::systemTextFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::systemTextFontStyle, Pid::FONT_STYLE }, + { Sid::systemTextColor, Pid::COLOR }, { Sid::systemTextAlign, Pid::ALIGN }, { Sid::systemTextPosAbove, Pid::OFFSET }, { Sid::systemTextFrameType, Pid::FRAME_TYPE }, @@ -1407,6 +1477,7 @@ const TextStyle staffTextStyle {{ { Sid::staffTextFontSize, Pid::FONT_SIZE }, { Sid::staffTextFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::staffTextFontStyle, Pid::FONT_STYLE }, + { Sid::staffTextColor, Pid::COLOR }, { Sid::staffTextAlign, Pid::ALIGN }, { Sid::staffTextPosAbove, Pid::OFFSET }, { Sid::staffTextFrameType, Pid::FRAME_TYPE }, @@ -1422,6 +1493,7 @@ const TextStyle chordSymbolTextStyleA {{ { Sid::chordSymbolAFontSize, Pid::FONT_SIZE }, { Sid::chordSymbolAFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::chordSymbolAFontStyle, Pid::FONT_STYLE }, + { Sid::chordSymbolAColor, Pid::COLOR }, { Sid::chordSymbolAAlign, Pid::ALIGN }, { Sid::chordSymbolAPosAbove, Pid::OFFSET }, { Sid::chordSymbolAFrameType, Pid::FRAME_TYPE }, @@ -1437,6 +1509,7 @@ const TextStyle chordSymbolTextStyleB {{ { Sid::chordSymbolBFontSize, Pid::FONT_SIZE }, { Sid::chordSymbolBFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::chordSymbolBFontStyle, Pid::FONT_STYLE }, + { Sid::chordSymbolBColor, Pid::COLOR }, { Sid::chordSymbolBAlign, Pid::ALIGN }, { Sid::chordSymbolBPosAbove, Pid::OFFSET }, { Sid::chordSymbolBFrameType, Pid::FRAME_TYPE }, @@ -1452,6 +1525,7 @@ const TextStyle rehearsalMarkTextStyle {{ { Sid::rehearsalMarkFontSize, Pid::FONT_SIZE }, { Sid::rehearsalMarkFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::rehearsalMarkFontStyle, Pid::FONT_STYLE }, + { Sid::rehearsalMarkColor, Pid::COLOR }, { Sid::rehearsalMarkAlign, Pid::ALIGN }, { Sid::rehearsalMarkPosAbove, Pid::OFFSET }, { Sid::rehearsalMarkFrameType, Pid::FRAME_TYPE }, @@ -1467,6 +1541,7 @@ const TextStyle repeatLeftTextStyle {{ { Sid::repeatLeftFontSize, Pid::FONT_SIZE }, { Sid::repeatLeftFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::repeatLeftFontStyle, Pid::FONT_STYLE }, + { Sid::repeatLeftColor, Pid::COLOR }, { Sid::repeatLeftAlign, Pid::ALIGN }, { Sid::markerPosAbove, Pid::OFFSET }, { Sid::repeatLeftFrameType, Pid::FRAME_TYPE }, @@ -1482,6 +1557,7 @@ const TextStyle repeatRightTextStyle {{ { Sid::repeatRightFontSize, Pid::FONT_SIZE }, { Sid::repeatRightFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::repeatRightFontStyle, Pid::FONT_STYLE }, + { Sid::repeatRightColor, Pid::COLOR }, { Sid::repeatRightAlign, Pid::ALIGN }, { Sid::jumpPosAbove, Pid::OFFSET }, { Sid::repeatRightFrameType, Pid::FRAME_TYPE }, @@ -1497,6 +1573,7 @@ const TextStyle frameTextStyle {{ { Sid::frameFontSize, Pid::FONT_SIZE }, { Sid::frameFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::frameFontStyle, Pid::FONT_STYLE }, + { Sid::frameColor, Pid::COLOR }, { Sid::frameAlign, Pid::ALIGN }, { Sid::frameOffset, Pid::OFFSET }, { Sid::frameFrameType, Pid::FRAME_TYPE }, @@ -1512,6 +1589,7 @@ const TextStyle textLineTextStyle {{ { Sid::textLineFontSize, Pid::BEGIN_FONT_SIZE }, { Sid::textLineFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::textLineFontStyle, Pid::BEGIN_FONT_STYLE }, + { Sid::textLineColor, Pid::COLOR }, { Sid::textLineTextAlign, Pid::ALIGN }, { Sid::textLinePosAbove, Pid::OFFSET }, { Sid::textLineFrameType, Pid::FRAME_TYPE }, @@ -1527,6 +1605,7 @@ const TextStyle glissandoTextStyle {{ { Sid::glissandoFontSize, Pid::FONT_SIZE }, { Sid::glissandoFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::glissandoFontStyle, Pid::FONT_STYLE }, + { Sid::glissandoColor, Pid::COLOR }, { Sid::glissandoAlign, Pid::ALIGN }, { Sid::glissandoOffset, Pid::OFFSET }, { Sid::glissandoFrameType, Pid::FRAME_TYPE }, @@ -1542,6 +1621,7 @@ const TextStyle ottavaTextStyle {{ { Sid::ottavaFontSize, Pid::BEGIN_FONT_SIZE }, { Sid::ottavaFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::ottavaFontStyle, Pid::BEGIN_FONT_STYLE }, + { Sid::ottavaColor, Pid::COLOR }, { Sid::ottavaTextAlign, Pid::BEGIN_TEXT_ALIGN }, { Sid::ottavaPosAbove, Pid::OFFSET }, { Sid::ottavaFrameType, Pid::FRAME_TYPE }, @@ -1553,12 +1633,13 @@ const TextStyle ottavaTextStyle {{ }}; const TextStyle voltaTextStyle {{ - { Sid::voltaFontFace, Pid::BEGIN_FONT_FACE }, + { Sid::voltaFontFace, Pid::BEGIN_FONT_FACE }, { Sid::voltaFontSize, Pid::BEGIN_FONT_SIZE }, { Sid::voltaFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, - { Sid::voltaFontStyle, Pid::BEGIN_FONT_STYLE }, - { Sid::voltaAlign, Pid::BEGIN_TEXT_ALIGN }, - { Sid::voltaOffset, Pid::BEGIN_TEXT_OFFSET }, + { Sid::voltaFontStyle, Pid::BEGIN_FONT_STYLE }, + { Sid::voltaColor, Pid::COLOR }, + { Sid::voltaAlign, Pid::BEGIN_TEXT_ALIGN }, + { Sid::voltaOffset, Pid::BEGIN_TEXT_OFFSET }, { Sid::voltaFrameType, Pid::FRAME_TYPE }, { Sid::voltaFramePadding, Pid::FRAME_PADDING }, { Sid::voltaFrameWidth, Pid::FRAME_WIDTH }, @@ -1568,12 +1649,13 @@ const TextStyle voltaTextStyle {{ }}; const TextStyle pedalTextStyle {{ - { Sid::pedalFontFace, Pid::BEGIN_FONT_FACE }, - { Sid::pedalFontSize, Pid::BEGIN_FONT_SIZE }, + { Sid::pedalFontFace, Pid::BEGIN_FONT_FACE }, + { Sid::pedalFontSize, Pid::BEGIN_FONT_SIZE }, { Sid::pedalFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, - { Sid::pedalFontStyle, Pid::BEGIN_FONT_STYLE }, - { Sid::pedalTextAlign, Pid::BEGIN_TEXT_ALIGN }, - { Sid::pedalPosAbove, Pid::BEGIN_TEXT_OFFSET }, + { Sid::pedalFontStyle, Pid::BEGIN_FONT_STYLE }, + { Sid::pedalColor, Pid::COLOR }, + { Sid::pedalTextAlign, Pid::BEGIN_TEXT_ALIGN }, + { Sid::pedalPosAbove, Pid::BEGIN_TEXT_OFFSET }, { Sid::pedalFrameType, Pid::FRAME_TYPE }, { Sid::pedalFramePadding, Pid::FRAME_PADDING }, { Sid::pedalFrameWidth, Pid::FRAME_WIDTH }, @@ -1587,8 +1669,9 @@ const TextStyle letRingTextStyle {{ { Sid::letRingFontSize, Pid::BEGIN_FONT_SIZE }, { Sid::letRingFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::letRingFontStyle, Pid::BEGIN_FONT_STYLE }, + { Sid::letRingColor, Pid::COLOR }, { Sid::letRingTextAlign, Pid::BEGIN_TEXT_ALIGN }, - { Sid::letRingPosAbove, Pid::BEGIN_TEXT_OFFSET }, + { Sid::letRingPosAbove, Pid::BEGIN_TEXT_OFFSET }, { Sid::letRingFrameType, Pid::FRAME_TYPE }, { Sid::letRingFramePadding, Pid::FRAME_PADDING }, { Sid::letRingFrameWidth, Pid::FRAME_WIDTH }, @@ -1602,8 +1685,9 @@ const TextStyle palmMuteTextStyle {{ { Sid::palmMuteFontSize, Pid::BEGIN_FONT_SIZE }, { Sid::palmMuteFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::palmMuteFontStyle, Pid::BEGIN_FONT_STYLE }, + { Sid::palmMuteColor, Pid::COLOR }, { Sid::palmMuteTextAlign, Pid::BEGIN_TEXT_ALIGN }, - { Sid::palmMutePosAbove, Pid::BEGIN_TEXT_OFFSET }, + { Sid::palmMutePosAbove, Pid::BEGIN_TEXT_OFFSET }, { Sid::palmMuteFrameType, Pid::FRAME_TYPE }, { Sid::palmMuteFramePadding, Pid::FRAME_PADDING }, { Sid::palmMuteFrameWidth, Pid::FRAME_WIDTH }, @@ -1613,12 +1697,13 @@ const TextStyle palmMuteTextStyle {{ }}; const TextStyle hairpinTextStyle {{ - { Sid::hairpinFontFace, Pid::BEGIN_FONT_FACE }, - { Sid::hairpinFontSize, Pid::BEGIN_FONT_SIZE }, + { Sid::hairpinFontFace, Pid::BEGIN_FONT_FACE }, + { Sid::hairpinFontSize, Pid::BEGIN_FONT_SIZE }, { Sid::hairpinFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, - { Sid::hairpinFontStyle, Pid::BEGIN_FONT_STYLE }, - { Sid::hairpinTextAlign, Pid::BEGIN_TEXT_ALIGN }, - { Sid::hairpinPosAbove, Pid::BEGIN_TEXT_OFFSET }, + { Sid::hairpinFontStyle, Pid::BEGIN_FONT_STYLE }, + { Sid::hairpinColor, Pid::COLOR }, + { Sid::hairpinTextAlign, Pid::BEGIN_TEXT_ALIGN }, + { Sid::hairpinPosAbove, Pid::BEGIN_TEXT_OFFSET }, { Sid::hairpinFrameType, Pid::FRAME_TYPE }, { Sid::hairpinFramePadding, Pid::FRAME_PADDING }, { Sid::hairpinFrameWidth, Pid::FRAME_WIDTH }, @@ -1632,6 +1717,7 @@ const TextStyle bendTextStyle {{ { Sid::bendFontSize, Pid::FONT_SIZE }, { Sid::bendFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::bendFontStyle, Pid::FONT_STYLE }, + { Sid::bendColor, Pid::COLOR }, { Sid::bendAlign, Pid::BEGIN_TEXT_ALIGN }, { Sid::bendOffset, Pid::BEGIN_TEXT_OFFSET }, { Sid::bendFrameType, Pid::FRAME_TYPE }, @@ -1647,6 +1733,7 @@ const TextStyle headerTextStyle {{ { Sid::headerFontSize, Pid::FONT_SIZE }, { Sid::headerFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::headerFontStyle, Pid::FONT_STYLE }, + { Sid::headerColor, Pid::COLOR }, { Sid::headerAlign, Pid::BEGIN_TEXT_ALIGN }, { Sid::headerOffset, Pid::BEGIN_TEXT_OFFSET }, { Sid::headerFrameType, Pid::FRAME_TYPE }, @@ -1662,6 +1749,7 @@ const TextStyle footerTextStyle {{ { Sid::footerFontSize, Pid::FONT_SIZE }, { Sid::footerFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::footerFontStyle, Pid::FONT_STYLE }, + { Sid::footerColor, Pid::COLOR }, { Sid::footerAlign, Pid::BEGIN_TEXT_ALIGN }, { Sid::footerOffset, Pid::BEGIN_TEXT_OFFSET }, { Sid::footerFrameType, Pid::FRAME_TYPE }, @@ -1673,18 +1761,19 @@ const TextStyle footerTextStyle {{ }}; const TextStyle instrumentChangeTextStyle {{ - { Sid::instrumentChangeFontFace, Pid::FONT_FACE }, - { Sid::instrumentChangeFontSize, Pid::FONT_SIZE }, + { Sid::instrumentChangeFontFace, Pid::FONT_FACE }, + { Sid::instrumentChangeFontSize, Pid::FONT_SIZE }, { Sid::instrumentChangeFontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, - { Sid::instrumentChangeFontStyle, Pid::FONT_STYLE }, - { Sid::instrumentChangeAlign, Pid::ALIGN }, - { Sid::instrumentChangeOffset, Pid::OFFSET }, - { Sid::instrumentChangeFrameType, Pid::FRAME_TYPE }, - { Sid::instrumentChangeFramePadding, Pid::FRAME_PADDING }, - { Sid::instrumentChangeFrameWidth, Pid::FRAME_WIDTH }, - { Sid::instrumentChangeFrameRound, Pid::FRAME_ROUND }, - { Sid::instrumentChangeFrameFgColor, Pid::FRAME_FG_COLOR }, - { Sid::instrumentChangeFrameBgColor, Pid::FRAME_BG_COLOR }, + { Sid::instrumentChangeFontStyle, Pid::FONT_STYLE }, + { Sid::instrumentChangeColor, Pid::COLOR }, + { Sid::instrumentChangeAlign, Pid::ALIGN }, + { Sid::instrumentChangeOffset, Pid::OFFSET }, + { Sid::instrumentChangeFrameType, Pid::FRAME_TYPE }, + { Sid::instrumentChangeFramePadding, Pid::FRAME_PADDING }, + { Sid::instrumentChangeFrameWidth, Pid::FRAME_WIDTH }, + { Sid::instrumentChangeFrameRound, Pid::FRAME_ROUND }, + { Sid::instrumentChangeFrameFgColor, Pid::FRAME_FG_COLOR }, + { Sid::instrumentChangeFrameBgColor, Pid::FRAME_BG_COLOR }, }}; const TextStyle user1TextStyle {{ @@ -1692,6 +1781,7 @@ const TextStyle user1TextStyle {{ { Sid::user1FontSize, Pid::FONT_SIZE }, { Sid::user1FontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::user1FontStyle, Pid::FONT_STYLE }, + { Sid::user1Color, Pid::COLOR }, { Sid::user1Align, Pid::ALIGN }, { Sid::user1Offset, Pid::OFFSET }, { Sid::user1FrameType, Pid::FRAME_TYPE }, @@ -1707,6 +1797,7 @@ const TextStyle user2TextStyle {{ { Sid::user2FontSize, Pid::FONT_SIZE }, { Sid::user2FontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::user2FontStyle, Pid::FONT_STYLE }, + { Sid::user2Color, Pid::COLOR }, { Sid::user2Align, Pid::ALIGN }, { Sid::user2Offset, Pid::OFFSET }, { Sid::user2FrameType, Pid::FRAME_TYPE }, @@ -1722,6 +1813,7 @@ const TextStyle user3TextStyle {{ { Sid::user3FontSize, Pid::FONT_SIZE }, { Sid::user3FontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::user3FontStyle, Pid::FONT_STYLE }, + { Sid::user3Color, Pid::COLOR }, { Sid::user3Align, Pid::ALIGN }, { Sid::user3Offset, Pid::OFFSET }, { Sid::user3FrameType, Pid::FRAME_TYPE }, @@ -1737,6 +1829,7 @@ const TextStyle user4TextStyle {{ { Sid::user4FontSize, Pid::FONT_SIZE }, { Sid::user4FontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::user4FontStyle, Pid::FONT_STYLE }, + { Sid::user4Color, Pid::COLOR }, { Sid::user4Align, Pid::ALIGN }, { Sid::user4Offset, Pid::OFFSET }, { Sid::user4FrameType, Pid::FRAME_TYPE }, @@ -1752,6 +1845,7 @@ const TextStyle user5TextStyle {{ { Sid::user5FontSize, Pid::FONT_SIZE }, { Sid::user5FontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::user5FontStyle, Pid::FONT_STYLE }, + { Sid::user5Color, Pid::COLOR }, { Sid::user5Align, Pid::ALIGN }, { Sid::user5Offset, Pid::OFFSET }, { Sid::user5FrameType, Pid::FRAME_TYPE }, @@ -1767,6 +1861,7 @@ const TextStyle user6TextStyle {{ { Sid::user6FontSize, Pid::FONT_SIZE }, { Sid::user6FontSpatiumDependent, Pid::SIZE_SPATIUM_DEPENDENT }, { Sid::user6FontStyle, Pid::FONT_STYLE }, + { Sid::user6Color, Pid::COLOR }, { Sid::user6Align, Pid::ALIGN }, { Sid::user6Offset, Pid::OFFSET }, { Sid::user6FrameType, Pid::FRAME_TYPE }, diff --git a/libmscore/style.h b/libmscore/style.h index bd0acc8771cd..065be28343d4 100644 --- a/libmscore/style.h +++ b/libmscore/style.h @@ -73,6 +73,7 @@ enum class Sid { lyricsOddFontSize, lyricsOddFontSpatiumDependent, lyricsOddFontStyle, + lyricsOddColor, lyricsOddAlign, lyricsOddFrameType, lyricsOddFramePadding, @@ -85,6 +86,7 @@ enum class Sid { lyricsEvenFontSize, lyricsEvenFontSpatiumDependent, lyricsEvenFontStyle, + lyricsEvenColor, lyricsEvenAlign, lyricsEvenFrameType, lyricsEvenFramePadding, @@ -188,6 +190,7 @@ enum class Sid { hairpinFontSize, hairpinFontSpatiumDependent, hairpinFontStyle, + hairpinColor, hairpinTextAlign, hairpinFrameType, hairpinFramePadding, @@ -214,6 +217,7 @@ enum class Sid { pedalFontSize, pedalFontSpatiumDependent, pedalFontStyle, + pedalColor, pedalTextAlign, pedalFrameType, pedalFramePadding, @@ -245,6 +249,7 @@ enum class Sid { chordSymbolAFontSize, chordSymbolAFontSpatiumDependent, chordSymbolAFontStyle, + chordSymbolAColor, chordSymbolAAlign, chordSymbolAFrameType, chordSymbolAFramePadding, @@ -257,6 +262,7 @@ enum class Sid { chordSymbolBFontSize, chordSymbolBFontSpatiumDependent, chordSymbolBFontStyle, + chordSymbolBColor, chordSymbolBAlign, chordSymbolBFrameType, chordSymbolBFramePadding, @@ -366,6 +372,7 @@ enum class Sid { voltaFontSize, voltaFontSpatiumDependent, voltaFontStyle, + voltaColor, voltaAlign, voltaOffset, voltaFrameType, @@ -407,6 +414,7 @@ enum class Sid { ottavaFontSize, ottavaFontSpatiumDependent, ottavaFontStyle, + ottavaColor, ottavaTextAlign, ottavaFrameType, ottavaFramePadding, @@ -444,6 +452,7 @@ enum class Sid { tupletFontSize, tupletFontSpatiumDependent, tupletFontStyle, + tupletColor, tupletAlign, tupletBracketHookHeight, tupletOffset, @@ -489,6 +498,7 @@ enum class Sid { defaultFontSize, defaultFontSpatiumDependent, defaultFontStyle, + defaultColor, defaultAlign, defaultFrameType, defaultFramePadding, @@ -505,6 +515,7 @@ enum class Sid { titleFontSize, titleFontSpatiumDependent, titleFontStyle, + titleColor, titleAlign, titleOffset, titleOffsetType, @@ -519,6 +530,7 @@ enum class Sid { subTitleFontSize, subTitleFontSpatiumDependent, subTitleFontStyle, + subTitleColor, subTitleAlign, subTitleOffset, subTitleOffsetType, @@ -533,6 +545,7 @@ enum class Sid { composerFontSize, composerFontSpatiumDependent, composerFontStyle, + composerColor, composerAlign, composerOffset, composerOffsetType, @@ -547,6 +560,7 @@ enum class Sid { lyricistFontSize, lyricistFontSpatiumDependent, lyricistFontStyle, + lyricistColor, lyricistAlign, lyricistOffset, lyricistOffsetType, @@ -561,6 +575,7 @@ enum class Sid { fingeringFontSize, fingeringFontSpatiumDependent, fingeringFontStyle, + fingeringColor, fingeringAlign, fingeringFrameType, fingeringFramePadding, @@ -574,6 +589,7 @@ enum class Sid { lhGuitarFingeringFontSize, lhGuitarFingeringFontSpatiumDependent, lhGuitarFingeringFontStyle, + lhGuitarFingeringColor, lhGuitarFingeringAlign, lhGuitarFingeringFrameType, lhGuitarFingeringFramePadding, @@ -587,6 +603,7 @@ enum class Sid { rhGuitarFingeringFontSize, rhGuitarFingeringFontSpatiumDependent, rhGuitarFingeringFontStyle, + rhGuitarFingeringColor, rhGuitarFingeringAlign, rhGuitarFingeringFrameType, rhGuitarFingeringFramePadding, @@ -600,6 +617,7 @@ enum class Sid { stringNumberFontSize, stringNumberFontSpatiumDependent, stringNumberFontStyle, + stringNumberColor, stringNumberAlign, stringNumberFrameType, stringNumberFramePadding, @@ -613,6 +631,7 @@ enum class Sid { longInstrumentFontSize, longInstrumentFontSpatiumDependent, longInstrumentFontStyle, + longInstrumentColor, longInstrumentAlign, longInstrumentOffset, longInstrumentFrameType, @@ -626,6 +645,7 @@ enum class Sid { shortInstrumentFontSize, shortInstrumentFontSpatiumDependent, shortInstrumentFontStyle, + shortInstrumentColor, shortInstrumentAlign, shortInstrumentOffset, shortInstrumentFrameType, @@ -639,6 +659,7 @@ enum class Sid { partInstrumentFontSize, partInstrumentFontSpatiumDependent, partInstrumentFontStyle, + partInstrumentColor, partInstrumentAlign, partInstrumentOffset, partInstrumentFrameType, @@ -652,6 +673,7 @@ enum class Sid { dynamicsFontSize, dynamicsFontSpatiumDependent, dynamicsFontStyle, + dynamicsColor, dynamicsAlign, dynamicsFrameType, dynamicsFramePadding, @@ -664,6 +686,7 @@ enum class Sid { expressionFontSize, expressionFontSpatiumDependent, expressionFontStyle, + expressionColor, expressionAlign, expressionPlacement, expressionOffset, @@ -678,6 +701,7 @@ enum class Sid { tempoFontSize, tempoFontSpatiumDependent, tempoFontStyle, + tempoColor, tempoAlign, tempoSystemFlag, tempoPlacement, @@ -695,6 +719,7 @@ enum class Sid { metronomeFontSize, metronomeFontSpatiumDependent, metronomeFontStyle, + metronomeColor, metronomePlacement, metronomeAlign, metronomeOffset, @@ -709,6 +734,7 @@ enum class Sid { measureNumberFontSize, measureNumberFontSpatiumDependent, measureNumberFontStyle, + measureNumberColor, measureNumberOffset, measureNumberOffsetType, measureNumberAlign, @@ -723,6 +749,7 @@ enum class Sid { translatorFontSize, translatorFontSpatiumDependent, translatorFontStyle, + translatorColor, translatorAlign, translatorOffset, translatorFrameType, @@ -736,6 +763,7 @@ enum class Sid { systemTextFontSize, systemTextFontSpatiumDependent, systemTextFontStyle, + systemTextColor, systemTextAlign, systemTextOffsetType, systemTextPlacement, @@ -753,6 +781,7 @@ enum class Sid { staffTextFontSize, staffTextFontSpatiumDependent, staffTextFontStyle, + staffTextColor, staffTextAlign, staffTextOffsetType, staffTextPlacement, @@ -770,6 +799,7 @@ enum class Sid { rehearsalMarkFontSize, rehearsalMarkFontSpatiumDependent, rehearsalMarkFontStyle, + rehearsalMarkColor, rehearsalMarkAlign, rehearsalMarkFrameType, rehearsalMarkFramePadding, @@ -786,6 +816,7 @@ enum class Sid { repeatLeftFontSize, repeatLeftFontSpatiumDependent, repeatLeftFontStyle, + repeatLeftColor, repeatLeftAlign, repeatLeftPlacement, repeatLeftFrameType, @@ -799,6 +830,7 @@ enum class Sid { repeatRightFontSize, repeatRightFontSpatiumDependent, repeatRightFontStyle, + repeatRightColor, repeatRightAlign, repeatRightPlacement, repeatRightFrameType, @@ -812,6 +844,7 @@ enum class Sid { frameFontSize, frameFontSpatiumDependent, frameFontStyle, + frameColor, frameAlign, frameOffset, frameFrameType, @@ -825,12 +858,14 @@ enum class Sid { textLineFontSize, textLineFontSpatiumDependent, textLineFontStyle, + textLineColor, textLineTextAlign, glissandoFontFace, glissandoFontSize, glissandoFontSpatiumDependent, glissandoFontStyle, + glissandoColor, glissandoAlign, glissandoOffset, glissandoFrameType, @@ -846,6 +881,7 @@ enum class Sid { bendFontSize, bendFontSpatiumDependent, bendFontStyle, + bendColor, bendAlign, bendOffset, bendFrameType, @@ -861,6 +897,7 @@ enum class Sid { headerFontSize, headerFontSpatiumDependent, headerFontStyle, + headerColor, headerAlign, headerOffset, headerFrameType, @@ -874,6 +911,7 @@ enum class Sid { footerFontSize, footerFontSpatiumDependent, footerFontStyle, + footerColor, footerAlign, footerOffset, footerFrameType, @@ -887,6 +925,7 @@ enum class Sid { instrumentChangeFontSize, instrumentChangeFontSpatiumDependent, instrumentChangeFontStyle, + instrumentChangeColor, instrumentChangeAlign, instrumentChangeOffset, instrumentChangePlacement, @@ -904,12 +943,14 @@ enum class Sid { figuredBassFontSize, figuredBassFontSpatiumDependent, figuredBassFontStyle, + figuredBassColor, user1Name, user1FontFace, user1FontSize, user1FontSpatiumDependent, user1FontStyle, + user1Color, user1Align, user1Offset, user1OffsetType, @@ -925,6 +966,7 @@ enum class Sid { user2FontSize, user2FontSpatiumDependent, user2FontStyle, + user2Color, user2Align, user2Offset, user2OffsetType, @@ -940,6 +982,7 @@ enum class Sid { user3FontSize, user3FontSpatiumDependent, user3FontStyle, + user3Color, user3Align, user3Offset, user3OffsetType, @@ -955,6 +998,7 @@ enum class Sid { user4FontSize, user4FontSpatiumDependent, user4FontStyle, + user4Color, user4Align, user4Offset, user4OffsetType, @@ -970,6 +1014,7 @@ enum class Sid { user5FontSize, user5FontSpatiumDependent, user5FontStyle, + user5Color, user5Align, user5Offset, user5OffsetType, @@ -985,6 +1030,7 @@ enum class Sid { user6FontSize, user6FontSpatiumDependent, user6FontStyle, + user6Color, user6Align, user6Offset, user6OffsetType, @@ -999,6 +1045,7 @@ enum class Sid { letRingFontSize, letRingFontSpatiumDependent, letRingFontStyle, + letRingColor, letRingTextAlign, letRingHookHeight, letRingPlacement, @@ -1019,6 +1066,7 @@ enum class Sid { palmMuteFontSize, palmMuteFontSpatiumDependent, palmMuteFontStyle, + palmMuteColor, palmMuteTextAlign, palmMuteHookHeight, palmMutePlacement, @@ -1152,7 +1200,7 @@ struct StyledProperty { typedef std::vector ElementStyle; -#define TEXT_STYLE_SIZE 12 +#define TEXT_STYLE_SIZE 13 typedef std::array TextStyle; diff --git a/mscore/editstyle.cpp b/mscore/editstyle.cpp index 6bae5de06b1f..67ef059864b9 100644 --- a/mscore/editstyle.cpp +++ b/mscore/editstyle.cpp @@ -674,6 +674,12 @@ EditStyle::EditStyle(Score* s, QWidget* parent) [=](){ textStyleValueChanged(Pid::FRAME_BG_COLOR, textStyleFrameBackground->color()); } ); + resetTextStyleColor->setIcon(*icons[int(Icons::reset_ICON)]); + connect(resetTextStyleColor, &QToolButton::clicked, [=](){ resetTextStyle(Pid::COLOR); }); + connect(textStyleColor, &Awl::ColorLabel::colorChanged, + [=](){ textStyleValueChanged(Pid::COLOR, textStyleColor->color()); } + ); + connect(textStyles, SIGNAL(currentRowChanged(int)), SLOT(textStyleChanged(int))); textStyles->setCurrentRow(0); MuseScore::restoreGeometry(this); @@ -1353,6 +1359,10 @@ void EditStyle::textStyleChanged(int row) resetTextStyleFrameBackground->setEnabled(cs->styleV(a.sid) != MScore::defaultStyle().value(a.sid)); break; + case Pid::COLOR: + textStyleColor->setColor(cs->styleV(a.sid).value()); + resetTextStyleColor->setEnabled(cs->styleV(a.sid) != MScore::defaultStyle().value(a.sid)); + break; default: break; diff --git a/mscore/editstyle.ui b/mscore/editstyle.ui index df419a9a8e71..d92bc04d0661 100644 --- a/mscore/editstyle.ui +++ b/mscore/editstyle.ui @@ -10653,14 +10653,14 @@ - + Size changes with staff space setting - + @@ -10720,7 +10720,7 @@ - + Reset to default @@ -10754,14 +10754,14 @@ - + Align: - + Font style: @@ -10785,14 +10785,45 @@ - + + + + Color: + + + + + + + QFrame::Box + + + + + + + Reset to default + + + Reset 'Color' value + + + + + + + :/data/icons/edit-reset.svg:/data/icons/edit-reset.svg + + + + Offset: - + Reset to default @@ -10809,7 +10840,7 @@ - + Reset to default @@ -10826,7 +10857,7 @@ - + Reset to default @@ -10843,13 +10874,13 @@ - + - + - + Qt::Vertical @@ -10862,7 +10893,7 @@ - +