summaryrefslogtreecommitdiff
path: root/muse2/muse/arranger/pcanvas.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-04-27 20:33:15 +0000
committerFlorian Jung <flo@windfisch.org>2011-04-27 20:33:15 +0000
commite2cec3f03fdee64da1c5080498476c1cdd43bbdb (patch)
tree2b373e4fafd3b015bc5c50fca77d67b3e5677e94 /muse2/muse/arranger/pcanvas.cpp
parentd8ac618f4dc9afd0731a9a3531d4641c9e7ea6fd (diff)
parent0f7a7ab47a2a7742fba2ea6af980ee5d950b8c37 (diff)
merged scoreedit branch into trunk
Diffstat (limited to 'muse2/muse/arranger/pcanvas.cpp')
-rw-r--r--muse2/muse/arranger/pcanvas.cpp27
1 files changed, 9 insertions, 18 deletions
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index e2c2b32d..c76e4421 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -783,19 +783,17 @@ QMenu* PartCanvas::genItemPopup(CItem* item)
partPopup->addSeparator();
switch(trackType) {
case Track::MIDI: {
- QAction *act_pianoroll = partPopup->addAction(QIcon(*pianoIconSet), tr("pianoroll"));
- act_pianoroll->setData(10);
- QAction *act_mlist = partPopup->addAction(QIcon(*edit_listIcon), tr("list"));
- act_mlist->setData(12);
+ partPopup->addAction(muse->startPianoEditAction);
+ partPopup->addMenu(muse->scoreSubmenu);
+ partPopup->addAction(muse->startScoreEditAction);
+ partPopup->addAction(muse->startListEditAction);
QAction *act_mexport = partPopup->addAction(tr("save part to disk"));
act_mexport->setData(16);
}
break;
case Track::DRUM: {
- QAction *act_dlist = partPopup->addAction(QIcon(*edit_listIcon), tr("list"));
- act_dlist->setData(12);
- QAction *act_drums = partPopup->addAction(QIcon(*edit_drummsIcon), tr("drums"));
- act_drums->setData(13);
+ partPopup->addAction(muse->startDrumEditAction);
+ partPopup->addAction(muse->startListEditAction);
QAction *act_dexport = partPopup->addAction(tr("save part to disk"));
act_dexport->setData(16);
}
@@ -866,15 +864,7 @@ void PartCanvas::itemPopup(CItem* item, int n, const QPoint& pt)
case 5:
copy(pl);
break;
- case 10: // pianoroll edit
- emit startEditor(pl, 0);
- return;
- case 12: // list edit
- emit startEditor(pl, 1);
- return;
- case 13: // drum edit
- emit startEditor(pl, 3);
- return;
+
case 14: // wave edit
{
// Changed to allow multiple selected parts to be shown. By T356
@@ -994,7 +984,8 @@ void PartCanvas::itemPopup(CItem* item, int n, const QPoint& pt)
// If no items selected, use the one clicked on.
if(!selfound)
item->part()->setColorIndex(curColorIndex);
-
+
+ song->update(SC_PART_MODIFIED);
redraw();
break;
}