diff options
| author | Florian Jung <flo@windfisch.org> | 2011-05-01 18:13:45 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-05-01 18:13:45 +0000 |
| commit | 3ed966e02579e9ccae39f080760612af5fe14b4c (patch) | |
| tree | f2981245a60c77b0f3634afb41239c8566299856 /muse2/muse/songfile.cpp | |
| parent | bf8e7d673f110765906dc92cf266cc8af2d789f9 (diff) | |
-removed split_note property from staff_t (replaced by SPLIT_NOTE macro)
- fixed a toolbar-naming-bug
- implemented reading and writing the score edit's status
- changed name initalizing
- and probably also introduced some segfaults i couldn't track :(
Diffstat (limited to 'muse2/muse/songfile.cpp')
| -rw-r--r-- | muse2/muse/songfile.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/muse2/muse/songfile.cpp b/muse2/muse/songfile.cpp index 3841a204..9a577308 100644 --- a/muse2/muse/songfile.cpp +++ b/muse2/muse/songfile.cpp @@ -19,6 +19,7 @@ #include "drumedit.h" //#include "midiedit/drumedit.h" // p4.0.2 #include "pianoroll.h" +#include "scoreedit.h" //#include "midiedit/pianoroll.h" // p4.0.2 #include "globals.h" #include "xml.h" @@ -1009,12 +1010,19 @@ void MusE::readToplevels(Xml& xml) // But for now be safe for all the top levels... if(!pl->empty()) { - startPianoroll(pl); toplevels.back().cobject()->readStatus(xml); pl = new PartList; } } + else if (tag == "scoreedit") { + ScoreEdit* score = new ScoreEdit(this, 0, arranger->cursorValue()); + score->show(); + toplevels.push_back(Toplevel(Toplevel::SCORE, (unsigned long)(score), score)); + connect(score, SIGNAL(deleted(unsigned long)), SLOT(toplevelDeleted(unsigned long))); + connect(score, SIGNAL(name_changed()), SLOT(scoreNamingChanged())); + score->readStatus(xml); + } else if (tag == "drumedit") { if(!pl->empty()) { |