From 41e2a580c4346491063edd31e8bf29e41a0cccc1 Mon Sep 17 00:00:00 2001 From: ronso0 Date: Tue, 5 Oct 2021 22:51:56 +0200 Subject: [PATCH 1/5] keyboard sheet: remove filters --- .../ic_template_keyboard_mapping_sheet.svg | 590 +++++++----------- 1 file changed, 219 insertions(+), 371 deletions(-) diff --git a/res/images/templates/ic_template_keyboard_mapping_sheet.svg b/res/images/templates/ic_template_keyboard_mapping_sheet.svg index 5f39a7619164..8948132d3ef2 100644 --- a/res/images/templates/ic_template_keyboard_mapping_sheet.svg +++ b/res/images/templates/ic_template_keyboard_mapping_sheet.svg @@ -29,13 +29,13 @@ inkscape:window-height="1056" id="namedview8739" showgrid="false" - inkscape:zoom="1.6269689" - inkscape:cx="-0.6146399" - inkscape:cy="482.185" + inkscape:zoom="1.4985923" + inkscape:cx="360.67182" + inkscape:cy="209.19633" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" - inkscape:current-layer="layer10" + inkscape:current-layer="layer3" showguides="true" inkscape:guide-bbox="true" units="px" @@ -7771,173 +7771,6 @@ style="stop-color:#ffffff;stop-opacity:1" id="stop15654" /> + style="display:inline;opacity:0.8" /> @@ -12717,7 +12533,7 @@ inkscape:label="mapped keys" style="display:inline">   Librarymaximize librarymaximize library Date: Wed, 6 Oct 2021 00:07:56 +0200 Subject: [PATCH 2/5] library: Return key invokes configured double-click action --- src/widget/wtracktableview.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp index 1a046d0dd39d..27c69d43bbb4 100644 --- a/src/widget/wtracktableview.cpp +++ b/src/widget/wtracktableview.cpp @@ -757,16 +757,20 @@ TrackModel* WTrackTableView::getTrackModel() const { } void WTrackTableView::keyPressEvent(QKeyEvent* event) { + // 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 + // Ignore if any cell editor is open. if (event->key() == kPropertiesShortcutKey && - (event->modifiers() & kPropertiesShortcutModifier) && state() != QTableView::EditingState) { - QModelIndexList indices = selectionModel()->selectedRows(); - if (indices.length() == 1) { - m_pTrackMenu->loadTrackModelIndices(indices); - m_pTrackMenu->slotShowDlgTrackInfo(); + if (!event->modifiers()) { + slotMouseDoubleClicked(currentIndex()); + } else if (event->modifiers() & kPropertiesShortcutModifier) { + // Note: the shortcut is displayed in the track context menu + QModelIndexList indices = selectionModel()->selectedRows(); + if (indices.length() == 1) { + m_pTrackMenu->loadTrackModelIndices(indices); + m_pTrackMenu->slotShowDlgTrackInfo(); + } } } else if (event->key() == kHideRemoveShortcutKey && event->modifiers() == kHideRemoveShortcutModifier) { From babd1b3a7c5ab207f482cb0641584e0ce3fe18df Mon Sep 17 00:00:00 2001 From: ronso0 Date: Tue, 5 Oct 2021 23:40:21 +0200 Subject: [PATCH 3/5] keyboard sheet: add preview deck + library section --- .../ic_template_keyboard_mapping_sheet.svg | 696 +++++++++++++----- 1 file changed, 492 insertions(+), 204 deletions(-) diff --git a/res/images/templates/ic_template_keyboard_mapping_sheet.svg b/res/images/templates/ic_template_keyboard_mapping_sheet.svg index 8948132d3ef2..bd862ba618e9 100644 --- a/res/images/templates/ic_template_keyboard_mapping_sheet.svg +++ b/res/images/templates/ic_template_keyboard_mapping_sheet.svg @@ -29,13 +29,13 @@ inkscape:window-height="1056" id="namedview8739" showgrid="false" - inkscape:zoom="1.4985923" - inkscape:cx="360.67182" - inkscape:cy="209.19633" + inkscape:zoom="1.6680728" + inkscape:cx="316.2332" + inkscape:cy="180.74751" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" - inkscape:current-layer="layer3" + inkscape:current-layer="layer5" showguides="true" inkscape:guide-bbox="true" units="px" @@ -49,7 +49,7 @@ inkscape:snap-smooth-nodes="true" inkscape:document-rotation="0" viewbox-y="0" - inkscape:snap-global="false" + inkscape:snap-global="true" inkscape:pagecheckerboard="0" />Mixxx Keyboard mapping sheet template + id="feGaussianBlur12554" /> + d="m 687.59179,220.76768 5.222,7.617 5.383,-7.852 -5.222,-7.615 z m -11.829,-17.253 5.223,7.619 5.382,-7.85 -5.224,-7.617 z m 53.291,-8.711 -5.976,8.714 5.221,7.614 11.195,-16.328 z m -70.937,34.445 h 10.448 l 5.973,-8.712 -5.224,-7.619 z m 53.133,-8.482 5.222,7.615 5.381,-7.848 -5.222,-7.615 z m -11.828,-17.25 5.221,7.614 5.381,-7.848 -5.221,-7.613 z" /> play load&pausestop atstartAutoDJLibraryPreviewtrackdoubleinfoclick Date: Thu, 21 Oct 2021 22:15:26 +0200 Subject: [PATCH 4/5] keyboard sheet: add Del/Cmd+Backspace 'remove/hide track' (#4330) --- .../ic_template_keyboard_mapping_sheet.svg | 174 ++++++++++++------ 1 file changed, 122 insertions(+), 52 deletions(-) diff --git a/res/images/templates/ic_template_keyboard_mapping_sheet.svg b/res/images/templates/ic_template_keyboard_mapping_sheet.svg index bd862ba618e9..70065b7cbe12 100644 --- a/res/images/templates/ic_template_keyboard_mapping_sheet.svg +++ b/res/images/templates/ic_template_keyboard_mapping_sheet.svg @@ -29,9 +29,9 @@ inkscape:window-height="1056" id="namedview8739" showgrid="false" - inkscape:zoom="1.6680728" - inkscape:cx="316.2332" - inkscape:cy="180.74751" + inkscape:zoom="2.3447939" + inkscape:cx="336.27689" + inkscape:cy="201.93672" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -50,7 +50,13 @@ inkscape:document-rotation="0" viewbox-y="0" inkscape:snap-global="true" - inkscape:pagecheckerboard="0" /><sodipodi:guide + position="487.15603,181.85285" + orientation="1,0" + id="guide10815" /><sodipodi:guide + position="469.56144,211.32011" + orientation="1,0" + id="guide11334" /></sodipodi:namedview><title id="title33436">Mixxx Keyboard mapping sheet templateimage/svg+xml + style="display:inline;opacity:0.8" /> @@ -14926,7 +14928,7 @@ transform="matrix(0.9950495,0,0,0.9375,530.98951,-50.051042)" />stop atLibraryhide/removetrack Date: Wed, 6 Oct 2021 00:27:34 +0200 Subject: [PATCH 5/5] WIP keyboard mappings: de/en update preview deck controls --- res/keyboard/de_DE.kbd.cfg | 9 +++++---- res/keyboard/en_US.kbd.cfg | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/res/keyboard/de_DE.kbd.cfg b/res/keyboard/de_DE.kbd.cfg index bb48d729a4e0..66d999e7b3ba 100644 --- a/res/keyboard/de_DE.kbd.cfg +++ b/res/keyboard/de_DE.kbd.cfg @@ -14,10 +14,11 @@ crossfader_down_small Shift+g talkover < [PreviewDeck1] -LoadSelectedTrackAndPlay Alt+Return -start_stop Return -back Alt+Left -fwd Alt+Right +LoadSelectedTrackAndPlay p +start_stop ü +play + +back Shift+Ü +fwd Shift+* [QuickEffectRack1_[Channel1]_Effect1] enabled 5 diff --git a/res/keyboard/en_US.kbd.cfg b/res/keyboard/en_US.kbd.cfg index 0ea286df5c8e..7193958fad68 100644 --- a/res/keyboard/en_US.kbd.cfg +++ b/res/keyboard/en_US.kbd.cfg @@ -14,10 +14,11 @@ crossfader_down_small Shift+g talkover ` [PreviewDeck1] -LoadSelectedTrackAndPlay Alt+Return -start_stop Return -back Alt+Left -fwd Alt+Right +LoadSelectedTrackAndPlay p +start_stop [ +play ] +back Shift+{ +fwd Shift+} [QuickEffectRack1_[Channel1]_Effect1] enabled 5