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

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

Merged
merged 7 commits into from
Jan 27, 2024

Conversation

ronso0
Copy link
Member

@ronso0 ronso0 commented Jan 24, 2024

Old
Return key stops a playing preview deck.
Alt+Return loads a track and starts playing it

New
P loads a track and starts playing it
Shift+P stops it
Return triggers the configured doubleclick action in the tracks table
(Ctrl+Return opens the track properties editor, for one track only, for multi-selection see #12548)

Return for activating a selection feels natural, and I caught myself multiple times trying that.
Considering that, we may as well

  • keep Alt+Return for load to preview deck
  • P does start/pause
  • Shift+P does go to start (or Cue?), and stop?

Keyboard mappings and the keyboard sheet are updated accordingly.
image

  • is supposed to mark hard-coded hotkeys, need to check how to add that hint elegantly.

This is kind of a breaking change, it shouldn't go to a bugfix release.
Otoh I don't want to delay 2.4

I'll probably split this up into the bugfixes (2.4) and the feature part (2.5).
Anyway, take a look and let me know what you think.

@github-actions github-actions bot added the ui label Jan 24, 2024
Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That looks good to me. I support the idea to merge it to the 2.4 branch.

@ronso0 ronso0 force-pushed the keyboard-return-doubleclick-and-polish branch from c8427ef to 3e93266 Compare January 27, 2024 00:58
@ronso0
Copy link
Member Author

ronso0 commented Jan 27, 2024

I removed the intermediate PDF changes (binary file).
I'll create and export the PDF when this is ready to be merged, and update the manual.

@daschuer
Copy link
Member

What is missing to be merged? Do we want a quick merge to 2.4 this weekend or should it go to main?

@ronso0
Copy link
Member Author

ronso0 commented Jan 27, 2024

Someone needs to review the greek and russian mappings, there others are straightforward (P = P).

And I need to update the PDF.

@daschuer
Copy link
Member

Some findings:

  • Greek: has OptionsMenu_ReloadSkin Ctrl+Shift+ρ which is not present in de_DE
  • Greek: cue_default ΄ is a dead key
  • Greek: cue_gotoandstop Shift+ ¨ is also a dead key

There are some other wrong keys assigned. I will issue a PR.

@ronso0
Copy link
Member Author

ronso0 commented Jan 27, 2024

Oh, thanks for taking a close look!
I was just about to load those keyboard layouts and double-check the mappings. Not sure how meaningful such a test is.

@daschuer
Copy link
Member

I just did the same. I am currently facing the issue that Mixxx comes always up with the English layout.
It looks like QGuiApplication::inputMethod(); is broken. The same happens with Mixxx 2.3.6 using the same method.

@daschuer
Copy link
Member

We can't do much about the dead keys. One main issue is that Mixxx does not follows if the users switching the keyboard layout. This is what Greek users do when searching for Greek tracks. We have code rotting around that issue all these issues.

@daschuer
Copy link
Member

#1746

@ronso0 ronso0 force-pushed the keyboard-return-doubleclick-and-polish branch from e603c7e to aacef8d Compare January 27, 2024 16:20
@ronso0 ronso0 marked this pull request as ready for review January 27, 2024 16:22
@ronso0 ronso0 force-pushed the keyboard-return-doubleclick-and-polish branch from aacef8d to 5191d1b Compare January 27, 2024 16:28
@ronso0
Copy link
Member Author

ronso0 commented Jan 27, 2024

I pushed once more because the Github diff of the SVG (rendering) looked wrong, which I blamed Inkscape for.
Anyhow, the SVG and PDF look as intended.

@daschuer
Copy link
Member

Cool, thank you for this last minute PR.
LGTM.

@daschuer daschuer merged commit 0d1bcd2 into mixxxdj:2.4 Jan 27, 2024
14 checks passed
@ronso0 ronso0 deleted the keyboard-return-doubleclick-and-polish branch January 27, 2024 21:31
@ronso0
Copy link
Member Author

ronso0 commented Jan 27, 2024

Yeah, great this still slipped in!

Reminder for myself: update the manual

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants