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

Use ColorPicker for all color dialogs #3815

Merged
merged 8 commits into from
Jan 29, 2021
Merged

Conversation

ferdnyc
Copy link
Contributor

@ferdnyc ferdnyc commented Nov 1, 2020

OK, building on #3813 (and, in fact, incorporating it, as it's a necessary prerequisite), this PR makes use of the replacement ColorPicker instead of QColorDialog, in all places where we accept a color as user input.

It also adds *args, **kwargs to some of our dialog windows' __init__() functions, as I noticed they weren't there. As a result of that, we can't (and Qt can't) pass any standard Qt args to those functions, which means you can't do things like parent them.

(Of course, the fac that our dialogs aren't parented or parentable is the only thing preventing them from also being modal-by-default, so it could be seen as a happy accident. Then again, it might be a good idea to properly parent them, so that Qt can clean them up for itself.)

Oh, yes, this one finally...
Fixes #3799 and fixes #3798

@ferdnyc ferdnyc added the interface GUI / user interface issues (i.e. windows, buttons, scrolling, pop-ups, etc...) label Nov 1, 2020
@ferdnyc ferdnyc added the closer This PR fixes one or more reported Issues label Nov 1, 2020
@jonoomph
Copy link
Member

LGTM! Is this ready to merge? If so, go for it. 👍

@github-actions github-actions bot added the conflicts A PR with unresolved merge conflicts label Dec 27, 2020
@github-actions
Copy link

Merge conflicts have been detected on this PR, please resolve.

@jonoomph jonoomph removed the conflicts A PR with unresolved merge conflicts label Jan 27, 2021
@jonoomph
Copy link
Member

@ferdnyc I resolved conflicts on this one. Can you take a quick looky, and make sure this all still works correctly. If so, let's merge it! Thanks! 👍

@github-actions github-actions bot added the conflicts A PR with unresolved merge conflicts label Jan 27, 2021
@github-actions
Copy link

Merge conflicts have been detected on this PR, please resolve.

@jonoomph jonoomph removed the conflicts A PR with unresolved merge conflicts label Jan 27, 2021
@jonoomph jonoomph merged commit 9f1fb74 into OpenShot:develop Jan 29, 2021
@jonoomph
Copy link
Member

Merging this one as well. I'm gonna be doing a bunch of testing over the weekend, and I really wanted this one included as well. 👍

@ferdnyc ferdnyc deleted the color-allover branch January 7, 2022 02:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
closer This PR fixes one or more reported Issues interface GUI / user interface issues (i.e. windows, buttons, scrolling, pop-ups, etc...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Color picker blocks the render view Color picker picks the wrong value if dialog has dark background
2 participants