QML Pt. 1: Add initial support for loading QML skins #3894

Holzhaus · 2021-05-23T00:27:07Z

Based on #3891.

daschuer · 2021-05-23T01:08:44Z

Thank you. For picking this up.
Is it possible to bring it in a mergeable state without any regressions to the old skins?
I think that would be a reasonable next step.

Maybe for after we have cut out 2.4 (If we go into beta right after 2.3 release)

Holzhaus · 2021-05-23T02:30:16Z

What regressions did you encounter? There shouldn't be any, or I made a mistake. This is largely based on #3891. Only the last 3 commits are QML related, everything else ist just refactoring.

daschuer · 2021-05-23T07:25:34Z

I don't think that there is a regression risk until now. What else do you plan to add to this draft?

I don't think we have fixed a plan for 2.4 yet.
It feels urgent to me to decide, to make it clear how to handle new feature PRs like this one.

Holzhaus · 2021-05-23T23:50:30Z

Ok, I think this is done. Please merge #3891 first, then this diff should become considerably smaller.

The QML demo skin now features a working (!) play button, 3-band EQ, filter knob, gain knob and volume slider for deck 1 and 2. Please have a look. I can remove the demo skin before merge :D

You can test by passing track path(s) on the command line when running Mixxx, because there is no library yet. Or just load tracks using a legacy skin, then switch to the QML demo skin.

ronso0 · 2021-05-24T00:57:21Z

The QML demo skin now features a working (!) play button, 3-band EQ, filter knob, gain knob and volume slider for deck 1 and 2. Please have a look. I can remove the demo skin before merge :D

Can we keep the QML demo but hide it by default, and list it when --developer or --qml argument is used?

daschuer · 2021-05-25T10:17:49Z

Uh, this PR is rapidly growing.
Did you consider to split our the skin technology abstraction, introduced during the first commits.
For my understanding this part was already in a mergable state.

daschuer · 2021-05-25T10:19:27Z

I am also happy to merge only the folder move.
This way we hopefully get rid of many of these 110 touched files.

Holzhaus · 2021-05-25T10:29:19Z

Uh, this PR is rapidly growing.
Did you consider to split our the skin technology abstraction, introduced during the first commits.
For my understanding this part was already in a mergable state.

I already did, see #3891.

Holzhaus · 2021-05-27T14:00:20Z

I reworked the initializiation logic.Initialization is now delayed until the component is fully constructed and all initial properties have been set: https://doc.qt.io/qt-5/qtqml-cppintegration-definetypes.html#receiving-notifications-for-object-initialization

…iciently

…ized

A single warning should suffice.

Holzhaus · 2021-05-28T00:40:18Z

OK, finally all checks pass. The ControlProxy code works much nicer now. Please have a look. For testing and see it in action, I suggest to check out the QML Demo skin from #3907.

src/skin/qml/qmlcontrolproxy.h

uklotzde

LGTM. Let's merge after the CI builds succeeded.

daschuer · 2021-05-28T15:11:27Z

src/skin/qml/qmlcontrolproxy.cpp

+    return m_pControlProxy->getParameter();
+}
+
+void QmlControlProxy::reinitializeOrReset() {


Is orReset still valid?
It look like the function returns early if it is already initialized

OrReset is confusing, because resetting a control proxy is different from resetting a smart pointer. It is also not the alternative to initialize.

How about:
ReinitializeFromKey()

Than it is clear that one cane assume that it becomes invalid if the key is invalid

daschuer

I have left just an optional comment where I stumbled over the function name.
LGTM

daschuer

Thank you for all the QML PRs. I am really curious how this will feel ..

Holzhaus added the skins label May 23, 2021

github-actions bot added build code quality ui labels May 23, 2021

Holzhaus force-pushed the skin-refactor-pt2 branch from 88f81ba to a2060a6 Compare May 23, 2021 00:35

Holzhaus force-pushed the skin-refactor-pt2 branch 4 times, most recently from 48748d1 to 9ce44b6 Compare May 23, 2021 23:46

Holzhaus mentioned this pull request May 24, 2021

QML Controls #3638

Closed

5 tasks

Holzhaus force-pushed the skin-refactor-pt2 branch 4 times, most recently from c69c72c to a21861f Compare May 25, 2021 09:34

Holzhaus force-pushed the skin-refactor-pt2 branch from a21861f to 4fd651e Compare May 25, 2021 13:12

Holzhaus mentioned this pull request May 25, 2021

QML Pt. 2: Add demo skin #3907

Merged

Holzhaus changed the title ~~[WIP] Add initial support for QML skins~~ QML: Add initial support for loading QML skins May 25, 2021

Holzhaus force-pushed the skin-refactor-pt2 branch from 4fd651e to 6da063f Compare May 25, 2021 15:13

Holzhaus changed the title ~~QML: Add initial support for loading QML skins~~ QML Pt. 1: Add initial support for loading QML skins May 25, 2021

Holzhaus marked this pull request as ready for review May 25, 2021 16:40

Holzhaus force-pushed the skin-refactor-pt2 branch 2 times, most recently from 6c42e95 to 430e957 Compare May 26, 2021 06:29

Holzhaus force-pushed the skin-refactor-pt2 branch 4 times, most recently from 6145db5 to ba6861c Compare May 27, 2021 18:29

Holzhaus and others added 12 commits May 28, 2021 01:31

Skin: Add QmlSkin class

153a8d2

SkinLoader: Disable QML support by default via config option

26395a5

ControlProxyQml: Add support for CO access from QML

dc760ab

ControlProxyQml: Ensure that UI is updated in any case

2b98680

QML: Add more checks and warnings and expose keyValid/initialized props

fc455bd

QML: Rename ControlProxyQml to QmlControlProxy and add to namespace

41b1e3e

QML: Register QmlControlProxy as Mixxx.ControlProxy

80181b0

QmlSkin: Add private dir() helper for constructing filePaths more eff…

9cd7649

…iciently

QML: Remove unused m_emptyString member from QmlControlProxy

87e4b82

QML: Rework QmlControlProxy initialization/reset logic

c738dc5

QML: Prevent QmlControlProxy value/parameter change while not initial…

7fc5ed0

…ized

QML: Prevent QmlControlProxy log spam when using an invalid CO

bf2518e

A single warning should suffice.

Holzhaus force-pushed the skin-refactor-pt2 branch from ba6861c to bf2518e Compare May 27, 2021 23:34

uklotzde reviewed May 28, 2021

View reviewed changes

src/skin/qml/qmlcontrolproxy.h Show resolved Hide resolved

uklotzde reviewed May 28, 2021

View reviewed changes

src/skin/qml/qmlcontrolproxy.h Outdated Show resolved Hide resolved

QML: Make QmlControlProxy constructor explicit

fedef14

uklotzde approved these changes May 28, 2021

View reviewed changes

daschuer requested changes May 28, 2021

View reviewed changes

daschuer reviewed May 28, 2021

View reviewed changes

daschuer approved these changes May 28, 2021

View reviewed changes

QML: Rename QmlControlProxy::reinitializeOrReset to reinitializeFromKey

9977cb0

Holzhaus requested a review from daschuer May 28, 2021 16:38

daschuer merged commit 5b16118 into mixxxdj:main May 28, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

QML Pt. 1: Add initial support for loading QML skins #3894

QML Pt. 1: Add initial support for loading QML skins #3894

Holzhaus commented May 23, 2021 •

edited

Loading

daschuer commented May 23, 2021

Holzhaus commented May 23, 2021

daschuer commented May 23, 2021 •

edited

Loading

Holzhaus commented May 23, 2021 •

edited

Loading

ronso0 commented May 24, 2021

daschuer commented May 25, 2021

daschuer commented May 25, 2021

Holzhaus commented May 25, 2021

Holzhaus commented May 27, 2021

Holzhaus commented May 28, 2021

uklotzde left a comment

daschuer May 28, 2021

daschuer May 28, 2021

Holzhaus May 28, 2021

daschuer left a comment

daschuer left a comment

QML Pt. 1: Add initial support for loading QML skins #3894

QML Pt. 1: Add initial support for loading QML skins #3894

Conversation

Holzhaus commented May 23, 2021 • edited Loading

daschuer commented May 23, 2021

Holzhaus commented May 23, 2021

daschuer commented May 23, 2021 • edited Loading

Holzhaus commented May 23, 2021 • edited Loading

ronso0 commented May 24, 2021

daschuer commented May 25, 2021

daschuer commented May 25, 2021

Holzhaus commented May 25, 2021

Holzhaus commented May 27, 2021

Holzhaus commented May 28, 2021

uklotzde left a comment

Choose a reason for hiding this comment

daschuer May 28, 2021

Choose a reason for hiding this comment

daschuer May 28, 2021

Choose a reason for hiding this comment

Holzhaus May 28, 2021

Choose a reason for hiding this comment

daschuer left a comment

Choose a reason for hiding this comment

daschuer left a comment

Choose a reason for hiding this comment

Holzhaus commented May 23, 2021 •

edited

Loading

daschuer commented May 23, 2021 •

edited

Loading

Holzhaus commented May 23, 2021 •

edited

Loading