Skip to content

Commit

Permalink
Introduced styles for pedal line texts
Browse files Browse the repository at this point in the history
  • Loading branch information
@bakajikara
bakajikara committed Mar 19, 2023
1 parent fa2364e commit c699b82
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 17 deletions.
15 changes: 8 additions & 7 deletions src/engraving/libmscore/pedal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ using namespace mu;

namespace mu::engraving {
static const ElementStyle pedalStyle {
{ Sid::pedalText, Pid::BEGIN_TEXT },
{ Sid::pedalContinueText, Pid::CONTINUE_TEXT },
{ Sid::pedalEndText, Pid::END_TEXT },
{ Sid::pedalFontFace, Pid::BEGIN_FONT_FACE },
{ Sid::pedalFontFace, Pid::CONTINUE_FONT_FACE },
{ Sid::pedalFontFace, Pid::END_FONT_FACE },
Expand Down Expand Up @@ -105,9 +108,6 @@ Pedal::Pedal(EngravingItem* parent)
{
initElementStyle(&pedalStyle);
setLineVisible(true);
resetProperty(Pid::BEGIN_TEXT);
resetProperty(Pid::CONTINUE_TEXT);
resetProperty(Pid::END_TEXT);

resetProperty(Pid::LINE_WIDTH);
resetProperty(Pid::LINE_STYLE);
Expand Down Expand Up @@ -150,9 +150,6 @@ void Pedal::write(XmlWriter& xml) const

for (auto i : {
Pid::END_HOOK_TYPE,
Pid::BEGIN_TEXT,
Pid::CONTINUE_TEXT,
Pid::END_TEXT,
Pid::LINE_VISIBLE,
Pid::BEGIN_HOOK_TYPE
}) {
Expand Down Expand Up @@ -197,9 +194,13 @@ engraving::PropertyValue Pedal::propertyDefault(Pid propertyId) const
return score()->styleV(Sid::pedalLineStyle);

case Pid::BEGIN_TEXT:
return score()->styleV(Sid::pedalText);

case Pid::CONTINUE_TEXT:
return score()->styleV(Sid::pedalContinueText);

case Pid::END_TEXT:
return "";
return score()->styleV(Sid::pedalEndText);

case Pid::BEGIN_TEXT_PLACE:
case Pid::CONTINUE_TEXT_PLACE:
Expand Down
3 changes: 3 additions & 0 deletions src/engraving/style/styledef.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,9 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
{ Sid::pedalFrameRound, "pedalFrameRound", 0 },
{ Sid::pedalFrameFgColor, "pedalFrameFgColor", Color::BLACK },
{ Sid::pedalFrameBgColor, "pedalFrameBgColor", Color::transparent },
{ Sid::pedalText, "pedalText", String(u"<sym>keyboardPedalPed</sym>") },
{ Sid::pedalContinueText, "pedalContinueText", String(u"(<sym>keyboardPedalPed</sym>)") },
{ Sid::pedalEndText, "pedalEndText", String(u"<sym>keyboardPedalUp</sym>") },

{ Sid::trillPlacement, "trillPlacement", PlacementV::ABOVE },
{ Sid::trillPosAbove, "trillPosAbove", PointF(.0, -0.5) },
Expand Down
3 changes: 3 additions & 0 deletions src/engraving/style/styledef.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,9 @@ enum class Sid {
pedalFrameRound,
pedalFrameFgColor,
pedalFrameBgColor,
pedalText,
pedalContinueText,
pedalEndText,

trillPlacement,
trillPosAbove,
Expand Down
36 changes: 26 additions & 10 deletions src/palette/internal/palettecreator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1233,40 +1233,48 @@ PalettePtr PaletteCreator::newLinesPalette(bool defaultPalette)

auto pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginText(Pedal::PEDAL_SYMBOL);
pedal->setContinueText(QString("(%1)").arg(Pedal::PEDAL_SYMBOL));
pedal->setEndText(String());
pedal->setEndHookType(HookType::HOOK_90);
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (with ped and line)"));

pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginText(Pedal::PEDAL_SYMBOL);
pedal->setContinueText(QString("(%1)").arg(Pedal::PEDAL_SYMBOL));
pedal->setEndText(Pedal::STAR_SYMBOL);
pedal->setLineVisible(false);
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (with ped and asterisk)"));

pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginText(String());
pedal->setContinueText(String());
pedal->setEndText(String());
pedal->setBeginHookType(HookType::HOOK_90);
pedal->setEndHookType(HookType::HOOK_90);
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (straight hooks)"));

if (!defaultPalette) {
pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginText(String());
pedal->setContinueText(String());
pedal->setEndText(String());
pedal->setBeginHookType(HookType::HOOK_90);
pedal->setEndHookType(HookType::HOOK_45);
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (angled end hook)"));

pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginText(String());
pedal->setContinueText(String());
pedal->setEndText(String());
pedal->setBeginHookType(HookType::HOOK_45);
pedal->setEndHookType(HookType::HOOK_45);
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (both hooks angled)"));

pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginText(String());
pedal->setContinueText(String());
pedal->setEndText(String());
pedal->setBeginHookType(HookType::HOOK_45);
pedal->setEndHookType(HookType::HOOK_90);
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (angled start hook)"));
Expand Down Expand Up @@ -1903,39 +1911,47 @@ PalettePtr PaletteCreator::newKeyboardPalette()

auto pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginText(Pedal::PEDAL_SYMBOL);
pedal->setContinueText(QString("(%1)").arg(Pedal::PEDAL_SYMBOL));
pedal->setEndText(Pedal::STAR_SYMBOL);
pedal->setLineVisible(false);
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (with ped and asterisk)"));

pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginText(Pedal::PEDAL_SYMBOL);
pedal->setContinueText(QString("(%1)").arg(Pedal::PEDAL_SYMBOL));
pedal->setEndText(String());
pedal->setEndHookType(HookType::HOOK_90);
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (with ped and line)"));

pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginText(String());
pedal->setContinueText(String());
pedal->setEndText(String());
pedal->setBeginHookType(HookType::HOOK_90);
pedal->setEndHookType(HookType::HOOK_90);
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (straight hooks)"));

pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginText(String());
pedal->setContinueText(String());
pedal->setEndText(String());
pedal->setBeginHookType(HookType::HOOK_90);
pedal->setEndHookType(HookType::HOOK_45);
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (angled end hook)"));

pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginText(String());
pedal->setContinueText(String());
pedal->setEndText(String());
pedal->setBeginHookType(HookType::HOOK_45);
pedal->setEndHookType(HookType::HOOK_45);
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (both hooks angled)"));

pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginText(String());
pedal->setContinueText(String());
pedal->setEndText(String());
pedal->setBeginHookType(HookType::HOOK_45);
pedal->setEndHookType(HookType::HOOK_90);
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (angled start hook)"));
Expand Down

0 comments on commit c699b82

Please sign in to comment.