mixxxdj · uklotzde · Jan 23, 2022 · Jan 22, 2022 · Jan 22, 2022 · Jan 22, 2022
diff --git a/res/qml/AuxiliaryUnit.qml b/res/qml/AuxiliaryUnit.qml
@@ -1,7 +1,5 @@
 import "." as Skin
 import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.12
 import "Theme"
 
 Row {

diff --git a/res/qml/Button.qml b/res/qml/Button.qml
@@ -1,6 +1,4 @@
-import "." as Skin
 import QtGraphicalEffects 1.12
-import QtQml 2.12
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 import "Theme"

diff --git a/res/qml/CrossfaderRow.qml b/res/qml/CrossfaderRow.qml
@@ -1,7 +1,5 @@
 import "." as Skin
-import Mixxx 0.1 as Mixxx
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 import "Theme"
 
 Item {

diff --git a/res/qml/Deck.qml b/res/qml/Deck.qml
@@ -1,9 +1,6 @@
 import "." as Skin
 import Mixxx 0.1 as Mixxx
-import Mixxx.Controls 0.1 as MixxxControls
 import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.11
 import "Theme"
 
 Item {
@@ -48,6 +45,7 @@ Item {
         anchors.left: parent.left
         anchors.right: parent.right
         group: root.group
+        rightColumnWidth: rateSlider.width
     }
 
     Skin.ControlSlider {
@@ -356,6 +354,8 @@ Item {
 
                     hotcueNumber: index + 1
                     group: root.group
+                    width: playButton.height
+                    height: playButton.height
                 }
 
             }

diff --git a/res/qml/DeckInfoBar.qml b/res/qml/DeckInfoBar.qml
@@ -9,6 +9,7 @@ Rectangle {
     id: root
 
     property string group // required
+    property int rightColumnWidth // required
     property var deckPlayer: Mixxx.PlayerManager.getPlayer(group)
     property color lineColor: Theme.deckLineColor
 
@@ -150,7 +151,7 @@ Rectangle {
         anchors.top: infoBarHSeparator1.top
         anchors.bottom: infoBarVSeparator.top
         anchors.right: infoBarHSeparator2.left
-        width: rateSlider.width
+        width: root.rightColumnWidth
     }
 
     Rectangle {
@@ -172,7 +173,7 @@ Rectangle {
         anchors.bottom: infoBarVSeparator.top
         anchors.right: root.right
         anchors.rightMargin: 5
-        width: rateSlider.width
+        width: root.rightColumnWidth
 
         Mixxx.ControlProxy {
             id: bpmControl
@@ -190,7 +191,7 @@ Rectangle {
 
         anchors.top: infoBarVSeparator.bottom
         anchors.bottom: infoBarHSeparator1.bottom
-        width: rateSlider.width
+        width: root.rightColumnWidth
         anchors.right: root.right
         anchors.rightMargin: 5
         text: (ratio > 0) ? "+" + ratio.toFixed(2) : ratio.toFixed(2)

diff --git a/res/qml/EffectUnit.qml b/res/qml/EffectUnit.qml
@@ -1,8 +1,5 @@
 import "." as Skin
-import Mixxx 0.1 as Mixxx
 import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.12
 import "Theme"
 
 Item {
@@ -21,7 +18,7 @@ Item {
         anchors.right: effectUnitControlsFrame.left
         height: 60
 
-        EffectSlot {
+        Skin.EffectSlot {
             id: effect1
 
             anchors.top: parent.top
@@ -32,7 +29,7 @@ Item {
             expanded: false
         }
 
-        EffectSlot {
+        Skin.EffectSlot {
             id: effect2
 
             anchors.top: parent.top
@@ -43,7 +40,7 @@ Item {
             expanded: false
         }
 
-        EffectSlot {
+        Skin.EffectSlot {
             id: effect3
 
             anchors.top: parent.top

diff --git a/res/qml/EqColumn.qml b/res/qml/EqColumn.qml
@@ -1,5 +1,4 @@
 import "." as Skin
-import Mixxx.Controls 0.1 as MixxxControls
 import QtQuick 2.12
 import QtQuick.Shapes 1.12
 import "Theme"
@@ -11,28 +10,28 @@ Column {
 
     spacing: 4
 
-    EqKnob {
+    Skin.EqKnob {
         statusKey: "button_parameter3"
         knob.group: "[EqualizerRack1_" + root.group + "_Effect1]"
         knob.key: "parameter3"
         knob.color: Theme.eqHighColor
     }
 
-    EqKnob {
+    Skin.EqKnob {
         statusKey: "button_parameter2"
         knob.group: "[EqualizerRack1_" + root.group + "_Effect1]"
         knob.key: "parameter2"
         knob.color: Theme.eqMidColor
     }
 
-    EqKnob {
+    Skin.EqKnob {
         knob.group: "[EqualizerRack1_" + root.group + "_Effect1]"
         knob.key: "parameter1"
         statusKey: "button_parameter1"
         knob.color: Theme.eqLowColor
     }
 
-    EqKnob {
+    Skin.EqKnob {
         knob.group: "[QuickEffectRack1_" + root.group + "]"
         knob.key: "super1"
         statusGroup: "[QuickEffectRack1_" + root.group + "_Effect1]"

diff --git a/res/qml/EqKnob.qml b/res/qml/EqKnob.qml
@@ -1,6 +1,5 @@
 import "." as Skin
 import Mixxx 0.1 as Mixxx
-import Mixxx.Controls 0.1 as MixxxControls
 import QtQuick 2.12
 import "Theme"
 

diff --git a/res/qml/HotcueButton.qml b/res/qml/HotcueButton.qml
@@ -1,7 +1,5 @@
 import "." as Skin
 import QtQuick 2.12
-import QtQuick.Controls 2.12
-import "Theme"
 
 Skin.Button {
     id: root
@@ -10,12 +8,10 @@ Skin.Button {
     property string group // required
 
     text: hotcueNumber
-    width: playButton.height
-    height: playButton.height
     activeColor: hotcue.color
     highlight: hotcue.isSet
 
-    Hotcue {
+    Skin.Hotcue {
         id: hotcue
 
         group: root.group
@@ -28,7 +24,7 @@ Skin.Button {
         }
     }
 
-    HotcuePopup {
+    Skin.HotcuePopup {
         id: popup
 
         hotcue: hotcue

diff --git a/res/qml/HotcuePopup.qml b/res/qml/HotcuePopup.qml
@@ -52,9 +52,8 @@ Popup {
         anchors.topMargin: 5
         text: "Clear"
         activeColor: Theme.deckActiveColor
-        onDownChanged: (down) => {
-            root.hotcue.clear = down;
-        }
+        onPressed: root.hotcue.clear = 1
+        onReleased: root.hotcue.clear = 0
     }
 
     enter: Transition {

diff --git a/res/qml/Library.qml b/res/qml/Library.qml
@@ -1,5 +1,4 @@
 import Mixxx 0.1 as Mixxx
-import QtQml.Models 2.12
 import QtQuick 2.12
 import "Theme"
 

diff --git a/res/qml/Mixer.qml b/res/qml/Mixer.qml
@@ -2,7 +2,7 @@ import "." as Skin
 import QtQuick 2.12
 
 Item {
-    id: mixer
+    id: root
 
     property string leftDeckGroup // required
     property string rightDeckGroup // required

diff --git a/res/qml/Mixxx/Controls/WaveformOverview.qml b/res/qml/Mixxx/Controls/WaveformOverview.qml
@@ -1,7 +1,6 @@
 import Mixxx 0.1 as Mixxx
 import Mixxx.Controls 0.1 as MixxxControls
 import QtQuick 2.12
-import QtQuick.Shapes 1.12
 
 Mixxx.WaveformOverview {
     id: root

diff --git a/res/qml/main.qml b/res/qml/main.qml
@@ -2,7 +2,6 @@ import "." as Skin
 import Mixxx 0.1 as Mixxx
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.11
 import "Theme"
 
 ApplicationWindow {
@@ -118,7 +117,7 @@ ApplicationWindow {
             width: parent.width
             visible: !root.maximizeLibrary
 
-            FadeBehavior on visible {
+            Skin.FadeBehavior on visible {
                 fadeTarget: crossfader
             }
 
@@ -133,37 +132,37 @@ ApplicationWindow {
             minimized: root.maximizeLibrary
             visible: root.show4decks
 
-            FadeBehavior on visible {
+            Skin.FadeBehavior on visible {
                 fadeTarget: decks34
             }
 
         }
 
-        SamplerRow {
+        Skin.SamplerRow {
             id: samplers
 
             width: parent.width
             visible: root.showSamplers
 
-            FadeBehavior on visible {
+            Skin.FadeBehavior on visible {
                 fadeTarget: samplers
             }
 
         }
 
-        EffectRow {
+        Skin.EffectRow {
             id: effects
 
             width: parent.width
             visible: root.showEffects
 
-            FadeBehavior on visible {
+            Skin.FadeBehavior on visible {
                 fadeTarget: effects
             }
 
         }
 
-        Library {
+        Skin.Library {
             width: parent.width
             height: parent.height - y
         }