merge doit/fall with glissando palette

musescore · Apr 27, 2013 · b3e891a · b3e891a
1 parent 4ae9e05
commit b3e891a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 38 deletions.
diff --git a/mscore/masterpalette.cpp b/mscore/masterpalette.cpp
@@ -133,7 +133,6 @@ MasterPalette::MasterPalette(QWidget* parent)
       addPalette(MuseScore::newFingeringPalette());
       addPalette(MuseScore::newNoteHeadsPalette());
       addPalette(MuseScore::newTremoloPalette());
-      addPalette(MuseScore::newFallDoitPalette());
       addPalette(MuseScore::newRepeatsPalette());
       addPalette(MuseScore::newTextPalette());
       addPalette(MuseScore::newBreaksPalette());

diff --git a/mscore/menus.cpp b/mscore/menus.cpp
@@ -416,41 +416,6 @@ Palette* MuseScore::newFingeringPalette()
       return sp;
       }
 
-//--------------------------------------------------------
-//   newFallDoitPalett
-//--------------------------------------------------------
-
-Palette* MuseScore::newFallDoitPalette()
-      {
-      Palette* sp = new Palette;
-      sp->setName(QT_TRANSLATE_NOOP("Palette", "Fall/Doit"));
-      sp->setGrid(27, 40);
-      sp->setDrawGrid(true);
-      const char* scorelineNames[] = {
-            QT_TR_NOOP("fall"),
-            QT_TR_NOOP("doit"),
-            QT_TR_NOOP("plop"),
-            QT_TR_NOOP("scoop"),
-            };
-
-      ChordLine* cl = new ChordLine(gscore);
-      cl->setChordLineType(CHORDLINE_FALL);
-      sp->append(cl, tr(scorelineNames[0]));
-
-      cl = new ChordLine(gscore);
-      cl->setChordLineType(CHORDLINE_DOIT);
-      sp->append(cl, tr(scorelineNames[1]));
-
-      cl = new ChordLine(gscore);
-      cl->setChordLineType(CHORDLINE_PLOP);
-      sp->append(cl, tr(scorelineNames[2]));
-
-      cl = new ChordLine(gscore);
-      cl->setChordLineType(CHORDLINE_SCOOP);
-      sp->append(cl, tr(scorelineNames[3]));
-      return sp;
-      }
-
 //---------------------------------------------------------
 //   newTremoloPalette
 //---------------------------------------------------------
@@ -600,6 +565,31 @@ Palette* MuseScore::newArpeggioPalette()
             a->setGlissandoType(GlissandoType(i));
             sp->append(a, tr("Glissando"));
             }
+
+      //fall and doits
+      const char* scorelineNames[] = {
+            QT_TR_NOOP("fall"),
+            QT_TR_NOOP("doit"),
+            QT_TR_NOOP("plop"),
+            QT_TR_NOOP("scoop"),
+            };
+
+      ChordLine* cl = new ChordLine(gscore);
+      cl->setChordLineType(CHORDLINE_FALL);
+      sp->append(cl, tr(scorelineNames[0]));
+
+      cl = new ChordLine(gscore);
+      cl->setChordLineType(CHORDLINE_DOIT);
+      sp->append(cl, tr(scorelineNames[1]));
+
+      cl = new ChordLine(gscore);
+      cl->setChordLineType(CHORDLINE_PLOP);
+      sp->append(cl, tr(scorelineNames[2]));
+
+      cl = new ChordLine(gscore);
+      cl->setChordLineType(CHORDLINE_SCOOP);
+      sp->append(cl, tr(scorelineNames[3]));
+
       return sp;
       }
 
@@ -946,7 +936,6 @@ void MuseScore::populatePalette()
       paletteBox->addPalette(newFingeringPalette());
       paletteBox->addPalette(newNoteHeadsPalette());
       paletteBox->addPalette(newTremoloPalette());
-      paletteBox->addPalette(newFallDoitPalette());
       paletteBox->addPalette(newRepeatsPalette());
       paletteBox->addPalette(newTextPalette());
       paletteBox->addPalette(newBreaksPalette());

diff --git a/mscore/musescore.h b/mscore/musescore.h
@@ -620,7 +620,6 @@ class MuseScore : public QMainWindow, public MuseScoreCore {
       static Palette* newDynamicsPalette();
       static Palette* newFramePalette();
       static Palette* newFingeringPalette();
-      static Palette* newFallDoitPalette();
       static Palette* newTremoloPalette();
       static Palette* newNoteHeadsPalette();
       static Palette* newArticulationsPalette();

diff --git a/share/workspaces/advanced.workspace b/share/workspaces/advanced.workspace