diff --git a/res/skins/Deere/deck_tempo_column.xml b/res/skins/Deere/deck_tempo_column.xml
index a56064dd6b3c..7d7e76ea1923 100644
--- a/res/skins/Deere/deck_tempo_column.xml
+++ b/res/skins/Deere/deck_tempo_column.xml
@@ -88,7 +88,7 @@
40f,-1me
40,200
slider-vertical.svg
- handle-vertical.svg
+ handle-vertical-blue.svg
,rate
diff --git a/res/skins/Deere/effect_meta_knob.xml b/res/skins/Deere/effect_meta_knob.xml
index 14bd0b3ed110..58a2732fb04e 100644
--- a/res/skins/Deere/effect_meta_knob.xml
+++ b/res/skins/Deere/effect_meta_knob.xml
@@ -17,7 +17,7 @@
EffectSlot_metaknob
[EffectRack_EffectUnit_Effect]
meta
- yellow
+ blue
diff --git a/res/skins/Deere/effect_unit_no_parameters.xml b/res/skins/Deere/effect_unit_no_parameters.xml
index eb9d8d58ea93..60a4e2b83707 100644
--- a/res/skins/Deere/effect_unit_no_parameters.xml
+++ b/res/skins/Deere/effect_unit_no_parameters.xml
@@ -62,7 +62,7 @@ Variables:
EffectUnit_super1
super1
Super
- yellow
+ blue
@@ -71,7 +71,7 @@ Variables:
EffectUnit_mix
mix
Mix
- blue
+ orange
diff --git a/res/skins/Deere/effect_unit_with_parameters.xml b/res/skins/Deere/effect_unit_with_parameters.xml
index 2ecccfdcc239..2c82e064a4ee 100644
--- a/res/skins/Deere/effect_unit_with_parameters.xml
+++ b/res/skins/Deere/effect_unit_with_parameters.xml
@@ -50,7 +50,7 @@ Variables:
EffectUnit_mix
mix
Mix
- blue
+ orange
@@ -64,7 +64,7 @@ Variables:
EffectUnit_super1
super1
Super
- yellow
+ blue
diff --git a/res/skins/Deere/equalizer_rack_parameter_left.xml b/res/skins/Deere/equalizer_rack_parameter_left.xml
index 591b84b4cde8..181ef5a64318 100644
--- a/res/skins/Deere/equalizer_rack_parameter_left.xml
+++ b/res/skins/Deere/equalizer_rack_parameter_left.xml
@@ -64,8 +64,8 @@
40f,34f
- knob_.svg
- knob_bg.svg
+ knob.svg
+ knob_bg_.svg
-135
135
1.602
diff --git a/res/skins/Deere/equalizer_rack_parameter_right.xml b/res/skins/Deere/equalizer_rack_parameter_right.xml
index ea402ef265a2..d5091f38a196 100644
--- a/res/skins/Deere/equalizer_rack_parameter_right.xml
+++ b/res/skins/Deere/equalizer_rack_parameter_right.xml
@@ -27,8 +27,8 @@
40f,34f
- knob_.svg
- knob_bg.svg
+ knob.svg
+ knob_bg_.svg
-135
135
1.602
diff --git a/res/skins/Deere/handle-crossfader-blue.svg b/res/skins/Deere/handle-crossfader-blue.svg
new file mode 100644
index 000000000000..f504efbbb023
--- /dev/null
+++ b/res/skins/Deere/handle-crossfader-blue.svg
@@ -0,0 +1,48 @@
+
+
+
+
diff --git a/res/skins/Deere/handle-crossfader-grey.svg b/res/skins/Deere/handle-crossfader-grey.svg
new file mode 100644
index 000000000000..dc0e8ece86bc
--- /dev/null
+++ b/res/skins/Deere/handle-crossfader-grey.svg
@@ -0,0 +1,48 @@
+
+
+
+
diff --git a/res/skins/Deere/handle-crossfader-lime.svg b/res/skins/Deere/handle-crossfader-lime.svg
new file mode 100644
index 000000000000..f504efbbb023
--- /dev/null
+++ b/res/skins/Deere/handle-crossfader-lime.svg
@@ -0,0 +1,48 @@
+
+
+
+
diff --git a/res/skins/Deere/handle-crossfader.svg b/res/skins/Deere/handle-crossfader.svg
deleted file mode 100644
index 72ca1b2acf1b..000000000000
--- a/res/skins/Deere/handle-crossfader.svg
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
diff --git a/res/skins/Deere/handle-vertical-blue.svg b/res/skins/Deere/handle-vertical-blue.svg
new file mode 100644
index 000000000000..3c2b0076e8e3
--- /dev/null
+++ b/res/skins/Deere/handle-vertical-blue.svg
@@ -0,0 +1,48 @@
+
+
+
+
diff --git a/res/skins/Deere/handle-vertical-carmine.svg b/res/skins/Deere/handle-vertical-carmine.svg
new file mode 100644
index 000000000000..a413ceeb15aa
--- /dev/null
+++ b/res/skins/Deere/handle-vertical-carmine.svg
@@ -0,0 +1,48 @@
+
+
+
+
diff --git a/res/skins/Deere/handle-vertical-grey.svg b/res/skins/Deere/handle-vertical-grey.svg
new file mode 100644
index 000000000000..3dd04aabfbcf
--- /dev/null
+++ b/res/skins/Deere/handle-vertical-grey.svg
@@ -0,0 +1,48 @@
+
+
+
+
diff --git a/res/skins/Deere/handle-vertical-lime.svg b/res/skins/Deere/handle-vertical-lime.svg
new file mode 100644
index 000000000000..5cac1bb35d3d
--- /dev/null
+++ b/res/skins/Deere/handle-vertical-lime.svg
@@ -0,0 +1,48 @@
+
+
+
+
diff --git a/res/skins/Deere/handle-vertical-purple.svg b/res/skins/Deere/handle-vertical-purple.svg
new file mode 100644
index 000000000000..f37ab7b29442
--- /dev/null
+++ b/res/skins/Deere/handle-vertical-purple.svg
@@ -0,0 +1,48 @@
+
+
+
+
diff --git a/res/skins/Deere/handle-vertical.svg b/res/skins/Deere/handle-vertical.svg
deleted file mode 100644
index 31b3debb3cf8..000000000000
--- a/res/skins/Deere/handle-vertical.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
diff --git a/res/skins/Deere/knob.svg b/res/skins/Deere/knob.svg
new file mode 100644
index 000000000000..c362907f4cc5
--- /dev/null
+++ b/res/skins/Deere/knob.svg
@@ -0,0 +1,110 @@
+
+
+
+
diff --git a/res/skins/Deere/knob.xml b/res/skins/Deere/knob.xml
index 27637baf259e..bc6035ff5516 100644
--- a/res/skins/Deere/knob.xml
+++ b/res/skins/Deere/knob.xml
@@ -10,8 +10,8 @@
40f,34f
- knob_.svg
- knob_bg.svg
+ knob.svg
+ knob_bg_.svg
-135
135
1.602
diff --git a/res/skins/Deere/knob_bg.svg b/res/skins/Deere/knob_bg.svg
deleted file mode 100644
index f51ec1e16d01..000000000000
--- a/res/skins/Deere/knob_bg.svg
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
diff --git a/res/skins/Deere/knob_bg_blue.svg b/res/skins/Deere/knob_bg_blue.svg
new file mode 100644
index 000000000000..2ec248af2282
--- /dev/null
+++ b/res/skins/Deere/knob_bg_blue.svg
@@ -0,0 +1,84 @@
+
+
+
+
diff --git a/res/skins/Deere/knob_bg_carmine.svg b/res/skins/Deere/knob_bg_carmine.svg
new file mode 100644
index 000000000000..99fe7b00fa01
--- /dev/null
+++ b/res/skins/Deere/knob_bg_carmine.svg
@@ -0,0 +1,89 @@
+
+
+
+
diff --git a/res/skins/Deere/knob_bg_grey.svg b/res/skins/Deere/knob_bg_grey.svg
new file mode 100644
index 000000000000..e2d6aaca570f
--- /dev/null
+++ b/res/skins/Deere/knob_bg_grey.svg
@@ -0,0 +1,84 @@
+
+
+
+
diff --git a/res/skins/Deere/knob_bg_lime.svg b/res/skins/Deere/knob_bg_lime.svg
new file mode 100644
index 000000000000..588c733583ba
--- /dev/null
+++ b/res/skins/Deere/knob_bg_lime.svg
@@ -0,0 +1,43 @@
+
+
+
+
diff --git a/res/skins/Deere/knob_bg_orange.svg b/res/skins/Deere/knob_bg_orange.svg
new file mode 100644
index 000000000000..e08fe01ebae1
--- /dev/null
+++ b/res/skins/Deere/knob_bg_orange.svg
@@ -0,0 +1,89 @@
+
+
+
+
diff --git a/res/skins/Deere/knob_bg_purple.svg b/res/skins/Deere/knob_bg_purple.svg
new file mode 100644
index 000000000000..877480b0dbe8
--- /dev/null
+++ b/res/skins/Deere/knob_bg_purple.svg
@@ -0,0 +1,42 @@
+
+
+
+
diff --git a/res/skins/Deere/knob_blue.svg b/res/skins/Deere/knob_blue.svg
deleted file mode 100644
index 71439a042137..000000000000
--- a/res/skins/Deere/knob_blue.svg
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
diff --git a/res/skins/Deere/knob_red.svg b/res/skins/Deere/knob_red.svg
deleted file mode 100644
index a40cedddf56a..000000000000
--- a/res/skins/Deere/knob_red.svg
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
diff --git a/res/skins/Deere/knob_small.svg b/res/skins/Deere/knob_small.svg
index 5a41c2923135..2f0b185789f0 100644
--- a/res/skins/Deere/knob_small.svg
+++ b/res/skins/Deere/knob_small.svg
@@ -1,18 +1,16 @@
+
+
diff --git a/res/skins/Deere/knob_toolbar.svg b/res/skins/Deere/knob_toolbar.svg
new file mode 100644
index 000000000000..c74e9cfc6ba2
--- /dev/null
+++ b/res/skins/Deere/knob_toolbar.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/res/skins/Deere/knob_toolbar.xml b/res/skins/Deere/knob_toolbar.xml
index 495c4cac4be8..9b3ea094c68e 100644
--- a/res/skins/Deere/knob_toolbar.xml
+++ b/res/skins/Deere/knob_toolbar.xml
@@ -12,8 +12,8 @@
34f,28f
- knob_.svg
- knob_bg.svg
+ knob_toolbar.svg
+ knob_bg_.svg
-135
135
1.32
diff --git a/res/skins/Deere/knob_yellow.svg b/res/skins/Deere/knob_yellow.svg
deleted file mode 100644
index eea3dc517ebe..000000000000
--- a/res/skins/Deere/knob_yellow.svg
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
diff --git a/res/skins/Deere/mixer.xml b/res/skins/Deere/mixer.xml
index 47444ffa302b..3a440aaa0971 100644
--- a/res/skins/Deere/mixer.xml
+++ b/res/skins/Deere/mixer.xml
@@ -217,7 +217,7 @@
crossfader
1me,40f
slider-crossfader.svg
- handle-crossfader.svg
+ handle-crossfader-grey.svg
true
[Master],crossfader
diff --git a/res/skins/Deere/mixer_column_eq_left.xml b/res/skins/Deere/mixer_column_eq_left.xml
index 949829a2e2c2..4e09ff912dfa 100644
--- a/res/skins/Deere/mixer_column_eq_left.xml
+++ b/res/skins/Deere/mixer_column_eq_left.xml
@@ -25,7 +25,7 @@
pregain
pregain
- red
+ grey
mute
mute
@@ -48,7 +48,7 @@
pregain
pregain
- red
+ grey
@@ -105,28 +105,28 @@
4
- yellow
+ orange
EqualizerRack_effect_parameter
EqualizerRack_effect_button_parameter
3
- yellow
+ orange
EqualizerRack_effect_parameter
EqualizerRack_effect_button_parameter
2
- yellow
+ orange
EqualizerRack_effect_parameter
EqualizerRack_effect_button_parameter
1
- yellow
+ orange
diff --git a/res/skins/Deere/mixer_column_eq_right.xml b/res/skins/Deere/mixer_column_eq_right.xml
index 0fd93e835cd9..0dbfe4d2d932 100644
--- a/res/skins/Deere/mixer_column_eq_right.xml
+++ b/res/skins/Deere/mixer_column_eq_right.xml
@@ -25,7 +25,7 @@
pregain
pregain
- red
+ grey
mute
mute
@@ -43,7 +43,7 @@
pregain
pregain
- red
+ grey
@@ -105,28 +105,28 @@
4
- yellow
+ orange
EqualizerRack_effect_parameter
EqualizerRack_effect_button_parameter
3
- yellow
+ orange
EqualizerRack_effect_parameter
EqualizerRack_effect_button_parameter
2
- yellow
+ orange
EqualizerRack_effect_parameter
EqualizerRack_effect_button_parameter
1
- yellow
+ orange
diff --git a/res/skins/Deere/mixer_column_gain_levels.xml b/res/skins/Deere/mixer_column_gain_levels.xml
index 9ece1083c983..b58cff59cf41 100644
--- a/res/skins/Deere/mixer_column_gain_levels.xml
+++ b/res/skins/Deere/mixer_column_gain_levels.xml
@@ -20,7 +20,7 @@
pregain
pregain
- red
+ grey
@@ -48,7 +48,7 @@
pregain
pregain
- red
+ grey
diff --git a/res/skins/Deere/mixer_column_volume.xml b/res/skins/Deere/mixer_column_volume.xml
index 7cc5f390910c..f5dc71879ca7 100644
--- a/res/skins/Deere/mixer_column_volume.xml
+++ b/res/skins/Deere/mixer_column_volume.xml
@@ -83,7 +83,7 @@
40,50
40,150
slider-vertical.svg
- handle-vertical.svg
+ handle-vertical-grey.svg
false
,volume
@@ -110,7 +110,7 @@
min,me
40,80
slider-vertical.svg
- handle-vertical.svg
+ handle-vertical-grey.svg
false
,volume
diff --git a/res/skins/Deere/mixer_controls_condensed_left.xml b/res/skins/Deere/mixer_controls_condensed_left.xml
index 5e3243005350..fd2a35cceff9 100644
--- a/res/skins/Deere/mixer_controls_condensed_left.xml
+++ b/res/skins/Deere/mixer_controls_condensed_left.xml
@@ -72,7 +72,7 @@
40,50
40,-1
slider-vertical.svg
- handle-vertical.svg
+ handle-vertical-grey.svg
false
,volume
diff --git a/res/skins/Deere/mixer_controls_condensed_right.xml b/res/skins/Deere/mixer_controls_condensed_right.xml
index a5ab9b1ae393..4f174e189e37 100644
--- a/res/skins/Deere/mixer_controls_condensed_right.xml
+++ b/res/skins/Deere/mixer_controls_condensed_right.xml
@@ -61,7 +61,7 @@
40,50
40,-1
slider-vertical.svg
- handle-vertical.svg
+ handle-vertical-grey.svg
false
,volume
diff --git a/res/skins/Deere/quick_effect_superknob_left.xml b/res/skins/Deere/quick_effect_superknob_left.xml
index 6684976abe93..09fb0794a883 100644
--- a/res/skins/Deere/quick_effect_superknob_left.xml
+++ b/res/skins/Deere/quick_effect_superknob_left.xml
@@ -5,7 +5,7 @@
Variables:
QuickEffect: the quick effect rack
group: the group
- color: the notch color. red, green, yellow, blue or light_blue
+ color: the knob ring color. red, yellow or light_blue
-->
[QuickEffectRack]
diff --git a/res/skins/Deere/quick_effect_superknob_right.xml b/res/skins/Deere/quick_effect_superknob_right.xml
index 5e49022a84f6..162862996f01 100644
--- a/res/skins/Deere/quick_effect_superknob_right.xml
+++ b/res/skins/Deere/quick_effect_superknob_right.xml
@@ -5,7 +5,7 @@
Variables:
QuickEffect: the quick effect rack
group: the group
- color: the notch color. red, green, yellow, blue or light_blue
+ color: the knob ring color. red, yellow or light_blue
-->
[QuickEffectRack]
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 705d34cc8231..ef52f874c45f 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -9,7 +9,7 @@
Creative Commons Attribution, Share-Alike 3.0 Unported
4
- 64
+ 8
1
1
@@ -234,7 +234,7 @@
-
+
Library
diff --git a/res/skins/Deere/slider-crossfader.svg b/res/skins/Deere/slider-crossfader.svg
index 11f1c9d43752..6e6cf3bab76e 100644
--- a/res/skins/Deere/slider-crossfader.svg
+++ b/res/skins/Deere/slider-crossfader.svg
@@ -1,18 +1,30 @@
+
+
diff --git a/res/skins/Deere/slider-vertical.svg b/res/skins/Deere/slider-vertical.svg
index db055b0073e9..25ea7a4051b8 100644
--- a/res/skins/Deere/slider-vertical.svg
+++ b/res/skins/Deere/slider-vertical.svg
@@ -1,18 +1,16 @@
+
+
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 92c7f4720133..137a8e4a244e 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -684,7 +684,7 @@ WWidget, QLabel {
#HotcueGrid, #HotcueGridExtended,
#VinylControlsContainer {
- background-color: #333333;
+ background-color: #333;
padding: 1px;
qproperty-layoutSpacing: 2;
}
diff --git a/res/skins/Deere/tool_bar.xml b/res/skins/Deere/tool_bar.xml
index a9de248cdd5c..efd19830c7c5 100644
--- a/res/skins/Deere/tool_bar.xml
+++ b/res/skins/Deere/tool_bar.xml
@@ -92,7 +92,7 @@
balance
[Master]
balance
- blue
+ orange
Balance
@@ -100,7 +100,7 @@
master_gain
[Master]
gain
- red
+ grey
Master
@@ -123,7 +123,7 @@
booth_gain
[Master]
booth_gain
- red
+ grey
Booth