Merge pull request mixxxdj#16489 from xARSENICx/LateNightQML/Legacy-Library-Integration

[GSoC] LateNightQML: Legacy Library Integration

Author: daschuer

CMakeLists.txt

@@ -3809,6 +3809,8 @@ if(QT_KNOWN_POLICY_QTP0002 AND ANDROID)
 endif()
 
 if(QML)
+  target_sources(mixxx-lib PRIVATE src/skin/qml/qmlskin.cpp)
+
   if(QT_KNOWN_POLICY_QTP0004)
     # See: https://doc.qt.io/qt-6/qt-cmake-policy-qtp0004.html
     # OLD (Qt < 6.8) requires to import qml modules with a folder e.g.:
@@ -3912,6 +3914,7 @@ if(QML)
       src/qml/qmleffectmanifestparametersmodel.cpp
       src/qml/qmleffectslotproxy.cpp
       src/qml/qmleffectsmanagerproxy.cpp
+      src/qml/qmllegacylibraryitem.cpp
       src/qml/qmllibraryproxy.cpp
       src/qml/qmllibrarysource.cpp
       src/qml/qmllibrarysourcetree.cpp

res/qml/Settings/Interface.qml

@@ -64,7 +64,6 @@ Category {
         keyPaletteInput.selected = Mixxx.Config.configKeyColorsEnabled ? "on" : "off";
         keyPaletteComboBox.currentIndex = keyPaletteComboBox.model.indexOf(Mixxx.Config.configKeyColorPalette);
         colorPane.hotcuePaletteColorIndex = Mixxx.Config.controlHotcueDefaultColorIndex;
-        console.log(colorPane.hotcuePaletteColorIndex, Mixxx.Config.controlHotcueDefaultColorIndex);
         if (colorPane.hotcuePaletteColorIndex < 0)
             colorPane.hotcuePaletteColorIndex = colorPane.defaultPalette.length - 1;
         hotcuePaletteInput.currentIndex = colorPane.hotcuePaletteColorIndex;
@@ -87,10 +86,10 @@ Category {
     }
     function saveDeck() {
         Mixxx.Config.controlCueDefault = cueModeInput.currentIndex;
-        Mixxx.Config.controlSetIntroStartAtMainCue = setIntroStartToMainCueInput.enabled;
+        Mixxx.Config.controlSetIntroStartAtMainCue = setIntroStartToMainCueInput.selected === "on";
         Mixxx.Config.controlPositionDisplay = trackTimeDisplayInput.options.indexOf(trackTimeDisplayInput.selected);
         Mixxx.Config.controlTimeFormat = timeMode.currentIndex;
-        Mixxx.Config.controlCloneDeckOnLoadDoubleTap = doublePressLoadToCloneInput.enabled;
+        Mixxx.Config.controlCloneDeckOnLoadDoubleTap = doublePressLoadToCloneInput.selected === "on";
         Mixxx.Config.controlCueRecall = trackLoadPointInput.currentIndex;
         Mixxx.Config.controlLoadWhenDeckPlaying = loadingTrackWhenPlayingInput.options.indexOf(loadingTrackWhenPlayingInput.selected);
         Mixxx.Config.controlSpeedAutoReset = resetOnTrackLoadInput.options.indexOf(resetOnTrackLoadInput.selected);
@@ -120,15 +119,15 @@ Category {
         // layoutInput.value =
         Mixxx.Config.libraryTooltips = tooltipsInput.options.indexOf(tooltipsInput.selected);
         Mixxx.Config.libraryInhibitScreensaver = disableScreensaverInput.options.indexOf(disableScreensaverInput.selected);
-        Mixxx.Config.configStartInFullscreenKey = startFullscreenInput.enabled;
-        Mixxx.Config.libraryHideMenuBar = autoHideMenuBarInput.enabled;
-        Mixxx.Config.libraryEnableSearchCompletions = searchCompletionInput.enabled;
-        Mixxx.Config.libraryEnableSearchHistoryShortcuts = searchHistoryKeyboardInput.enabled;
+        Mixxx.Config.configStartInFullscreenKey = startFullscreenInput.selected === "on";
+        Mixxx.Config.libraryHideMenuBar = autoHideMenuBarInput.selected === "on";
+        Mixxx.Config.libraryEnableSearchCompletions = searchCompletionInput.selected === "on";
+        Mixxx.Config.libraryEnableSearchHistoryShortcuts = searchHistoryKeyboardInput.selected === "on";
         Mixxx.Config.libraryBpmColumnPrecision = bpmPrecisionInput.value;
         Mixxx.Config.libraryRowHeight = libraryRowHeightInput.value;
         Mixxx.Config.configTrackColorPalette = trackPaletteComboBox.model[trackPaletteComboBox.currentIndex];
         Mixxx.Config.configHotcueColorPalette = hotcuePaletteComboBox.model[hotcuePaletteComboBox.currentIndex];
-        Mixxx.Config.configKeyColorsEnabled = keyPaletteInput.enabled;
+        Mixxx.Config.configKeyColorsEnabled = keyPaletteInput.selected === "on";
         Mixxx.Config.configKeyColorPalette = keyPaletteComboBox.model[keyPaletteComboBox.currentIndex];
         // keyPaletteInput.value
         Mixxx.Config.controlHotcueDefaultColorIndex = hotcuePaletteInput.currentIndex;

res/qml/main.qml

@@ -3,6 +3,7 @@ import Mixxx 1.0 as Mixxx
 import QtQuick 2.12
 import QtQuick.Controls
 import QtQuick.Layouts
+import QtQuick.Window
 import QtQuick.Shapes
 import Qt5Compat.GraphicalEffects
 import "Theme"
@@ -14,7 +15,9 @@ ApplicationWindow {
     property var focusedDeck: null
     property alias maximizeLibrary: maximizeLibraryButton.checked
     readonly property int numDecks: 4
+    readonly property int numPreviewDecks: 1
     readonly property int numSamplers: 16
+    readonly property int waveformOverviewTypeRgb: 2
     readonly property bool show4decks: show4DecksButton.checked && show4DecksButton.visible
     property alias showEffects: showEffectsButton.checked
     property alias showSamplers: showSamplersButton.checked
@@ -24,6 +27,7 @@ ApplicationWindow {
     minimumHeight: 300
     minimumWidth: 680
     visible: true
+    visibility: Mixxx.Config.configStartInFullscreenKey ? Window.FullScreen : Window.Windowed
     width: 1792
 
     Mixxx.ControlProxy {
@@ -42,6 +46,22 @@ ApplicationWindow {
             value = root.numSamplers;
         }
     }
+    Mixxx.ControlProxy {
+        group: "[App]"
+        key: "num_preview_decks"
+
+        onInitializedChanged: {
+            value = root.numPreviewDecks;
+        }
+    }
+    Mixxx.ControlProxy {
+        group: "[Waveform]"
+        key: "WaveformOverviewType"
+
+        onInitializedChanged: {
+            value = root.waveformOverviewTypeRgb;
+        }
+    }
     Column {
         id: content
 

res/skins/LateNightQML/Library.qml

@@ -0,0 +1,10 @@
+import Mixxx 1.0 as Mixxx
+import QtQuick
+
+Item {
+    id: root
+
+    Mixxx.LegacyLibraryItem {
+        anchors.fill: parent
+    }
+}