Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 2.2 keyboard mapping template #1950

Merged
merged 27 commits into from
Jul 6, 2019
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
e71cddb
Add missing ``Skin Settings`` to view menu, replaces the now defunct …
esbrandt Dec 18, 2018
45c495b
Add Missing shortcuts for Developer menu, visible when starting Mixxx…
esbrandt Dec 18, 2018
ebb5899
Replace deprecated ``flanger`` shortcuts with the Quickeffect control
esbrandt Dec 18, 2018
1bff933
Replace deprecated ``beatsync`` shortcut with ``sync_enabled``
esbrandt Dec 18, 2018
56aa7f9
Replace shortcuts for some transport controls like ``back``, ``Revers…
esbrandt Dec 18, 2018
f96df51
``reloop``, ``loop_in``, and ``loop_out`` shortcuts work now analog …
esbrandt Dec 18, 2018
a232e02
``beatloop`` and ``beatlooproll`` shortcuts work analog to the button…
esbrandt Dec 18, 2018
60b180c
Merge remote-tracking branch 'upstream/2.2' into 2.2-keyboard
esbrandt Dec 20, 2018
ab7a909
Merge remote-tracking branch 'upstream/2.2' into 2.2-keyboard
esbrandt Dec 23, 2018
4db75b6
Adapt changes from en_US keyboard mapping for de_DE
esbrandt Dec 23, 2018
c0b0b9c
Adapt changes from en_US keyboard mapping for de_CH
esbrandt Dec 23, 2018
b256912
Adapt changes from en_US keyboard mapping for it_IT
esbrandt Dec 23, 2018
9d59e4d
Add missing part to the it_IT mapping
esbrandt Dec 23, 2018
c3f0271
Adapt changes from en_US keyboard mapping for fr_FR
esbrandt Dec 23, 2018
07756da
Adapt changes from en_US keyboard mapping for fr_CH
esbrandt Dec 23, 2018
bddba69
Adapt changes from en_US keyboard mapping for fi_FI
esbrandt Dec 23, 2018
b779046
Adapt changes from en_US keyboard mapping for es_ES
esbrandt Dec 23, 2018
dcc715c
Adapt changes from en_US keyboard mapping for cs_CZ
esbrandt Dec 23, 2018
0c83976
Adapt changes from en_US keyboard mapping for da_DK
esbrandt Dec 23, 2018
2b23f53
Adapt changes from en_US keyboard mapping for el_GR. Needs testing
esbrandt Dec 23, 2018
5736425
Adapt changes from en_US keyboard mapping for ru_RU. Needs testing
esbrandt Dec 23, 2018
6dddf3e
Add missing controls in fr_FR mapping
esbrandt Dec 23, 2018
e2c78b3
Add missing controls in cs_CZ mapping
esbrandt Dec 23, 2018
a30985a
Merge remote-tracking branch 'upstream/2.2' into 2.2-keyboard
esbrandt Dec 24, 2018
eed30d7
Merge remote-tracking branch 'upstream/2.2' into 2.2-keyboard
esbrandt Dec 30, 2018
7b23599
Merge remote-tracking branch 'upstream/2.2' into 2.2-keyboard
esbrandt Jan 11, 2019
48f862e
Merge remote-tracking branch 'upstream/master' into 2.2-keyboard
esbrandt Feb 10, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 43 additions & 20 deletions res/keyboard/cs_CZ.kbd.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,30 @@ crossfader_down_small Shift+g
[Microphone]
talkover \

[VinylControl]
Toggle Ctrl+t

[PreviewDeck1]
LoadSelectedTrackAndPlay Alt+Return
start_stop Return
back Alt+Left
fwd Alt+Right

[QuickEffectRack1_[Channel1]_Effect1]
enabled ř

[QuickEffectRack1_[Channel2]_Effect1]
enabled ž

[Channel1]
play d
cue_set Shift+d
cue_default f
cue_gotoandstop Shift+f

back a
reverse Shift+a
fwd s
beatjump_backward a
beatjump_1_backward Shift+a
beatjump_forward s
beatjump_1_forward Shift+s

beatsync +
sync_enabled +
bpm_tap Shift+1

rate_perm_down F1
Expand All @@ -46,7 +50,6 @@ rate_temp_up_small Shift+F4

pfl t
filterLowKill b
flanger ř

hotcue_1_activate y
hotcue_2_activate x
Expand All @@ -61,12 +64,18 @@ LoadSelectedTrack Shift+Left
eject Alt+Shift+Left

loop_in ě
loop_in_goto Shift+2
loop_out š
reloop_exit č
loop_out_goto Shift+3
reloop_toggle č
reloop_andstop Shift+4

beatloop_4_toggle q
beatloop_activate q
beatlooproll_activate Shift+q
loop_halve w
beatjump_forward Shift+w
loop_double e
beatjump_backward Shift+e

passthrough Ctrl+j
vinylcontrol_mode Ctrl+Shift+Z
Expand All @@ -78,11 +87,12 @@ cue_set Shift+l
cue_default ů
cue_gotoandstop Shift+"

back j
reverse Shift+j
fwd k
beatjump_backward j
beatjump_1_backward Shift+j
beatjump_forward k
beatjump_1_forward Shift+k

beatsync ž
sync_enabled ž
bpm_tap Shift+6

rate_perm_down F5
Expand All @@ -96,7 +106,6 @@ rate_temp_up_small Shift+F8

pfl z
filterLowKill n
flanger 0

hotcue_1_activate m
hotcue_2_activate ,
Expand All @@ -111,12 +120,18 @@ LoadSelectedTrack Shift+Right
eject Alt+Shift+Right

loop_in ý
loop_in_goto Shift+7
loop_out á
reloop_exit í
loop_out_goto Shift+8
reloop_toggle í
reloop_andstop Shift+9

beatloop_4_toggle u
beatloop_activate u
beatlooproll_activate Shift+u
loop_halve i
beatjump_forward Shift+i
loop_double o
beatjump_backward Shift+o

passthrough Ctrl+k
vinylcontrol_mode Ctrl+Shift+U
Expand All @@ -128,15 +143,23 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
FileMenu_Quit Ctrl+q
LibraryMenu_NewPlaylist Ctrl+n
LibraryMenu_NewCrate Ctrl+Shift+N
ViewMenu_ShowSamplers Ctrl+1
ViewMenu_ShowSkinSettings Ctrl+1
ViewMenu_ShowMicrophone Ctrl+2
ViewMenu_ShowVinylControl Ctrl+3
ViewMenu_ShowPreviewDeck Ctrl+4
ViewMenu_ShowEffects Ctrl+5
ViewMenu_ShowCoverArt Ctrl+6
ViewMenu_MaximizeLibrary Space
OptionsMenu_EnableLiveBroadcasting Ctrl+l
OptionsMenu_EnableVinyl1 Ctrl+y
OptionsMenu_EnableVinyl2 Ctrl+u
OptionsMenu_EnableVinyl1 Ctrl+t
OptionsMenu_EnableVinyl2 Ctrl+z
OptionsMenu_EnableVinyl3 Ctrl+u
OptionsMenu_EnableVinyl4 Ctrl+i
OptionsMenu_RecordMix Ctrl+r
// DEVELOPER MENU
OptionsMenu_ReloadSkin Ctrl+Shift+R
OptionsMenu_DeveloperTools Ctrl+Shift+T
OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
DeveloperMenu_EnableDebugger Ctrl+Shift+D
OptionsMenu_EnableShortcuts Ctrl+\
65 changes: 44 additions & 21 deletions res/keyboard/da_DK.kbd.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,30 @@ crossfader_down_small Shift+g
[Microphone]
talkover <

[VinylControl]
Toggle Ctrl+t

[PreviewDeck1]
LoadSelectedTrackAndPlay Alt+Return
start_stop Return
back Alt+Left
fwd Alt+Right

[QuickEffectRack1_[Channel1]_Effect1]
enabled 5

[QuickEffectRack1_[Channel2]_Effect1]
enabled 0

[Channel1]
play d
cue_set Shift+d
cue_default f
cue_gotoandstop Shift+f

back a
reverse Shift+a
fwd s
beatjump_backward a
beatjump_1_backward Shift+a
beatjump_forward s
beatjump_1_forward Shift+s

beatsync 1
sync_enabled 1
bpm_tap Shift+!

rate_perm_down F1
Expand All @@ -46,7 +50,6 @@ rate_temp_up_small Shift+F4

pfl t
filterLowKill b
flanger 5

hotcue_1_activate z
hotcue_2_activate x
Expand All @@ -61,28 +64,35 @@ LoadSelectedTrack Shift+Left
eject Alt+Shift+Left

loop_in 2
loop_in_goto Shift+@
loop_out 3
reloop_exit 4
loop_out_goto Shift+#
reloop_toggle 4
reloop_andstop Shift+$

beatloop_4_toggle q
beatloop_activate q
beatlooproll_activate Shift+q
loop_halve w
beatjump_forward Shift+w
loop_double e
beatjump_backward Shift+e

passthrough Ctrl+j
vinylcontrol_mode Ctrl+Shift+Y
vinylcontrol_cueing Ctrl+Alt+Y

[Channel2]
play l
cue_set Shift+!
cue_set Shift+l
cue_default æ
cue_gotoandstop Shift+Æ

back j
reverse Shift+j
fwd k
beatjump_backward j
beatjump_1_backward Shift+j
beatjump_forward k
beatjump_1_forward Shift+k

beatsync 6
sync_enabled 6
bpm_tap Shift+&

rate_perm_down F5
Expand All @@ -96,7 +106,6 @@ rate_temp_up_small Shift+F8

pfl y
filterLowKill n
flanger 0

hotcue_1_activate m
hotcue_2_activate ,
Expand All @@ -111,12 +120,18 @@ LoadSelectedTrack Shift+Right
eject Alt+Shift+Right

loop_in 7
loop_in_goto Shift+/
loop_out 8
reloop_exit 9
loop_out_goto Shift+(
reloop_toggle 9
reloop_andstop Shift+)

beatloop_4_toggle u
beatloop_activate u
beatlooproll_activate Shift+u
loop_halve i
beatjump_forward Shift+i
loop_double o
beatjump_backward Shift+o

passthrough Ctrl+k
vinylcontrol_mode Ctrl+Shift+U
Expand All @@ -128,15 +143,23 @@ FileMenu_LoadDeck2 Ctrl+Shift+O
FileMenu_Quit Ctrl+q
LibraryMenu_NewPlaylist Ctrl+n
LibraryMenu_NewCrate Ctrl+Shift+N
ViewMenu_ShowSamplers Ctrl+1
ViewMenu_ShowSkinSettings Ctrl+1
ViewMenu_ShowMicrophone Ctrl+2
ViewMenu_ShowVinylControl Ctrl+3
ViewMenu_ShowPreviewDeck Ctrl+4
ViewMenu_ShowEffects Ctrl+5
ViewMenu_ShowCoverArt Ctrl+6
ViewMenu_MaximizeLibrary Space
OptionsMenu_EnableLiveBroadcasting Ctrl+l
OptionsMenu_EnableVinyl1 Ctrl+y
OptionsMenu_EnableVinyl2 Ctrl+u
OptionsMenu_EnableVinyl1 Ctrl+t
OptionsMenu_EnableVinyl2 Ctrl+y
OptionsMenu_EnableVinyl3 Ctrl+u
OptionsMenu_EnableVinyl4 Ctrl+i
OptionsMenu_RecordMix Ctrl+r
// DEVELOPER MENU
OptionsMenu_ReloadSkin Ctrl+Shift+R
OptionsMenu_DeveloperTools Ctrl+Shift+T
OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
DeveloperMenu_EnableDebugger Ctrl+Shift+D
OptionsMenu_EnableShortcuts Ctrl+<
Loading