Skip to content

Commit

Permalink
[Mod] Rename automatically-generated keyboard shortcuts to something …
Browse files Browse the repository at this point in the history 
…more identifiable. These names are still shown in the conflict list and can thus be confusing.

[Mod] Rearrange a few keyboard shortcuts to group them more logically.

git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@22190 56274372-70c3-4bfc-bfc3-4c3a0b034d27
  • Loading branch information
@sagamusix
sagamusix committed Nov 15, 2024
1 parent 40bbf0a commit 90cc3a1
Show file tree
Hide file tree
Showing 3 changed files with 118 additions and 109 deletions.
140 changes: 70 additions & 70 deletions mptrack/CommandSet.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -967,38 +967,38 @@ static constexpr struct
{KeyCommand::Hidden, kcSetFXDummy, _T("FX Dummy") },
{1294, kcSetFXmacroSlide, _T("Smooth MIDI Macro Slide")},
{1295, kcSetFXdelaycut, _T("Combined Note Delay and Note Cut")},
{KeyCommand::Hidden, kcPatternJumpDownh1Select, _T("kcPatternJumpDownh1Select")},
{KeyCommand::Hidden, kcPatternJumpUph1Select, _T("kcPatternJumpUph1Select")},
{KeyCommand::Hidden, kcPatternSnapDownh1Select, _T("kcPatternSnapDownh1Select")},
{KeyCommand::Hidden, kcPatternSnapUph1Select, _T("kcPatternSnapUph1Select")},
{KeyCommand::Hidden, kcNavigateDownSelect, _T("kcNavigateDownSelect")},
{KeyCommand::Hidden, kcNavigateUpSelect, _T("kcNavigateUpSelect")},
{KeyCommand::Hidden, kcNavigateLeftSelect, _T("kcNavigateLeftSelect")},
{KeyCommand::Hidden, kcNavigateRightSelect, _T("kcNavigateRightSelect")},
{KeyCommand::Hidden, kcNavigateNextChanSelect, _T("kcNavigateNextChanSelect")},
{KeyCommand::Hidden, kcNavigatePrevChanSelect, _T("kcNavigatePrevChanSelect")},
{KeyCommand::Hidden, kcHomeHorizontalSelect, _T("kcHomeHorizontalSelect")},
{KeyCommand::Hidden, kcHomeVerticalSelect, _T("kcHomeVerticalSelect")},
{KeyCommand::Hidden, kcHomeAbsoluteSelect, _T("kcHomeAbsoluteSelect")},
{KeyCommand::Hidden, kcEndHorizontalSelect, _T("kcEndHorizontalSelect")},
{KeyCommand::Hidden, kcEndVerticalSelect, _T("kcEndVerticalSelect")},
{KeyCommand::Hidden, kcEndAbsoluteSelect, _T("kcEndAbsoluteSelect")},
{KeyCommand::Hidden, kcPatternJumpDownh1Select, _T("Jump down by measure select")},
{KeyCommand::Hidden, kcPatternJumpUph1Select, _T("Jump up by measure select")},
{KeyCommand::Hidden, kcPatternSnapDownh1Select, _T("Snap down to measure select")},
{KeyCommand::Hidden, kcPatternSnapUph1Select, _T("Snap up to measure select")},
{KeyCommand::Hidden, kcNavigateDownSelect, _T("Select to Down")},
{KeyCommand::Hidden, kcNavigateUpSelect, _T("Select to Up")},
{KeyCommand::Hidden, kcNavigateLeftSelect, _T("Select to Left")},
{KeyCommand::Hidden, kcNavigateRightSelect, _T("Select to Right")},
{KeyCommand::Hidden, kcNavigateNextChanSelect, _T("Select to Next Channel")},
{KeyCommand::Hidden, kcNavigatePrevChanSelect, _T("Select to Previous Channel")},
{KeyCommand::Hidden, kcHomeHorizontalSelect, _T("Select to First Channel")},
{KeyCommand::Hidden, kcHomeVerticalSelect, _T("Select to First Row")},
{KeyCommand::Hidden, kcHomeAbsoluteSelect, _T("Selecto to First Row / Channel")},
{KeyCommand::Hidden, kcEndHorizontalSelect, _T("Select to Last Channel")},
{KeyCommand::Hidden, kcEndVerticalSelect, _T("Select to Last Row")},
{KeyCommand::Hidden, kcEndAbsoluteSelect, _T("Select to Last Row /channel")},
{KeyCommand::Hidden, kcSelectWithNav, _T("kcSelectWithNav")},
{KeyCommand::Hidden, kcSelectOffWithNav, _T("kcSelectOffWithNav")},
{KeyCommand::Hidden, kcCopySelectWithNav, _T("kcCopySelectWithNav")},
{KeyCommand::Hidden, kcCopySelectOffWithNav, _T("kcCopySelectOffWithNav")},
{1316 | KeyCommand::Dummy, kcChordModifier, _T("Chord Modifier")},
{1317 | KeyCommand::Dummy, kcSetSpacing, _T("Set edit step on note entry")},
{KeyCommand::Hidden, kcSetSpacing0, _T("")},
{KeyCommand::Hidden, kcSetSpacing1, _T("")},
{KeyCommand::Hidden, kcSetSpacing2, _T("")},
{KeyCommand::Hidden, kcSetSpacing3, _T("")},
{KeyCommand::Hidden, kcSetSpacing4, _T("")},
{KeyCommand::Hidden, kcSetSpacing5, _T("")},
{KeyCommand::Hidden, kcSetSpacing6, _T("")},
{KeyCommand::Hidden, kcSetSpacing7, _T("")},
{KeyCommand::Hidden, kcSetSpacing8, _T("")},
{KeyCommand::Hidden, kcSetSpacing9, _T("")},
{1317 | KeyCommand::Dummy, kcSetSpacing, _T("Edit Step Modifier")},
{KeyCommand::Hidden, kcSetSpacing0, _T("Set Edit Step to 0")},
{KeyCommand::Hidden, kcSetSpacing1, _T("Set Edit Step to 1")},
{KeyCommand::Hidden, kcSetSpacing2, _T("Set Edit Step to 2")},
{KeyCommand::Hidden, kcSetSpacing3, _T("Set Edit Step to 3")},
{KeyCommand::Hidden, kcSetSpacing4, _T("Set Edit Step to 4")},
{KeyCommand::Hidden, kcSetSpacing5, _T("Set Edit Step to 5")},
{KeyCommand::Hidden, kcSetSpacing6, _T("Set Edit Step to 6")},
{KeyCommand::Hidden, kcSetSpacing7, _T("Set Edit Step to 7")},
{KeyCommand::Hidden, kcSetSpacing8, _T("Set Edit Step to 8")},
{KeyCommand::Hidden, kcSetSpacing9, _T("Set Edit Step to 9")},
{KeyCommand::Hidden, kcCopySelectWithSelect, _T("kcCopySelectWithSelect")},
{KeyCommand::Hidden, kcCopySelectOffWithSelect, _T("kcCopySelectOffWithSelect")},
{KeyCommand::Hidden, kcSelectWithCopySelect, _T("kcSelectWithCopySelect")},
Expand All @@ -1015,10 +1015,10 @@ static constexpr struct
{1339, kcPatternJumpUph2, _T("Jump up by beat")},
{1340, kcPatternSnapDownh2, _T("Snap down to beat")},
{1341, kcPatternSnapUph2, _T("Snap up to beat")},
{KeyCommand::Hidden, kcPatternJumpDownh2Select, _T("kcPatternJumpDownh2Select")},
{KeyCommand::Hidden, kcPatternJumpUph2Select, _T("kcPatternJumpUph2Select")},
{KeyCommand::Hidden, kcPatternSnapDownh2Select, _T("kcPatternSnapDownh2Select")},
{KeyCommand::Hidden, kcPatternSnapUph2Select, _T("kcPatternSnapUph2Select")},
{KeyCommand::Hidden, kcPatternJumpDownh2Select, _T("Jump down by beat select")},
{KeyCommand::Hidden, kcPatternJumpUph2Select, _T("Jump up by beat select")},
{KeyCommand::Hidden, kcPatternSnapDownh2Select, _T("Snap down to beat select")},
{KeyCommand::Hidden, kcPatternSnapUph2Select, _T("Snap up to beat select")},
{1346, kcFileOpen, _T("File/Open")},
{1347, kcFileNew, _T("File/New")},
{1348, kcFileClose, _T("File/Close")},
Expand Down Expand Up @@ -1089,8 +1089,8 @@ static constexpr struct
{1685, kcSwitchToOrderList, _T("Switch to Order List")},
{1686, kcEditMixPasteITStyle, _T("Mix Paste (IT Style)")},
{1687, kcApproxRealBPM, _T("Show approx. real BPM")},
{KeyCommand::Hidden, kcNavigateDownBySpacingSelect, _T("kcNavigateDownBySpacingSelect")},
{KeyCommand::Hidden, kcNavigateUpBySpacingSelect, _T("kcNavigateUpBySpacingSelect")},
{KeyCommand::Hidden, kcNavigateDownBySpacingSelect, _T("Up-By-Spacing-Select")},
{KeyCommand::Hidden, kcNavigateUpBySpacingSelect, _T("Down-By-Spacing-Select")},
{1691, kcNavigateDownBySpacing, _T("Navigate down by spacing")},
{1692, kcNavigateUpBySpacing, _T("Navigate up by spacing")},
{1693, kcPrevDocument, _T("Previous Document")},
Expand All @@ -1113,12 +1113,12 @@ static constexpr struct
{1779, kcSoloChnOnPatTransition, _T("Solo channel on pattern transition")},
{1780, kcTimeAtRow, _T("Show playback time at current row")},
{1781, kcViewMIDImapping, _T("View MIDI Mapping")},
{1782, kcVSTGUIPrevPresetJump, _T("Plugin preset backward jump")},
{1783, kcVSTGUINextPresetJump, _T("Plugin preset forward jump")},
{1782, kcVSTGUIPrevPresetJump, _T("Plugin Preset -10")},
{1783, kcVSTGUINextPresetJump, _T("Plugin Preset +10")},
{1784, kcSampleInvert, _T("Invert Sample Phase")},
{1785, kcSampleSignUnsign, _T("Signed / Unsigned Conversion")},
{1786, kcChannelReset, _T("Reset Channel")},
{1787, kcToggleOverflowPaste, _T("Toggle overflow paste")},
{1787, kcToggleOverflowPaste, _T("Toggle Overflow Paste")},
{1788, kcNotePC, _T("Parameter Control")},
{1789, kcNotePCS, _T("Parameter Control (smooth)")},
{1790, kcSampleRemoveDCOffset, _T("Remove DC Offset")},
Expand All @@ -1129,10 +1129,10 @@ static constexpr struct
{1795, kcOrderlistNavigateRight, _T("Next Order")},
{1796, kcOrderlistNavigateFirst, _T("First Order")},
{1797, kcOrderlistNavigateLast, _T("Last Order")},
{KeyCommand::Hidden, kcOrderlistNavigateLeftSelect, _T("kcOrderlistNavigateLeftSelect")},
{KeyCommand::Hidden, kcOrderlistNavigateRightSelect, _T("kcOrderlistNavigateRightSelect")},
{KeyCommand::Hidden, kcOrderlistNavigateFirstSelect, _T("kcOrderlistNavigateFirstSelect")},
{KeyCommand::Hidden, kcOrderlistNavigateLastSelect, _T("kcOrderlistNavigateLastSelect")},
{KeyCommand::Hidden, kcOrderlistNavigateLeftSelect, _T("Left-Select")},
{KeyCommand::Hidden, kcOrderlistNavigateRightSelect, _T("Right-Select")},
{KeyCommand::Hidden, kcOrderlistNavigateFirstSelect, _T("First-Select")},
{KeyCommand::Hidden, kcOrderlistNavigateLastSelect, _T("Last-Select")},
{1802, kcOrderlistEditDelete, _T("Delete Order")},
{1803, kcOrderlistEditInsert, _T("Insert Order")},
{1804, kcOrderlistEditPattern, _T("Edit Pattern")},
Expand All @@ -1148,26 +1148,26 @@ static constexpr struct
{1814, kcOrderlistPat7, _T("Pattern index digit 7")},
{1815, kcOrderlistPat8, _T("Pattern index digit 8")},
{1816, kcOrderlistPat9, _T("Pattern index digit 9")},
{1817, kcOrderlistPatPlus, _T("Increase pattern index ")},
{1818, kcOrderlistPatMinus, _T("Decrease pattern index")},
{1817, kcOrderlistPatPlus, _T("Increase Pattern Index")},
{1818, kcOrderlistPatMinus, _T("Decrease Pattern Index")},
{1819, kcShowSplitKeyboardSettings, _T("Split Keyboard Settings dialog")},
{1820, kcEditPushForwardPaste, _T("Push Forward Paste (Insert)")},
{1821, kcInstrumentEnvelopePointMoveLeft, _T("Move envelope point left")},
{1822, kcInstrumentEnvelopePointMoveRight, _T("Move envelope point right")},
{1823, kcInstrumentEnvelopePointMoveUp, _T("Move envelope point up")},
{1824, kcInstrumentEnvelopePointMoveDown, _T("Move envelope point down")},
{1825, kcInstrumentEnvelopePointPrev, _T("Select previous envelope point")},
{1826, kcInstrumentEnvelopePointNext, _T("Select next envelope point")},
{1821, kcInstrumentEnvelopePointMoveLeft, _T("Move Envelope Point Left")},
{1822, kcInstrumentEnvelopePointMoveRight, _T("Move Envelope Point Right")},
{1823, kcInstrumentEnvelopePointMoveUp, _T("Move envelope Point Up")},
{1824, kcInstrumentEnvelopePointMoveDown, _T("Move Envelope Point Down")},
{1825, kcInstrumentEnvelopePointPrev, _T("Select Previous Envelope Point")},
{1826, kcInstrumentEnvelopePointNext, _T("Select Next Envelope Point")},
{1827, kcInstrumentEnvelopePointInsert, _T("Insert Envelope Point")},
{1828, kcInstrumentEnvelopePointRemove, _T("Remove Envelope Point")},
{1829, kcInstrumentEnvelopeSetLoopStart, _T("Set Loop Start")},
{1830, kcInstrumentEnvelopeSetLoopEnd, _T("Set Loop End")},
{1831, kcInstrumentEnvelopeSetSustainLoopStart, _T("Set sustain loop start")},
{1832, kcInstrumentEnvelopeSetSustainLoopEnd, _T("Set sustain loop end")},
{1833, kcInstrumentEnvelopeToggleReleaseNode, _T("Toggle release node")},
{1834, kcInstrumentEnvelopePointMoveUp8, _T("Move envelope point up (Coarse)")},
{1835, kcInstrumentEnvelopePointMoveDown8, _T("Move envelope point down (Coarse)")},
{1836, kcPatternEditPCNotePlugin, _T("Toggle PC Event/instrument plugin editor")},
{1831, kcInstrumentEnvelopeSetSustainLoopStart, _T("Set Sustain Loop Start")},
{1832, kcInstrumentEnvelopeSetSustainLoopEnd, _T("Set Sustain Loop End")},
{1833, kcInstrumentEnvelopeToggleReleaseNode, _T("Toggle Release Mode")},
{1834, kcInstrumentEnvelopePointMoveUp8, _T("Move Envelope Point Up (Coarse)")},
{1835, kcInstrumentEnvelopePointMoveDown8, _T("Move Envelope Point Down (Coarse)")},
{1836, kcPatternEditPCNotePlugin, _T("Toggle PC Event/Instrument Plugin Editor")},
{1837, kcInstrumentEnvelopeZoomIn, _T("Zoom In")},
{1838, kcInstrumentEnvelopeZoomOut, _T("Zoom Out")},
{1839, kcVSTGUIToggleRecordParams, _T("Toggle Parameter Recording")},
Expand Down Expand Up @@ -1196,16 +1196,16 @@ static constexpr struct
{1862, kcDecreaseSpacing, _T("Decrease Edit Step")},
{1863, kcSampleAutotune, _T("Tune Sample to given Note")},
{1864, kcFileCloseAll, _T("File/Close All")},
{KeyCommand::Hidden, kcSetOctaveStop0, _T("")},
{KeyCommand::Hidden, kcSetOctaveStop1, _T("")},
{KeyCommand::Hidden, kcSetOctaveStop2, _T("")},
{KeyCommand::Hidden, kcSetOctaveStop3, _T("")},
{KeyCommand::Hidden, kcSetOctaveStop4, _T("")},
{KeyCommand::Hidden, kcSetOctaveStop5, _T("")},
{KeyCommand::Hidden, kcSetOctaveStop6, _T("")},
{KeyCommand::Hidden, kcSetOctaveStop7, _T("")},
{KeyCommand::Hidden, kcSetOctaveStop8, _T("")},
{KeyCommand::Hidden, kcSetOctaveStop9, _T("")},
{KeyCommand::Hidden, kcSetOctaveStop0, _T("Set Octave 0")},
{KeyCommand::Hidden, kcSetOctaveStop1, _T("Set Octave 1")},
{KeyCommand::Hidden, kcSetOctaveStop2, _T("Set Octave 2")},
{KeyCommand::Hidden, kcSetOctaveStop3, _T("Set Octave 3")},
{KeyCommand::Hidden, kcSetOctaveStop4, _T("Set Octave 4")},
{KeyCommand::Hidden, kcSetOctaveStop5, _T("Set Octave 5")},
{KeyCommand::Hidden, kcSetOctaveStop6, _T("Set Octave 6")},
{KeyCommand::Hidden, kcSetOctaveStop7, _T("Set Octave 7")},
{KeyCommand::Hidden, kcSetOctaveStop8, _T("Set Octave 8")},
{KeyCommand::Hidden, kcSetOctaveStop9, _T("Set Octave 9")},
{1875, kcOrderlistLockPlayback, _T("Lock Playback to Selection")},
{1876, kcOrderlistUnlockPlayback, _T("Unlock Playback")},
{1877, kcChannelSettings, _T("Quick Channel Settings")},
Expand Down Expand Up @@ -1338,10 +1338,10 @@ static constexpr struct
{2029, kcViewToggle, _T("Toggle Between Upper / Lower View") },
{2030, kcFileSaveOPL, _T("File/Export OPL Register Dump") },
{2031, kcSampleLoadRaw, _T("Load Raw Sample")},
{2032, kcTogglePatternPlayRow, _T("Toggle row playback when navigating")},
{2032, kcTogglePatternPlayRow, _T("Toggle Row Playback when Navigating")},
{2033, kcInsNoteMapTransposeSamples, _T("Transpose Samples / Reset Map") },
{KeyCommand::Hidden, kcPrevEntryInColumnSelect, _T("kcPrevEntryInColumnSelect")},
{KeyCommand::Hidden, kcNextEntryInColumnSelect, _T("kcNextEntryInColumnSelect")},
{KeyCommand::Hidden, kcPrevEntryInColumnSelect, _T("Select to previous entry in column")},
{KeyCommand::Hidden, kcNextEntryInColumnSelect, _T("Select to next entry in column")},
{2034, kcTreeViewOpen, _T("Open / View Item")},
{2035, kcTreeViewPlay, _T("Play Item")},
{2036, kcTreeViewInsert, _T("Insert Item")},
Expand Down Expand Up @@ -1395,9 +1395,9 @@ static constexpr struct
{2100, kcGotoParamColumn, _T("Go to effect parameter column")},
{2101, kcContextMenu, _T("Open Context Menu")},
{2102, kcOrderlistStreamExport, _T("Stream Export")},
{2103, kcToggleVisibilityInstrColumn, _T("Toggle instrument column visibility")},
{2104, kcToggleVisibilityVolumeColumn, _T("Toggle volume column visibility")},
{2105, kcToggleVisibilityEffectColumn, _T("Toggle effect column visibility")},
{2103, kcToggleVisibilityInstrColumn, _T("Toggle Instrument Column Visibility")},
{2104, kcToggleVisibilityVolumeColumn, _T("Toggle Volume Column Visibility")},
{2105, kcToggleVisibilityEffectColumn, _T("Toggle Effect Column Visibility")},
{2106, kcFileOpenTemplate, _T("File/Open Template")},
};
// clang-format on
Expand Down
Loading

0 comments on commit 90cc3a1

Please sign in to comment.