diff options
| author | Florian Jung <flo@windfisch.org> | 2011-04-26 18:33:00 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-04-26 18:33:00 +0000 |
| commit | 928081edaa0752e14577c36b6b595ab38079224a (patch) | |
| tree | f84f7a919d7bfe95929e63e0c12c13acfc6a66c7 /muse2/muse/arranger/pcanvas.cpp | |
| parent | cea0fdb5f411c7af11f588191bccf4b643536594 (diff) | |
added "new score window"-menu-entry for quickly opening a new score
window with one staff per track
added "score"-entries for the popup-menu in the arranger
changed arranger's popup-menu: now the pianoroll etc. actions are
the same as the "Edit"-Menu's actions
Diffstat (limited to 'muse2/muse/arranger/pcanvas.cpp')
| -rw-r--r-- | muse2/muse/arranger/pcanvas.cpp | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp index 6068c743..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 |