Keyboard: automatically reload mapping file and update tooltips + menubar accelerators #13082

ronso0 · 2024-04-10T13:34:22Z

Yeeiij, finally!
When keyboard shortcuts are toggled On/Off, the widget tooltips are adjusted accordingly.
When the keyboard mapping file has been changed (or removed), tooltips and the mapping are rebuilt.
Same applies to menubar shortcuts.

As before, we look for the user's Custom.kbd.cfg first, then use the built-in mapping based on the selected locale.

Inspired by #1746, but implemented more simply.
Replaces #13074

Fixes #9814

Update for the Manual is mixxxdj/manual#735

src/controllers/keyboard/keyboardeventfilter.cpp

ronso0 · 2024-04-10T21:01:52Z

oh, need to consider skin reload...

edit: Done.

ronso0 · 2024-04-15T18:55:03Z

Extending this to WMainMenuBar, as done in #1746, is certainly possibly.

Done.

ronso0 · 2024-04-16T09:06:15Z

We could add dummy shortcuts (empty) to all currently unmapped menubar actions so users can add shortcuts themselves.
(i.e. add ConfigKeys to menubar and all *.kbd.cfg files)

Nothing that holds up this PR though.

cr7pt0gr4ph7

Not too important, but the upper/lowercasing of KeyboardEventFIlter got a bit mixed up the commit message Keyboard: handle mapping file and config setting in KeyboardEventFIlter`.

src/widget/wmainmenubar.cpp

daschuer · 2024-05-01T15:18:30Z

This one has a conflict now. Can we remove the 2.5-beta milestone?

ronso0 · 2024-05-01T15:24:48Z

Sure, assigned it to 2.5 for now because I think this is a bugfix, see #9814
It can either slip in during the beta period (it's already working without issues), or later.

Set to draft because I've just rebased this and am about to tweak it considering @cr7pt0gr4ph7's suggestions.

cr7pt0gr4ph7

Small nitpick: Spelling of "chnanged" in the commit message. LGTM otherwise.

ronso0 · 2024-05-03T10:25:49Z

Thanks for taking the time to review!

Spelling of "chnanged" in the commit message.

Yeah, that happens when I work in bright sunlight...

ronso0 · 2025-10-28T15:02:00Z

I was very grateful this works as desired when my controllers Play buttons ceased to work during my last live session.
I quickly assigned 1 and 2 to play, saved the mapping and could continue my set.

daschuer · 2026-01-19T14:10:53Z

@acolombier and @Swiftb0y can you have a final look here? Are your comments sufficiently fixed?

acolombier

Looking good, haven't retested again! Just a small Q around connections with lambda capture, but all 👍 otherwise.

src/controllers/keyboard/keyboardeventfilter.cpp

acolombier · 2026-01-19T22:31:37Z

src/controllers/keyboard/keyboardeventfilter.cpp

+    QStringList shortcutHints;
+    for (auto* pWidget : std::as_const(m_widgets)) {
+        QString keyString;
+        shortcutHints.clear();


Nit - move shortcutHints declaration to this scope instead?

acolombier · 2026-01-19T22:34:13Z

src/widget/wmainmenubar.h

    UserSettingsPointer m_pConfig;
    QAction* m_pViewKeywheel;
-    ConfigObject<ConfigValueKbd>* m_pKbdConfig;
+    // TODO KeyboardEventFilterPointer ??


Is this still TODO? If yes, could you elaborate it a bit further?

Not necessarily. Will remove it.
I just noticed that I typed std::shared_ptr<KeyboardEventFilter> a few times and wondered if we could add a wrapper/typedef KeyboardEventFilterPointer like we have for the settings
(typedef QWeakPointer<UserSettings> UserSettingsWeakPointer;)

I think that makes sense indeed!

I tried it, but I think it's not worth it because (like i did it) the forward-declarations won't suffice anymore and it requires extra header includes. Here's a test commit 06bf4cd

ronso0 · 2026-01-28T00:31:12Z

Thanks @acolombier for your review, I think I fixed everything.

If all's good I'd like to squash the small fixups -- not 100% sure how well that goes with the intermediate merge commits. Can as well rebase onto main, just to have a clean history.

acolombier

Looking good!

IIRC, you should be able to rebase this to the latest head you merged in (9e947aec194aeb9a0f74330d1ad16b27e8bc1b83 by the looks of it?) and it should drop the merge commit from the history

git rebase --autosquash -i 9e947aec194aeb9a0f74330d1ad16b27e8bc1b83

Edit: looks like CI is failing on Windows

ronso0 · 2026-01-28T20:28:48Z

yeah, all builds are failing because of a conflict, and there is a mismatch between local and this, idk where that comes from.
I'll backup and try to rebase locally, first without the fixups. Let's see how that goes..

…gled or mapping file changed

github-actions bot added the ui label Apr 10, 2024

ronso0 added keyboard tooltip labels Apr 10, 2024

ronso0 added this to the 2.5-beta milestone Apr 10, 2024

acolombier reviewed Apr 10, 2024

View reviewed changes

src/controllers/keyboard/keyboardeventfilter.cpp Outdated Show resolved Hide resolved

acolombier mentioned this pull request Apr 10, 2024

Double reload when editing controller mapping file #13083

Open

ronso0 force-pushed the kbd-mapping-reload-tooltip-update branch 2 times, most recently from c41be0a to 6896dc8 Compare April 11, 2024 23:03

ronso0 marked this pull request as ready for review April 14, 2024 22:29

ronso0 force-pushed the kbd-mapping-reload-tooltip-update branch from 6896dc8 to 428caf9 Compare April 15, 2024 18:54

ronso0 mentioned this pull request Apr 15, 2024

Tooltips: immediatly show/hide keyboard hints when option is toggled #13074

Closed

ronso0 force-pushed the kbd-mapping-reload-tooltip-update branch from 428caf9 to 7f055f3 Compare April 15, 2024 19:22

ronso0 force-pushed the kbd-mapping-reload-tooltip-update branch from 7f055f3 to 4583b2d Compare April 19, 2024 08:01

ronso0 mentioned this pull request Apr 26, 2024

Usability/Keyboard: Add a rebindable keyboard shortcut for editing items as a replacement for F2 #13148

Merged

cr7pt0gr4ph7 reviewed Apr 30, 2024

View reviewed changes

src/widget/wmainmenubar.cpp Outdated Show resolved Hide resolved

ronso0 marked this pull request as draft May 1, 2024 15:20

ronso0 modified the milestones: 2.5-beta, 2.5.0 May 1, 2024

ronso0 force-pushed the kbd-mapping-reload-tooltip-update branch from 4583b2d to 61db431 Compare May 1, 2024 16:47

cr7pt0gr4ph7 reviewed May 2, 2024

View reviewed changes

ronso0 force-pushed the kbd-mapping-reload-tooltip-update branch from 61db431 to 0b63ef6 Compare May 3, 2024 10:25

ronso0 marked this pull request as ready for review May 3, 2024 10:26

daschuer modified the milestones: 2.5.0, 2.5-beta May 8, 2024

ronso0 force-pushed the kbd-mapping-reload-tooltip-update branch 3 times, most recently from bf5ed1b to 234e419 Compare May 9, 2025 22:22

ronso0 changed the title ~~Keyboard: automatically reload mapping file and update tooltips~~ Keyboard: automatically reload mapping file and update tooltips + menubar accelerators May 9, 2025

ronso0 force-pushed the kbd-mapping-reload-tooltip-update branch from 234e419 to c4dbddb Compare May 9, 2025 22:56

This was referenced May 13, 2025

Saving controller script does not trigger reload in 2.6 #14768

Open

Current locale is not taken into account for setting the keyboard mapping (fr-CH), Mixxx assumes a US layout #14797

Closed

ronso0 mentioned this pull request May 24, 2025

allow to refresh custom keyboard configuration without restart #10527

Open

ronso0 linked an issue May 24, 2025 that may be closed by this pull request

allow to refresh custom keyboard configuration without restart #10527

Open

ronso0 force-pushed the kbd-mapping-reload-tooltip-update branch from 5b04405 to 569b17e Compare October 25, 2025 14:10

acolombier reviewed Jan 19, 2026

View reviewed changes

ronso0 force-pushed the kbd-mapping-reload-tooltip-update branch from 656d200 to 8d45955 Compare January 28, 2026 00:28

acolombier approved these changes Jan 28, 2026

View reviewed changes

ronso0 added 4 commits February 2, 2026 00:55

settings: remove self-include

95ad4ee

store KeyDownInformation modifiers as Qt::KeyboardModifiers, not int

3569993

KeyboardEventFilter: handle mapping file, moved from CoreServices

3553022

KeyboardEventFilter: add file path helper

59636bd

ronso0 force-pushed the kbd-mapping-reload-tooltip-update branch from c7fee5f to de7aa54 Compare February 2, 2026 00:45

ronso0 added 5 commits February 2, 2026 11:44

Skins: update tooltips with keyboard shortcuts when shortcuts are tog…

42b8d1c

…gled or mapping file changed

Menubar: update shortcuts when the keyboard mapping file changed

e6469e8

KeyboardEventFilter: move menubar toggle connection to WMainMenubar

66392a6

KeyboardEventFilter: use mixxx::Logger

bbfdba8

Interface/Tooltips: add option to show only keyboard shortcuts

db5708e

ronso0 force-pushed the kbd-mapping-reload-tooltip-update branch 2 times, most recently from 956cf22 to db5708e Compare February 2, 2026 11:09

ronso0 mentioned this pull request Feb 7, 2026

Usability/Keyboard: Make the star ratings in the tracks view editable via keyboard #13717

Draft

Uh oh!

Keyboard: automatically reload mapping file and update tooltips + menubar accelerators #13082

Are you sure you want to change the base?

Keyboard: automatically reload mapping file and update tooltips + menubar accelerators #13082

Uh oh!

Conversation

ronso0 commented Apr 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

ronso0 commented Apr 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ronso0 commented Apr 15, 2024

Uh oh!

ronso0 commented Apr 16, 2024

Uh oh!

cr7pt0gr4ph7 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

daschuer commented May 1, 2024

Uh oh!

ronso0 commented May 1, 2024

Uh oh!

cr7pt0gr4ph7 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ronso0 commented May 3, 2024

Uh oh!

ronso0 commented Oct 28, 2025

Uh oh!

daschuer commented Jan 19, 2026

Uh oh!

acolombier left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

acolombier Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

acolombier Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

ronso0 Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

acolombier Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

ronso0 Feb 2, 2026

Choose a reason for hiding this comment

Uh oh!

ronso0 commented Jan 28, 2026

Uh oh!

acolombier left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ronso0 commented Jan 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

ronso0 commented Apr 10, 2024 •

edited

Loading

ronso0 commented Apr 10, 2024 •

edited

Loading

cr7pt0gr4ph7 left a comment •

edited

Loading

cr7pt0gr4ph7 left a comment •

edited

Loading

acolombier left a comment •

edited

Loading