Partial ties refinements

src/engraving/dom/tie.cpp

@@ -217,12 +217,6 @@ Tie::Tie(const ElementType& type, EngravingItem* parent)
 
 void Tie::updatePossibleJumpPoints()
 {
-    MasterScore* master = masterScore();
-    const Note* note = toNote(parentItem());
-    const Chord* chord = note->chord();
-    const Measure* measure = chord->measure();
-    const MeasureBase* masterMeasureBase = master->measure(measure->index());
-    const Measure* masterMeasure = masterMeasureBase && masterMeasureBase->isMeasure() ? toMeasure(masterMeasureBase) : nullptr;
     if (!tieJumpPoints()) {
         return;
     }
@@ -233,6 +227,13 @@ void Tie::updatePossibleJumpPoints()
         return;
     }
 
+    MasterScore* master = masterScore();
+    const Note* note = toNote(parentItem());
+    const Chord* chord = note->chord();
+    const Measure* measure = chord->measure();
+    const MeasureBase* masterMeasureBase = master->measure(measure->index());
+    const Measure* masterMeasure = masterMeasureBase && masterMeasureBase->isMeasure() ? toMeasure(masterMeasureBase) : nullptr;
+
     int jumpPointIdx = 0;
 
     Note* nextNote = searchTieNote(note);
@@ -293,7 +294,7 @@ void Tie::addTiesToJumpPoints()
             jumpPoint->undoSetActive(true);
             continue;
         }
-        jumpPoints->addTieToScore(jumpPoint);
+        jumpPoints->undoAddTieToScore(jumpPoint);
     }
 }
 
@@ -499,10 +500,10 @@ const String TieJumpPoint::menuTitle() const
 {
     const Measure* measure = m_note->findMeasure();
     const int measureNo = measure ? measure->no() + 1 : 0;
-    const TranslatableString tieTo("engraving", "Tie to ");
-    const String title = tieTo.str + precedingJumpItemName() + u" " + muse::mtrc("engraving", "(m. %1)").arg(measureNo);
+    const String measureStr = String::fromStdString(std::to_string(measureNo));
 
-    return title;
+    //: %1 represents the preceding jump item eg. coda. %2 represents the measure number
+    return muse::mtrc("engraving", "Tie to %1 (m. %2)").arg(precedingJumpItemName(), measureStr);
 }
 
 String TieJumpPoint::precedingJumpItemName() const
@@ -512,7 +513,8 @@ String TieJumpPoint::precedingJumpItemName() const
     const Measure* measure = seg->measure();
 
     if (seg->score()->firstSegment(SegmentType::ChordRest) == seg) {
-        return muse::mtrc("engraving", "start of score");
+        //: Used at %1 in the string "Tie to %1 (m. %2)"
+        return muse::mtrc("engraving", "start of score", "partial tie menu");
     }
 
     // Markers
@@ -527,9 +529,11 @@ String TieJumpPoint::precedingJumpItemName() const
         }
 
         if (marker->markerType() == MarkerType::CODA || marker->markerType() == MarkerType::VARCODA) {
-            return muse::mtrc("engraving", "coda");
+            //: Used at %1 in the string "Tie to %1 (m. %2)"
+            return muse::mtrc("engraving", "coda", "partial tie menu");
         } else {
-            return muse::mtrc("engraving", "segno");
+            //: Used at %1 in the string "Tie to %1 (m. %2)"
+            return muse::mtrc("engraving", "segno", "partial tie menu");
         }
     }
 
@@ -542,12 +546,14 @@ String TieJumpPoint::precedingJumpItemName() const
 
         Volta* volta = toVolta(spanner.value);
 
-        return muse::mtrc("engraving", "“%1” volta").arg(volta->beginText());
+        //: Used at %1 in the string "Tie to %1 (m. %2)". %1 in this string represents the volta's text set by the user
+        return muse::mtrc("engraving", "“%1” volta", "partial tie menu").arg(volta->beginText());
     }
 
     // Repeat barlines
     if (measure->repeatStart()) {
-        return muse::mtrc("engraving", "start repeat");
+        //: Used at %1 in the string "Tie to %1 (m. %2)"
+        return muse::mtrc("engraving", "start repeat", "partial tie menu");
     }
 
     for (Segment* prevSeg = seg->prev(SegmentType::BarLineType); prevSeg && prevSeg->tick() == seg->tick();
@@ -559,15 +565,18 @@ String TieJumpPoint::precedingJumpItemName() const
 
         BarLine* bl = toBarLine(el);
         if (bl->barLineType() & (BarLineType::START_REPEAT | BarLineType::END_START_REPEAT)) {
-            return muse::mtrc("engraving", "start repeat");
+            //: Used at %1 in the string "Tie to %1 (m. %2)"
+            return muse::mtrc("engraving", "start repeat", "partial tie menu");
         }
     }
 
     if (m_note->tieBack() && m_note->tieBack()->startNote()) {
-        return muse::mtrc("engraving", "next note");
+        //: Used at %1 in the string "Tie to %1 (m. %2)"
+        return muse::mtrc("engraving", "next note", "partial tie menu");
     }
 
-    return muse::mtrc("engraving", "invalid");
+    //: Used at %1 in the string "Tie to %1 (m. %2)"
+    return muse::mtrc("engraving", "invalid", "partial tie menu");
 }
 
 //---------------------------------------------------------
@@ -630,12 +639,12 @@ void TieJumpPointList::toggleJumpPoint(const String& id)
     if (checked) {
         undoRemoveTieFromScore(end);
     } else {
-        addTieToScore(end);
+        undoAddTieToScore(end);
     }
     score->endCmd();
 }
 
-void TieJumpPointList::addTieToScore(TieJumpPoint* jumpPoint)
+void TieJumpPointList::undoAddTieToScore(TieJumpPoint* jumpPoint)
 {
     Note* note = jumpPoint->note();
     Score* score = note ? note->score() : nullptr;
@@ -714,8 +723,8 @@ Tie* Tie::changeTieType(Tie* oldTie, Note* endNote)
         return nullptr;
     }
 
-    TranslatableString undoCmd = addPartialTie ? TranslatableString("engraving", "Replace full tie with partial tie") : TranslatableString(
-        "engraving", "Replace partial tie with full tie");
+    TranslatableString undoCmd = addPartialTie ? TranslatableString("engraving", "Replace full tie with partial tie")
+                                 : TranslatableString("engraving", "Replace partial tie with full tie");
     Tie* newTie = addPartialTie ? Factory::createPartialTie(score->dummy()->note()) : Factory::createTie(score->dummy()->note());
 
     score->undoRemoveElement(oldTie);

src/engraving/dom/tie.h

@@ -70,7 +70,7 @@ class TieJumpPointList
     TieJumpPoint* findJumpPoint(const String& id);
     void toggleJumpPoint(const String& id);
 
-    void addTieToScore(TieJumpPoint* jumpPoint);
+    void undoAddTieToScore(TieJumpPoint* jumpPoint);
     void undoRemoveTieFromScore(TieJumpPoint* jumpPoint);
 
     std::vector<TieJumpPoint*>::iterator begin() { return m_jumpPoints.begin(); }

src/notation/qml/MuseScore/NotationScene/internal/CapoPopup.qml

@@ -33,7 +33,7 @@ StyledPopupView {
     property alias navigationOrderStart: capoSettingsNavPanel.order
     readonly property alias navigationOrderEnd: capoSettingsNavPanel.order
 
-    property QtObject model: capoModel
+    readonly property alias model: capoModel
 
 
     contentWidth: content.width

src/notation/qml/MuseScore/NotationScene/internal/HarpPedalPopup.qml

@@ -30,7 +30,7 @@ import MuseScore.NotationScene 1.0
 StyledPopupView {
     id: root
 
-    property QtObject model: harpModel
+    readonly property alias model: harpModel
 
     property variant pedalState: harpModel.pedalState
 

src/notation/qml/MuseScore/NotationScene/internal/PartialTiePopup.qml

@@ -36,7 +36,7 @@ StyledPopupView {
     property alias navigationOrderStart: partialTieNavPanel.order
     readonly property alias navigationOrderEnd: partialTieNavPanel.order
 
-    property QtObject model: partialTiePopupModel
+    readonly property alias model: partialTiePopupModel
 
     showArrow: false
 

src/notation/qml/MuseScore/NotationScene/internal/StringTuningsPopup.qml

@@ -33,7 +33,7 @@ StyledPopupView {
     property alias navigationOrderStart: navPanel.order
     readonly property alias navigationOrderEnd: navPanel.order
 
-    property QtObject model: stringTuningsModel
+    readonly property alias model: stringTuningsModel
 
 
     contentWidth: content.width

src/playback/qml/MuseScore/Playback/SoundFlagPopup.qml

@@ -36,7 +36,7 @@ StyledPopupView {
     property alias navigationOrderStart: navPanel.order
     readonly property alias navigationOrderEnd: museSoundsParams.navigationPanelOrderEnd
 
-    property QtObject model: soundFlagModel
+    readonly property alias model: soundFlagModel
 
     contentWidth: content.width
     contentHeight: content.childrenRect.height