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

Jump to bottom

controlpickermenu: add fx parameter buttons & other missing controls #3112

Merged
merged 10 commits into from Nov 5, 2020
Merged

controlpickermenu: add fx parameter buttons & other missing controls #3112

merged 10 commits into from Nov 5, 2020

Conversation

ronso0
Copy link
Member

@ronso0 ronso0 commented Sep 22, 2020 •
edited

Add missing controls to controlpicker menu.
Continuation of #3093
https://bugs.launchpad.net/mixxx/+bug/1895364

  • add fx parameter buttons
  • fix Fx mix mode buttons
  • add some common skin controls
  • add Broadcast toggle
  • add Recording toggle

@ronso0 ronso0 added this to In progress in 2.3 release via automation Sep 22, 2020
@ronso0 ronso0 added this to the 2.3.0 milestone Sep 22, 2020
@ronso0 ronso0 mentioned this pull request Sep 22, 2020
Merged
@ronso0 ronso0 marked this pull request as draft September 22, 2020 13:46
@ronso0
Copy link
Member Author

ronso0 commented Sep 23, 2020

I extend the mapping error message:
image

@ronso0
Copy link
Member Author

ronso0 commented Sep 23, 2020

I consider this ready to be merged, please check!

@ronso0 ronso0 marked this pull request as ready for review September 23, 2020 18:04
@ronso0 ronso0 moved this from In progress to In Review in 2.3 release Sep 23, 2020
@Holzhaus
Copy link
Member

There are a bunch of pre-commit issues. Please resolve them.

@ronso0 ronso0 force-pushed the controls-fx-parameter-buttons branch from cc65c9c to 1568014 Compare September 23, 2020 22:15
@ronso0
Copy link
Member Author

ronso0 commented Sep 23, 2020

There are a bunch of pre-commit issues. Please resolve them.

Done. Those were changes that make the file inconsistent style-wise, but hej...
Ready!

@Holzhaus
Copy link
Member

There are merge conflicts now.

@ronso0 ronso0 requested a review from Holzhaus October 6, 2020 20:36
@Holzhaus
Copy link
Member

Holzhaus commented Oct 7, 2020

I'm still on vacation, if you want a quick review better request it from someone else ;-)

@ronso0 ronso0 requested a review from daschuer October 7, 2020 18:39
@ronso0
Copy link
Member Author

ronso0 commented Oct 7, 2020

thanks for letting me know!

@ronso0 ronso0 requested review from Holzhaus and removed request for Holzhaus October 21, 2020 22:23
Holzhaus
Holzhaus approved these changes Oct 22, 2020
View reviewed changes
Copy link
Member

@Holzhaus Holzhaus left a comment

Choose a reason for hiding this comment

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

LGTM!

src/controllers/dlgcontrollerlearning.cpp Outdated Show resolved Hide resolved
@ronso0 ronso0 force-pushed the controls-fx-parameter-buttons branch from 635b5fb to 82e9fdf Compare October 22, 2020 21:48
@github-actions github-actions bot removed the ui label Oct 22, 2020
@ronso0 ronso0 force-pushed the controls-fx-parameter-buttons branch from c1dba15 to 3b99c1c Compare October 24, 2020 17:58
@Holzhaus
Copy link
Member

There are merge conflicts now.

@Holzhaus Holzhaus marked this pull request as draft October 25, 2020 15:26
@ronso0
Copy link
Member Author

ronso0 commented Oct 28, 2020 •
edited

Ready again!
had to update the pre-commit hooks to finally fix the black issues.

@ronso0 ronso0 marked this pull request as ready for review October 28, 2020 18:15
@ronso0 ronso0 force-pushed the controls-fx-parameter-buttons branch from 7e06d29 to 87f7dc3 Compare October 28, 2020 18:28
@ronso0 ronso0 marked this pull request as draft October 29, 2020 18:04
@ronso0
Copy link
Member Author

ronso0 commented Oct 29, 2020

Draft again until some can clairfy my black fixes.
from https://mixxx.zulipchat.com/#narrow/stream/109171-development/topic/pre-commit.20.2F.20yaml.20.2F.20black

I repeatedly noticed CI pre-commit complaints about some python files (tools/clang_format.py, tools/serato_heartbeat.py).
I did pre-commit autoupdate and then the issues were discovered locally, as well.
But that changed the yaml file, too, changing some hook versions from stable to v.1.7.x for example.
How to deal with that? What's the recommended way to keep pre-commit up to date?

pre-commit/pre-commit#1354
doesn't help me much...

@ronso0 ronso0 force-pushed the controls-fx-parameter-buttons branch from 87f7dc3 to c486932 Compare November 3, 2020 09:06
@ronso0 ronso0 force-pushed the controls-fx-parameter-buttons branch from c486932 to 67e5961 Compare November 3, 2020 09:35
@ronso0 ronso0 marked this pull request as ready for review November 3, 2020 09:37
@ronso0
Copy link
Member Author

ronso0 commented Nov 3, 2020

Ready again!

@ronso0
Copy link
Member Author

ronso0 commented Nov 5, 2020

Ready again!

ping

Holzhaus
Holzhaus approved these changes Nov 5, 2020
View reviewed changes
Copy link
Member

@Holzhaus Holzhaus left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

@Holzhaus Holzhaus merged commit 51e1fc0 into mixxxdj:2.3 Nov 5, 2020
2.3 release automation moved this from In Review to Done Nov 5, 2020
@ronso0 ronso0 deleted the controls-fx-parameter-buttons branch November 5, 2020 22:35
This was referenced Aug 23, 2022
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Holzhaus Holzhaus Holzhaus approved these changes

@daschuer daschuer Awaiting requested review from daschuer

Assignees
No one assigned
Labels
build code quality controller mappings library skins ui
Projects
2.3 release
  
Done
Milestone
2.3.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ronso0 @Holzhaus