fix toggling of master palette

musescore · Oct 30, 2014 · c1853eb · c1853eb
1 parent 8b8be3e
commit c1853eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/mscore/actions.cpp b/mscore/actions.cpp
@@ -1129,7 +1129,7 @@ Shortcut Shortcut::sc[] = {
          QT_TRANSLATE_NOOP("action","Other..."),
          QT_TRANSLATE_NOOP("action","Other tuplets")
          ),
-      Shortcut(    
+      Shortcut(
          MsWidget::SCORE_TAB,
          STATE_NORMAL | STATE_NOTE_ENTRY_PITCHED | STATE_NOTE_ENTRY_DRUM | STATE_NOTE_ENTRY_TAB,
          ShortcutFlags::A_CMD,
@@ -2481,6 +2481,7 @@ Shortcut Shortcut::sc[] = {
          STATE_NORMAL | STATE_NOTE_ENTRY,
          0,
          "masterpalette",
+         Qt::ApplicationShortcut,
          QT_TRANSLATE_NOOP("action","Master Palette..."),
          QT_TRANSLATE_NOOP("action","Show master palette")
          ),

diff --git a/mscore/globals.h b/mscore/globals.h
@@ -38,6 +38,7 @@ extern double converterDpi;
 // used to assign actions (shortcuts) to the apropriate
 // widget (actions.cpp, shortcuts.cpp)
 //---------------------------------------------------------
+
 enum MsWidget {
       MAIN_WINDOW = 0,
       SCORE_TAB   = 1 << 0

diff --git a/mscore/masterpalette.cpp b/mscore/masterpalette.cpp
@@ -62,7 +62,6 @@ void MuseScore::showMasterPalette(const QString& s)
       masterPalette->setVisible(a->isChecked());
       if (!s.isEmpty())
             masterPalette->selectItem(s);
-      masterPalette->show();
       }
 
 //---------------------------------------------------------