diff options
| author | Florian Jung <flo@windfisch.org> | 2012-01-03 19:23:06 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-01-03 19:23:06 +0000 |
| commit | fb6be39db34e23725ffdd9c8ac3023d672036210 (patch) | |
| tree | 92493634923e07d36989160f464e97e8db910654 /muse2 | |
| parent | 7993a73cece885bac45021dd021ac43f6f332040 (diff) | |
added "reset drummap ordering", changed "reset drummap" from "to GM
default" to "to instrument default" (that is, turn tied_to_patch on)
Diffstat (limited to 'muse2')
| -rw-r--r-- | muse2/muse/arranger/tlist.cpp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp index 3b33fc66..3deeb65a 100644 --- a/muse2/muse/arranger/tlist.cpp +++ b/muse2/muse/arranger/tlist.cpp @@ -1576,12 +1576,19 @@ void TList::mousePressEvent(QMouseEvent* ev) if (t->type()==MusECore::Track::NEW_DRUM) { + QAction* tmp; p->addAction(tr("Save track's drumlist"))->setData(1010); p->addAction(tr("Save track's drumlist differences to initial state"))->setData(1011); p->addAction(tr("Load track's drumlist"))->setData(1012); - p->addAction(tr("Reset track's drumlist"))->setData(1013); + tmp=p->addAction(tr("Reset track's drumlist")); + tmp->setData(1013); + tmp->setEnabled(!((MusECore::MidiTrack*)t)->drummap_tied_to_patch()); + tmp=p->addAction(tr("Reset track's drumlist-ordering")); + tmp->setData(1016); + tmp->setEnabled(!((MusECore::MidiTrack*)t)->drummap_ordering_tied_to_patch()); p->addAction(tr("Copy track's drumlist to all selected tracks"))->setData(1014); p->addAction(tr("Copy track's drumlist's differences to all selected tracks"))->setData(1015); + // 1016 is occupied. p->addSeparator(); } @@ -1623,10 +1630,20 @@ void TList::mousePressEvent(QMouseEvent* ev) case 1013: if (QMessageBox::warning(this, tr("Drum map"), - tr("Reset the track's drum map with GM defaults?"), + tr("Reset the track's drum map with instrument defaults?"), QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok) == QMessageBox::Ok) { - ((MusECore::MidiTrack*)t)->init_drummap(); + ((MusECore::MidiTrack*)t)->set_drummap_tied_to_patch(true); + MusEGlobal::song->update(SC_DRUMMAP); + } + break; + + case 1016: + if (QMessageBox::warning(this, tr("Drum map"), + tr("Reset the track's drum map ordering?"), + QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok) == QMessageBox::Ok) + { + ((MusECore::MidiTrack*)t)->set_drummap_ordering_tied_to_patch(true); MusEGlobal::song->update(SC_DRUMMAP); } break; |