simplify basic palette further

musescore · Nov 19, 2014 · 0f5bd23 · 0f5bd23
1 parent 9969021
commit 0f5bd23
Show file tree

Hide file tree

Showing 3 changed files with 139 additions and 126 deletions.
diff --git a/mscore/masterpalette.cpp b/mscore/masterpalette.cpp
@@ -43,8 +43,8 @@ namespace Ms {
 
 extern void populateIconPalette(Palette* p, const IconAction* a);
 extern Palette* newKeySigPalette();
-extern Palette* newBarLinePalette();
-extern Palette* newLinesPalette();
+extern Palette* newBarLinePalette(bool);
+extern Palette* newLinesPalette(bool);
 extern Palette* newAccidentalsPalette();
 
 //---------------------------------------------------------
@@ -117,23 +117,23 @@ MasterPalette::MasterPalette(QWidget* parent)
       setupUi(this);
       setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
-      addPalette(MuseScore::newGraceNotePalette());
+      addPalette(MuseScore::newGraceNotePalette(false));
       addPalette(MuseScore::newClefsPalette(false));
       stack->addWidget(new KeyEditor);
 
       timeDialog = new TimeDialog;
       stack->addWidget(timeDialog);
 
-      addPalette(MuseScore::newBarLinePalette());
-      addPalette(MuseScore::newLinesPalette());
+      addPalette(MuseScore::newBarLinePalette(false));
+      addPalette(MuseScore::newLinesPalette(false));
       addPalette(MuseScore::newArpeggioPalette());
       addPalette(MuseScore::newBreathPalette());
       addPalette(MuseScore::newBracketsPalette());
       addPalette(MuseScore::newArticulationsPalette(false));
 
       addPalette(MuseScore::newAccidentalsPalette(false));
 
-      addPalette(MuseScore::newDynamicsPalette(true));
+      addPalette(MuseScore::newDynamicsPalette(false, true));
       addPalette(MuseScore::newFingeringPalette());
       addPalette(MuseScore::newNoteHeadsPalette());
       addPalette(MuseScore::newTremoloPalette());
@@ -142,7 +142,7 @@ MasterPalette::MasterPalette(QWidget* parent)
       addPalette(MuseScore::newTextPalette());
       addPalette(MuseScore::newBreaksPalette());
       addPalette(MuseScore::newBagpipeEmbellishmentPalette());
-      addPalette(MuseScore::newBeamPalette());
+      addPalette(MuseScore::newBeamPalette(false));
       addPalette(MuseScore::newFramePalette());
 
       stack->addWidget(new SymbolDialog);