Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1425] trunk/OpenMPT
|
From: <sag...@us...> - 2012-11-14 23:42:19
|
Revision: 1425
http://modplug.svn.sourceforge.net/modplug/?rev=1425&view=rev
Author: saga-games
Date: 2012-11-14 23:42:12 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
[Imp] Added "Zoom into Selection" shortcut for sample editor (http://forum.openmpt.org/index.php?topic=4877.0).
[Imp] Added "Zoom into Selection" to default keymap and DE_jojo.mkb, also added Quick Channel Settings shortcuts to the default keymap.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/CommandSet.h
trunk/OpenMPT/mptrack/View_smp.cpp
trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2012-11-11 23:19:24 UTC (rev 1424)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2012-11-14 23:42:12 UTC (rev 1425)
@@ -634,6 +634,7 @@
DefineKeyCommand(kcChnSettingsNext, 1879, _T("Next Channel"));
DefineKeyCommand(kcChnSettingsClose, 1880, _T("Switch to Pattern Editor"));
DefineKeyCommand(kcTransposeCustom, 1881, _T("Transpose Custom"));
+ DefineKeyCommand(kcSampleZoomSelection, 1882, _T("Zoom into Selection"));
// Add new key commands here.
#ifdef _DEBUG
Modified: trunk/OpenMPT/mptrack/CommandSet.h
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h 2012-11-11 23:19:24 UTC (rev 1424)
+++ trunk/OpenMPT/mptrack/CommandSet.h 2012-11-14 23:42:12 UTC (rev 1425)
@@ -268,6 +268,8 @@
kcTransposeOctUp,
kcTransposeOctDown,
kcTransposeCustom,
+ kcDataEntryUp,
+ kcDataEntryDown,
kcPatternAmplify,
kcPatternInterpolateNote,
kcPatternInterpolateVol,
@@ -640,8 +642,9 @@
kcSampleAmplify,
kcSampleReverse,
kcSampleDelete,
- kcSampleZoomUp,
- kcSampleZoomDown,
+ kcSampleZoomUp,
+ kcSampleZoomDown,
+ kcSampleZoomSelection,
kcSampleInvert,
kcSampleSignUnsign,
kcSampleRemoveDCOffset,
Modified: trunk/OpenMPT/mptrack/View_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_smp.cpp 2012-11-11 23:19:24 UTC (rev 1424)
+++ trunk/OpenMPT/mptrack/View_smp.cpp 2012-11-14 23:42:12 UTC (rev 1425)
@@ -1490,7 +1490,7 @@
{
if (m_dwEndSel >= m_dwBeginSel + 4)
{
- ::AppendMenu(hMenu, MF_STRING | (CanZoomSelection() ? 0 : MF_GRAYED), ID_SAMPLE_ZOOMONSEL, "Zoom");
+ ::AppendMenu(hMenu, MF_STRING | (CanZoomSelection() ? 0 : MF_GRAYED), ID_SAMPLE_ZOOMONSEL, "Zoom\t" + ih->GetKeyTextFromCommand(kcSampleZoomSelection));
::AppendMenu(hMenu, MF_STRING, ID_SAMPLE_SETLOOP, "Set As Loop");
if (pSndFile->GetType() & (MOD_TYPE_IT|MOD_TYPE_MPT))
::AppendMenu(hMenu, MF_STRING, ID_SAMPLE_SETSUSTAINLOOP, "Set As Sustain Loop");
@@ -1503,10 +1503,10 @@
{
//Set loop points
wsprintf(s, "Set Loop Start to:\t%d", dwPos);
- ::AppendMenu(hMenu, MF_STRING | (dwPos + 4 <= sample.nLoopEnd ? 0 : MF_GRAYED),
+ ::AppendMenu(hMenu, MF_STRING | (dwPos + 4 <= sample.nLoopEnd ? 0 : MF_GRAYED),
ID_SAMPLE_SETLOOPSTART, s);
wsprintf(s, "Set Loop End to:\t%d", dwPos);
- ::AppendMenu(hMenu, MF_STRING | (dwPos >= sample.nLoopStart + 4 ? 0 : MF_GRAYED),
+ ::AppendMenu(hMenu, MF_STRING | (dwPos >= sample.nLoopStart + 4 ? 0 : MF_GRAYED),
ID_SAMPLE_SETLOOPEND, s);
if (pSndFile->GetType() & (MOD_TYPE_IT|MOD_TYPE_MPT))
@@ -1514,10 +1514,10 @@
//Set sustain loop points
::AppendMenu(hMenu, MF_SEPARATOR, 0, "");
wsprintf(s, "Set Sustain Start to:\t%d", dwPos);
- ::AppendMenu(hMenu, MF_STRING | (dwPos + 4 <= sample.nSustainEnd ? 0 : MF_GRAYED),
- ID_SAMPLE_SETSUSTAINSTART, s);
+ ::AppendMenu(hMenu, MF_STRING | (dwPos + 4 <= sample.nSustainEnd ? 0 : MF_GRAYED),
+ ID_SAMPLE_SETSUSTAINSTART, s);
wsprintf(s, "Set Sustain End to:\t%d", dwPos);
- ::AppendMenu(hMenu, MF_STRING | (dwPos >= sample.nSustainStart + 4 ? 0 : MF_GRAYED),
+ ::AppendMenu(hMenu, MF_STRING | (dwPos >= sample.nSustainStart + 4 ? 0 : MF_GRAYED),
ID_SAMPLE_SETSUSTAINEND, s);
}
::AppendMenu(hMenu, MF_SEPARATOR, 0, "");
@@ -2678,6 +2678,7 @@
case kcSampleTrim: OnSampleTrim() ; return wParam;
case kcSampleZoomUp: OnZoomUp(); return wParam;
case kcSampleZoomDown: OnZoomDown(); return wParam;
+ case kcSampleZoomSelection: OnZoomOnSel(); return wParam;
case kcPrevInstrument: OnPrevInstrument(); return wParam;
case kcNextInstrument: OnNextInstrument(); return wParam;
case kcEditSelectAll: OnEditSelectAll(); return wParam;
Modified: trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
===================================================================
--- trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2012-11-11 23:19:24 UTC (rev 1424)
+++ trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2012-11-14 23:42:12 UTC (rev 1425)
@@ -13,14 +13,14 @@
0:1350:3:83:1 //File/Save As: Shift+Ctrl+S (KeyDown)
0:1693:0:166:1 //Previous Document: (KeyDown)
0:1694:0:167:1 //Next Document: (KeyDown)
-0:1030:0:116:1 //Play song/Pause song: F5 (KeyDown)
-0:1031:0:119:1 //Pause song: F8 (KeyDown)
+0:1030:0:116:1 //Play Song / Pause song: F5 (KeyDown)
+0:1031:0:119:1 //Pause Song: F8 (KeyDown)
0:1375:0:27:1 //Stop Song: ESC (KeyDown)
-0:1029:0:117:1 //Play song from start: F6 (KeyDown)
-0:1028:2:117:1 //Play song from cursor: Ctrl+F6 (KeyDown)
+0:1029:0:117:1 //Play Song from Start: F6 (KeyDown)
+0:1028:2:117:1 //Play Song from Cursor: Ctrl+F6 (KeyDown)
0:1027:0:118:1 //Play pattern from start: F7 (KeyDown)
0:1026:2:118:1 //Play pattern from cursor: Ctrl+F7 (KeyDown)
-0:1376:0:120:1 //Toggle Midi Record: F9 (KeyDown)
+0:1376:0:120:1 //Toggle MIDI Record: F9 (KeyDown)
0:1359:2:90:1 //Undo: Ctrl+Z (KeyDown)
0:1360:2:88:1 //Cut: Ctrl+X (KeyDown)
0:1361:2:67:1 //Copy: Ctrl+C (KeyDown)
@@ -28,7 +28,7 @@
0:1362:1:45:1 //Paste: Shift+INSERT (KeyDown)
0:1363:3:86:1 //Mix Paste: Shift+Ctrl+V (KeyDown)
0:1793:1:86:5 //Paste Flood: Shift+V (KeyDown|KeyHold)
-0:1820:6:86:1 //Push Forward Paste: Ctrl+Alt+V (KeyDown)
+0:1820:6:86:1 //Push Forward Paste (Insert): Ctrl+Alt+V (KeyDown)
0:1364:2:53:1 //Select All: Ctrl+5 (KeyDown)
0:1365:2:70:1 //Find / Replace: Ctrl+F (KeyDown)
0:1366:0:114:1 //Find Next: F3 (KeyDown)
@@ -40,8 +40,8 @@
0:1025:4:67:1 //View Comments: Alt+C (KeyDown)
0:1368:2:113:1 //Toggle Tree View: Ctrl+F2 (KeyDown)
0:1369:2:112:1 //View Options: Ctrl+F1 (KeyDown)
-0:1781:2:114:1 //View MIDI mapping: Ctrl+F3 (KeyDown)
-0:1370:0:112:1 //Help (to do): F1 (KeyDown)
+0:1781:2:114:1 //View MIDI Mapping: Ctrl+F3 (KeyDown)
+0:1370:0:112:1 //Help: F1 (KeyDown)
0:1032:2:111:5 //Previous instrument: Ctrl+NUM DIVIDE (KeyDown|KeyHold)
0:1032:2:38:5 //Previous instrument: Ctrl+UP (KeyDown|KeyHold)
0:1033:2:106:5 //Next instrument: Ctrl+NUMMULT (KeyDown|KeyHold)
@@ -88,22 +88,22 @@
2:1836:2:191:1 //Edit plugin assigned to PC note: Ctrl+/ (KeyDown)
2:1662:6:80:1 //Toggle channel's plugin editor: Ctrl+Alt+P (KeyDown)
2:1062:0:93:1 //Show note properties: Application (KeyDown)
-2:1772:5:80:1 //Show pattern properties window: Shift+Alt+P (KeyDown)
+2:1772:5:80:1 //Show Pattern Properties: Shift+Alt+P (KeyDown)
2:1819:2:69:1 //Split Keyboard Settings dialog: Ctrl+E (KeyDown)
-2:1776:1:122:1 //Toggle loop pattern: Shift+F11 (KeyDown)
+2:1776:1:122:1 //Toggle Loop Pattern: Shift+F11 (KeyDown)
2:1780:2:84:1 //Show playback time at current row: Ctrl+T (KeyDown)
-2:1005:0:121:1 //Mute current channel: F10 (KeyDown)
-2:1006:2:121:1 //Solo current channel: Ctrl+F10 (KeyDown)
+2:1005:0:121:1 //Mute current Channel: F10 (KeyDown)
+2:1006:2:121:1 //Solo current Channel: Ctrl+F10 (KeyDown)
2:1771:6:121:1 //Unmute all channels: Ctrl+Alt+F10 (KeyDown)
-2:1786:2:82:1 //Reset channel: Ctrl+R (KeyDown)
+2:1786:2:82:1 //Reset Channel: Ctrl+R (KeyDown)
2:1007:2:81:5 //Transpose +1: Ctrl+Q (KeyDown|KeyHold)
2:1008:2:65:5 //Transpose -1: Ctrl+A (KeyDown|KeyHold)
2:1009:3:81:5 //Transpose +12: Shift+Ctrl+Q (KeyDown|KeyHold)
2:1010:3:65:5 //Transpose -12: Shift+Ctrl+A (KeyDown|KeyHold)
2:1012:2:77:1 //Amplify selection: Ctrl+M (KeyDown)
-2:1014:2:74:1 //Interpolate volume: Ctrl+J (KeyDown)
-2:1015:2:75:1 //Interpolate effect: Ctrl+K (KeyDown)
-2:1016:4:66:1 //Open effect visualizer: Alt+B (KeyDown)
+2:1014:2:74:1 //Interpolate Volume: Ctrl+J (KeyDown)
+2:1015:2:75:1 //Interpolate Effect: Ctrl+K (KeyDown)
+2:1016:4:66:1 //Open Effect Visualizer: Alt+B (KeyDown)
2:1766:2:71:1 //Go to row/channel/...: Ctrl+G (KeyDown)
2:1013:2:73:1 //Apply current instrument: Ctrl+I (KeyDown)
2:1660:4:69:5 //Grow selection: Alt+E (KeyDown|KeyHold)
@@ -224,20 +224,20 @@
5:1230:0:104:1 //Set volume digit 8: NUM 8 (KeyDown)
5:1231:0:57:1 //Set volume digit 9: 9 (KeyDown)
5:1231:0:105:1 //Set volume digit 9: NUM 9 (KeyDown)
-5:1232:0:86:1 //Vol command - volume: V (KeyDown)
-5:1233:0:80:1 //Vol command - pan: P (KeyDown)
-5:1234:0:67:1 //Vol command - vol slide up: C (KeyDown)
-5:1235:0:68:1 //Vol command - vol slide down: D (KeyDown)
-5:1236:0:65:1 //Vol command - vol fine slide up: A (KeyDown)
-5:1237:0:66:1 //Vol command - vol fine slide down: B (KeyDown)
-5:1238:0:85:1 //Vol command - vibrato speed: U (KeyDown)
-5:1239:0:72:1 //Vol command - vibrato: H (KeyDown)
-5:1240:0:76:1 //Vol command - XM pan left: L (KeyDown)
-5:1241:0:82:1 //Vol command - XM pan right: R (KeyDown)
-5:1242:0:71:1 //Vol command - Portamento: G (KeyDown)
-5:1243:0:70:1 //Vol command - Portamento Up: F (KeyDown)
-5:1244:0:69:1 //Vol command - Portamento Down: E (KeyDown)
-5:1246:0:79:1 //Vol command - Offset: O (KeyDown)
+5:1232:0:86:1 //Volume Command - Volume: V (KeyDown)
+5:1233:0:80:1 //Volume Command - Panning: P (KeyDown)
+5:1234:0:67:1 //Volume Command - Volume Slide Up: C (KeyDown)
+5:1235:0:68:1 //Volume Command - Volume Slide Down: D (KeyDown)
+5:1236:0:65:1 //Volume Command - Fine Volume Slide Up: A (KeyDown)
+5:1237:0:66:1 //Volume Command - Fine Volume Slide Down: B (KeyDown)
+5:1238:0:85:1 //Volume Command - Vibrato Speed: U (KeyDown)
+5:1239:0:72:1 //Volume Command - Vibrato Depth: H (KeyDown)
+5:1240:0:76:1 //Volume Command - XM Pan Slide Left: L (KeyDown)
+5:1241:0:82:1 //Volume Command - XM Pan Slide Right: R (KeyDown)
+5:1242:0:71:1 //Volume Command - Portamento: G (KeyDown)
+5:1243:0:70:1 //Volume Command - Portamento Up: F (KeyDown)
+5:1244:0:69:1 //Volume Command - Portamento Down: E (KeyDown)
+5:1246:0:79:1 //Volume Command - Offset: O (KeyDown)
//----( Pattern Context [bottom] - FX Col (6) )------------
6:1294:0:220:1 //FX midi macro slide: \ (KeyDown)
@@ -279,15 +279,16 @@
8:1384:1:78:1 //Normalise Sample: Shift+N (KeyDown)
8:1385:3:65:1 //Amplify Sample: Shift+Ctrl+A (KeyDown)
8:1385:2:77:1 //Amplify Sample: Ctrl+M (KeyDown)
-8:1381:3:82:1 //Reverse sample: Shift+Ctrl+R (KeyDown)
+8:1381:3:82:1 //Reverse Sample: Shift+Ctrl+R (KeyDown)
8:1382:0:46:1 //Delete sample selection: DELETE (KeyDown)
8:1386:0:107:1 //Zoom Out: NUM PLUS (KeyDown)
8:1387:0:109:1 //Zoom In: NUM SUB (KeyDown)
-8:1784:2:73:1 //Invert sample phase: Ctrl+I (KeyDown)
-8:1785:2:85:1 //Signed/Unsigned conversion: Ctrl+U (KeyDown)
+8:1882:0:32:1 //Zoom into Selection: Space (KeyDown)
+8:1784:2:73:1 //Invert Sample Phase: Ctrl+I (KeyDown)
+8:1785:2:85:1 //Signed / Unsigned Conversion: Ctrl+U (KeyDown)
8:1790:2:69:1 //Remove DC Offset: Ctrl+E (KeyDown)
-8:1856:2:68:1 //Quick fade: Ctrl+D (KeyDown)
-8:1857:2:76:1 //Crossfade sample loop: Ctrl+L (KeyDown)
+8:1856:2:68:1 //Quick Fade: Ctrl+D (KeyDown)
+8:1857:2:76:1 //Crossfade Sample Loop: Ctrl+L (KeyDown)
//----( Instrument Context [bottom] (9) )------------
9:1837:0:107:5 //Zoom In: NUM PLUS (KeyDown|KeyHold)
@@ -332,16 +333,16 @@
//----( Sample Context [top] (16) )------------
//----( Instrument Context [top] (17) )------------
-17:1851:2:68:1 //Duplicate instrument: Ctrl+D (KeyDown)
-17:1850:3:69:1 //Edit sample map: Shift+Ctrl+E (KeyDown)
-17:1849:2:69:1 //Edit current sample: Ctrl+E (KeyDown)
+17:1851:2:68:1 //Duplicate Instrument: Ctrl+D (KeyDown)
+17:1850:3:69:1 //Edit Sample Map: Shift+Ctrl+E (KeyDown)
+17:1849:2:69:1 //Edit Current Sample: Ctrl+E (KeyDown)
17:1846:3:77:1 //Map all notes to selected note: Shift+Ctrl+M (KeyDown)
17:1847:2:77:1 //Map all notes to selected sample: Ctrl+M (KeyDown)
-17:1848:2:82:1 //Reset note mapping: Ctrl+R (KeyDown)
-17:1843:2:81:1 //Transpose +1 (note map): Ctrl+Q (KeyDown)
-17:1842:2:65:1 //Transpose -1 (note map): Ctrl+A (KeyDown)
-17:1845:3:81:1 //Transpose +12 (note map): Shift+Ctrl+Q (KeyDown)
-17:1844:3:65:1 //Transpose -12 (note map): Shift+Ctrl+A (KeyDown)
+17:1848:2:82:1 //Reset Note Mapping: Ctrl+R (KeyDown)
+17:1843:2:81:1 //Transpose +1 (Note Map): Ctrl+Q (KeyDown)
+17:1842:2:65:1 //Transpose -1 (Note Map): Ctrl+A (KeyDown)
+17:1845:3:81:1 //Transpose +12 (Note Map): Shift+Ctrl+Q (KeyDown)
+17:1844:3:65:1 //Transpose -12 (Note Map): Shift+Ctrl+A (KeyDown)
//----( Comments Context [top] (18) )------------
@@ -384,3 +385,10 @@
19:1854:0:32:1 //Stop (---) Index: SPACE (KeyDown)
19:1875:2:76:1 //Lock Playback to Selection: Ctrl+L (KeyDown)
19:1876:2:85:1 //Unlock Playback: Ctrl+U (KeyDown)
+
+//----( Quick Channel Settings Context (20) )------------
+20:1878:1:37:5 //Previous Channel: Shift+Left (KeyDown|KeyHold)
+20:1878:1:8:5 //Previous Channel: Shift+Backspace (KeyDown|KeyHold)
+20:1879:1:39:5 //Next Channel: Shift+Right (KeyDown|KeyHold)
+20:1879:1:13:5 //Next Channel: Shift+ENTER (KeyDown|KeyHold)
+20:1880:0:13:1 //Switch to Pattern Editor: ENTER (KeyDown)
Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb
===================================================================
--- trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb 2012-11-11 23:19:24 UTC (rev 1424)
+++ trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb 2012-11-14 23:42:12 UTC (rev 1425)
@@ -286,6 +286,7 @@
8:1382:0:46:1 //Delete Sample Selection: ENTF (KeyDown)
8:1386:0:107:1 //Zoom Out: + (ZEHNERTASTATUR) (KeyDown)
8:1387:0:109:1 //Zoom In: - (ZEHNERTASTATUR) (KeyDown)
+8:1882:0:32:1 //Zoom into Selection: LEER (KeyDown)
8:1784:2:73:1 //Invert Sample Phase: Ctrl+I (KeyDown)
8:1785:2:85:1 //Signed / Unsigned Conversion: Ctrl+U (KeyDown)
8:1790:2:69:1 //Remove DC Offset: Ctrl+E (KeyDown)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
