mixxxdj · Swiftb0y · Jan 17, 2022 · Jan 16, 2022 · Jan 16, 2022 · Jan 16, 2022
diff --git a/res/qml/ComboBox.qml b/res/qml/ComboBox.qml
@@ -10,20 +10,22 @@ ComboBox {
     }
 
     delegate: ItemDelegate {
+        id: itemDlgt
+
         width: parent.width
         highlighted: root.highlightedIndex === index
         text: root.textAt(index)
 
         contentItem: Text {
-            text: parent.text
+            text: itemDlgt.text
             color: Theme.deckTextColor
             elide: Text.ElideRight
             verticalAlignment: Text.AlignVCenter
         }
 
         background: Rectangle {
             radius: 5
-            border.width: highlighted ? 1 : 0
+            border.width: itemDlgt.highlighted ? 1 : 0
             border.color: Theme.deckLineColor
             color: "transparent"
         }

diff --git a/res/qml/DeckInfoBar.qml b/res/qml/DeckInfoBar.qml
@@ -65,7 +65,9 @@ Rectangle {
         Mixxx.ControlProxy {
             group: root.group
             key: "play"
-            onValueChanged: spinnyIndicator.indicatorVisible = (value > 0)
+            onValueChanged: (value) => {
+                spinnyIndicator.indicatorVisible = (value > 0);
+            }
         }
 
         MixxxControls.Spinny {
@@ -109,11 +111,11 @@ Rectangle {
         id: infoBarVSeparator
 
         anchors.left: coverArt.right
-        anchors.right: infoBar.right
-        anchors.verticalCenter: infoBar.verticalCenter
+        anchors.right: root.right
+        anchors.verticalCenter: root.verticalCenter
         anchors.margins: 5
         height: 2
-        color: infoBar.lineColor
+        color: root.lineColor
     }
 
     Skin.EmbeddedText {
@@ -132,13 +134,13 @@ Rectangle {
     Rectangle {
         id: infoBarHSeparator1
 
-        anchors.top: infoBar.top
-        anchors.bottom: infoBar.bottom
+        anchors.top: root.top
+        anchors.bottom: root.bottom
         anchors.right: infoBarKey.left
         anchors.topMargin: 5
         anchors.bottomMargin: 5
         width: 2
-        color: infoBar.lineColor
+        color: root.lineColor
     }
 
     Skin.EmbeddedText {
@@ -154,21 +156,21 @@ Rectangle {
     Rectangle {
         id: infoBarHSeparator2
 
-        anchors.top: infoBar.top
-        anchors.bottom: infoBar.bottom
+        anchors.top: root.top
+        anchors.bottom: root.bottom
         anchors.right: infoBarRateRatio.left
         anchors.topMargin: 5
         anchors.bottomMargin: 5
         width: 2
-        color: infoBar.lineColor
+        color: root.lineColor
     }
 
     Skin.EmbeddedText {
         id: infoBarRate
 
         anchors.top: infoBarHSeparator2.top
         anchors.bottom: infoBarVSeparator.top
-        anchors.right: infoBar.right
+        anchors.right: root.right
         anchors.rightMargin: 5
         width: rateSlider.width
 
@@ -189,7 +191,7 @@ Rectangle {
         anchors.top: infoBarVSeparator.bottom
         anchors.bottom: infoBarHSeparator1.bottom
         width: rateSlider.width
-        anchors.right: infoBar.right
+        anchors.right: root.right
         anchors.rightMargin: 5
         text: (ratio > 0) ? "+" + ratio.toFixed(2) : ratio.toFixed(2)
 

diff --git a/res/qml/DeckRow.qml b/res/qml/DeckRow.qml
@@ -1,5 +1,4 @@
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 Item {
     id: root

diff --git a/res/qml/EffectRow.qml b/res/qml/EffectRow.qml
@@ -1,6 +1,5 @@
 import "." as Skin
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 Item {
     id: root

diff --git a/res/qml/EffectSlot.qml b/res/qml/EffectSlot.qml
@@ -48,7 +48,7 @@ Item {
             anchors.margins: 5
             textRole: "display"
             model: Mixxx.EffectsManager.visibleEffectsModel
-            onActivated: {
+            onActivated: (index) => {
                 const effectId = model.get(index).effectId;
                 if (root.slot.effectId != effectId)
                     root.slot.effectId = effectId;
@@ -62,7 +62,7 @@ Item {
                     // TODO: Consider using an additional QHash in the
                     // model and provide a more efficient lookup method
                     for (let i = 0; i < rowCount; i++) {
-                        if (effectSelector.model.get(i).effectId === target.effectId) {
+                        if (effectSelector.model.get(i).effectId === root.slot.effectId) {
                             effectSelector.currentIndex = i;
                             break;
                         }

diff --git a/res/qml/EffectUnit.qml b/res/qml/EffectUnit.qml
@@ -160,7 +160,7 @@ Item {
                 height: 40
                 width: height
                 arcStart: Knob.ArcStart.Minimum
-                group: "[EffectRack1_EffectUnit" + unitNumber + "]"
+                group: "[EffectRack1_EffectUnit" + root.unitNumber + "]"
                 key: "super1"
                 color: Theme.effectUnitColor
                 visible: false
@@ -177,7 +177,7 @@ Item {
                 height: 40
                 width: height
                 arcStart: Knob.ArcStart.Minimum
-                group: "[EffectRack1_EffectUnit" + unitNumber + "]"
+                group: "[EffectRack1_EffectUnit" + root.unitNumber + "]"
                 key: "mix"
                 color: Theme.effectUnitColor
                 visible: false

diff --git a/res/qml/Hotcue.qml b/res/qml/Hotcue.qml
@@ -25,28 +25,28 @@ Item {
         id: hotcueColorControl
 
         group: root.group
-        key: "hotcue_" + hotcueNumber + "_color"
+        key: "hotcue_" + root.hotcueNumber + "_color"
     }
 
     Mixxx.ControlProxy {
         id: hotcueActivateControl
 
         group: root.group
-        key: "hotcue_" + hotcueNumber + "_activate"
+        key: "hotcue_" + root.hotcueNumber + "_activate"
     }
 
     Mixxx.ControlProxy {
         id: hotcueStatusControl
 
         group: root.group
-        key: "hotcue_" + hotcueNumber + "_status"
+        key: "hotcue_" + root.hotcueNumber + "_status"
     }
 
     Mixxx.ControlProxy {
         id: hotcueClearControl
 
         group: root.group
-        key: "hotcue_" + hotcueNumber + "_clear"
+        key: "hotcue_" + root.hotcueNumber + "_clear"
     }
 
 }
diff --git a/res/qml/HotcueButton.qml b/res/qml/HotcueButton.qml
@@ -39,7 +39,7 @@ Skin.Button {
 
         anchors.fill: parent
         acceptedButtons: Qt.RightButton
-        onClicked: {
+        onClicked: (mouse) => {
             if (hotcue.isSet) {
                 popup.x = mouse.x;
                 popup.y = mouse.y;

diff --git a/res/qml/HotcuePopup.qml b/res/qml/HotcuePopup.qml
@@ -33,7 +33,7 @@ Popup {
                 MouseArea {
                     anchors.fill: parent
                     onClicked: {
-                        hotcue.setColor(parent.color);
+                        root.hotcue.setColor(parent.color);
                         root.close();
                     }
                 }
@@ -52,7 +52,9 @@ Popup {
         anchors.topMargin: 5
         text: "Clear"
         activeColor: Theme.deckActiveColor
-        onDownChanged: hotcue.clear = down
+        onDownChanged: (down) => {
+            root.hotcue.clear = down;
+        }
     }
 
     enter: Transition {

diff --git a/res/qml/InfoBarButton.qml b/res/qml/InfoBarButton.qml
@@ -1,4 +1,3 @@
-import "." as Skin
 import Mixxx 0.1 as Mixxx
 import QtGraphicalEffects 1.12
 import QtQuick 2.12

diff --git a/res/qml/Library.qml b/res/qml/Library.qml
@@ -1,4 +1,3 @@
-import "." as Skin
 import Mixxx 0.1 as Mixxx
 import QtQml.Models 2.12
 import QtQuick 2.12
@@ -12,9 +11,15 @@ Item {
         LibraryControl {
             id: libraryControl
 
-            onMoveVertical: listView.moveSelectionVertical(offset)
-            onLoadSelectedTrack: listView.loadSelectedTrack(group, play)
-            onLoadSelectedTrackIntoNextAvailableDeck: listView.loadSelectedTrackIntoNextAvailableDeck(play)
+            onMoveVertical: (offset) => {
+                listView.moveSelectionVertical(offset);
+            }
+            onLoadSelectedTrack: (group, play) => {
+                listView.loadSelectedTrack(group, play);
+            }
+            onLoadSelectedTrackIntoNextAvailableDeck: (play) => {
+                listView.loadSelectedTrackIntoNextAvailableDeck(play);
+            }
             onFocusWidgetChanged: {
                 switch (focusWidget) {
                 case FocusedWidgetControl.WidgetKind.LibraryView:
@@ -65,7 +70,7 @@ Item {
             highlightMoveDuration: 250
             highlightResizeDuration: 50
             model: Mixxx.Library.model
-            Keys.onPressed: {
+            Keys.onPressed: (event) => {
                 switch (event.key) {
                 case Qt.Key_Enter:
                 case Qt.Key_Return:

diff --git a/res/qml/LibraryControl.qml b/res/qml/LibraryControl.qml
@@ -19,7 +19,7 @@ Item {
     Mixxx.ControlProxy {
         group: "[Library]"
         key: "GoToItem"
-        onValueChanged: {
+        onValueChanged: (value) => {
             if (value != 0 && root.focusWidget == FocusedWidgetControl.WidgetKind.LibraryView)
                 root.loadSelectedTrackIntoNextAvailableDeck(false);
 
@@ -29,7 +29,7 @@ Item {
     Mixxx.ControlProxy {
         group: "[Playlist]"
         key: "LoadSelectedIntoFirstStopped"
-        onValueChanged: {
+        onValueChanged: (value) => {
             if (value != 0 && root.focusWidget == FocusedWidgetControl.WidgetKind.LibraryView)
                 root.loadSelectedTrackIntoNextAvailableDeck(false);
 
@@ -39,7 +39,7 @@ Item {
     Mixxx.ControlProxy {
         group: "[Playlist]"
         key: "SelectTrackKnob"
-        onValueChanged: {
+        onValueChanged: (value) => {
             if (value != 0) {
                 root.focusWidget = FocusedWidgetControl.WidgetKind.LibraryView;
                 root.moveVertical(value);
@@ -50,7 +50,7 @@ Item {
     Mixxx.ControlProxy {
         group: "[Playlist]"
         key: "SelectPrevTrack"
-        onValueChanged: {
+        onValueChanged: (value) => {
             if (value != 0) {
                 root.focusWidget = FocusedWidgetControl.WidgetKind.LibraryView;
                 root.moveVertical(-1);
@@ -61,7 +61,7 @@ Item {
     Mixxx.ControlProxy {
         group: "[Playlist]"
         key: "SelectNextTrack"
-        onValueChanged: {
+        onValueChanged: (value) => {
             if (value != 0) {
                 root.focusWidget = FocusedWidgetControl.WidgetKind.LibraryView;
                 root.moveVertical(1);
@@ -72,7 +72,7 @@ Item {
     Mixxx.ControlProxy {
         group: "[Library]"
         key: "MoveVertical"
-        onValueChanged: {
+        onValueChanged: (value) => {
             if (value != 0 && root.focusWidget == FocusedWidgetControl.WidgetKind.LibraryView)
                 root.moveVertical(value);
 
@@ -82,7 +82,7 @@ Item {
     Mixxx.ControlProxy {
         group: "[Library]"
         key: "MoveUp"
-        onValueChanged: {
+        onValueChanged: (value) => {
             if (value != 0 && root.focusWidget == FocusedWidgetControl.WidgetKind.LibraryView)
                 root.moveVertical(-1);
 
@@ -92,7 +92,7 @@ Item {
     Mixxx.ControlProxy {
         group: "[Library]"
         key: "MoveDown"
-        onValueChanged: {
+        onValueChanged: (value) => {
             if (value != 0 && root.focusWidget == FocusedWidgetControl.WidgetKind.LibraryView)
                 root.moveVertical(1);
 
@@ -112,7 +112,9 @@ Item {
         delegate: LibraryControlLoadSelectedTrackHandler {
             group: "[Channel" + (index + 1) + "]"
             enabled: root.focusWidget == FocusedWidgetControl.WidgetKind.LibraryView
-            onLoadTrackRequested: root.loadSelectedTrack(group, play)
+            onLoadTrackRequested: (play) => {
+                root.loadSelectedTrack(this.group, play);
+            }
         }
 
     }
@@ -130,7 +132,9 @@ Item {
         delegate: LibraryControlLoadSelectedTrackHandler {
             group: "[PreviewDeck" + (index + 1) + "]"
             enabled: root.focusWidget == FocusedWidgetControl.WidgetKind.LibraryView
-            onLoadTrackRequested: root.loadSelectedTrack(group, play)
+            onLoadTrackRequested: (play) => {
+                root.loadSelectedTrack(this.group, play);
+            }
         }
 
     }
@@ -148,7 +152,9 @@ Item {
         delegate: LibraryControlLoadSelectedTrackHandler {
             group: "[Sampler" + (index + 1) + "]"
             enabled: root.focusWidget == FocusedWidgetControl.WidgetKind.LibraryView
-            onLoadTrackRequested: root.loadSelectedTrack(group, play)
+            onLoadTrackRequested: (play) => {
+                root.loadSelectedTrack(this.group, play);
+            }
         }
 
     }

diff --git a/res/qml/LibraryControlLoadSelectedTrackHandler.qml b/res/qml/LibraryControlLoadSelectedTrackHandler.qml
@@ -16,7 +16,7 @@ Item {
     Mixxx.ControlProxy {
         group: root.group
         key: "LoadSelectedTrack"
-        onValueChanged: {
+        onValueChanged: (value) => {
             if (value == 0 || !root.enabled)
                 return ;
 
@@ -27,7 +27,7 @@ Item {
     Mixxx.ControlProxy {
         group: root.group
         key: "LoadSelectedTrackAndPlay"
-        onValueChanged: {
+        onValueChanged: (value) => {
             if (value == 0 || !root.enabled)
                 return ;
 

diff --git a/res/qml/MicrophoneDuckingPanel.qml b/res/qml/MicrophoneDuckingPanel.qml
@@ -36,7 +36,7 @@ Column {
             id: duckingControl
 
             property string duckingModeName: {
-                switch (value) {
+                switch (this.value) {
                 case MicrophoneDuckingPanel.DuckingMode.Auto:
                     return "Auto";
                 case MicrophoneDuckingPanel.DuckingMode.Manual:
@@ -46,11 +46,11 @@ Column {
                 }
             }
             property bool duckingEnabled: {
-                return (value == MicrophoneDuckingPanel.DuckingMode.Auto || value == MicrophoneDuckingPanel.DuckingMode.Manual);
+                return (this.value == MicrophoneDuckingPanel.DuckingMode.Auto || this.value == MicrophoneDuckingPanel.DuckingMode.Manual);
             }
 
             function nextMode() {
-                value = (value + 1) % MicrophoneDuckingPanel.DuckingMode.NumModes;
+                this.value = (this.value + 1) % MicrophoneDuckingPanel.DuckingMode.NumModes;
             }
 
             group: "[Master]"