From 08caf81a5b76e92f5c2981db9b5fc6941453d4e9 Mon Sep 17 00:00:00 2001 From: Robert Jonsson Date: Sun, 5 Sep 2010 21:24:13 +0000 Subject: see changelog --- muse/ChangeLog | 2 + muse/muse/app.cpp | 3 +- muse/muse/arranger/trackinfo.cpp | 8 +- muse/muse/shortcuts.cpp | 4 +- muse/muse/shortcuts.h | 3 +- muse/share/drummaps/addictive.map | 1797 ------------------------------------- 6 files changed, 15 insertions(+), 1802 deletions(-) delete mode 100644 muse/share/drummaps/addictive.map diff --git a/muse/ChangeLog b/muse/ChangeLog index cfe19696..4c4075dc 100644 --- a/muse/ChangeLog +++ b/muse/ChangeLog @@ -1,4 +1,6 @@ 05.09.2010 + * Fixed: shortcut for insert moved to Ctrl+Shift+X (rj) + * Added: Select all toggle for midi channels iR menu (rj) * Added: Auto-route-connect old songs with obsolete midi input port/channel masks (before iR button added). (T356) - Added MidiTrack::setInPortAndChannelMask() and called it from MidiTrack::read(). 03.09.2010 diff --git a/muse/muse/app.cpp b/muse/muse/app.cpp index 82e966d5..a4a2a417 100644 --- a/muse/muse/app.cpp +++ b/muse/muse/app.cpp @@ -1070,7 +1070,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow(0, "mainwindow") menuEdit->setAccel(CTRL+SHIFT+Key_B, CMD_PASTE_CLONE_TO_TRACK); menuEdit->insertItem(*editpasteIconSet, tr("&Insert empty measure"), CMD_INSERTMEAS); - menuEdit->setAccel(CTRL+SHIFT+Key_M, CMD_INSERTMEAS); + menuEdit->setAccel(CTRL+SHIFT+Key_X, CMD_INSERTMEAS); menuEdit->insertSeparator(); menuEdit->insertItem(QIconSet(*edit_track_delIcon), tr("Delete Selected Tracks"), CMD_DELETE_TRACK); @@ -2512,6 +2512,7 @@ PopupMenu* MusE::prepareRoutingPopupMenu(Track* track, bool dst) } } } + subp->insertItem(QString("Toggle all"), 1000+i); pup->insertItem(QT_TR_NOOP(md->name()), subp); } diff --git a/muse/muse/arranger/trackinfo.cpp b/muse/muse/arranger/trackinfo.cpp index b94dec43..3c0f1cc4 100644 --- a/muse/muse/arranger/trackinfo.cpp +++ b/muse/muse/arranger/trackinfo.cpp @@ -572,7 +572,13 @@ void Arranger::routingPopupMenuActivated(int n) //if(gRoutingPopupMenuMaster != this || !track || !track->isMidiTrack()) if(!midiTrackInfo || gRoutingPopupMenuMaster != midiTrackInfo || !selected || !selected->isMidiTrack()) return; - muse->routingPopupMenuActivated(selected, n); + if (n > 999) { + for (int i = 0; i < MIDI_CHANNELS; i++) + muse->routingPopupMenuActivated(selected, i + MIDI_CHANNELS * (n-1000)); + } + else { + muse->routingPopupMenuActivated(selected, n); + } } //--------------------------------------------------------- diff --git a/muse/muse/shortcuts.cpp b/muse/muse/shortcuts.cpp index ee25de61..1f9a8c6f 100644 --- a/muse/muse/shortcuts.cpp +++ b/muse/muse/shortcuts.cpp @@ -129,8 +129,8 @@ void initShortCuts() defShrt(SHRT_SEL_BELOW, Qt::Key_Down, "Edit: Select nearest part on track below", ARRANG_SHRT, "sel_part_below"); defShrt(SHRT_SEL_BELOW_ADD, Qt::SHIFT + Qt::Key_Down, "Edit: Add nearest part on track below", ARRANG_SHRT, "sel_part_below_add"); - defShrt(SHRT_INSERT, Qt::CTRL+Qt::SHIFT+ Qt::Key_I, "Edit: Insert parts, moving time", ARRANG_SHRT, "insert_parts"); - defShrt(SHRT_INSERTMEAS, Qt::CTRL+Qt::SHIFT+ Qt::Key_M, "Edit: Insert empty measure", ARRANG_SHRT, "insert_measure"); +// defShrt(SHRT_INSERT, Qt::CTRL+Qt::SHIFT+ Qt::Key_I, "Edit: Insert parts, moving time", ARRANG_SHRT, "insert_parts"); +// defShrt(SHRT_INSERTMEAS, Qt::CTRL+Qt::SHIFT+ Qt::Key_M, "Edit: Insert empty measure", ARRANG_SHRT, "insert_measure"); defShrt(SHRT_SEL_TRACK_ABOVE, Qt::CTRL + Qt::Key_Up, "Select track above", ARRANG_SHRT, "sel_track_above"); defShrt(SHRT_SEL_TRACK_BELOW, Qt::CTRL + Qt::Key_Down, "Select track below", ARRANG_SHRT, "sel_track_below"); diff --git a/muse/muse/shortcuts.h b/muse/muse/shortcuts.h index 89875375..0e2121f9 100644 --- a/muse/muse/shortcuts.h +++ b/muse/muse/shortcuts.h @@ -164,9 +164,10 @@ enum { SHRT_SEL_BELOW, //Down SHRT_SEL_BELOW_ADD, //move down and add to selection + /* SHRT_INSERT, //Ctrl+Shift+I - insert parts instead of pasting SHRT_INSERTMEAS, //Ctrl+Shift+M - insert measures - + */ //Arranger tracks SHRT_SEL_TRACK_BELOW, SHRT_SEL_TRACK_ABOVE, diff --git a/muse/share/drummaps/addictive.map b/muse/share/drummaps/addictive.map deleted file mode 100644 index a513f67f..00000000 --- a/muse/share/drummaps/addictive.map +++ /dev/null @@ -1,1797 +0,0 @@ - - - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 35 - 35 - - - Bass Drum 1 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 36 - 36 - - - Snare1 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 37 - 37 - - - Snare2 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 38 - 38 - - - Snare3 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 39 - 39 - - - Snare4 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 40 - 40 - - - Snare5H - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 41 - 41 - - - Snare6 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 43 - 43 - - - SideStick - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 42 - 42 - - - SideStick2 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 44 - 44 - - - Cymbal1 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 46 - 46 - - - Xtra - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 47 - 47 - - - HighHatStomp - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 48 - 48 - - - HighHat1 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 49 - 49 - - - HighHat2 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 50 - 50 - - - HighHat3 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 51 - 51 - - - HighHat4 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 52 - 52 - - - HighHatBell - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 53 - 53 - - - HighHatOpen1 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 54 - 54 - - - HighHatOpen2 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 55 - 55 - - - HighHatOpen3 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 56 - 56 - - - HighHatOpen4 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 57 - 57 - - - HighHatOpen5 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 58 - 58 - - - HighHatOpenStomp - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 59 - 59 - - - Ride - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 45 - 45 - - - Ride2 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 60 - 60 - - - Ride3 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 61 - 61 - - - Ride4 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 62 - 62 - - - RideHold - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 63 - 63 - - - Tom4_1 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 65 - 65 - - - Tom4_2 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 66 - 66 - - - Tom3_1 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 67 - 67 - - - Tom3_2 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 68 - 68 - - - Tom2_1 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 69 - 69 - - - Tom2_2 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 70 - 70 - - - Tom1_1 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 71 - 71 - - - Tom1_2 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 72 - 72 - - - Sticks - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 75 - 75 - - - Cymbal1 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 77 - 77 - - - Cymbal1Grab - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 78 - 78 - - - Cymbal2 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 79 - 79 - - - Cymbal2Grab - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 80 - 80 - - - Cymbal3 - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 81 - 81 - - - Cymbal3Grab - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 82 - 82 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 76 - 76 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 74 - 74 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 64 - 64 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 73 - 73 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 83 - 83 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 84 - 84 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 85 - 85 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 86 - 86 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 87 - 87 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 88 - 88 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 89 - 89 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 90 - 90 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 91 - 91 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 92 - 92 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 93 - 93 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 94 - 94 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 95 - 95 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 96 - 96 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 97 - 97 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 98 - 98 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 99 - 99 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 100 - 100 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 101 - 101 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 102 - 102 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 103 - 103 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 104 - 104 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 105 - 105 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 106 - 106 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 107 - 107 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 108 - 108 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 109 - 109 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 110 - 110 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 111 - 111 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 112 - 112 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 113 - 113 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 114 - 114 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 115 - 115 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 116 - 116 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 117 - 117 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 118 - 118 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 119 - 119 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 120 - 120 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 121 - 121 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 122 - 122 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 123 - 123 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 124 - 124 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 125 - 125 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 126 - 126 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 127 - 127 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 0 - 0 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 1 - 1 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 2 - 2 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 3 - 3 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 4 - 4 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 5 - 5 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 6 - 6 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 7 - 7 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 8 - 8 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 9 - 9 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 10 - 10 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 11 - 11 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 12 - 12 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 13 - 13 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 14 - 14 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 15 - 15 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 16 - 16 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 17 - 17 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 18 - 18 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 19 - 19 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 20 - 20 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 21 - 21 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 22 - 22 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 23 - 23 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 24 - 24 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 25 - 25 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 26 - 26 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 27 - 27 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 28 - 28 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 29 - 29 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 30 - 30 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 31 - 31 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 32 - 32 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 33 - 33 - - - - 100 - 16 - 32 - 0 - 0 - 70 - 90 - 110 - 127 - 34 - 34 - - - -- cgit v1.2.3