Skip to content

Commit 9b9f25c

Browse files
committed
feat(QML): add controller settings
1 parent 01e4622 commit 9b9f25c

41 files changed

Lines changed: 3789 additions & 250 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3685,8 +3685,9 @@ else()
36853685
find_package(QT 5.12 NAMES Qt5 COMPONENTS Core REQUIRED)
36863686
endif()
36873687
if(QML)
3688-
list(APPEND QT_EXTRA_COMPONENTS "Quick")
36893688
list(APPEND QT_EXTRA_COMPONENTS "LabsQmlModels")
3689+
list(APPEND QT_EXTRA_COMPONENTS "Multimedia")
3690+
list(APPEND QT_EXTRA_COMPONENTS "Quick")
36903691
list(APPEND QT_EXTRA_COMPONENTS "QuickControls2")
36913692
list(APPEND QT_EXTRA_COMPONENTS "QuickControls2Impl")
36923693
list(APPEND QT_EXTRA_COMPONENTS "QuickLayouts")
@@ -3845,6 +3846,7 @@ if(QML)
38453846
src/qml/qmlsettingparameter.cpp
38463847
src/qml/qmltrackproxy.cpp
38473848
src/qml/qmlsoundmanagerproxy.cpp
3849+
src/qml/qmlpreferencesproxy.cpp
38483850
src/waveform/renderers/allshader/digitsrenderer.cpp
38493851
src/waveform/renderers/allshader/waveformrenderbeat.cpp
38503852
src/waveform/renderers/allshader/waveformrenderer.cpp
@@ -4157,6 +4159,14 @@ else()
41574159
COMPONENT applocal
41584160
)
41594161

4162+
# install qml6-module-qtmultimedia
4163+
install(
4164+
DIRECTORY
4165+
"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/Qt6/qml/QtMultimedia"
4166+
DESTINATION "${MIXXX_INSTALL_DATADIR}/Qt6/qml"
4167+
COMPONENT applocal
4168+
)
4169+
41604170
# install qml6-module-qtqml-workerscript
41614171
install(
41624172
DIRECTORY
@@ -4220,6 +4230,22 @@ else()
42204230
DESTINATION "${MIXXX_INSTALL_DATADIR}/Qt6/qml/Qt/labs"
42214231
COMPONENT applocal
42224232
)
4233+
4234+
# install qml6-module-qtquick-dialogs
4235+
install(
4236+
DIRECTORY
4237+
"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/Qt6/qml/QtQuick/Dialogs"
4238+
DESTINATION "${MIXXX_INSTALL_DATADIR}/Qt6/qml/QtQuick"
4239+
COMPONENT applocal
4240+
)
4241+
4242+
# install qml6-module-qt-labs-folderlistmodel
4243+
install(
4244+
DIRECTORY
4245+
"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/Qt6/qml/Qt/labs/folderlistmodel"
4246+
DESTINATION "${MIXXX_INSTALL_DATADIR}/Qt6/qml/Qt/labs"
4247+
COMPONENT applocal
4248+
)
42234249
endif()
42244250

42254251
if(WIN32)
@@ -4531,6 +4557,7 @@ if(RUBBERBAND)
45314557
target_link_libraries(mixxx-lib PRIVATE rubberband::rubberband)
45324558
target_compile_definitions(mixxx-lib PUBLIC __RUBBERBAND__)
45334559
if(QML)
4560+
target_link_libraries(mixxx-qml-lib PRIVATE rubberband::rubberband)
45344561
target_compile_definitions(mixxx-qml-lib PUBLIC __RUBBERBAND__)
45354562
endif()
45364563
target_sources(
@@ -5233,7 +5260,12 @@ if(QT6)
52335260
list(
52345261
APPEND
52355262
CPACK_DEBIAN_PACKAGE_DEPENDS
5236-
"qml6-module-qt5compat-graphicaleffects"
5263+
"libqt6sql6-sqlite, fonts-open-sans, fonts-ubuntu, qt6-qpa-plugins, qml6-module-qt5compat-graphicaleffects, qml6-module-qtquick-controls, qml6-module-qtquick-layouts, qml6-module-qtquick-nativestyle, qml6-module-qtquick-templates, qml6-module-qtquick-window, qml6-module-qtquick-dialogs, qml6-module-qt-labs-qmlmodels, qml6-module-qt-labs-folderlistmodel, qml6-module-qtquick-shapes, qml6-module-qtmultimedia, qml6-module-qtqml-workerscript"
5264+
)
5265+
else()
5266+
set(
5267+
CPACK_DEBIAN_PACKAGE_DEPENDS
5268+
"libqt6sql6-sqlite, fonts-open-sans, fonts-ubuntu, qt6-qpa-plugins"
52375269
)
52385270
list(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "qml6-module-qtquick-controls")
52395271
list(APPEND CPACK_DEBIAN_PACKAGE_DEPENDS "qml6-module-qtquick-layouts")

packaging/debian/control.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,20 @@ Build-Depends: debhelper (>= 11),
1313
qt6-base-private-dev,
1414
qt6-qpa-plugins,
1515
qml6-module-qt5compat-graphicaleffects,
16+
qml6-module-qtmultimedia,
1617
qml6-module-qtqml-workerscript,
1718
qml6-module-qtquick-controls,
1819
qml6-module-qtquick-layouts,
1920
qml6-module-qtquick-shapes,
2021
qml6-module-qtquick-templates,
2122
qml6-module-qtquick-window,
23+
qml6-module-qtquick-dialogs,
2224
qml6-module-qt-labs-qmlmodels,
25+
qml6-module-qt-labs-folderlistmodel,
2326
libqt6core5compat6-dev,
2427
libqt6opengl6-dev,
28+
libqt6multimedia6,
29+
libqt6multimediaquick6,
2530
libqt6sql6-sqlite,
2631
libqt6svg6-dev,
2732
cmake (>= 3.13),

res/controllers/Dummy Device Screen.hid.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,14 @@
6262
<value color="#FFFFFF" label="White">white</value>
6363
</option>
6464
</row>
65+
<option
66+
variable="intValue"
67+
type="integer"
68+
min="20"
69+
max="500"
70+
step="2"
71+
default="50"
72+
label="Int value"/>
6573
</group>
6674
</settings>
6775
<controller id="DummyDevice">

0 commit comments

Comments
 (0)