Fix Instrument change text should show full instrument name

Author: CubikingChill

src/engraving/dom/instrchange.cpp

@@ -152,7 +152,7 @@ void InstrumentChange::setupInstrument(const Instrument* instrument)
     }
 
     //: The text of an "instrument change" marking. It is an instruction to the player to switch to another instrument.
-    const String newInstrChangeText = muse::mtrc("engraving", "To %1").arg(instrument->trackName());
+    const String newInstrChangeText = muse::mtrc("engraving", "To %1").arg(instrument->trackNameWithTrait());
     undoChangeProperty(Pid::TEXT, TextBase::plainToXmlText(newInstrChangeText));
 }
 

src/engraving/dom/instrument.cpp

@@ -1066,6 +1066,15 @@ String Instrument::trackName() const
     return m_trackName;
 }
 
+String Instrument::trackNameWithTrait() const
+{
+    if (m_trait.type == TraitType::Transposition && !m_trait.isHiddenOnScore) {
+        return muse::qtrc("notation", "%1 in %2", "Transposing instrument displayed in the score")
+               .arg(m_trackName, m_trait.name);
+    }
+    return m_trackName;
+}
+
 void Instrument::setTrackName(const String& s)
 {
     m_trackName = s;

src/engraving/dom/instrument.h

@@ -348,6 +348,7 @@ class Instrument
     String musicXmlId() const;
 
     String trackName() const;
+    String trackNameWithTrait() const;
     void setTrackName(const String& s);
     String nameAsXmlText() const;
     String nameAsPlainText() const;

src/notation/internal/notationparts.cpp

@@ -48,19 +48,6 @@ using namespace mu::engraving;
 
 static const mu::engraving::Fraction DEFAULT_TICK = mu::engraving::Fraction(0, 1);
 
-static String formatInstrumentTitleOnScore(const String& instrumentName, const Trait& trait)
-{
-    // Comments for translators start with //:
-
-    if (trait.type == TraitType::Transposition && !trait.isHiddenOnScore) {
-        //: %1=name ("Horn"), %2=transposition ("C alto"). Example: "Horn in C alto"
-        return muse::qtrc("notation", "%1 in %2", "Transposing instrument displayed in the score")
-               .arg(instrumentName, trait.name);
-    }
-
-    return instrumentName; // Example: "Flute"
-}
-
 NotationParts::NotationParts(IGetScore* getScore, INotationInteractionPtr interaction, INotationUndoStackPtr undoStack)
     : m_getScore(getScore), m_undoStack(undoStack), m_interaction(interaction)
 {