Merge pull request #25252 from CMakeScore/text-shortcuts-improvements

Fix #19121: Create dynamics with shortcut or through "Add -> Text" menu
musescore · Nov 6, 2024 · 92c997f · 92c997f
2 parents 3f9e519 + 83f4b53
commit 92c997f
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 1 deletion.
diff --git a/src/app/configs/data/shortcuts.xml b/src/app/configs/data/shortcuts.xml
@@ -738,6 +738,10 @@
     <key>staff-text</key>
     <seq>Ctrl+T</seq>
     </SC>
+  <SC>
+    <key>dynamics</key>
+    <seq>Ctrl+D</seq>
+    </SC>
   <SC>
     <key>expression-text</key>
     <seq>Ctrl+E</seq>

diff --git a/src/app/configs/data/shortcuts_azerty.xml b/src/app/configs/data/shortcuts_azerty.xml
@@ -764,6 +764,10 @@
     <key>staff-text</key>
     <seq>Ctrl+T</seq>
     </SC>
+  <SC>
+    <key>dynamics</key>
+    <seq>Ctrl+D</seq>
+    </SC>
   <SC>
     <key>expression-text</key>
     <seq>Ctrl+E</seq>

diff --git a/src/app/configs/data/shortcuts_mac.xml b/src/app/configs/data/shortcuts_mac.xml
@@ -738,6 +738,10 @@
     <key>staff-text</key>
     <seq>Ctrl+T</seq>
     </SC>
+  <SC>
+    <key>dynamics</key>
+    <seq>Ctrl+D</seq>
+    </SC>
   <SC>
     <key>expression-text</key>
     <seq>Ctrl+E</seq>

diff --git a/src/appshell/view/appmenumodel.cpp b/src/appshell/view/appmenumodel.cpp
@@ -609,6 +609,7 @@ MenuItemList AppMenuModel::makeTextItems()
         makeSeparator(),
         makeMenuItem("system-text"),
         makeMenuItem("staff-text"),
+        makeMenuItem("dynamics"),
         makeMenuItem("expression-text"),
         makeMenuItem("rehearsalmark-text"),
         makeMenuItem("instrument-change-text"),

diff --git a/src/engraving/dom/edit.cpp b/src/engraving/dom/edit.cpp
@@ -943,6 +943,15 @@ TextBase* Score::addText(TextStyleType type, EngravingItem* destinationElement)
         undoAddElement(textBox);
         break;
     }
+    case TextStyleType::DYNAMICS: {
+        ChordRest* chordRest = chordOrRest(destinationElement);
+        if (!chordRest) {
+            break;
+        }
+        textBox = Factory::createDynamic(dummy()->segment());
+        chordRest->undoAddAnnotation(textBox);
+        break;
+    }
     case TextStyleType::HARP_PEDAL_DIAGRAM:
     case TextStyleType::HARP_PEDAL_TEXT_DIAGRAM: {
         ChordRest* chordRest = getSelectedChordRest();

diff --git a/src/notation/internal/notationactioncontroller.cpp b/src/notation/internal/notationactioncontroller.cpp
@@ -327,6 +327,7 @@ void NotationActionController::init()
 
     registerAction("system-text", [this]() { addText(TextStyleType::SYSTEM); });
     registerAction("staff-text", [this]() { addText(TextStyleType::STAFF); });
+    registerAction("dynamics", [this]() { addText(TextStyleType::DYNAMICS); });
     registerAction("expression-text", [this]() { addText(TextStyleType::EXPRESSION); });
     registerAction("rehearsalmark-text", [this]() { addText(TextStyleType::REHEARSAL_MARK); });
     registerAction("instrument-change-text", [this]() { addText(TextStyleType::INSTRUMENT_CHANGE); });

diff --git a/src/notation/internal/notationinteraction.cpp b/src/notation/internal/notationinteraction.cpp
@@ -4609,6 +4609,7 @@ Ret NotationInteraction::canAddTextToItem(TextStyleType type, const EngravingIte
     static const std::set<TextStyleType> needSelectNoteOrRestTypes {
         TextStyleType::SYSTEM,
         TextStyleType::STAFF,
+        TextStyleType::DYNAMICS,
         TextStyleType::EXPRESSION,
         TextStyleType::REHEARSAL_MARK,
         TextStyleType::INSTRUMENT_CHANGE,
@@ -4671,6 +4672,10 @@ void NotationInteraction::addText(TextStyleType type, EngravingItem* item)
         }
     }
 
+    if (text->hasVoiceAssignmentProperties()) {
+        text->setInitialTrackAndVoiceAssignment(item->track(), false);
+    }
+
     apply();
     showItem(text);
 

diff --git a/src/notation/internal/notationuiactions.cpp b/src/notation/internal/notationuiactions.cpp
@@ -1276,6 +1276,12 @@ const UiActionList NotationUiActions::m_actions = {
              TranslatableString("action", "St&aff text"),
              TranslatableString("action", "Add text: staff text")
              ),
+    UiAction("dynamics",
+             mu::context::UiCtxProjectOpened,
+             mu::context::CTX_ANY,
+             TranslatableString("action", "&Dynamic"),
+             TranslatableString("action", "Add text: dynamic")
+             ),
     UiAction("expression-text",
              mu::context::UiCtxProjectOpened,
              mu::context::CTX_ANY,
@@ -1309,7 +1315,7 @@ const UiActionList NotationUiActions::m_actions = {
     UiAction("chord-text",
              mu::context::UiCtxProjectOpened,
              mu::context::CTX_ANY,
-             TranslatableString("action", "Chor&d symbol"),
+             TranslatableString("action", "C&hord symbol"),
              TranslatableString("action", "Add text: chord symbol")
              ),
     UiAction("roman-numeral-text",

diff --git a/src/notation/view/noteinputbarmodel.cpp b/src/notation/view/noteinputbarmodel.cpp
@@ -740,6 +740,7 @@ MenuItemList NoteInputBarModel::makeTextItems()
         makeMenuItem("system-text"),
         makeMenuItem("staff-text"),
         makeMenuItem("expression-text"),
+        makeMenuItem("dynamics"),
         makeMenuItem("rehearsalmark-text"),
         makeMenuItem("instrument-change-text"),
         makeMenuItem("fingering-text"),