From c95feff1f178ec0d89ea21abf5d7e6294c0d0132 Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Sun, 7 Aug 2011 15:15:12 +0000 Subject: moved the arranger out to its own window --- muse2/muse/arranger/pcanvas.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'muse2/muse/arranger/pcanvas.cpp') diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp index 7298194c..d223321b 100644 --- a/muse2/muse/arranger/pcanvas.cpp +++ b/muse2/muse/arranger/pcanvas.cpp @@ -24,6 +24,8 @@ #include "fastlog.h" #include "widgets/tools.h" +#include "arranger.h" +#include "arrangerview.h" #include "pcanvas.h" #include "midieditor.h" #include "globals.h" @@ -619,17 +621,17 @@ QMenu* PartCanvas::genItemPopup(CItem* item) partPopup->addSeparator(); switch(trackType) { case Track::MIDI: { - partPopup->addAction(muse->startPianoEditAction); - partPopup->addMenu(muse->scoreSubmenu); - partPopup->addAction(muse->startScoreEditAction); - partPopup->addAction(muse->startListEditAction); + partPopup->addAction(muse->arranger->parentWin->startPianoEditAction); + partPopup->addMenu(muse->arranger->parentWin->scoreSubmenu); + partPopup->addAction(muse->arranger->parentWin->startScoreEditAction); + partPopup->addAction(muse->arranger->parentWin->startListEditAction); QAction *act_mexport = partPopup->addAction(tr("save part to disk")); act_mexport->setData(16); } break; case Track::DRUM: { - partPopup->addAction(muse->startDrumEditAction); - partPopup->addAction(muse->startListEditAction); + partPopup->addAction(muse->arranger->parentWin->startDrumEditAction); + partPopup->addAction(muse->arranger->parentWin->startListEditAction); QAction *act_dexport = partPopup->addAction(tr("save part to disk")); act_dexport->setData(16); } -- cgit v1.2.3