summaryrefslogtreecommitdiff
path: root/muse2/muse/app.cpp
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2011-03-27 21:42:44 +0000
committerRobert Jonsson <spamatica@gmail.com>2011-03-27 21:42:44 +0000
commita26d70917c64a2785fc9ea571d1c102d4bac205c (patch)
treef5bd259b392993716331178abcdde26af74c0dfb /muse2/muse/app.cpp
parent5b26094ecf066577cd1e45b5a21136a4cece942a (diff)
score edit placeholder added
Diffstat (limited to 'muse2/muse/app.cpp')
-rw-r--r--muse2/muse/app.cpp29
1 files changed, 29 insertions, 0 deletions
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index b0fda65f..3ca47fbc 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -43,6 +43,7 @@
#include "midiseq.h"
#include "mixdowndialog.h"
#include "pianoroll.h"
+#include "scoreedit.h"
#include "popupmenu.h"
#include "shortcutconfig.h"
#include "songinfo.h"
@@ -976,6 +977,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
editOutsideLoopAction = new QAction(QIcon(*select_outside_loopIcon), tr("&Outside Loop"), this);
editAllPartsAction = new QAction( QIcon(*select_all_parts_on_trackIcon), tr("All &Parts on Track"), this);
+ startScoreEditAction = new QAction(*scoreIconSet, tr("Score"), this);
startPianoEditAction = new QAction(*pianoIconSet, tr("Pianoroll"), this);
startDrumEditAction = new QAction(QIcon(*edit_drummsIcon), tr("Drums"), this);
startListEditAction = new QAction(QIcon(*edit_listIcon), tr("List"), this);
@@ -1125,6 +1127,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
connect(editSignalMapper, SIGNAL(mapped(int)), this, SLOT(cmd(int)));
connect(startPianoEditAction, SIGNAL(activated()), SLOT(startPianoroll()));
+ connect(startScoreEditAction, SIGNAL(activated()), SLOT(startScoreEdit()));
connect(startDrumEditAction, SIGNAL(activated()), SLOT(startDrumEditor()));
connect(startListEditAction, SIGNAL(activated()), SLOT(startListEditor()));
connect(startWaveEditAction, SIGNAL(activated()), SLOT(startWaveEditor()));
@@ -1343,6 +1346,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow()
menuEdit->addSeparator();
menuEdit->addAction(startPianoEditAction);
+ menuEdit->addAction(startScoreEditAction);
menuEdit->addAction(startDrumEditAction);
menuEdit->addAction(startListEditAction);
menuEdit->addAction(startWaveEditAction);
@@ -3376,6 +3380,7 @@ void MusE::startEditor(PartList* pl, int type)
case 1: startListEditor(pl); break;
case 3: startDrumEditor(pl, true); break;
case 4: startWaveEditor(pl); break;
+ //case 5: startScoreEdit(pl, true); break;
}
}
@@ -3409,6 +3414,30 @@ PartList* MusE::getMidiPartsToEdit()
}
//---------------------------------------------------------
+// startScoreEdit
+//---------------------------------------------------------
+
+void MusE::startScoreEdit()
+ {
+ PartList* pl = getMidiPartsToEdit();
+ if (pl == 0)
+ return;
+ startScoreEdit(pl, true);
+ }
+
+void MusE::startScoreEdit(PartList* pl, bool showDefaultCtrls)
+ {
+
+ ScoreEdit* scoreedit = new ScoreEdit(pl, this, 0, arranger->cursorValue());
+ if(showDefaultCtrls) // p4.0.12
+ scoreedit->addCtrl();
+ scoreedit->show();
+ toplevels.push_back(Toplevel(Toplevel::PIANO_ROLL, (unsigned long)(scoreedit), scoreedit));
+ connect(scoreedit, SIGNAL(deleted(unsigned long)), SLOT(toplevelDeleted(unsigned long)));
+ connect(muse, SIGNAL(configChanged()), scoreedit, SLOT(configChanged()));
+ }
+
+//---------------------------------------------------------
// startPianoroll
//---------------------------------------------------------