Merge pull request #5455 from MarcSabatella/293301-read-location

fix #293301: add get-location command to read current location
musescore · Dec 6, 2019 · eb66794 · eb66794
2 parents ebf2b55 + ea02b2e
commit eb66794
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 0 deletions.
diff --git a/mscore/data/shortcuts-Mac.xml b/mscore/data/shortcuts-Mac.xml
@@ -284,6 +284,10 @@
     <key>palette-search</key>
     <seq>Ctrl+F9</seq>
     </SC>
+  <SC>
+    <key>get-location</key>
+    <seq>Shift+L</seq>
+    </SC>
   <SC>
     <key>move-up</key>
     <seq>Ctrl+Shift+Up</seq>

diff --git a/mscore/data/shortcuts.xml b/mscore/data/shortcuts.xml
@@ -284,6 +284,10 @@
     <key>palette-search</key>
     <seq>Ctrl+F9</seq>
     </SC>
+  <SC>
+    <key>get-location</key>
+    <seq>Shift+L</seq>
+    </SC>
   <SC>
     <key>move-up</key>
     <seq>Ctrl+Shift+Up</seq>

diff --git a/mscore/data/shortcuts_AZERTY.xml b/mscore/data/shortcuts_AZERTY.xml
@@ -294,6 +294,10 @@
     <key>palette-search</key>
     <seq>Ctrl+F9</seq>
     </SC>
+  <SC>
+    <key>get-location</key>
+    <seq>Shift+L</seq>
+    </SC>
   <SC>
     <key>move-up</key>
     <seq>Ctrl+Shift+Up</seq>

diff --git a/mscore/scoreaccessibility.cpp b/mscore/scoreaccessibility.cpp
@@ -110,6 +110,8 @@ void ScoreAccessibility::clearAccessibilityInfo()
       MuseScoreView* view = static_cast<MuseScore*>(mainWindow)->currentScoreView();
       if (view)
             view->score()->setAccessibleInfo(tr("No selection"));
+      _oldBar = -1;
+      _oldStaff = -1;
       }
 
 void ScoreAccessibility::currentInfoChanged()

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -23,6 +23,7 @@
 #include "musescore.h"
 #include "navigator.h"
 #include "preferences.h"
+#include "scoreaccessibility.h"
 #include "scoretab.h"
 #include "seq.h"
 #include "splitstaff.h"
@@ -2138,6 +2139,25 @@ void ScoreView::cmd(const char* s)
       else if (cmd == "last-element") {
             cmdGotoElement(score()->lastElement(false));
             }
+      else if (cmd == "get-location") {
+            // get current selection
+            Element* e = score()->selection().element();
+            if (!e) {
+                  // no current selection - restore lost selection
+                  e = score()->selection().currentCR();
+                  if (e && e->isChord())
+                        e = toChord(e)->upNote();
+                  }
+            if (!e) {
+                  // no current or last selection - fall back to first element
+                  e = score()->firstElement(false);
+                  }
+            // TODO: find & read current key & time signatures
+            if (e) {
+                  ScoreAccessibility::instance()->clearAccessibilityInfo();
+                  cmdGotoElement(e);
+                  }
+            }
       else if (cmd == "rest" || cmd == "rest-TAB")
             cmdEnterRest();
       else if (cmd == "rest-1")

diff --git a/mscore/shortcut.cpp b/mscore/shortcut.cpp
@@ -917,6 +917,17 @@ Shortcut Shortcut::_sc[] = {
          Qt::WindowShortcut,
          ShortcutFlags::A_CMD
          },
+      {
+         MsWidget::SCORE_TAB,
+         STATE_NORMAL | STATE_TEXT_EDIT | STATE_HARMONY_FIGBASS_EDIT,
+         "get-location",
+         QT_TRANSLATE_NOOP("action","Get Location"),
+         QT_TRANSLATE_NOOP("action","Accessibility: Get location"),
+         0,
+         Icons::Invalid_ICON,
+         Qt::WindowShortcut,
+         ShortcutFlags::A_CMD
+         },
       {
          MsWidget::MAIN_WINDOW,
          STATE_NORMAL | STATE_NOTE_ENTRY,