Merge pull request #1196 from MarcSabatella/text-shortcuts

disable certain shortcuts in text edit mode
musescore · Aug 22, 2014 · b4dbb5a · b4dbb5a
2 parents dd9373b + 27f7e54
commit b4dbb5a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/mscore/actions.cpp b/mscore/actions.cpp
@@ -2387,7 +2387,7 @@ Shortcut Shortcut::sc[] = {
          ),
       Shortcut(
          MsWidget::MAIN_WINDOW,
-         STATE_ALL,
+         STATE_NORMAL | STATE_NOTE_ENTRY | STATE_PLAY,
          0,
          "resource-manager",
          Qt::ApplicationShortcut,
@@ -2477,31 +2477,31 @@ Shortcut Shortcut::sc[] = {
          ),
       Shortcut(
          MsWidget::MAIN_WINDOW,
-         STATE_NORMAL | STATE_NOTE_ENTRY | STATE_TEXT_EDIT,
+         STATE_NORMAL | STATE_NOTE_ENTRY,
          0,
          "masterpalette",
          QT_TRANSLATE_NOOP("action","Master Palette..."),
          QT_TRANSLATE_NOOP("action","Show master palette")
          ),
       Shortcut(
          MsWidget::MAIN_WINDOW,
-         STATE_NORMAL | STATE_NOTE_ENTRY | STATE_TEXT_EDIT,
+         STATE_NORMAL | STATE_NOTE_ENTRY,
          0,
          "key-signatures",
          QT_TRANSLATE_NOOP("action","Key Signatures..."),
          QT_TRANSLATE_NOOP("action","Show key signature palette")
          ),
       Shortcut(
          MsWidget::MAIN_WINDOW,
-         STATE_NORMAL | STATE_NOTE_ENTRY | STATE_TEXT_EDIT,
+         STATE_NORMAL | STATE_NOTE_ENTRY,
          0,
          "time-signatures",
          QT_TRANSLATE_NOOP("action","Time Signatures..."),
          QT_TRANSLATE_NOOP("action","Show time signature palette")
          ),
       Shortcut(
          MsWidget::MAIN_WINDOW,
-         STATE_NORMAL | STATE_NOTE_ENTRY | STATE_TEXT_EDIT,
+         STATE_NORMAL | STATE_NOTE_ENTRY,
          0,
          "symbols",
          QT_TRANSLATE_NOOP("action","Symbols..."),