From 4cb5a2b9feebffecd42789d529b3ca790e8206ac Mon Sep 17 00:00:00 2001
From: Florian Jung <flo@windfisch.org>
Date: Wed, 18 Jan 2012 17:40:50 +0000
Subject: moved redundant toolbar generation into TopWin::TopWin

---
 muse2/muse/app.cpp                   |  6 +--
 muse2/muse/arranger/arrangerview.cpp | 13 ------
 muse2/muse/cliplist/cliplist.cpp     | 15 +-----
 muse2/muse/cobject.cpp               | 33 +++++++++++++
 muse2/muse/liste/listedit.cpp        | 12 -----
 muse2/muse/marker/markerview.cpp     | 12 -----
 muse2/muse/master/lmaster.cpp        | 12 -----
 muse2/muse/master/masteredit.cpp     | 13 ------
 muse2/muse/midiedit/drumedit.cpp     | 11 -----
 muse2/muse/midiedit/pianoroll.cpp    | 12 -----
 muse2/muse/midiedit/scoreedit.cpp    | 17 -------
 muse2/muse/waveedit/waveedit.cpp     | 10 ----
 muse2/share/templates/MusE.cfg       | 89 +++++++++++++++++++++++-------------
 13 files changed, 94 insertions(+), 161 deletions(-)

(limited to 'muse2')

diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index 26f2d158..04d84ffb 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -716,9 +716,9 @@ MusE::MusE(int /*argc*/, char** /*argv*/) : QMainWindow()
       panicToolbar->addAction(MusEGlobal::panicAction);
 
       requiredToolbars.push_back(tools);
-      requiredToolbars.push_back(songpos_tb);
-      requiredToolbars.push_back(sig_tb);
-      requiredToolbars.push_back(tempo_tb);
+      optionalToolbars.push_back(songpos_tb);
+      optionalToolbars.push_back(sig_tb);
+      optionalToolbars.push_back(tempo_tb);
       optionalToolbars.push_back(undoToolbar);
       optionalToolbars.push_back(transportToolbar);
       optionalToolbars.push_back(panicToolbar);
diff --git a/muse2/muse/arranger/arrangerview.cpp b/muse2/muse/arranger/arrangerview.cpp
index 2eab50a5..36658903 100644
--- a/muse2/muse/arranger/arrangerview.cpp
+++ b/muse2/muse/arranger/arrangerview.cpp
@@ -97,19 +97,6 @@ ArrangerView::ArrangerView(QWidget* parent)
   editSignalMapper->setMapping(sc, CMD_DELETE);
 
   // Toolbars ---------------------------------------------------------
-  QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools"));
-  undo_tools->setObjectName("Undo/Redo tools");
-  undo_tools->addActions(MusEGlobal::undoRedo->actions());
-
-
-  QToolBar* panic_toolbar = addToolBar(tr("panic"));
-  panic_toolbar->setObjectName("panic");
-  panic_toolbar->addAction(MusEGlobal::panicAction);
-
-  QToolBar* transport_toolbar = addToolBar(tr("transport"));
-  transport_toolbar->setObjectName("transport");
-  transport_toolbar->addActions(MusEGlobal::transportAction->actions());
-
   editTools = new EditToolBar(this, arrangerTools);
   addToolBar(editTools);
   editTools->setObjectName("arrangerTools");
diff --git a/muse2/muse/cliplist/cliplist.cpp b/muse2/muse/cliplist/cliplist.cpp
index 60041dae..02a30dec 100644
--- a/muse2/muse/cliplist/cliplist.cpp
+++ b/muse2/muse/cliplist/cliplist.cpp
@@ -134,20 +134,7 @@ ClipListEdit::ClipListEdit(QWidget* parent)
 
       //editor->view->setColumnAlignment(COL_REFS, Qt::AlignRight);
       
-      // Toolbars ---------------------------------------------------------
-      QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools"));
-      undo_tools->setObjectName("Undo/Redo tools");
-      undo_tools->addActions(MusEGlobal::undoRedo->actions());
-
-
-      QToolBar* panic_toolbar = addToolBar(tr("panic"));         
-      panic_toolbar->setObjectName("panic");
-      panic_toolbar->addAction(MusEGlobal::panicAction);
-
-      QToolBar* transport_toolbar = addToolBar(tr("transport"));
-      transport_toolbar->setObjectName("transport");
-      transport_toolbar->addActions(MusEGlobal::transportAction->actions());
-
+            
       QMenu* settingsMenu = menuBar()->addMenu(tr("Window &Config"));
       settingsMenu->addAction(subwinAction);      
       settingsMenu->addAction(shareAction);      
diff --git a/muse2/muse/cobject.cpp b/muse2/muse/cobject.cpp
index ded80e1c..f13cd257 100644
--- a/muse2/muse/cobject.cpp
+++ b/muse2/muse/cobject.cpp
@@ -27,6 +27,8 @@
 #include "globals.h"
 #include "app.h"
 #include "shortcuts.h"
+#include "songpos_toolbar.h"
+#include "sig_tempo_toolbar.h"
 
 #include <QMdiSubWindow>
 #include <QToolBar>
@@ -94,6 +96,37 @@ TopWin::TopWin(ToplevelType t, QWidget* parent, const char* name, Qt::WindowFlag
 		mdisubwin->resize(_widthInit[_type], _heightInit[_type]);
 	else
 		resize(_widthInit[_type], _heightInit[_type]);
+	
+	 
+	QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools"));
+	undo_tools->setObjectName("Undo/Redo tools");
+	undo_tools->addActions(MusEGlobal::undoRedo->actions());
+
+	QToolBar* panic_toolbar = addToolBar(tr("Panic"));         
+	panic_toolbar->setObjectName("panic");
+	panic_toolbar->addAction(MusEGlobal::panicAction);
+
+	QToolBar* transport_toolbar = addToolBar(tr("Transport"));
+	transport_toolbar->setObjectName("transport");
+	transport_toolbar->addActions(MusEGlobal::transportAction->actions());
+
+	QToolBar* songpos_tb;
+	songpos_tb = addToolBar(tr("Song Position"));
+	songpos_tb->setObjectName("Song Position");
+	songpos_tb->addWidget(new MusEGui::SongPosToolbarWidget(songpos_tb));
+	songpos_tb->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+	songpos_tb->setContextMenuPolicy(Qt::PreventContextMenu);
+
+	QToolBar* tempo_tb;
+	tempo_tb = addToolBar(tr("Tempo"));
+	tempo_tb->setObjectName("Tempo");
+	tempo_tb->addWidget(new MusEGui::TempoToolbarWidget(tempo_tb));
+
+	QToolBar* sig_tb;
+	sig_tb = addToolBar(tr("Signature"));
+	sig_tb->setObjectName("Signature");
+	sig_tb->addWidget(new MusEGui::SigToolbarWidget(tempo_tb));
+
 }
 
 
diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp
index 6795cedb..5e72a0c7 100644
--- a/muse2/muse/liste/listedit.cpp
+++ b/muse2/muse/liste/listedit.cpp
@@ -528,21 +528,9 @@ ListEdit::ListEdit(MusECore::PartList* pl)
 
 
       // Toolbars ---------------------------------------------------------
-      QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools"));
-      undo_tools->setObjectName("Undo/Redo tools");
-      undo_tools->addActions(MusEGlobal::undoRedo->actions());
-
       QToolBar* insertTools = addToolBar(tr("Insert tools"));
       insertTools->setObjectName("list insert tools");
       insertTools->addActions(insertItems->actions());
-
-      QToolBar* panic_toolbar = addToolBar(tr("panic"));         
-      panic_toolbar->setObjectName("panic");
-      panic_toolbar->addAction(MusEGlobal::panicAction);
-
-      QToolBar* transport_toolbar = addToolBar(tr("transport"));
-      transport_toolbar->setObjectName("transport");
-      transport_toolbar->addActions(MusEGlobal::transportAction->actions());
       
       //
       //---------------------------------------------------
diff --git a/muse2/muse/marker/markerview.cpp b/muse2/muse/marker/markerview.cpp
index 39ce4fc0..a957e3bf 100644
--- a/muse2/muse/marker/markerview.cpp
+++ b/muse2/muse/marker/markerview.cpp
@@ -198,23 +198,11 @@ MarkerView::MarkerView(QWidget* parent)
       
       
       // Toolbars ---------------------------------------------------------
-      QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools"));
-      undo_tools->setObjectName("Undo/Redo tools");
-      undo_tools->addActions(MusEGlobal::undoRedo->actions());
-
       QToolBar* edit = addToolBar(tr("edit tools"));
       edit->setObjectName("marker edit tools");
       edit->addAction(markerAdd);
       edit->addAction(markerDelete);
 
-      QToolBar* panic_toolbar = addToolBar(tr("panic"));
-      panic_toolbar->setObjectName("panic");
-      panic_toolbar->addAction(MusEGlobal::panicAction);
-
-      QToolBar* transport_toolbar = addToolBar(tr("transport"));
-      transport_toolbar->setObjectName("transport");
-      transport_toolbar->addActions(MusEGlobal::transportAction->actions());
-
       //---------------------------------------------------
       //    master
       //---------------------------------------------------
diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp
index f461e1d3..91ffdf7e 100644
--- a/muse2/muse/master/lmaster.cpp
+++ b/muse2/muse/master/lmaster.cpp
@@ -203,10 +203,6 @@ LMaster::LMaster()
       connect(signalMapper, SIGNAL(mapped(int)), SLOT(cmd(int)));
 
       // Toolbars ---------------------------------------------------------
-      QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools"));
-      undo_tools->setObjectName("Undo/Redo tools");
-      undo_tools->addActions(MusEGlobal::undoRedo->actions());
-
       QToolBar* edit = addToolBar(tr("Edit tools"));
       edit->setObjectName("Master List Edit Tools");
       QToolButton* tempoButton = new QToolButton();
@@ -222,14 +218,6 @@ LMaster::LMaster()
       edit->addWidget(timeSigButton);
       edit->addWidget(keyButton);
       
-      QToolBar* panic_toolbar = addToolBar(tr("panic"));         
-      panic_toolbar->setObjectName("panic");
-      panic_toolbar->addAction(MusEGlobal::panicAction);
-
-      QToolBar* transport_toolbar = addToolBar(tr("transport"));
-      transport_toolbar->setObjectName("transport");
-      transport_toolbar->addActions(MusEGlobal::transportAction->actions());
-
       ///Q3Accel* qa = new Q3Accel(this);
       ///qa->connectItem(qa->insertItem(Qt::CTRL+Qt::Key_Z), song, SLOT(undo()));
       ///qa->connectItem(qa->insertItem(Qt::CTRL+Qt::Key_Y), song, SLOT(redo()));
diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index f6169766..571d3c83 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -117,19 +117,6 @@ MasterEdit::MasterEdit()
       settingsMenu->addAction(fullscreenAction);
 
       // Toolbars ---------------------------------------------------------
-      QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools"));
-      undo_tools->setObjectName("Undo/Redo tools");
-      undo_tools->addActions(MusEGlobal::undoRedo->actions());
-
-
-      QToolBar* panic_toolbar = addToolBar(tr("panic"));         
-      panic_toolbar->setObjectName("panic");
-      panic_toolbar->addAction(MusEGlobal::panicAction);
-
-      QToolBar* transport_toolbar = addToolBar(tr("transport"));
-      transport_toolbar->setObjectName("transport");
-      transport_toolbar->addActions(MusEGlobal::transportAction->actions());
-
       MusEGui::EditToolBar* tools2 = new MusEGui::EditToolBar(this, MusEGui::PointerTool | MusEGui::PencilTool | MusEGui::RubberTool);
       addToolBar(tools2);
 
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index 1f159d1a..b4518fa9 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -404,9 +404,6 @@ DrumEdit::DrumEdit(MusECore::PartList* pl, QWidget* parent, const char* name, un
       tools = addToolBar(tr("Drum tools"));
       tools->setObjectName("Drum tools");
 
-      tools->addActions(MusEGlobal::undoRedo->actions());
-      tools->addSeparator();
-
       srec  = new QToolButton();
       srec->setToolTip(tr("Step Record"));
       srec->setIcon(*steprecIcon);
@@ -442,14 +439,6 @@ DrumEdit::DrumEdit(MusECore::PartList* pl, QWidget* parent, const char* name, un
       connect(stepLenWidget, SIGNAL(currentIndexChanged(QString)), SLOT(setStep(QString)));
       cursorToolbar->addWidget(stepLenWidget);
 
-      QToolBar* panicToolbar = addToolBar(tr("panic"));
-      panicToolbar->setObjectName("panic");
-      panicToolbar->addAction(MusEGlobal::panicAction);
-      
-      QToolBar* transport = addToolBar(tr("transport"));
-      transport->setObjectName("transport");
-      transport->addActions(MusEGlobal::transportAction->actions());
-      
       addToolBarBreak();
       // don't show pitch value in toolbar
       toolbar = new MusEGui::Toolbar1(this, _rasterInit, false);
diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp
index 8c2a7a87..33245c4c 100644
--- a/muse2/muse/midiedit/pianoroll.cpp
+++ b/muse2/muse/midiedit/pianoroll.cpp
@@ -264,8 +264,6 @@ PianoRoll::PianoRoll(MusECore::PartList* pl, QWidget* parent, const char* name,
       //---------ToolBar----------------------------------
       tools = addToolBar(tr("Pianoroll tools"));
       tools->setObjectName("Pianoroll tools");
-      tools->addActions(MusEGlobal::undoRedo->actions());
-      tools->addSeparator();
 
       srec  = new QToolButton();
       srec->setToolTip(tr("Step Record"));
@@ -288,16 +286,6 @@ PianoRoll::PianoRoll(MusECore::PartList* pl, QWidget* parent, const char* name,
       tools2 = new MusEGui::EditToolBar(this, pianorollTools);
       addToolBar(tools2);
 
-      QToolBar* panicToolbar = addToolBar(tr("panic"));         
-      panicToolbar->setObjectName("panic");
-      panicToolbar->addAction(MusEGlobal::panicAction);
-
-      //-------------------------------------------------------------
-      //    Transport Bar
-      QToolBar* transport = addToolBar(tr("transport"));
-      transport->setObjectName("transport");
-      transport->addActions(MusEGlobal::transportAction->actions());
-
       addToolBarBreak();
       toolbar = new MusEGui::Toolbar1(this, _rasterInit);
       addToolBar(toolbar);
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index 46ce8e60..ebc8796c 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -237,11 +237,6 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 
 
 	// Toolbars ---------------------------------------------------------
-	QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools"));
-	undo_tools->setObjectName("Undo/Redo tools");
-	undo_tools->addActions(MusEGlobal::undoRedo->actions());
-	addToolBar(undo_tools);
-
 	QToolBar* steprec_tools=addToolBar(tr("Step recording tools"));
 	steprec_tools->setObjectName("Step recording tools");
 	srec  = new QToolButton();
@@ -258,14 +253,6 @@ ScoreEdit::ScoreEdit(QWidget* parent, const char* name, unsigned initPos)
 	score_canvas->set_tool(MusEGui::PointerTool);
 	connect(edit_tools, SIGNAL(toolChanged(int)), score_canvas,   SLOT(set_tool(int)));
 
-	QToolBar* panic_toolbar = addToolBar(tr("panic"));         
-	panic_toolbar->setObjectName("panic");
-	panic_toolbar->addAction(MusEGlobal::panicAction);
-
-	QToolBar* transport_toolbar = addToolBar(tr("transport"));
-	transport_toolbar->setObjectName("transport");
-	transport_toolbar->addActions(MusEGlobal::transportAction->actions());
-
 	addToolBarBreak();
 
 	QToolBar* note_settings_toolbar = addToolBar(tr("Note settings"));
@@ -4668,8 +4655,6 @@ void ScoreCanvas::add_new_parts(const std::map< MusECore::Part*, std::set<MusECo
  *   o test drum controllers
  *   o test old- and new drumtrack recording, steprecording
  *
- * > o add a songposition scrollbar-toolbar (in different sizes)
- *     this might be equivalent to "redo transport menu" (below).
  * > o add toolbar(s) for tempo- etc spinboxes from the transport window 
  *   o add controller editor "like search-and-replace":
  *     acts on all specified type's events, and edits the value:
@@ -4711,8 +4696,6 @@ void ScoreCanvas::add_new_parts(const std::map< MusECore::Part*, std::set<MusECo
  *     "range" setting, or they've been modified), default to "in range" or "selected in range"
  * 
  *   o rename stuff with F2 key
- *   o redo transport menu: offer "one beat" and "one bar" steps
- *                          maybe also offer scrollbar
  *
  *   o shrink a part from its beginning as well! watch out for clones!
  *
diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp
index 1c1115b1..06b5ab1d 100644
--- a/muse2/muse/waveedit/waveedit.cpp
+++ b/muse2/muse/waveedit/waveedit.cpp
@@ -175,19 +175,9 @@ WaveEdit::WaveEdit(MusECore::PartList* pl)
       settingsMenu->addAction(shareAction);
       settingsMenu->addAction(fullscreenAction);
 
-      //---------ToolBar----------------------------------
-      tools = addToolBar(tr("Wave edit tools"));
-      tools->setObjectName("Wave edit tools");
-
-      tools->addActions(MusEGlobal::undoRedo->actions());
 
       connect(MusEGlobal::muse, SIGNAL(configChanged()), SLOT(configChanged()));
 
-      //--------------------------------------------------
-      //    Transport Bar
-      QToolBar* transport = addToolBar(tr("transport"));
-      transport->setObjectName("transport");
-      transport->addActions(MusEGlobal::transportAction->actions());
 
       //--------------------------------------------------
       //    ToolBar:   Solo  Cursor1 Cursor2
diff --git a/muse2/share/templates/MusE.cfg b/muse2/share/templates/MusE.cfg
index ef4689a6..3c13b834 100644
--- a/muse2/share/templates/MusE.cfg
+++ b/muse2/share/templates/MusE.cfg
@@ -24,7 +24,8 @@
     <importMidiSplitParts>1</importMidiSplitParts>
     <startMode>1</startMode>
     <startSong></startSong>
-    <projectBaseFolder>./</projectBaseFolder>
+    <newDrumRecordCondition>3</newDrumRecordCondition>
+    <projectBaseFolder>/home/flo/MusE</projectBaseFolder>
     <projectStoreInFolder>1</projectStoreInFolder>
     <useProjectSaveDialog>1</useProjectSaveDialog>
     <midiInputDevice>0</midiInputDevice>
@@ -41,6 +42,18 @@
     <useOldStyleStopShortCut>0</useOldStyleStopShortCut>
     <moveArmedCheckBox>0</moveArmedCheckBox>
     <popupsDefaultStayOpen>0</popupsDefaultStayOpen>
+    <leftMouseButtonCanDecrease>0</leftMouseButtonCanDecrease>
+    <rangeMarkerWithoutMMB>0</rangeMarkerWithoutMMB>
+    <unhideTracks>1</unhideTracks>
+    <addHiddenTracks>1</addHiddenTracks>
+    <drumTrackPreference>1</drumTrackPreference>
+    <waveTracksVisible>1</waveTracksVisible>
+    <auxTracksVisible>0</auxTracksVisible>
+    <groupTracksVisible>0</groupTracksVisible>
+    <midiTracksVisible>1</midiTracksVisible>
+    <inputTracksVisible>0</inputTracksVisible>
+    <outputTracksVisible>0</outputTracksVisible>
+    <synthTracksVisible>0</synthTracksVisible>
     <font0>arial,10,-1,5,50,0,0,0,0,0</font0>
     <font1>arial,7,-1,5,50,0,0,0,0,0</font1>
     <font2>arial,10,-1,5,50,0,0,0,0,0</font2>
@@ -99,11 +112,14 @@
     <partColorName14>Keyboard</partColorName14>
     <partColorName15>Piano</partColorName15>
     <partColorName16>Saxophone</partColorName16>
+    <partCanvasBg r="98" g="124" b="168"></partCanvasBg>
     <trackBg r="84" g="97" b="114"></trackBg>
     <selectTrackBg r="109" g="174" b="178"></selectTrackBg>
     <selectTrackFg r="0" g="0" b="0"></selectTrackFg>
+    <mixerBg r="0" g="0" b="0"></mixerBg>
     <midiTrackLabelBg r="74" g="150" b="194"></midiTrackLabelBg>
     <drumTrackLabelBg r="74" g="150" b="194"></drumTrackLabelBg>
+    <newDrumTrackLabelBg r="74" g="150" b="194"></newDrumTrackLabelBg>
     <waveTrackLabelBg r="213" g="128" b="202"></waveTrackLabelBg>
     <outputTrackLabelBg r="84" g="185" b="58"></outputTrackLabelBg>
     <inputTrackLabelBg r="199" g="75" b="64"></inputTrackLabelBg>
@@ -111,24 +127,21 @@
     <auxTrackLabelBg r="161" g="234" b="242"></auxTrackLabelBg>
     <synthTrackLabelBg r="229" g="157" b="101"></synthTrackLabelBg>
     <midiTrackBg r="215" g="220" b="230"></midiTrackBg>
+    <ctrlGraphFg r="255" g="170" b="0"></ctrlGraphFg>
     <drumTrackBg r="215" g="220" b="230"></drumTrackBg>
+    <newDrumTrackBg r="215" g="220" b="230"></newDrumTrackBg>
     <waveTrackBg r="220" g="209" b="217"></waveTrackBg>
     <outputTrackBg r="197" g="220" b="206"></outputTrackBg>
     <inputTrackBg r="220" g="214" b="206"></inputTrackBg>
     <groupTrackBg r="220" g="216" b="202"></groupTrackBg>
     <auxTrackBg r="208" g="215" b="220"></auxTrackBg>
     <synthTrackBg r="220" g="211" b="202"></synthTrackBg>
-    <partCanvasBg r="98" g="124" b="168"></partCanvasBg>
-    <ctrlGraphFg r="255" g="170" b="0"></ctrlGraphFg>
-    <mixerBg r="0" g="0" b="0"></mixerBg>
     <mtctype>1</mtctype>
     <mtcoffset>00:00:00:00:00</mtcoffset>
     <extSync>0</extSync>
     <geometryMain x="0" y="0" w="878" h="468"></geometryMain>
     <geometryTransport x="0" y="0" w="0" h="0"></geometryTransport>
     <geometryBigTime x="0" y="0" w="600" h="200"></geometryBigTime>
-    <geometryPianoroll x="0" y="0" w="400" h="300"></geometryPianoroll>
-    <geometryDrumedit x="0" y="0" w="400" h="300"></geometryDrumedit>
     <bigtimeVisible>0</bigtimeVisible>
     <transportVisible>0</transportVisible>
     <mixer1Visible>0</mixer1Visible>
@@ -138,6 +151,7 @@
       <geometry x="0" y="0" w="300" h="500"></geometry>
       <showMidiTracks>1</showMidiTracks>
       <showDrumTracks>1</showDrumTracks>
+      <showNewDrumTracks>1</showNewDrumTracks>
       <showInputTracks>1</showInputTracks>
       <showOutputTracks>1</showOutputTracks>
       <showWaveTracks>1</showWaveTracks>
@@ -150,6 +164,7 @@
       <geometry x="200" y="200" w="300" h="500"></geometry>
       <showMidiTracks>1</showMidiTracks>
       <showDrumTracks>1</showDrumTracks>
+      <showNewDrumTracks>1</showNewDrumTracks>
       <showInputTracks>1</showInputTracks>
       <showOutputTracks>1</showOutputTracks>
       <showWaveTracks>1</showWaveTracks>
@@ -195,13 +210,14 @@
       </sequencer>
     <drumedit>
       <raster>96</raster>
-      <dlistwidth>133</dlistwidth>
-      <dcanvaswidth>795</dcanvaswidth>
+      <dlistwidth>132</dlistwidth>
+      <dcanvaswidth>788</dcanvaswidth>
+      <ignore_hide_init>0</ignore_hide_init>
       <topwin>
         <width>934</width>
         <height>488</height>
-        <nonshared_toolbars>000000ff00000000fd00000000000003ae0000019e00000004000000040000000800000008fc00000002000000020000000400000014004400720075006d00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000f5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000198ffffffff00000000000000000000000a00700061006e0069006301000002be000000f8000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a90000020d0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c000000000000000000000014004400720075006d00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000181ffffffff000000000000000000000012007400720061006e00730070006f007200740100000224ffffffff00000000000000000000000a00700061006e00690063010000034a000000b6000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001a9000002570000000000000000</shared_toolbars>
+        <nonshared_toolbars>000000ff00000000fd00000000000003a60000018200000004000000040000000800000008fc00000002000000020000000400000014004400720075006d00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f0072007401000000ecffffffff00000000000000000000000a00700061006e006900630100000212000000f8000000000000000000000002000000070000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001b90000020d00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000227ffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e010000025effffffff00000000000000000000000a00540065006d0070006f010000026bffffffff000000000000000000000012005300690067006e0061007400750072006501000002f6ffffffff0000000000000000</nonshared_toolbars>
+        <shared_toolbars>000000ff00000000fd00000000000004000000023100000004000000040000000800000008fc0000000300000002000000060000001800460069006c006500200042007500740074006f006e00730100000000ffffffff00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000085ffffffff000000000000000000000014004400720075006d00200074006f006f006c007301000000ceffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000117ffffffff000000000000000000000012007400720061006e00730070006f0072007401000001baffffffff00000000000000000000000a00700061006e0069006301000002e000000120000000000000000000000002000000030000000c0063007500720073006f00720100000000ffffffff0000000000000000000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000081ffffffff000000000000000000000012004e006f0074006500200049006e0066006f01000001b9ffffffff000000000000000000000002000000030000000a00540065006d0070006f0100000000ffffffff000000000000000000000012005300690067006e00610074007500720065010000008bffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e010000013b000002c50000000000000000</shared_toolbars>
         <shares_when_free>0</shares_when_free>
         <shares_when_subwin>1</shares_when_subwin>
         <default_subwin>0</default_subwin>
@@ -213,19 +229,27 @@
       <topwin>
         <width>852</width>
         <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000035c0000018200000004000000040000000800000008fc0000000200000002000000040000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000ae00000098000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c000000f800000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002120000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024d00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e005000690061006e006f0072006f006c006c00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c0073010000013affffffff000000000000000000000012007400720061006e00730070006f0072007401000001bfffffffff00000000000000000000000a00700061006e0069006301000002e50000011b00000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000152000002ae0000000000000000</shared_toolbars>
+        <nonshared_toolbars>000000ff00000000fd00000000000003540000014600000004000000040000000800000008fc0000000300000002000000050000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000001e005000690061006e006f0072006f006c006c00200074006f006f006c00730100000049ffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000b000000098000000000000000000000012007400720061006e00730070006f007200740100000148ffffffff00000000000000000000000a00700061006e00690063010000026e000000f800000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000162ffffffff000000000000000000000002000000030000000a00540065006d0070006f0100000000ffffffff000000000000000000000012005300690067006e00610074007500720065010000008bffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e010000013b000002190000000000000000</nonshared_toolbars>
+        <shared_toolbars>000000ff00000000fd00000000000004000000023100000004000000040000000800000008fc0000000300000002000000060000001800460069006c006500200042007500740074006f006e00730100000000ffffffff00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000085ffffffff00000000000000000000001e005000690061006e006f0072006f006c006c00200074006f006f006c007301000000ceffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000135ffffffff000000000000000000000012007400720061006e00730070006f0072007401000001baffffffff00000000000000000000000a00700061006e0069006301000002e00000012000000000000000000000000200000002000000260050006f0073002f0053006e00610070002f0053006f006c006f002d0074006f006f006c00730100000000ffffffff000000000000000000000012004e006f0074006500200049006e0066006f0100000162ffffffff000000000000000000000002000000030000000a00540065006d0070006f0100000000ffffffff000000000000000000000012005300690067006e00610074007500720065010000008bffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e010000013b000002c50000000000000000</shared_toolbars>
         <shares_when_free>0</shares_when_free>
         <shares_when_subwin>1</shares_when_subwin>
         <default_subwin>0</default_subwin>
         </topwin>
       </pianoroll>
     <scoreedit>
+      <quantPowerInit>3</quantPowerInit>
+      <pxPerWholeInit>300</pxPerWholeInit>
+      <newNoteVeloInit>64</newNoteVeloInit>
+      <newNoteVeloOffInit>64</newNoteVeloOffInit>
+      <newLenInit>0</newLenInit>
+      <noteColorInit>0</noteColorInit>
+      <preambleContainsKeysig>1</preambleContainsKeysig>
+      <preambleContainsTimesig>1</preambleContainsTimesig>
       <topwin>
         <width>867</width>
         <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd000000000000036b000001e300000004000000040000000800000008fc0000000200000002000000060000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000049ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000074ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000dbffffffff000000000000000000000012007400720061006e00730070006f007200740100000203ffffffff00000000000000000000000a00700061006e006900630100000329000000420000000000000000000000020000000100000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000025900000004000000040000000800000008fc0000000200000002000000060000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c007301000000d5ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000100ffffffff000000000000000000000012007400720061006e00730070006f007200740100000167ffffffff00000000000000000000000a00700061006e00690063010000028d000001730000000000000000000000020000000200000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000002650000019b0000000000000000</shared_toolbars>
+        <nonshared_toolbars>000000ff00000000fd0000000000000363000001c400000004000000040000000800000008fc0000000200000002000000060000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c00730100000049ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000074ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e0067007301000000dbffffffff000000000000000000000012007400720061006e00730070006f007200740100000224ffffffff00000000000000000000000a00700061006e006900630100000338000000420000000000000000000000020000000400000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e010000021bffffffff00000000000000000000000a00540065006d0070006f0100000228ffffffff000000000000000000000012005300690067006e0061007400750072006501000002b3ffffffff0000000000000000</nonshared_toolbars>
+        <shared_toolbars>000000ff00000000fd00000000000004000000023d00000004000000040000000800000008fc0000000300000002000000060000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff00000000000000000000002800530074006500700020007200650063006f007200640069006e006700200074006f006f006c007301000000d5ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000100ffffffff000000000000000000000012007400720061006e00730070006f007200740100000167ffffffff00000000000000000000000a00700061006e00690063010000028d000001730000000000000000000000020000000200000022004e006500770020006e006f00740065002000730065007400740069006e006700730100000000ffffffff00000000000000000000002a005100750061006e007400690073006100740069006f006e002000730065007400740069006e00670073010000027a00000186000000000000000000000002000000030000000a00540065006d0070006f0100000000ffffffff000000000000000000000012005300690067006e00610074007500720065010000008bffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e010000013b000002c50000000000000000</shared_toolbars>
         <shares_when_free>0</shares_when_free>
         <shares_when_subwin>1</shares_when_subwin>
         <default_subwin>0</default_subwin>
@@ -236,8 +260,8 @@
       <topwin>
         <width>784</width>
         <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000318000001ce00000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f0072007401000000b0ffffffff00000000000000000000000a00700061006e0069006301000001d600000142000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000002bb0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024500000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff000000000000000000000014004500640069007400200054006f006f006c007301000000d500000071000000000000000000000012007400720061006e00730070006f007200740100000146ffffffff00000000000000000000000a00700061006e00690063010000026c00000194000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005d000003a30000000000000000</shared_toolbars>
+        <nonshared_toolbars>000000ff00000000fd00000000000003100000019200000004000000040000000800000008fc0000000400000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000014004500640069007400200054006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f0072007401000000b0ffffffff00000000000000000000000a00700061006e0069006301000001d600000142000000000000000000000002000000020000001a0045006e00610062006c00650020006d006100730074006500720100000000ffffffff0000000000000000000000080049006e0066006f010000005dffffffff000000000000000000000002000000030000000a00540065006d0070006f0100000000ffffffff000000000000000000000012005300690067006e00610074007500720065010000008bffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e010000013b0000028500000000000000000000000200000000</nonshared_toolbars>
+        <shared_toolbars>000000ff00000000fd00000000000004000000022900000004000000040000000800000008fc0000000400000002000000060000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff00000000000000000000001a0045006e00610062006c00650020006d0061007300740065007201000000d5ffffffff000000000000000000000014004500640069007400200054006f006f006c0073010000013200000071000000000000000000000012007400720061006e00730070006f0072007401000001a3ffffffff00000000000000000000000a00700061006e0069006301000002c90000013700000000000000000000000200000001000000080049006e0066006f0100000000ffffffff00000000000000000000000200000000000000020000000300000012005300690067006e006100740075007200650100000000ffffffff00000000000000000000000a00540065006d0070006f01000000b0ffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e010000013b000002c50000000000000000</shared_toolbars>
         <shares_when_free>0</shares_when_free>
         <shares_when_subwin>1</shares_when_subwin>
         <default_subwin>0</default_subwin>
@@ -246,10 +270,10 @@
     <waveedit>
       <bgcolor r="200" g="200" b="200"></bgcolor>
       <topwin>
-        <width>760</width>
-        <height>460</height>
-        <nonshared_toolbars>000000ff00000000fd0000000000000300000001ac00000004000000040000000800000008fc0000000100000002000000030000001e00570061007600650020006500640069007400200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c00730100000049ffffffff000000000000000000000012007400720061006e00730070006f007200740100000184ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000027700000004000000040000000800000008fc0000000100000002000000040000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e00570061007600650020006500640069007400200074006f006f006c0073010000008cffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000d5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000210ffffffff0000000000000000</shared_toolbars>
+        <width>797</width>
+        <height>478</height>
+        <nonshared_toolbars>000000ff00000000fd000000000000031d0000018200000004000000040000000800000008fc0000000200000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000490000010f000000000000000000000012007400720061006e00730070006f007200740100000158ffffffff00000000000000000000000a00700061006e00690063010000027e0000009f000000000000000000000002000000030000000a00540065006d0070006f0100000000ffffffff000000000000000000000012005300690067006e00610074007500720065010000008bffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e010000013b000001e20000000000000000</nonshared_toolbars>
+        <shared_toolbars>000000ff00000000fd00000000000004000000025b00000004000000040000000800000008fc0000000200000002000000050000001800460069006c006500200042007500740074006f006e00730100000000ffffffff00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000085ffffffff00000000000000000000001c0057006100760065004500640069007400200074006f006f006c007301000000ceffffffff000000000000000000000012007400720061006e00730070006f0072007401000001d1ffffffff00000000000000000000000a00700061006e0069006301000002f700000109000000000000000000000002000000030000000a00540065006d0070006f0100000000ffffffff000000000000000000000012005300690067006e00610074007500720065010000008bffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e010000013b000002c50000000000000000</shared_toolbars>
         <shares_when_free>0</shares_when_free>
         <shares_when_subwin>1</shares_when_subwin>
         <default_subwin>0</default_subwin>
@@ -259,8 +283,8 @@
       <topwin>
         <width>756</width>
         <height>327</height>
-        <nonshared_toolbars>000000ff00000000fd00000000000002fc0000012700000004000000040000000800000008fc0000000100000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000022006c00690073007400200069006e007300650072007400200074006f006f006c00730100000049000000e0000000000000000000000012007400720061006e00730070006f007200740100000129ffffffff00000000000000000000000a00700061006e00690063010000024f000000b50000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000027700000004000000040000000800000008fc0000000100000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff000000000000000000000022006c00690073007400200069006e007300650072007400200074006f006f006c007301000000d5000000e7000000000000000000000012007400720061006e00730070006f0072007401000001bcffffffff00000000000000000000000a00700061006e0069006301000002e20000011e0000000000000000</shared_toolbars>
+        <nonshared_toolbars>000000ff00000000fd00000000000002f4000000ef00000004000000040000000800000008fc0000000200000002000000060000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000000a00700061006e006900630100000049ffffffff000000000000000000000012007400720061006e00730070006f0072007401000000740000012300000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e01000001970000000d000000000000000000000012005300690067006e0061007400750072006500000001a4000000b1000000000000000000000022006c00690073007400200069006e007300650072007400200074006f006f006c00730100000255ffffffff000000000000000000000002000000010000000a00540065006d0070006f0100000000ffffffff0000000000000000</nonshared_toolbars>
+        <shared_toolbars>000000ff00000000fd00000000000004000000027b00000004000000040000000800000008fc0000000100000002000000080000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff000000000000000000000022006c00690073007400200069006e007300650072007400200074006f006f006c007301000000d5ffffffff000000000000000000000012007400720061006e00730070006f007200740100000196ffffffff00000000000000000000000a00540065006d0070006f00000002c5ffffffff000000000000000000000012005300690067006e006100740075007200650000000350ffffffff00000000000000000000000a00700061006e0069006301000002bcffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e01000002e7000001190000000000000000</shared_toolbars>
         <shares_when_free>0</shares_when_free>
         <shares_when_subwin>1</shares_when_subwin>
         <default_subwin>0</default_subwin>
@@ -270,8 +294,8 @@
       <topwin>
         <width>784</width>
         <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd00000000000003180000020000000004000000040000000800000008fc0000000100000002000000030000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000000000000059000000000000000000000012007400720061006e00730070006f007200740100000059ffffffff00000000000000000000000a00700061006e00690063010000017f000001a10000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000027700000004000000040000000800000008fc0000000100000002000000040000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff000000000000000000000012007400720061006e00730070006f0072007401000000d5ffffffff00000000000000000000000a00700061006e0069006301000001fb000002050000000000000000</shared_toolbars>
+        <nonshared_toolbars>000000ff00000000fd0000000000000310000001e400000004000000040000000800000008fc0000000100000002000000060000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000000a00700061006e006900630100000049ffffffff000000000000000000000012007400720061006e00730070006f007200740100000074ffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e010000019affffffff00000000000000000000000a00540065006d0070006f01000001d5ffffffff000000000000000000000012005300690067006e006100740075007200650100000260ffffffff0000000000000000</nonshared_toolbars>
+        <shared_toolbars>000000ff00000000fd00000000000004000000027b00000004000000040000000800000008fc0000000100000002000000070000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff000000000000000000000012007400720061006e00730070006f0072007401000000d5ffffffff00000000000000000000000a00700061006e0069006301000001fbffffffff00000000000000000000000a00540065006d0070006f00000002c5ffffffff000000000000000000000012005300690067006e006100740075007200650000000350ffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e0100000226000001da0000000000000000</shared_toolbars>
         <shares_when_free>0</shares_when_free>
         <shares_when_subwin>1</shares_when_subwin>
         <default_subwin>0</default_subwin>
@@ -279,10 +303,10 @@
       </cliplistedit>
     <lmaster>
       <topwin>
-        <width>400</width>
+        <width>408</width>
         <height>360</height>
-        <nonshared_toolbars>000000ff00000000fd00000000000001900000012600000004000000040000000800000008fc00000003000000020000000200000012007400720061006e00730070006f007200740100000000ffffffff00000000000000000000000a00700061006e0069006301000001260000006a0000000000000000000000020000000000000002000000020000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000002c004d006100730074006500720020004c0069007300740020004500640069007400200054006f006f006c00730100000049ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000027700000004000000040000000800000008fc0000000100000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff00000000000000000000002c004d006100730074006500720020004c0069007300740020004500640069007400200054006f006f006c007301000000d5000000ac000000000000000000000012007400720061006e00730070006f007200740100000181ffffffff00000000000000000000000a00700061006e0069006301000002a7000001590000000000000000</shared_toolbars>
+        <nonshared_toolbars>000000ff00000000fd00000000000001900000012c00000004000000040000000800000008fc0000000100000002000000070000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000000a00700061006e006900630100000037ffffffff000000000000000000000012007400720061006e00730070006f007200740100000062ffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e0100000099ffffffff00000000000000000000000a00540065006d0070006f01000000a6ffffffff000000000000000000000012005300690067006e006100740075007200650100000131ffffffff00000000000000000000002c004d006100730074006500720020004c0069007300740020004500640069007400200054006f006f006c007301000001e1ffffffff0000000000000000</nonshared_toolbars>
+        <shared_toolbars>000000ff00000000fd00000000000004000000027b00000004000000040000000800000008fc0000000200000002000000070000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff00000000000000000000002c004d006100730074006500720020004c0069007300740020004500640069007400200054006f006f006c007301000000d5ffffffff000000000000000000000012005300690067006e0061007400750072006500000002d9ffffffff000000000000000000000012007400720061006e00730070006f007200740100000182ffffffff00000000000000000000000a00700061006e0069006301000002a8ffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e01000002d30000012d000000000000000000000002000000010000000a00540065006d0070006f0000000000ffffffff0000000000000000</shared_toolbars>
         <shares_when_free>0</shares_when_free>
         <shares_when_subwin>1</shares_when_subwin>
         <default_subwin>0</default_subwin>
@@ -292,8 +316,8 @@
       <topwin>
         <width>784</width>
         <height>544</height>
-        <nonshared_toolbars>000000ff00000000fd00000000000003180000020000000004000000040000000800000008fc0000000100000002000000040000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff000000000000000000000022006d00610072006b006500720020006500640069007400200074006f006f006c0073010000004900000054000000000000000000000012007400720061006e00730070006f00720074010000009dffffffff00000000000000000000000a00700061006e0069006301000001c30000015d0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000027700000004000000040000000800000008fc0000000100000002000000050000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff000000000000000000000022006d00610072006b006500720020006500640069007400200074006f006f006c007301000000d50000007f000000000000000000000012007400720061006e00730070006f007200740100000154ffffffff00000000000000000000000a00700061006e00690063010000027a000001860000000000000000</shared_toolbars>
+        <nonshared_toolbars>000000ff00000000fd0000000000000310000001e400000004000000040000000800000008fc0000000100000002000000070000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000000a00700061006e006900630100000049ffffffff000000000000000000000012007400720061006e00730070006f007200740100000074ffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e0100000191ffffffff00000000000000000000000a00540065006d0070006f010000019effffffff000000000000000000000012005300690067006e006100740075007200650100000229ffffffff000000000000000000000022006d00610072006b006500720020006500640069007400200074006f006f006c007301000002d9ffffffff0000000000000000</nonshared_toolbars>
+        <shared_toolbars>000000ff00000000fd00000000000004000000027b00000004000000040000000800000008fc0000000100000002000000080000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff000000000000000000000022006d00610072006b006500720020006500640069007400200074006f006f006c007301000000d5ffffffff000000000000000000000012007400720061006e00730070006f00720074010000011effffffff00000000000000000000000a00700061006e006900630100000244ffffffff00000000000000000000000a00540065006d0070006f00000002c5ffffffff000000000000000000000012005300690067006e006100740075007200650000000329ffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e010000026f000001910000000000000000</shared_toolbars>
         <shares_when_free>0</shares_when_free>
         <shares_when_subwin>1</shares_when_subwin>
         <default_subwin>0</default_subwin>
@@ -301,10 +325,10 @@
       </marker>
     <arrangerview>
       <topwin>
-        <width>996</width>
-        <height>223</height>
+        <width>1024</width>
+        <height>553</height>
         <nonshared_toolbars>000000ff00000000fd00000000000003ec0000008d00000004000000040000000800000008fc0000000200000002000000050000001e0055006e0064006f002f005200650064006f00200074006f006f006c00730100000000ffffffff00000000000000000000001a0061007200720061006e0067006500720054006f006f006c00730100000049ffffffff00000000000000000000002600560069007300690062006c006500200074007200610063006b0020007400790070006500730100000128000000f0000000000000000000000012007400720061006e00730070006f007200740100000218ffffffff00000000000000000000000a00700061006e00690063010000033e000000b6000000000000000000000002000000010000001e0041007200720061006e0067006500720054006f006f006c0062006100720100000000ffffffff0000000000000000</nonshared_toolbars>
-        <shared_toolbars>000000ff00000000fd00000000000004000000024500000004000000040000000800000008fc0000000200000002000000060000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff00000000000000000000001a0061007200720061006e0067006500720054006f006f006c007301000000d5ffffffff00000000000000000000002600560069007300690062006c006500200074007200610063006b00200074007900700065007301000001b4ffffffff000000000000000000000012007400720061006e00730070006f007200740100000293ffffffff00000000000000000000000a00700061006e0069006301000003b900000047000000000000000000000002000000010000001e0041007200720061006e0067006500720054006f006f006c0062006100720100000000ffffffff0000000000000000</shared_toolbars>
+        <shared_toolbars>000000ff00000000fd00000000000004000000022900000004000000040000000800000008fc0000000300000002000000060000001800460069006c006500200042007500740074006f006e007301000000000000008c00000000000000000000001e0055006e0064006f002f005200650064006f00200074006f006f006c0073010000008cffffffff00000000000000000000001a0061007200720061006e0067006500720054006f006f006c007301000000d5ffffffff00000000000000000000002600560069007300690062006c006500200074007200610063006b00200074007900700065007301000001b4ffffffff000000000000000000000012007400720061006e00730070006f007200740100000293ffffffff00000000000000000000000a00700061006e0069006301000003b900000047000000000000000000000002000000010000001e0041007200720061006e0067006500720054006f006f006c0062006100720100000000ffffffff000000000000000000000002000000030000000a00540065006d0070006f0100000000ffffffff000000000000000000000012005300690067006e00610074007500720065010000008bffffffff00000000000000000000001a0053006f006e006700200050006f0073006900740069006f006e010000013b000002c50000000000000000</shared_toolbars>
         <shares_when_free>0</shares_when_free>
         <shares_when_subwin>1</shares_when_subwin>
         <default_subwin>1</default_subwin>
@@ -449,6 +473,7 @@
       <mixer_automation_clear>0</mixer_automation_clear>
       <add_midi_track>67108938</add_midi_track>
       <add_drum_track>0</add_drum_track>
+      <add_new_style_drum_track>0</add_new_style_drum_track>
       <add_wave_track>0</add_wave_track>
       <add_audio_output>0</add_audio_output>
       <add_audio_group>0</add_audio_group>
-- 
cgit v1.2.3