Skip to content

Commit

Permalink
Merge pull request #22623 from miiizen/pedal-palette-port
Browse files Browse the repository at this point in the history 
[4.3 port] Reset pedals in the palette
  • Loading branch information
@Eism
Eism committed Apr 30, 2024
1 parent 9c993ba commit 8ccce03
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 0 deletions.
19 changes: 19 additions & 0 deletions src/palette/internal/palettecompat.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "engraving/dom/expression.h"
#include "engraving/dom/factory.h"
#include "engraving/dom/ornament.h"
#include "engraving/dom/pedal.h"
#include "engraving/dom/score.h"
#include "engraving/dom/stafftext.h"
#include "engraving/dom/stringtunings.h"
Expand Down Expand Up @@ -80,6 +81,24 @@ void PaletteCompat::migrateOldPaletteItemIfNeeded(ElementPtr& element, Score* pa
newExpression->setXmlText(oldExpression->xmlText());
}
element.reset(newExpression);
return;
}

if (item->isPedal()) {
Pedal* newPedal = Factory::createPedal(paletteScore->dummy());
Pedal* oldPedal = toPedal(item);

newPedal->setLen(oldPedal->frontSegment()->pos2().x());
newPedal->setLineVisible(oldPedal->lineVisible());
newPedal->setBeginHookType(oldPedal->beginHookType());
newPedal->setEndHookType(oldPedal->endHookType());

newPedal->setBeginText(newPedal->propertyDefault(Pid::BEGIN_TEXT).value<String>());
newPedal->setContinueText(newPedal->propertyDefault(Pid::CONTINUE_TEXT).value<String>());
newPedal->setEndText(newPedal->propertyDefault(Pid::END_TEXT).value<String>());

element.reset(newPedal);
return;
}
}

Expand Down
36 changes: 36 additions & 0 deletions src/palette/internal/palettecreator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1248,36 +1248,54 @@ PalettePtr PaletteCreator::newLinesPalette(bool defaultPalette)
auto pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setEndHookType(HookType::HOOK_90);
pedal->setBeginText(pedal->propertyDefault(Pid::BEGIN_TEXT).value<String>());
pedal->setContinueText(pedal->propertyDefault(Pid::CONTINUE_TEXT).value<String>());
pedal->setEndText(pedal->propertyDefault(Pid::END_TEXT).value<String>());
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (with ped and line)"));

pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setLineVisible(false);
pedal->setBeginText(pedal->propertyDefault(Pid::BEGIN_TEXT).value<String>());
pedal->setContinueText(pedal->propertyDefault(Pid::CONTINUE_TEXT).value<String>());
pedal->setEndText(pedal->propertyDefault(Pid::END_TEXT).value<String>());
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (with ped and asterisk)"));

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

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

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

pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginHookType(HookType::HOOK_45);
pedal->setEndHookType(HookType::HOOK_90);
pedal->setBeginText(pedal->propertyDefault(Pid::BEGIN_TEXT).value<String>());
pedal->setContinueText(pedal->propertyDefault(Pid::CONTINUE_TEXT).value<String>());
pedal->setEndText(pedal->propertyDefault(Pid::END_TEXT).value<String>());
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (angled start hook)"));
}

Expand Down Expand Up @@ -1939,35 +1957,53 @@ PalettePtr PaletteCreator::newKeyboardPalette()
auto pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setLineVisible(false);
pedal->setBeginText(pedal->propertyDefault(Pid::BEGIN_TEXT).value<String>());
pedal->setContinueText(pedal->propertyDefault(Pid::CONTINUE_TEXT).value<String>());
pedal->setEndText(pedal->propertyDefault(Pid::END_TEXT).value<String>());
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (with ped and asterisk)"));

pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setEndHookType(HookType::HOOK_90);
pedal->setBeginText(pedal->propertyDefault(Pid::BEGIN_TEXT).value<String>());
pedal->setContinueText(pedal->propertyDefault(Pid::CONTINUE_TEXT).value<String>());
pedal->setEndText(pedal->propertyDefault(Pid::END_TEXT).value<String>());
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (with ped and line)"));

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

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

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

pedal = makeElement<Pedal>(gpaletteScore);
pedal->setLen(w);
pedal->setBeginHookType(HookType::HOOK_45);
pedal->setEndHookType(HookType::HOOK_90);
pedal->setBeginText(pedal->propertyDefault(Pid::BEGIN_TEXT).value<String>());
pedal->setContinueText(pedal->propertyDefault(Pid::CONTINUE_TEXT).value<String>());
pedal->setEndText(pedal->propertyDefault(Pid::END_TEXT).value<String>());
sp->appendElement(pedal, QT_TRANSLATE_NOOP("palette", "Pedal (angled start hook)"));

return sp;
Expand Down

0 comments on commit 8ccce03

Please sign in to comment.