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.

Sign up for GitHub

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

Keyboard mapping: Return triggers doubleclick, move Preview functions to P / Shift+P #12639

Merged
merged 7 commits into from
Jan 27, 2024
Merged

Keyboard mapping: Return triggers doubleclick, move Preview functions to P / Shift+P #12639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8b58b60
(fix)Keyboard sheet: '4-bar loop' -> 'beat loop'
ronso0 Jan 23, 2024
e793f46
Keyboard sheet: add REC, fix left Ctrl style
ronso0 Jan 23, 2024
b7dbbe6
Tracks table: Return key invokes configured double-click action
ronso0 Oct 5, 2021
06277df
Keyboard: move Preview keys to 'P', update sheet
ronso0 Jan 23, 2024
267fcb1
fix el_GR talkover keyboard mapping
daschuer Jan 27, 2024
ca2d31d
fix some keyboard mappings in ru-RU
daschuer Jan 27, 2024
5191d1b
Keyboard sheet: update PDF
ronso0 Jan 27, 2024
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
Binary file modified res/Mixxx-Keyboard-Shortcuts.pdf
View file
Open in desktop
Binary file not shown.
Binary file added res/Mixxx-Keyboard-Shortcuts.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10,974 changes: 5,671 additions & 5,303 deletions res/images/templates/ic_template_keyboard_mapping_sheet.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions res/keyboard/cs_CZ.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ crossfader_down_small Shift+g
talkover \

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

Expand Down
4 changes: 2 additions & 2 deletions res/keyboard/da_DK.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ crossfader_down_small Shift+g
talkover <

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

Expand Down
4 changes: 2 additions & 2 deletions res/keyboard/de_CH.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ crossfader_down_small Shift+g
talkover <

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

Expand Down
4 changes: 2 additions & 2 deletions res/keyboard/de_DE.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ crossfader_down_small Shift+g
talkover <

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

Expand Down
8 changes: 4 additions & 4 deletions res/keyboard/el_GR.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ crossfader_up_small Shift+Η
crossfader_down_small Shift+Γ

[Microphone]
talkover `
talkover «

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

Expand Down Expand Up @@ -92,7 +92,7 @@ waveform_zoom_set_default Shift++
play λ
cue_set Shift+Λ
cue_default ΄
cue_gotoandstop Shift+
cue_gotoandstop Shift+ ¨

beatjump_backward ξ
beatjump_1_backward Shift+Ξ
Expand Down
4 changes: 2 additions & 2 deletions res/keyboard/en_US.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ crossfader_down_small Shift+g
talkover `

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

Expand Down
4 changes: 2 additions & 2 deletions res/keyboard/es_ES.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ crossfader_down_small Shift+g
talkover <

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

Expand Down
4 changes: 2 additions & 2 deletions res/keyboard/fi_FI.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ crossfader_down_small Shift+g
talkover <

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

Expand Down
4 changes: 2 additions & 2 deletions res/keyboard/fr_CH.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ crossfader_down_small Shift+g
talkover <

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

Expand Down
4 changes: 2 additions & 2 deletions res/keyboard/fr_FR.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ crossfader_down_small Shift+g
talkover <

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

Expand Down
4 changes: 2 additions & 2 deletions res/keyboard/it_IT.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ crossfader_down_small Shift+g
talkover <

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

Expand Down
18 changes: 9 additions & 9 deletions res/keyboard/ru_RU.kbd.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ crossfader_up_small Shift+Р
crossfader_down_small Shift+П

[Microphone]
talkover ]
talkover /

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

Expand Down Expand Up @@ -96,7 +96,7 @@ beatjump_forward л
beatjump_1_forward Shift+Л

sync_enabled 6
bpm_tap Shift+,
bpm_tap Shift+:

rate_perm_down F5
rate_perm_up F6
Expand All @@ -112,19 +112,19 @@ pfl н
hotcue_1_activate ь
hotcue_2_activate б
hotcue_3_activate ю
hotcue_4_activate /
hotcue_4_activate .
hotcue_1_clear Shift+Ь
hotcue_2_clear Shift+Б
hotcue_3_clear Shift+Ю
hotcue_4_clear Shift+?
hotcue_4_clear Shift+,

LoadSelectedTrack Shift+Right
eject Alt+Shift+Right

loop_in 7
loop_in_goto Shift+.
loop_in_goto Shift+?
loop_out 8
loop_out_goto Shift+;
loop_out_goto Shift+*
reloop_toggle 9
reloop_andstop Shift+(

Expand Down Expand Up @@ -168,4 +168,4 @@ OptionsMenu_DeveloperTools Ctrl+Shift+T
OptionsMenu_DeveloperStatsExperiment Ctrl+Shift+E
OptionsMenu_DeveloperStatsBase Ctrl+Shift+B
DeveloperMenu_EnableDebugger Ctrl+Shift+D
OptionsMenu_EnableShortcuts Ctrl+]
OptionsMenu_EnableShortcuts Ctrl+|
13 changes: 10 additions & 3 deletions src/widget/wtracktableview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ void WTrackTableView::initTrackMenu() {
// slot
void WTrackTableView::slotMouseDoubleClicked(const QModelIndex& index) {
// Read the current TrackDoubleClickAction setting
// TODO simplify this casting madness
int doubleClickActionConfigValue =
m_pConfig->getValue(mixxx::library::prefs::kTrackDoubleClickActionConfigKey,
static_cast<int>(DlgPrefLibrary::TrackDoubleClickAction::LoadToDeck));
Expand Down Expand Up @@ -822,11 +823,17 @@ TrackModel* WTrackTableView::getTrackModel() const {
void WTrackTableView::keyPressEvent(QKeyEvent* event) {
switch (event->key()) {
case kPropertiesShortcutKey: {
// Return invokes the double-click action.
// Ctrl+Return opens track properties dialog.
// Ignore it if any cell editor is open.
// Note: the shortcut is displayed in the track context menu
if ((event->modifiers() & kPropertiesShortcutModifier) &&
state() != QTableView::EditingState) {
// Note: we use kPropertiesShortcutKey/~Mofifier here and in
// in WTrackMenu to display the shortcut.
if (state() == QTableView::EditingState) {
break;
}
if (event->modifiers().testFlag(Qt::NoModifier)) {
slotMouseDoubleClicked(currentIndex());
} else if ((event->modifiers() & kPropertiesShortcutModifier)) {
QModelIndexList indices = selectionModel()->selectedRows();
if (indices.length() == 1) {
m_pTrackMenu->loadTrackModelIndices(indices);
Expand Down
Loading