Merge pull request #2938 from IsaacWeiss/153091-regroup-rhythms-menu

Fix #153091: Move [Format > Reset Note and Rest Groupings] to [Tools > Regroup Rhythms]
musescore · Dec 31, 2016 · 98e51d9 · 98e51d9
2 parents 4a3e110 + 791b576
commit 98e51d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -1104,7 +1104,6 @@ MuseScore::MuseScore()
       menuFormat->addSeparator();
 
       menuFormat->addAction(getAction("reset-beammode"));
-      menuFormat->addAction(getAction("reset-groupings"));
       menuFormat->addAction(getAction("reset"));
       menuFormat->addSeparator();
 
@@ -1138,6 +1137,7 @@ MuseScore::MuseScore()
       menuTools->addSeparator();
 
       menuTools->addAction(getAction("pitch-spell"));
+      menuTools->addAction(getAction("reset-groupings"));
       menuTools->addAction(getAction("resequence-rehearsal-marks"));
       menuTools->addSeparator();
 

diff --git a/mscore/shortcut.cpp b/mscore/shortcut.cpp
@@ -675,8 +675,8 @@ Shortcut Shortcut::_sc[] = {
          MsWidget::SCORE_TAB,
          STATE_NORMAL | STATE_NOTE_ENTRY,
          "reset-groupings",
-         QT_TRANSLATE_NOOP("action","Reset Note and Rest Groupings"),
-         QT_TRANSLATE_NOOP("action","Reset note and rest groupings"),
+         QT_TRANSLATE_NOOP("action","Regroup Rhythms"),
+         QT_TRANSLATE_NOOP("action","Regroup rhythms"),
          QT_TRANSLATE_NOOP("action","Combine rests and tied notes from selection and resplit at rhythmical locations"),
          Icons::Invalid_ICON,
          Qt::WindowShortcut