feat(QML): add controller settings

Author: acolombier

CMakeLists.txt

@@ -2498,6 +2498,7 @@ if(BUILD_TESTING)
     src/test/colormapperjsproxy_test.cpp
     src/test/colorpalette_test.cpp
     src/test/configobject_test.cpp
+    src/test/controller_mapping_file_handler_test.cpp
     src/test/controller_mapping_validation_test.cpp
     src/test/controller_mapping_settings_test.cpp
     src/test/controllers/controller_columnid_regression_test.cpp
@@ -2611,9 +2612,7 @@ if(BUILD_TESTING)
   if(QML)
     target_sources(
       mixxx-test
-      PRIVATE
-        src/test/controller_mapping_file_handler_test.cpp
-        src/test/controllerrenderingengine_test.cpp
+      PRIVATE src/test/controllerrenderingengine_test.cpp
     )
   endif()
 
@@ -3314,8 +3313,9 @@ else()
   find_package(QT 5.12 NAMES Qt5 COMPONENTS Core REQUIRED)
 endif()
 if(QML)
-  list(APPEND QT_EXTRA_COMPONENTS "Quick")
   list(APPEND QT_EXTRA_COMPONENTS "LabsQmlModels")
+  list(APPEND QT_EXTRA_COMPONENTS "Multimedia")
+  list(APPEND QT_EXTRA_COMPONENTS "Quick")
   list(APPEND QT_EXTRA_COMPONENTS "QuickControls2")
   list(APPEND QT_EXTRA_COMPONENTS "QuickControls2Impl")
   list(APPEND QT_EXTRA_COMPONENTS "QuickLayouts")
@@ -3455,6 +3455,7 @@ if(QML)
       src/qml/qmlwaveformrenderer.cpp
       src/qml/qmlsettingparameter.cpp
       src/qml/qmltrackproxy.cpp
+      src/qml/qmlpreferencesproxy.cpp
       src/waveform/renderers/allshader/digitsrenderer.cpp
       src/waveform/renderers/allshader/waveformrenderbeat.cpp
       src/waveform/renderers/allshader/waveformrenderer.cpp
@@ -3811,6 +3812,22 @@ else()
         DESTINATION "${MIXXX_INSTALL_DATADIR}/Qt6/qml/Qt/labs"
         COMPONENT applocal
       )
+
+      # install qml6-module-qtquick-dialogs
+      install(
+        DIRECTORY
+          "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/Qt6/qml/QtQuick/Dialogs"
+        DESTINATION "${MIXXX_INSTALL_DATADIR}/Qt6/qml/QtQuick"
+        COMPONENT applocal
+      )
+
+      # install qml6-module-qt-labs-folderlistmodel
+      install(
+        DIRECTORY
+          "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/Qt6/qml/Qt/labs/folderlistmodel"
+        DESTINATION "${MIXXX_INSTALL_DATADIR}/Qt6/qml/Qt/labs"
+        COMPONENT applocal
+      )
     endif()
 
     if(WIN32)
@@ -4120,6 +4137,10 @@ if(RUBBERBAND)
   find_package(rubberband REQUIRED)
   target_link_libraries(mixxx-lib PRIVATE rubberband::rubberband)
   target_compile_definitions(mixxx-lib PUBLIC __RUBBERBAND__)
+  if(QML)
+    target_link_libraries(mixxx-qml-lib PRIVATE rubberband::rubberband)
+    target_compile_definitions(mixxx-qml-lib PUBLIC __RUBBERBAND__)
+  endif()
   target_sources(
     mixxx-lib
     PRIVATE
@@ -4897,7 +4918,7 @@ if(QT6)
   if(QML)
     set(
       CPACK_DEBIAN_PACKAGE_DEPENDS
-      "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-qt-labs-qmlmodels, qml6-module-qtquick-shapes, qml6-module-qtqml-workerscript"
+      "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-qt-labs-qmlmodels, qml6-module-qtquick-dialogs, qml6-module-qtquick-shapes, qml6-module-qtqml-workerscript"
     )
   else()
     set(

packaging/debian/control.in

@@ -13,16 +13,21 @@ Build-Depends: debhelper (>= 11),
                qt6-base-private-dev,
                qt6-qpa-plugins,
                qml6-module-qt5compat-graphicaleffects,
+               qml6-module-qtmultimedia,
                qml6-module-qtqml-workerscript,
                qml6-module-qtquick-controls,
                qml6-module-qtquick-layouts,
                qml6-module-qtquick-nativestyle,
                qml6-module-qtquick-shapes,
                qml6-module-qtquick-templates,
                qml6-module-qtquick-window,
+               qml6-module-qtquick-dialogs,
                qml6-module-qt-labs-qmlmodels,
+               qml6-module-qt-labs-folderlistmodel,
                libqt6core5compat6-dev,
                libqt6opengl6-dev,
+               libqt6multimedia6,
+               libqt6multimediaquick6,
                libqt6sql6-sqlite,
                libqt6svg6-dev,
                cmake (>= 3.13),

res/controllers/Dummy Device Screen.hid.xml

@@ -62,6 +62,14 @@
                     <value color="#FFFFFF" label="White">white</value>
                 </option>
             </row>
+            <option
+                variable="intValue"
+                type="integer"
+                min="20"
+                max="500"
+                step="2"
+                default="50"
+                label="Int value"/>
          </group>
     </settings>
     <controller id="DummyDevice">