Shortcuts and QActions for new Note Entry Modes

musescore · Jul 5, 2016 · a6bba9d · a6bba9d
1 parent 4c2a771
commit a6bba9d
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 17 deletions.
diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -2391,7 +2391,7 @@ void Score::cmd(const QAction* a)
             changeAccidental(AccidentalType::FLAT);
       else if (cmd == "flat2")
             changeAccidental(AccidentalType::FLAT2);
-      else if (cmd == "repitch")
+      else if (cmd == "note-input-repitch")
             _is.setRepitchMode(a->isChecked());
       else if (cmd == "flip")
             cmdFlip();

diff --git a/mscore/data/shortcuts.xml b/mscore/data/shortcuts.xml
@@ -64,6 +64,10 @@
     <key>note-input</key>
     <seq>N</seq>
     </SC>
+  <SC>
+    <key>note-input-repitch</key>
+    <seq>Ctrl+Shift+I</seq>
+    </SC>
   <SC>
     <key>interval1</key>
     <seq>Alt+1</seq>
@@ -683,10 +687,6 @@
     <seq>Ctrl+U</seq>
     <seq>Meta+Ctrl+F</seq>
     </SC>
-  <SC>
-    <key>repitch</key>
-    <seq>Ctrl+Shift+I</seq>
-    </SC>
   <SC>
     <key>toggle-piano</key>
     <seq>P</seq>

diff --git a/mscore/keyb.cpp b/mscore/keyb.cpp
@@ -378,7 +378,7 @@ void MuseScore::updateInputState(Score* score)
       getAction("no-beam")->setChecked(is.beamMode()    == Beam::Mode::NONE);
       getAction("beam32")->setChecked(is.beamMode()     == Beam::Mode::BEGIN32);
       getAction("auto-beam")->setChecked(is.beamMode()  == Beam::Mode::AUTO);
-      getAction("repitch")->setChecked(is.repitchMode());
+      getAction("note-input-repitch")->setChecked(is.repitchMode());
 
       if(is.noteEntryMode() && !is.rest())
             updateShadowNote();

diff --git a/mscore/shortcut.cpp b/mscore/shortcut.cpp
@@ -243,6 +243,61 @@ Shortcut Shortcut::_sc[] = {
          Qt::WindowShortcut,
          ShortcutFlags::A_CHECKABLE
          },
+      {
+         MsWidget::MAIN_WINDOW,
+         STATE_NORMAL | STATE_NOTE_ENTRY,
+         "note-input-steptime",
+         QT_TRANSLATE_NOOP("action","Step-time (default)"),
+         QT_TRANSLATE_NOOP("action","Enter notes with a mouse or keyboard"),
+         0,
+         Icons::noteEntry_ICON, // Icons::noteEntrySteptime_ICON (using normal icon for the time being.)
+         Qt::WindowShortcut,
+         ShortcutFlags::A_CHECKABLE
+         },
+      {
+         MsWidget::MAIN_WINDOW,
+         STATE_NORMAL | STATE_NOTE_ENTRY,
+         "note-input-repitch",
+         QT_TRANSLATE_NOOP("action","Re-Pitch"),
+         QT_TRANSLATE_NOOP("action","Replace pitches without changing rhythms"),
+         0,
+         Icons::noteEntryRepitch_ICON,
+         Qt::ApplicationShortcut,
+         ShortcutFlags::A_CMD | ShortcutFlags::A_CHECKABLE
+         },
+      {
+         MsWidget::MAIN_WINDOW,
+         STATE_NORMAL | STATE_NOTE_ENTRY,
+         "note-input-rhythm",
+         QT_TRANSLATE_NOOP("action","Rhythm"),
+         QT_TRANSLATE_NOOP("action","Enter durations with a single click or keypress"),
+         0,
+         Icons::noteEntryRhythm_ICON,
+         Qt::WindowShortcut,
+         ShortcutFlags::A_CHECKABLE
+         },
+      {
+         MsWidget::MAIN_WINDOW,
+         STATE_NORMAL | STATE_NOTE_ENTRY,
+         "note-input-realtime-auto",
+         QT_TRANSLATE_NOOP("action","Real-time (automatic)"),
+         QT_TRANSLATE_NOOP("action","Perform the piece at a fixed tempo indicated by a metronome beat"),
+         0,
+         Icons::noteEntryRealtimeAuto_ICON,
+         Qt::WindowShortcut,
+         ShortcutFlags::A_CHECKABLE
+         },
+      {
+         MsWidget::MAIN_WINDOW,
+         STATE_NORMAL | STATE_NOTE_ENTRY,
+         "note-input-realtime-manual",
+         QT_TRANSLATE_NOOP("action","Real-time (manual)"),
+         QT_TRANSLATE_NOOP("action","Perform the piece while tapping a key or pedal to set the tempo"),
+         0,
+         Icons::noteEntryRealtimeManual_ICON,
+         Qt::WindowShortcut,
+         ShortcutFlags::A_CHECKABLE
+         },
       {
          MsWidget::MAIN_WINDOW,
          STATE_NORMAL | STATE_NOTE_ENTRY,
@@ -2529,17 +2584,6 @@ Shortcut Shortcut::_sc[] = {
          QT_TRANSLATE_NOOP("action","Configure Grid"),
          QT_TRANSLATE_NOOP("action","Configure grid")
          },
-      {
-         MsWidget::MAIN_WINDOW,
-         STATE_NOTE_ENTRY,
-         "repitch",
-         QT_TRANSLATE_NOOP("action","Re-Pitch Mode"),
-         QT_TRANSLATE_NOOP("action","Replace pitches without changing rhythms"),
-         0,
-         Icons::repitch_ICON,
-         Qt::ApplicationShortcut,
-         ShortcutFlags::A_CMD | ShortcutFlags::A_CHECKABLE
-         },
       {
          MsWidget::MAIN_WINDOW,
          STATE_NORMAL | STATE_NOTE_ENTRY | STATE_PLAY | STATE_FOTO | STATE_EDIT,