half-way working version

toolbar state can be saved and restored, though this is still a bit buggy

2 files changed, 46 insertions, 1 deletions

diff --git a/muse2/muse/marker/markerview.cpp b/muse2/muse/marker/markerview.cpp
index 3c0f2267..8def5714 100644
--- a/muse2/muse/marker/markerview.cpp
+++ b/muse2/muse/marker/markerview.cpp
@@ -312,7 +312,10 @@ void MarkerView::readStatus(Xml& xml)
                   break;
             switch (token) {
                   case Xml::TagStart:
-                        xml.unknown("Marker");
+                        if (tag=="topwin")
+                            TopWin::readStatus(xml);
+                        else
+                            xml.unknown("Marker");
                         break;
                   case Xml::TagEnd:
                         if (tag == "marker")
@@ -330,6 +333,46 @@ void MarkerView::readStatus(Xml& xml)
 void MarkerView::writeStatus(int level, Xml& xml) const
       {
       xml.tag(level++, "marker");
+      TopWin::writeStatus(level, xml);
+      xml.tag(level, "/marker");
+      }
+
+//---------------------------------------------------------
+//   readConfiguration
+//---------------------------------------------------------
+
+void MarkerView::readConfiguration(Xml& xml)
+      {
+      for (;;) {
+            Xml::Token token = xml.parse();
+            const QString& tag = xml.s1();
+            switch (token) {
+                  case Xml::Error:
+                  case Xml::End:
+                        return;
+                  case Xml::TagStart:
+                        if (tag == "topwin")
+                              TopWin::readConfiguration(MARKER, xml);
+                        else
+                              xml.unknown("MarkerView");
+                        break;
+                  case Xml::TagEnd:
+                        if (tag == "marker")
+                              return;
+                  default:
+                        break;
+                  }
+            }
+      }
+
+//---------------------------------------------------------
+//   writeConfiguration
+//---------------------------------------------------------
+
+void MarkerView::writeConfiguration(int level, Xml& xml)
+      {
+      xml.tag(level++, "marker");
+      TopWin::writeConfiguration(MARKER, level, xml);
       xml.tag(level, "/marker");
       }
 
diff --git a/muse2/muse/marker/markerview.h b/muse2/muse/marker/markerview.h
index 94a6314e..bab0f6e3 100644
--- a/muse2/muse/marker/markerview.h
+++ b/muse2/muse/marker/markerview.h
@@ -85,6 +85,8 @@ class MarkerView : public TopWin {
       ~MarkerView();
       virtual void readStatus(Xml&);
       virtual void writeStatus(int, Xml&) const;
+      static void readConfiguration(Xml&);
+      static void writeConfiguration(int, Xml&);
       void nextMarker();
       void prevMarker();
       };