1 files changed, 27 insertions, 62 deletions

diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index fafa3b4f..777e6066 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -31,12 +31,10 @@
 #include <QLabel>
 #include <QToolBar>
 #include <QToolButton>
-#include <QSettings>
+#include <QMenuBar>
+#include <QMenu>
 
 int MasterEdit::_rasterInit = 0;
-int MasterEdit::_widthInit = 600;
-int MasterEdit::_heightInit = 400;
-QByteArray MasterEdit::_toolbarInit;
 
 //---------------------------------------------------------
 //   closeEvent
@@ -44,11 +42,7 @@ QByteArray MasterEdit::_toolbarInit;
 
 void MasterEdit::closeEvent(QCloseEvent* e)
       {
-      QSettings settings("MusE", "MusE-qt");
-      //settings.setValue("MasterEdit/geometry", saveGeometry());
-      settings.setValue("MasterEdit/windowState", saveState());
-      
-      emit deleted((unsigned long)this);
+      emit deleted(static_cast<TopWin*>(this));
       e->accept();
       }
 
@@ -85,22 +79,34 @@ void MasterEdit::songChanged(int type)
 //---------------------------------------------------------
 
 MasterEdit::MasterEdit()
-   : MidiEditor(_rasterInit, 0)
+   : MidiEditor(TopWin::MASTER, _rasterInit, 0)
       {
       setWindowTitle(tr("MusE: Mastertrack"));
       _raster = 0;      // measure
+      resize(_widthInit[_type], _heightInit[_type]);
       setMinimumSize(400, 300);
-      resize(_widthInit, _heightInit);
 
       //---------Pulldown Menu----------------------------
 //      QPopupMenu* file = new QPopupMenu(this);
 //      menuBar()->insertItem("&File", file);
 
-      //---------ToolBar----------------------------------
-      
-      tools = addToolBar(tr("Master tools"));
-      tools->setObjectName("Master tools");
-      tools->addActions(undoRedo->actions());
+      QMenu* settingsMenu = menuBar()->addMenu(tr("&Settings"));
+      settingsMenu->addAction(subwinAction);
+      settingsMenu->addAction(shareAction);
+
+      // Toolbars ---------------------------------------------------------
+      QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools"));
+      undo_tools->setObjectName("Undo/Redo tools");
+      undo_tools->addActions(undoRedo->actions());
+
+
+      QToolBar* panic_toolbar = addToolBar(tr("panic"));         
+      panic_toolbar->setObjectName("panic");
+      panic_toolbar->addAction(panicAction);
+
+      QToolBar* transport_toolbar = addToolBar(tr("transport"));
+      transport_toolbar->setObjectName("transport");
+      transport_toolbar->addActions(transportAction->actions());
 
       EditToolBar* tools2 = new EditToolBar(this, PointerTool | PencilTool | RubberTool);
       addToolBar(tools2);
@@ -241,12 +247,8 @@ MasterEdit::MasterEdit()
       connect(canvas, SIGNAL(followEvent(int)), hscroll, SLOT(setOffset(int)));
       connect(canvas, SIGNAL(timeChanged(unsigned)),   SLOT(setTime(unsigned)));
 
-      if (!_toolbarInit.isEmpty())
-            restoreState(_toolbarInit);      
-      
-      QSettings settings("MusE", "MusE-qt");
-      //restoreGeometry(settings.value("MasterEdit/geometry").toByteArray());
-      restoreState(settings.value("MasterEdit/windowState").toByteArray());
+      initTopwinState();
+      initalizing=false;
       }
 
 //---------------------------------------------------------
@@ -335,12 +337,8 @@ void MasterEdit::readConfiguration(Xml& xml)
                   case Xml::TagStart:
                         if (tag == "raster")
                               _rasterInit = xml.parseInt();
-                        else if (tag == "width")
-                              _widthInit = xml.parseInt();
-                        else if (tag == "height")
-                              _heightInit = xml.parseInt();
-                        else if (tag == "toolbars")
-                              _toolbarInit = QByteArray::fromHex(xml.parse1().toAscii());
+                        else if (tag == "topwin")
+                              TopWin::readConfiguration(MASTER, xml);
                         else
                               xml.unknown("MasterEdit");
                         break;
@@ -361,9 +359,7 @@ void MasterEdit::writeConfiguration(int level, Xml& xml)
       {
       xml.tag(level++, "masteredit");
       xml.intTag(level, "raster", _rasterInit);
-      xml.intTag(level, "width", _widthInit);
-      xml.intTag(level, "height", _heightInit);
-      xml.strTag(level, "toolbars", _toolbarInit.toHex().data());
+      TopWin::writeConfiguration(MASTER, level, xml);
       xml.tag(level, "/masteredit");
       }
 
@@ -432,34 +428,3 @@ void MasterEdit::setTempo(int val)
       }
 
 
-//---------------------------------------------------------
-//   resizeEvent
-//---------------------------------------------------------
-
-void MasterEdit::resizeEvent(QResizeEvent* ev)
-      {
-      QWidget::resizeEvent(ev);
-      storeInitialState();
-      }
-
-//---------------------------------------------------------
-//   focusOutEvent
-//---------------------------------------------------------
-
-void MasterEdit::focusOutEvent(QFocusEvent* ev)
-      {
-      QWidget::focusOutEvent(ev);
-      storeInitialState();
-      }
-
-
-//---------------------------------------------------------
-//   storeInitialState
-//---------------------------------------------------------
-
-void MasterEdit::storeInitialState()
-      {
-      _widthInit = width();
-      _heightInit = height();
-      _toolbarInit=saveState();
-      }