diff --git a/res/skins/Deere/auxiliary.xml b/res/skins/Deere/auxiliary.xml
index 331609a6d01..0d2cbd312dd 100644
--- a/res/skins/Deere/auxiliary.xml
+++ b/res/skins/Deere/auxiliary.xml
@@ -10,34 +10,42 @@
[Auxiliary]
AuxiliaryContainer
- vertical
- max,max
+ horizontal
+ max,min
-
- horizontal
- AuxLabelContainer
-
-
-
-
-
AuxiliaryControls
horizontal
-
- microphone_pregain
- pregain
- red
- mute
- mute
- Gain
-
+
+ vertical
+ AuxiliaryControls
+
+
+
+ horizontal
+ AuxLabelContainer
+
+
+
+
+
+
+
+ microphone_pregain
+ pregain
+ red
+ mute
+ mute
+ Gain
+
+
+
AuxiliaryButtonsAndMeter
@@ -64,7 +72,9 @@
,pfl
-
+
+ Aux
+
diff --git a/res/skins/Deere/beatjump.xml b/res/skins/Deere/beatjump.xml
index b6dc76c6ced..11bb51b8343 100644
--- a/res/skins/Deere/beatjump.xml
+++ b/res/skins/Deere/beatjump.xml
@@ -7,49 +7,58 @@
-->
- BeatJumpContainer
- horizontal
+ vertical
+ f,min
-
- beatjump_backward
- BeatJumpButton
-
-
-
- icon/ic_beatjump_backward_48px.svg
- icon/ic_beatjump_backward_48px.svg
-
- ,beatjump_backward
- ,beatjump_1_backward
-
-
-
- 2
-
-
BeatjumpSizeSpinBox
beatjump_size
,beatjump_size
-
- 2
+
+
+ ,2f
-
- beatjump_forward
- BeatJumpButton
-
-
-
- icon/ic_beatjump_forward_48px.svg
- icon/ic_beatjump_forward_48px.svg
-
- ,beatjump_forward
- ,beatjump_1_forward
-
+
+ horizontal
+
+
+
+ beatjump_backward
+ BeatJumpButton
+
+
+
+ icon/ic_beatjump_backward_48px.svg
+ icon/ic_beatjump_backward_48px.svg
+
+ ,beatjump_backward
+ ,beatjump_1_backward
+
+
+
+
+ 2f,
+
+
+
+ beatjump_forward
+ BeatJumpButton
+
+
+
+ icon/ic_beatjump_forward_48px.svg
+ icon/ic_beatjump_forward_48px.svg
+
+ ,beatjump_forward
+ ,beatjump_1_forward
+
+
+
+
diff --git a/res/skins/Deere/crossfader_orientation_button.xml b/res/skins/Deere/crossfader_orientation_button.xml
index 228dae192e6..7f29c11012d 100644
--- a/res/skins/Deere/crossfader_orientation_button.xml
+++ b/res/skins/Deere/crossfader_orientation_button.xml
@@ -1,7 +1,7 @@
orientation
- OrientationButton
+ OrientationButton
diff --git a/res/skins/Deere/deck.xml b/res/skins/Deere/deck.xml
index e783ca31dde..0c115803b0f 100644
--- a/res/skins/Deere/deck.xml
+++ b/res/skins/Deere/deck.xml
@@ -46,7 +46,7 @@
vertical
min,min
-
+
diff --git a/res/skins/Deere/deck_controls_row.xml b/res/skins/Deere/deck_controls_row.xml
index 3ed23cff03f..f9c3fe7fa08 100644
--- a/res/skins/Deere/deck_controls_row.xml
+++ b/res/skins/Deere/deck_controls_row.xml
@@ -9,164 +9,57 @@
ControlsRow
horizontal
- me,me
+ -1,47
+ me,min
-
- FullControlsRow
- horizontal
- -1,-1me
-
-
-
- -1me,1min
-
- -1me,1min
-
-
-
- [Deere],show_minimal_deck_controls
- visible
-
-
-
-
-
-
+
+
+ 3me,1min
+
+ 3me,1min
+
+ 3me,1min
- horizontal
- -1,-1me
- MinimalControlsContainer
+ vertical
+ 40,42
+ 60, -1
+ me,me
-
- quantize
- QuantizeButton
-
-
-
-
- icon/ic_quantize_48px.svg
- icon/ic_quantize_48px.svg
-
- icon/ic_quantize_48px.svg
- icon/ic_quantize_48px.svg
- ,quantize
-
-
-
- keylock
- KeylockButton
-
-
-
-
- icon/ic_key_48px.svg
- icon/ic_key_48px.svg
-
- icon/ic_key_48px.svg
- icon/ic_key_48px.svg
- ,keylock
-
-
-
- slip_mode
- SlipModeButton
-
-
-
-
- icon/ic_slip_48px.svg
- icon/ic_slip_48px.svg
-
- icon/ic_slip_48px.svg
- icon/ic_slip_48px.svg
- ,slip_enabled
-
-
-
-
-
- beatloop_size
- ,beatloop_size
-
-
-
- reloop_toggle
- Reloop
-
-
-
-
- icon/ic_loop_48px.svg
- icon/ic_loop_48px.svg
-
- icon/ic_loop_48px.svg
- icon/ic_loop_48px.svg
- ,reloop_toggle
- ,reloop_andstop
- ,loop_enabled
-
-
-
-
-
- sync_enabled
- DeckSync
-
-
-
- Sync
-
-
- Sync
-
-
- ,sync_enabled
-
-
cue_default_cue_gotoandstop
DeckCue
-
-
-
+
+
+
true
true
CUE
-
-
CUE
-
-
,cue_default
,cue_gotoandstop
,cue_indicator
+
+
+ 2
+
+
play_cue_set
PlayToggle
-
-
-
+
+
+
false
false
-
- icon/ic_play_48px.svg
- icon/ic_play_48px.svg
-
- icon/ic_play_48px.svg
- icon/ic_play_48px.svg
,play
,cue_set
,play_indicator
-
- [Deere],show_minimal_deck_controls
- visible
-
diff --git a/res/skins/Deere/deck_mixer_controls_col1_left.xml b/res/skins/Deere/deck_mixer_controls_col1_left.xml
deleted file mode 100644
index 9b67b2c7443..00000000000
--- a/res/skins/Deere/deck_mixer_controls_col1_left.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
- [Channel]
-
- DeckMixer_Column1
- vertical
- max,min
-
-
-
-
- vertical
-
-
- pregain
- pregain
- red
- Gain
- mute
- mute
-
-
-
- [Master],show_4decks
- visible
-
-
-
-
- 4
- yellow
-
-
-
- EqualizerRack_effect_parameter
- EqualizerRack_effect_button_parameter
- 3
- yellow
-
-
-
- EqualizerRack_effect_parameter
- EqualizerRack_effect_button_parameter
- 2
- yellow
-
-
-
- EqualizerRack_effect_parameter
- EqualizerRack_effect_button_parameter
- 1
- yellow
-
-
-
- QuickEffectRack_super1
- QuickEffectRack_enabled
- 1
- blue
-
-
-
-
- [Master],show_eqs
- visible
-
-
-
diff --git a/res/skins/Deere/deck_mixer_controls_col1_right.xml b/res/skins/Deere/deck_mixer_controls_col1_right.xml
deleted file mode 100644
index 90281604249..00000000000
--- a/res/skins/Deere/deck_mixer_controls_col1_right.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
- [Channel]
-
- DeckMixer_Column1
- vertical
- max,min
-
-
-
-
- vertical
-
-
- pregain
- pregain
- red
- Gain
- mute
- mute
-
-
-
- [Master],show_4decks
- visible
-
-
-
-
- 4
- yellow
-
-
-
- EqualizerRack_effect_parameter
- EqualizerRack_effect_button_parameter
- 3
- yellow
-
-
-
- EqualizerRack_effect_parameter
- EqualizerRack_effect_button_parameter
- 2
- yellow
-
-
-
- EqualizerRack_effect_parameter
- EqualizerRack_effect_button_parameter
- 1
- yellow
-
-
-
- QuickEffectRack_super1
- QuickEffectRack_enabled
- 1
- blue
-
-
-
-
- [Master],show_eqs
- visible
-
-
-
diff --git a/res/skins/Deere/deck_overview_row.xml b/res/skins/Deere/deck_overview_row.xml
index 0b686011a23..2e18abbb55a 100644
--- a/res/skins/Deere/deck_overview_row.xml
+++ b/res/skins/Deere/deck_overview_row.xml
@@ -11,7 +11,7 @@
horizontal
me,me
-1,40
- -1,65
+ -1,80
ButtonGrid
@@ -52,19 +52,17 @@
,repeat
-
- eject
- EjectButton
+
+ beats_translate_curpos
+ BeatsTranslateCurposButton
- icon/ic_eject_48px.svg
- icon/ic_eject_48px.svg
-
- icon/ic_eject_48px.svg
- icon/ic_eject_48px.svg
- ,eject
+ icon/ic_beats_translate_curpos_48px.svg
+ icon/ic_beats_translate_curpos_48px.svg
+ ,beats_translate_curpos
+ ,beats_translate_match_alignment
@@ -74,17 +72,19 @@
ButtonGrid
horizontal
-
- beats_translate_curpos
- BeatsTranslateCurposButton
+
+ eject
+ EjectButton
- icon/ic_beats_translate_curpos_48px.svg
- icon/ic_beats_translate_curpos_48px.svg
- ,beats_translate_curpos
- ,beats_translate_match_alignment
+ icon/ic_eject_48px.svg
+ icon/ic_eject_48px.svg
+
+ icon/ic_eject_48px.svg
+ icon/ic_eject_48px.svg
+ ,eject
@@ -193,7 +193,6 @@
- ButtonGrid
vertical
[Master],show_4effectunits
diff --git a/res/skins/Deere/deck_inner_column.xml b/res/skins/Deere/deck_tempo_column.xml
similarity index 54%
rename from res/skins/Deere/deck_inner_column.xml
rename to res/skins/Deere/deck_tempo_column.xml
index fe342637d74..a56064dd6b3 100644
--- a/res/skins/Deere/deck_inner_column.xml
+++ b/res/skins/Deere/deck_tempo_column.xml
@@ -64,13 +64,6 @@
-
- [Deere],show_minimal_deck_controls
- visible
-
-
-
-
@@ -103,66 +96,6 @@
-
- 2
-
-
-
- vertical
-
-
-
- cue_default_cue_gotoandstop
- DeckCue
-
-
-
- true
- true
- CUE
-
-
- CUE
-
-
- ,cue_default
- ,cue_gotoandstop
- ,cue_indicator
-
-
-
-
- 2
-
-
-
- play_cue_set
- PlayToggle
-
-
-
- false
- false
-
- icon/ic_play_48px.svg
- icon/ic_play_48px.svg
-
- icon/ic_play_48px.svg
- icon/ic_play_48px.svg
- ,play
- ,cue_set
- ,play_indicator
-
-
-
- [Deere],show_minimal_deck_controls
- visible
-
-
-
-
-
-
diff --git a/res/skins/Deere/deck_text_row.xml b/res/skins/Deere/deck_text_row.xml
index 168117602dd..587fe0cc204 100644
--- a/res/skins/Deere/deck_text_row.xml
+++ b/res/skins/Deere/deck_text_row.xml
@@ -96,6 +96,7 @@
[Deere],key_layout_prev
+ KeyEditRowCollapsed
stacked
@@ -130,42 +131,6 @@
KeyEditRowExpanded
horizontal
-
-
- stacked
- 60,
-
-
- KeyEditTrigger
- visual_key
- 1
-
- 0
-
-
-
-
-
- [Deere],key_layout_next
-
-
-
-
- KeyEditTriggerLabel
-
- min,
- true
-
- ,visual_key
-
-
-
-
-
KeyEditRowControls
horizontal
@@ -202,9 +167,9 @@
sync_reset_key
SyncKeyButton
-
-
-
+ 42,22
+ 42,22
+ f,f
Match
@@ -212,11 +177,47 @@
,reset_key
-
+
+
+
+
+ stacked
+ 60,
+
+
+ KeyEditTrigger
+ visual_key
+ 1
+
+ 0
+
+
+
+
+
+ [Deere],key_layout_next
+
+
+
+
+ KeyEditTriggerLabel
+
+ min,
+ true
+
+ ,visual_key
+
+
+
+
-
+
-
+
BpmEditRowExpanded
horizontal
-
- stacked
-
-
- BpmEditTrigger
- visual_bpm
- 1
-
- 0
-
-
-
-
-
- [Deere],bpm_layout_next
-
-
-
-
- BpmEditTriggerLabel
-
- right
-
- ,visual_bpm
-
-
-
-
-
BpmEditRowControls
horizontal
@@ -375,6 +346,19 @@
,beats_translate_later
+
+ beats_translate_curpos
+ BeatsTranslateCurposButton
+
+
+
+
+ icon/ic_beats_translate_curpos_48px.svg
+ icon/ic_beats_translate_curpos_48px.svg
+ ,beats_translate_curpos
+ ,beats_translate_match_alignment
+
+
bpm_tap
40,20
@@ -393,16 +377,43 @@
+
+ stacked
+
+
+ BpmEditTrigger
+ visual_bpm
+ 1
+
+ 0
+
+
+
+
+ [Deere],bpm_layout_next
+
+
+
+
+ BpmEditTriggerLabel
+
+ right
+
+ ,visual_bpm
+
+
+
+
-
+
-
+
-
+
-
+
-
+
LowerTextRow
@@ -475,11 +486,11 @@
-
+
-
+
-
+
-
+
diff --git a/res/skins/Deere/effect_focus_button.xml b/res/skins/Deere/effect_focus_button.xml
index 31737fff674..347d42e6a51 100644
--- a/res/skins/Deere/effect_focus_button.xml
+++ b/res/skins/Deere/effect_focus_button.xml
@@ -7,10 +7,13 @@ Variables:
Effect: the effect
-->
+ [EffectRack_EffectUnit]
EffectFocusButtonContainer
- horizontal
+
+ vertical
+
EffectSlot_focus
CircleButton
@@ -29,26 +32,70 @@ Variables:
icon/ic_radio_button_on_48px.svg
- [EffectRack_EffectUnit],focused_effect
+ ,focused_effect
LeftButton
true
-
-
-
+
- [EffectRack_EffectUnit],focused_effect
+ ,focused_effect
RightButton
true
-
-
-
-
+
+
+
+
+ ,focused_effect
+
+ false
+
+
+ ,focused_effect
+
+ visible
+
+
+
+
+
+ EffectSlot_focus
+ CircleButton
+ 15f,15f
+ 2
+
+ 0
+
+ icon/ic_radio_button_off_48px.svg
+ icon/ic_radio_button_off_48px.svg
+
+
+ 1
+
+ icon/ic_radio_button_on_48px.svg
+ icon/ic_radio_button_on_48px.svg
+
+
+ ,focused_effect
+ LeftButton
+ true
+
+
+
+ ,focused_effect
+ RightButton
+ true
+
+
+
+ ,focused_effect
+
+ visible
+
- [EffectRack_EffectUnit],show_focus
+ ,show_focus
visible
diff --git a/res/skins/Deere/effect_rack.xml b/res/skins/Deere/effect_rack.xml
index df17c4c97da..556920b2219 100644
--- a/res/skins/Deere/effect_rack.xml
+++ b/res/skins/Deere/effect_rack.xml
@@ -4,70 +4,71 @@ Container for all the effect units
-->
+
+ [EffectRack1],show
+ visible
+
vertical
me,f
-
+
EffectRackContainer
- me,min
+ vertical
-
- vertical
+ EffectUnitsRow
+ horizontal
+ me,me
+
+ 1
+ 1
+
-
- EffectUnitsRow1
- horizontal
- -1,50
- -1,195
- me,me
-
-
- 1
- 1
-
+
+ 4
+ 22
+
-
- 1
- 2
-
-
-
+
+ 1
+ 2
+
+
+
-
- EffectUnitsRow2
- horizontal
- -1,50
- -1,195
- me,me
-
-
- 1
- 3
-
+
+ EffectUnitsRow
+ horizontal
+ me,me
+
+
+ 1
+ 3
+
-
- 1
- 4
-
-
-
- [Master],show_4effectunits
- visible
-
-
+
+ 4
+ 22
+
+
+ 1
+ 4
+
+
+ [Master],show_4effectunits
+ visible
+
-
+
diff --git a/res/skins/Deere/effect_unit.xml b/res/skins/Deere/effect_unit.xml
index 075398656fe..9ecc9ce0da5 100644
--- a/res/skins/Deere/effect_unit.xml
+++ b/res/skins/Deere/effect_unit.xml
@@ -12,12 +12,9 @@
EffectUnit
vertical
me,me
- -1,65
- -1,195
EffectUnitGroupControls
- -1,20
me,max
horizontal
@@ -77,9 +74,13 @@
vertical
+ me,min
-
-
+
+
+ EffectUnitFiller
+ me,me
+
,show_parameters
@@ -93,8 +94,7 @@
vertical
-
-
+
,show_parameters
diff --git a/res/skins/Deere/effect_unit_group_control_button.xml b/res/skins/Deere/effect_unit_group_control_button.xml
deleted file mode 100644
index 6825df69351..00000000000
--- a/res/skins/Deere/effect_unit_group_control_button.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- EffectUnit_group_enabled
- EffectChainGroupControlButton
-
-
-
-
-
-
-
-
-
- ,group__enable
-
-
diff --git a/res/skins/Deere/equalizer_rack_parameter_left.xml b/res/skins/Deere/equalizer_rack_parameter_left.xml
index 3b21ae1ea5a..591b84b4cde 100644
--- a/res/skins/Deere/equalizer_rack_parameter_left.xml
+++ b/res/skins/Deere/equalizer_rack_parameter_left.xml
@@ -16,107 +16,66 @@
[EqualizerRack__Effect]
horizontal
+ me,me
-
+
+
+ 15f,15f
+ CircleButton
+ 2
+
+ 0
+
+ icon/ic_radio_button_off_48px.svg
+ icon/ic_radio_button_off_48px.svg
+
+
+ 1
+
+ icon/ic_radio_button_on_48px.svg
+ icon/ic_radio_button_on_48px.svg
+
+
+ ,button_parameter
+ LeftButton
+
+
+ [Master],show_killswitches
+ visible
+
+
+
+
+ 0me,1min
+
+
+ [Master],show_killswitches
+
+ visible
+
+
+
+ EQKnob
+ 40,34
+ 40,41
vertical
-
-
- vertical
- 15f,12f
-
-
-
-
-
- 15f,15f
- CircleButton
- 2
-
- 0
-
- icon/ic_radio_button_off_48px.svg
- icon/ic_radio_button_off_48px.svg
-
-
- 1
-
- icon/ic_radio_button_on_48px.svg
- icon/ic_radio_button_on_48px.svg
-
+
+ 40f,34f
+ knob_.svg
+ knob_bg.svg
+ -135
+ 135
+ 1.602
- ,button_parameter
- LeftButton
+ ,parameter
-
-
-
- vertical
- 15f,-1me
-
-
-
+
-
- 40f,-1me
-
-
-
- EQKnobNoLabel
- 40,34
- 40,41
- vertical
-
-
- 40f,34f
- knob_.svg
- knob_bg.svg
- -135
- 135
- 1.602
-
- ,parameter
-
-
-
-
-
-
- EQKnobWithLabel
- 40,42
- 40,45
- vertical
-
-
- 40f,34f
- knob_.svg
- knob_bg.svg
- -135
- 135
- 1.602
-
- ,parameter
-
-
-
- 40f,10f
- KnobLabel
-
-
-
-
-
-
-
-
-
-
-
,parameter_loaded
diff --git a/res/skins/Deere/equalizer_rack_parameter_right.xml b/res/skins/Deere/equalizer_rack_parameter_right.xml
index 57f092b52b6..ea402ef265a 100644
--- a/res/skins/Deere/equalizer_rack_parameter_right.xml
+++ b/res/skins/Deere/equalizer_rack_parameter_right.xml
@@ -16,105 +16,64 @@
[EqualizerRack__Effect]
horizontal
+ me,me
-
- 40f,-1me
-
-
-
- EQKnobNoLabel
- 40,34
- 40,41
- vertical
-
-
- 40f,34f
- knob_.svg
- knob_bg.svg
- -135
- 135
- 1.602
-
- ,parameter
-
-
-
-
-
-
- EQKnobWithLabel
- 40,42
- 40,45
- vertical
-
-
- 40f,34f
- knob_.svg
- knob_bg.svg
- -135
- 135
- 1.602
-
- ,parameter
-
-
-
- 40f,10f
- KnobLabel
-
-
-
-
-
-
-
-
-
-
-
-
+ EQKnob
+ 40,34
+ 40,41
vertical
-
-
- vertical
- 15f,12f
-
-
-
-
-
- 15f,15f
- CircleButton
- 2
-
- 0
-
- icon/ic_radio_button_off_48px.svg
- icon/ic_radio_button_off_48px.svg
-
-
- 1
-
- icon/ic_radio_button_on_48px.svg
- icon/ic_radio_button_on_48px.svg
-
+
+ 40f,34f
+ knob_.svg
+ knob_bg.svg
+ -135
+ 135
+ 1.602
- ,button_parameter
- LeftButton
+ ,parameter
-
+
+
+
-
- vertical
- 15f,-1me
-
-
+
+
+ 15f,15f
+ CircleButton
+ 2
+
+ 0
+
+ icon/ic_radio_button_off_48px.svg
+ icon/ic_radio_button_off_48px.svg
+
+
+ 1
+
+ icon/ic_radio_button_on_48px.svg
+ icon/ic_radio_button_on_48px.svg
+
+
+ ,button_parameter
+ LeftButton
+
+
+ [Master],show_killswitches
+ visible
+
+
-
+
+ 0me,1min
+
+
+ [Master],show_killswitches
+
+ visible
+
diff --git a/res/skins/Deere/handle-horizontal.svg b/res/skins/Deere/handle-crossfader.svg
similarity index 100%
rename from res/skins/Deere/handle-horizontal.svg
rename to res/skins/Deere/handle-crossfader.svg
diff --git a/res/skins/Deere/icon/ic_autodj_32px.svg b/res/skins/Deere/icon/ic_autodj_32px.svg
index 9ae0f3db493..bcca289a450 100644
--- a/res/skins/Deere/icon/ic_autodj_32px.svg
+++ b/res/skins/Deere/icon/ic_autodj_32px.svg
@@ -51,5 +51,5 @@
inkscape:connector-curvature="0"
id="path6"
d="m 27,12 2,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 l -2,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-8 c 0,-0.554 0.446,-1 1,-1 z m -24,0 2,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 L 3,22 C 2.446,22 2,21.554 2,21 L 2,13 C 2,12.446 2.446,12 3,12 Z M 8,12 8,13.1563 8,14 8,24.844 c 0,0.6463 0.446,1.1562 1,1.1562 l 1,0 0,3 c 0,0.554 0.446,1 1,1 l 2,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 4,0 0,3 c 0,0.554 0.446,1 1,1 l 2,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 1,0 c 0.554,0 1,-0.5099 1,-1.1562 L 24,14 24,13.1563 24,12 23,12 9,12 8,12 Z M 16,1.938 c -4.4183,0 -8,3.5967 -8,8.0313 0,0.011 -4.09e-5,0.021 0,0.031 l 16,0 c 4.1e-5,-0.011 0,-0.021 0,-0.031 C 24,5.5347 20.4183,1.938 16,1.938 Z m -3.5,3.0625 c 0.82843,0 1.5,0.6716 1.5,1.5 0,0.8284 -0.67157,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.6716 -1.5,-1.5 0,-0.8284 0.67157,-1.5 1.5,-1.5 z m 7,0 c 0.82843,0 1.5,0.6716 1.5,1.5 0,0.8284 -0.67157,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.6716 -1.5,-1.5 0,-0.8284 0.67157,-1.5 1.5,-1.5 z"
- style="color:#000000;fill:#d2d2d2;fill-opacity:1" />
+ style="color:#000000;fill:#ff6600;fill-opacity:1" />
diff --git a/res/skins/Deere/icon/ic_broadcast_0_32px.svg b/res/skins/Deere/icon/ic_broadcast_0_32px.svg
new file mode 100644
index 00000000000..9d3dabf3d84
--- /dev/null
+++ b/res/skins/Deere/icon/ic_broadcast_0_32px.svg
@@ -0,0 +1,56 @@
+
+
diff --git a/res/skins/Deere/icon/ic_broadcast_32px.svg b/res/skins/Deere/icon/ic_broadcast_1_32px.svg
similarity index 50%
rename from res/skins/Deere/icon/ic_broadcast_32px.svg
rename to res/skins/Deere/icon/ic_broadcast_1_32px.svg
index 6567a3ce33e..ecb3a134ee6 100644
--- a/res/skins/Deere/icon/ic_broadcast_32px.svg
+++ b/res/skins/Deere/icon/ic_broadcast_1_32px.svg
@@ -12,8 +12,8 @@
version="1.1"
viewBox="0 0 31.999999 31.999998"
id="svg2"
- inkscape:version="0.91 r13725"
- sodipodi:docname="ic_broadcast_32px.svg">
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="ic_broadcast_1_32px.svg">
@@ -37,19 +37,19 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
- inkscape:window-height="702"
+ inkscape:window-height="747"
id="namedview8"
showgrid="false"
inkscape:zoom="7.375"
- inkscape:cx="16.813559"
+ inkscape:cx="-6.1016952"
inkscape:cy="16.542373"
inkscape:window-x="0"
- inkscape:window-y="27"
+ inkscape:window-y="21"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
+ d="M 25.93858,5.2812483 A 0.7657016,0.7657016 0 0 0 25.412212,5.513003 l -4.59375,4.59375 a 0.7657016,0.7657016 0 1 0 1.082671,1.08267 l 4.59375,-4.5937496 A 0.7657016,0.7657016 0 0 0 25.93861,5.2812483 z M 11.429219,20.601406 c -0.222154,-0.0076 -0.436069,0.0843 -0.586177,0.248215 l -3.98217,4.344004 -0.8000016,-0.0077 c -0.1862689,0 -0.3664971,0.06584 -0.5069281,0.18842 -0.01441,0.01225 -0.028382,0.0245 -0.041872,0.03751 l -0.00751,0.0092 c -0.1509966,0.151441 -0.2317777,0.359078 -0.2228122,0.572765 0.019186,0.408766 0.3564061,0.730176 0.765625,0.729793 l 1.1439204,0 8.4042665,0 0.02392,0 8.801625,0 0.0015,0 c 1.006568,-0.01301 1.008022,-1.516014 0.0016,-1.53125 l -0.0016,0 -3.826593,-0.0077 -0.003,0 -4.638616,0.0077 -3.982169,-4.345534 c -0.13987,-0.152738 -0.335709,-0.242317 -0.542772,-0.248211 z m 15.290298,-1.359215 a 9.8666097,9.8666097 0 0 1 -9.530501,2.553743 9.8666097,9.8666097 0 0 1 -6.976911,-6.976912 9.8666097,9.8666097 0 0 1 2.553742,-9.5305002"
+ style="text-indent:0;text-decoration:none;text-transform:none;block-progression:tb;color:#000000;fill:#ffd615;fill-opacity:1" />
diff --git a/res/skins/Deere/icon/ic_broadcast_2_32px.svg b/res/skins/Deere/icon/ic_broadcast_2_32px.svg
new file mode 100644
index 00000000000..b3f26e9c47f
--- /dev/null
+++ b/res/skins/Deere/icon/ic_broadcast_2_32px.svg
@@ -0,0 +1,57 @@
+
+
diff --git a/res/skins/Deere/icon/ic_broadcast_3_32px.svg b/res/skins/Deere/icon/ic_broadcast_3_32px.svg
new file mode 100644
index 00000000000..31d92baa384
--- /dev/null
+++ b/res/skins/Deere/icon/ic_broadcast_3_32px.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/res/skins/Deere/icon/ic_recording_32px.svg b/res/skins/Deere/icon/ic_recording_0_32px.svg
similarity index 52%
rename from res/skins/Deere/icon/ic_recording_32px.svg
rename to res/skins/Deere/icon/ic_recording_0_32px.svg
index b2e58f377db..35cf3f00448 100644
--- a/res/skins/Deere/icon/ic_recording_32px.svg
+++ b/res/skins/Deere/icon/ic_recording_0_32px.svg
@@ -12,8 +12,8 @@
version="1.1"
viewBox="0 0 31.999999 31.999998"
id="svg2"
- inkscape:version="0.91 r13725"
- sodipodi:docname="ic_recording_32px.svg">
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="ic_recording_0_32px.svg">
@@ -37,19 +37,19 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
- inkscape:window-height="702"
+ inkscape:window-height="747"
id="namedview8"
showgrid="false"
inkscape:zoom="7.375"
inkscape:cx="16.813559"
inkscape:cy="16.542373"
inkscape:window-x="0"
- inkscape:window-y="27"
+ inkscape:window-y="21"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
+ d="m 5.9511719,7.5781235 c -0.7953314,0 -1.435547,0.6829375 -1.435547,1.53125 l 0,13.7812515 c 0,0.848312 0.6402539,1.53125 1.435547,1.53125 l 20.0976581,0 c 0.795331,0 1.435547,-0.682938 1.435547,-1.53125 l 0,-13.7812515 c 0,-0.8483125 -0.640255,-1.53125 -1.435547,-1.53125 l -3.158204,0 0,3.0625005 -13.7812508,0 0,-3.0625005 -3.1582033,0 z m 4.6894531,0 0,1.53125 10.718751,0 0,-1.53125 -10.718751,0 z M 9.8750002,15.234374 c 1.2685648,0 2.2968748,1.028311 2.2968748,2.296875 0,1.268564 -1.02831,2.296876 -2.2968748,2.296876 -1.2685641,0 -2.2968751,-1.028312 -2.2968751,-2.296876 0,-1.268564 1.028311,-2.296875 2.2968751,-2.296875 z m 12.2500008,0 c 1.268564,0 2.296875,1.028311 2.296875,2.296875 0,1.268564 -1.028311,2.296876 -2.296875,2.296876 -1.268564,0 -2.296875,-1.028312 -2.296875,-2.296876 0,-1.268564 1.028311,-2.296875 2.296875,-2.296875 z m -8.039063,1.53125 3.828125,0 c 0.212078,0 0.382812,0.170734 0.382812,0.382812 l 0,0.765625 c 0,0.212078 -0.170734,0.382813 -0.382812,0.382813 l -3.828125,0 c -0.212078,0 -0.382813,-0.170735 -0.382813,-0.382813 l 0,-0.765625 c 0,-0.212078 0.170735,-0.382812 0.382813,-0.382812 z" />
diff --git a/res/skins/Deere/icon/ic_recording_1_32px.svg b/res/skins/Deere/icon/ic_recording_1_32px.svg
new file mode 100644
index 00000000000..668951942af
--- /dev/null
+++ b/res/skins/Deere/icon/ic_recording_1_32px.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/res/skins/Deere/icon/ic_recording_2_32px.svg b/res/skins/Deere/icon/ic_recording_2_32px.svg
new file mode 100644
index 00000000000..7f78546ed4f
--- /dev/null
+++ b/res/skins/Deere/icon/ic_recording_2_32px.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/res/skins/Deere/icon/ic_recording_3_32px.svg b/res/skins/Deere/icon/ic_recording_3_32px.svg
new file mode 100644
index 00000000000..bf719dcdc2b
--- /dev/null
+++ b/res/skins/Deere/icon/ic_recording_3_32px.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/res/skins/Deere/icon/ic_vinylcontrol_32px.svg b/res/skins/Deere/icon/ic_vinylcontrol_32px.svg
index b011f22b71a..429ca265471 100644
--- a/res/skins/Deere/icon/ic_vinylcontrol_32px.svg
+++ b/res/skins/Deere/icon/ic_vinylcontrol_32px.svg
@@ -12,7 +12,7 @@
version="1.1"
viewBox="0 0 31.999999 31.999998"
id="svg2"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.48.4 r9939"
sodipodi:docname="ic_vinylcontrol_32px.svg">
@@ -37,19 +37,20 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
- inkscape:window-height="702"
+ inkscape:window-height="746"
id="namedview8"
showgrid="false"
inkscape:zoom="7.375"
- inkscape:cx="16.813559"
+ inkscape:cx="-6.1016952"
inkscape:cy="16.542373"
inkscape:window-x="0"
- inkscape:window-y="27"
+ inkscape:window-y="0"
inkscape:window-maximized="1"
- inkscape:current-layer="svg2" />
+ inkscape:current-layer="svg2"
+ inkscape:snap-page="true" />
+ d="m 16,3.7499994 c -6.7200002,0 -12.2500002,5.5299998 -12.2500002,12.2499996 0,6.720088 5.53,12.25 12.2500002,12.25 6.719999,0 12.249999,-5.529912 12.249999,-12.25 0,-6.7199998 -5.53,-12.2499996 -12.249999,-12.2499996 z m 0,7.6801376 c 2.569437,0 4.569862,2.000425 4.569862,4.569862 0,2.569525 -2.000338,4.569863 -4.569862,4.569863 -2.569438,0 -4.569863,-2.000338 -4.569863,-4.569863 0,-2.569437 2.000338,-4.569862 4.569863,-4.569862 z m 0,2.2337 c -1.283188,0 -2.336163,1.053062 -2.336163,2.336162 0,1.283188 1.052975,2.336163 2.336163,2.336163 1.283187,0 2.336162,-1.052975 2.336162,-2.336163 0,-1.2831 -1.053062,-2.336162 -2.336162,-2.336162 z"
+ style="text-indent:0;text-decoration:none;text-transform:none;block-progression:tb;color:#000000;fill:#d2d2d2;fill-opacity:1" />
diff --git a/res/skins/Deere/knob_bg.svg b/res/skins/Deere/knob_bg.svg
index c1784f5dac4..f51ec1e16d0 100644
--- a/res/skins/Deere/knob_bg.svg
+++ b/res/skins/Deere/knob_bg.svg
@@ -12,7 +12,7 @@
id="svg2"
height="34"
width="40"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.48.4 r9939"
sodipodi:docname="knob_bg.svg">
-
horizontal
-
-
- vertical
-
+
+
+ CircleButton
+ 15f,15f
+ 2
+
+ 0
+
+ icon/ic_radio_button_off_48px.svg
+ icon/ic_radio_button_off_48px.svg
+
+
+ 1
+
+ icon/ic_radio_button_on_48px.svg
+ icon/ic_radio_button_on_48px.svg
+
+
+ ,
+ LeftButton
+
+
-
- vertical
- 15f,12f
-
-
-
-
-
- CircleButton
- 15f,15f
- 2
-
- 0
-
- icon/ic_radio_button_off_48px.svg
- icon/ic_radio_button_off_48px.svg
-
-
- 1
-
- icon/ic_radio_button_on_48px.svg
- icon/ic_radio_button_on_48px.svg
-
-
- ,
- LeftButton
-
-
-
-
- vertical
- 15f,-1me
-
-
-
-
-
-
-
+
diff --git a/res/skins/Deere/knob_with_button_right.xml b/res/skins/Deere/knob_with_button_right.xml
index ccfe36644a2..44ecba2cf1d 100644
--- a/res/skins/Deere/knob_with_button_right.xml
+++ b/res/skins/Deere/knob_with_button_right.xml
@@ -13,49 +13,30 @@
horizontal
-
+
-
- vertical
-
-
-
- vertical
- 15f,12f
-
-
-
-
-
- CircleButton
- 15f,15f
- 2
-
- 0
-
- icon/ic_radio_button_off_48px.svg
- icon/ic_radio_button_off_48px.svg
-
-
- 1
-
- icon/ic_radio_button_on_48px.svg
- icon/ic_radio_button_on_48px.svg
-
-
- ,
- LeftButton
-
-
-
-
- vertical
- 15f,-1me
-
-
-
-
-
+
+
+ CircleButton
+ 15f,15f
+ 2
+
+ 0
+
+ icon/ic_radio_button_off_48px.svg
+ icon/ic_radio_button_off_48px.svg
+
+
+ 1
+
+ icon/ic_radio_button_on_48px.svg
+ icon/ic_radio_button_on_48px.svg
+
+
+ ,
+ LeftButton
+
+
diff --git a/res/skins/Deere/knob_with_label.xml b/res/skins/Deere/knob_with_label.xml
index e93cac2a259..0b94af95085 100644
--- a/res/skins/Deere/knob_with_label.xml
+++ b/res/skins/Deere/knob_with_label.xml
@@ -6,32 +6,17 @@
control: The control to connect to.
-->
-
+
+ 40,42
+ 40,45
+ vertical
-
-
- 40,34
- 40,41
- vertical
-
-
-
-
-
-
- 40,42
- 40,45
- vertical
-
-
-
-
-
-
+
+
-
+
diff --git a/res/skins/Deere/knob_yellow.svg b/res/skins/Deere/knob_yellow.svg
index 83209e56a51..eea3dc517eb 100644
--- a/res/skins/Deere/knob_yellow.svg
+++ b/res/skins/Deere/knob_yellow.svg
@@ -12,7 +12,7 @@
id="svg2"
height="34"
width="40"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.48.4 r9939"
sodipodi:docname="knob_yellow.svg">
-
+
+
+
+
+
+
+
+
+ 4
+
+ 0
+
+
+
+
+
+ 1
+
+
+
+
+
+ 2
+
+
+
+
+
+ 3
+
+
+
+
+
+
+ LeftButton
+
+
+
+ false
+
+
+
diff --git a/res/skins/Deere/library.xml b/res/skins/Deere/library.xml
index b06a7659e8b..ec9e5b96276 100644
--- a/res/skins/Deere/library.xml
+++ b/res/skins/Deere/library.xml
@@ -1,191 +1,185 @@
-
+
LibraryContainer
-
+ vertical
+
me,i
- 0,0
-
-
- LibraryExpanded
- vertical
-
- me,f
- 0,0
+
+
+ LibrarySplitter
+ horizontal
+ me,me
+ [Deere],LibrarySidebarSplitSize
+ 2,8
-
-
- LibrarySplitter
- horizontal
- me,me
- [Deere],LibrarySidebarSplitSize
- 2,8
+
+ vertical
+ PreviewDeckContainer
vertical
+
+ i,max
+
+ channel_VuMeter>
+ [PreviewDeck1]
+ VuMeter
+
+
- PreviewDeckContainer
- vertical
-
- i,max
+ PreviewDeckTextRow
+ horizontal
-
- channel_VuMeter>
- [PreviewDeck1]
- VuMeter
-
-
-
- PreviewDeckTextRow
- horizontal
-
-
- text
- me,min
- [PreviewDeck1]
- right
-
+
+ text
+ me,min
+ [PreviewDeck1]
+ right
+
-
- eject
- PreviewDeckEjectButton
-
-
-
-
- icon/ic_eject_48px.svg
- icon/ic_eject_48px.svg
- [PreviewDeck1],eject
-
-
-
-
-
- PreviewDeckVisualRow
- horizontal
-
-
- play_start
- PreviewDeckPlayButton
-
-
-
-
- icon/ic_play_48px.svg
- icon/ic_play_48px.svg
-
- icon/ic_pause_48px.svg
- icon/ic_pause_48px.svg
- [PreviewDeck1],play
- [PreviewDeck1],start
-
-
-
- waveform_overview
-
- [PreviewDeck1]
- me,30f
-
- #FFE300
- #0099FF
- #FF0035
-
-
-
- #FF8000
- #00FF00
-
- bottom
- #FFFFFF
- #00FF00
- %1
-
-
- cue_point
- C
- top
- #FF001C
- #00FF00
-
-
- [PreviewDeck1],playposition
- false
-
-
-
-
+
+ eject
+ PreviewDeckEjectButton
+
+
+
+
+ icon/ic_eject_48px.svg
+ icon/ic_eject_48px.svg
+ [PreviewDeck1],eject
+
-
- [PreviewDeck],show_previewdeck
- visible
-
+
+ PreviewDeckVisualRow
horizontal
-
- maximize_library
- LibraryToggle
- [Master],maximize_library
+
+ play_start
+ PreviewDeckPlayButton
+
+
+
+
+ icon/ic_play_48px.svg
+ icon/ic_play_48px.svg
+
+ icon/ic_pause_48px.svg
+ icon/ic_pause_48px.svg
+ [PreviewDeck1],play
+ [PreviewDeck1],start
-
-
-
-
-
-
- LibraryCoverArtSplitter
- vertical
- me,me
- 30,30
- [Deere],LibraryCoverartSplitSize
- 2,8
- 0,0
-
-
-
-
- LibraryCoverArt
- coverart
- me,me
- 30,30
+
+ waveform_overview
+
+ [PreviewDeck1]
+ me,30f
+
+ #FFE300
+ #0099FF
+ #FF0035
+
+
+
+ #FF8000
+ #00FF00
+
+ bottom
+ #FFFFFF
+ #00FF00
+ %1
+
+
+ cue_point
+ C
+ top
+ #FF001C
+ #00FF00
+
- [Library],show_coverart
- visible
+ [PreviewDeck1],playposition
+ false
-
+
-
+
+
+
+ [PreviewDeck],show_previewdeck
+ visible
+
+
+
+ horizontal
+
+
+ maximize_library
+ LibraryToggle
+ [Master],maximize_library
+
+
+
-
-
+
+
+ LibraryCoverArtSplitter
+ vertical
+ me,me
+ 30,30
+ [Deere],LibraryCoverartSplitSize
+ 2,8
+ 0,0
+
+
+
+
+
+ LibraryCoverArt
+ coverart
+ me,me
+ 30,30
+
+ [Library],show_coverart
+ visible
+
+
+
+
-
+
+
+
-
+
+ [Library],show_library
+ visible
+
+
-
- LibraryCollapsed
- vertical
- -1,20
- -1,20
- me,min
+ Spacer22
+ me,me
+
+
+ [Library],show_library
+
+ visible
+
-
-
+
diff --git a/res/skins/Deere/loop.xml b/res/skins/Deere/loop.xml
index b061fcc98da..98071ace2a1 100644
--- a/res/skins/Deere/loop.xml
+++ b/res/skins/Deere/loop.xml
@@ -8,106 +8,114 @@
LoopContainer
- horizontal
+ vertical
+ f,min
+
- -1,-1
- max,max
+
+ horizontal
+
-
+
+ BeatloopSizeSpinBox
+ beatloop_size
+ ,beatloop_size
+
-
- BeatloopSizeSpinBox
- beatloop_size
- ,beatloop_size
-
+
+
+ 2f,
+
-
- 2
-
+
+ beatloop_activate
+ BeatloopActivate
+
+
+
+
+ icon/ic_beatloop_activate_48px.svg
+ icon/ic_beatloop_activate_48px.svg
+
+ icon/ic_beatloop_activate_48px.svg
+ icon/ic_beatloop_activate_48px.svg
+ ,beatloop_activate
+ ,beatlooproll_activate
+
-
- LoopButtons
- vertical
-
+
+
-
- LoopButtonsTopRow
- horizontal
-
+
+
+ ,2f
+
-
- beatloop_activate
- BeatloopActivate
-
-
-
-
- icon/ic_beatloop_activate_48px.svg
- icon/ic_beatloop_activate_48px.svg
-
- icon/ic_beatloop_activate_48px.svg
- icon/ic_beatloop_activate_48px.svg
- ,beatloop_activate
- ,beatlooproll_activate
-
+
+ horizontal
+
-
- reloop_toggle
- Reloop
-
-
-
-
- icon/ic_loop_48px.svg
- icon/ic_loop_48px.svg
-
- icon/ic_loop_48px.svg
- icon/ic_loop_48px.svg
- ,reloop_toggle
- ,reloop_andstop
- ,loop_enabled
-
+
+
+ 6f,
+
-
-
+
+ loop_in
+ LoopIn
+
+
+
+
+ icon/ic_loop_in_48px.svg
+ icon/ic_loop_in_48px.svg
+ ,loop_in
+ ,loop_in_goto
+
-
- LoopButtonsBottomRow
- horizontal
-
+
+
+ 2f,
+
-
- loop_in
- LoopIn
-
-
-
-
- icon/ic_loop_in_48px.svg
- icon/ic_loop_in_48px.svg
- ,loop_in
- ,loop_in_goto
-
+
+ loop_out
+ LoopOut
+
+
+
+
+ icon/ic_loop_out_48px.svg
+ icon/ic_loop_out_48px.svg
+ ,loop_out
+ ,loop_out_goto
+
-
- loop_out
- LoopOut
-
-
-
-
- icon/ic_loop_out_48px.svg
- icon/ic_loop_out_48px.svg
- ,loop_out
- ,loop_out_goto
-
+
+
+ 8f,
+
-
-
+
+ reloop_toggle
+ Reloop
+
+
+
+
+ icon/ic_loop_48px.svg
+ icon/ic_loop_48px.svg
+
+ icon/ic_loop_48px.svg
+ icon/ic_loop_48px.svg
+ ,reloop_toggle
+ ,reloop_andstop
+ ,loop_enabled
+
-
+
-
+
diff --git a/res/skins/Deere/loopmove.xml b/res/skins/Deere/loopmove.xml
deleted file mode 100644
index b46cc354d7d..00000000000
--- a/res/skins/Deere/loopmove.xml
+++ /dev/null
@@ -1,418 +0,0 @@
-
-
-
-
- LoopMoveContainer
- horizontal
- -1,-1
- max,min
- [LoopMove],next
- [LoopMove],prev
-
-
-
- horizontal
-
-
- 4
-
- icon/ic_loop_move_backward_48px.svg
- icon/ic_loop_move_backward_48px.svg
- backward
-
-
-
- LoopMoveValue
-
-
-
- 4
-
-
- [LoopMove],next
- [LoopMove],prev
-
-
-
- 4
-
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- forward
-
-
-
-
-
- horizontal
-
-
- 8
-
- icon/ic_loop_move_backward_48px.svg
- icon/ic_loop_move_backward_48px.svg
- backward
-
-
-
- LoopMoveValue
-
-
-
- 8
-
-
- [LoopMove],next
- [LoopMove],prev
-
-
-
- 8
-
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- forward
-
-
-
-
-
- horizontal
-
-
- 16
-
- icon/ic_loop_move_backward_48px.svg
- icon/ic_loop_move_backward_48px.svg
- backward
-
-
-
- LoopMoveValue
-
-
-
- 16
-
-
- [LoopMove],next
- [LoopMove],prev
-
-
-
- 16
-
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- forward
-
-
-
-
-
- horizontal
-
-
- 32
-
- icon/ic_loop_move_backward_48px.svg
- icon/ic_loop_move_backward_48px.svg
- backward
-
-
-
- LoopMoveValue
-
-
-
- 32
-
-
- [LoopMove],next
- [LoopMove],prev
-
-
-
- 32
-
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- forward
-
-
-
-
-
- horizontal
-
-
- 64
-
- icon/ic_loop_move_backward_48px.svg
- icon/ic_loop_move_backward_48px.svg
- backward
-
-
-
- LoopMoveValue
-
-
-
- 64
-
-
- [LoopMove],next
- [LoopMove],prev
-
-
-
- 64
-
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- forward
-
-
-
-
-
- horizontal
-
-
- 0.03125
-
- icon/ic_loop_move_backward_48px.svg
- icon/ic_loop_move_backward_48px.svg
- backward
-
-
-
- LoopMoveValue
-
-
-
- 1/32
-
-
- [LoopMove],next
- [LoopMove],prev
-
-
-
- 0.03125
-
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- forward
-
-
-
-
-
- horizontal
-
-
- 0.0625
-
- icon/ic_loop_move_backward_48px.svg
- icon/ic_loop_move_backward_48px.svg
- backward
-
-
-
- LoopMoveValue
-
-
-
- 1/16
-
-
- [LoopMove],next
- [LoopMove],prev
-
-
-
- 0.0625
-
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- forward
-
-
-
-
-
- horizontal
-
-
- 0.125
-
- icon/ic_loop_move_backward_48px.svg
- icon/ic_loop_move_backward_48px.svg
- backward
-
-
-
- LoopMoveValue
-
-
-
- 1/8
-
-
- [LoopMove],next
- [LoopMove],prev
-
-
-
- 0.125
-
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- forward
-
-
-
-
-
- horizontal
-
-
- 0.25
-
- icon/ic_loop_move_backward_48px.svg
- icon/ic_loop_move_backward_48px.svg
- backward
-
-
-
- LoopMoveValue
-
-
-
- 1/4
-
-
- [LoopMove],next
- [LoopMove],prev
-
-
-
- 0.25
-
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- forward
-
-
-
-
-
- horizontal
-
-
- 0.5
-
- icon/ic_loop_move_backward_48px.svg
- icon/ic_loop_move_backward_48px.svg
- backward
-
-
-
- LoopMoveValue
-
-
-
- 1/2
-
-
- [LoopMove],next
- [LoopMove],prev
-
-
-
- 0.5
-
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- forward
-
-
-
-
-
- horizontal
-
-
- 1
-
- icon/ic_loop_move_backward_48px.svg
- icon/ic_loop_move_backward_48px.svg
- backward
-
-
-
- LoopMoveValue
-
-
-
- 1
-
-
- [LoopMove],next
- [LoopMove],prev
-
-
-
- 1
-
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- forward
-
-
-
-
-
- horizontal
-
-
- 2
-
- icon/ic_loop_move_backward_48px.svg
- icon/ic_loop_move_backward_48px.svg
- backward
-
-
-
- LoopMoveValue
-
-
-
- 2
-
-
- [LoopMove],next
- [LoopMove],prev
-
-
-
- 2
-
- icon/ic_loop_move_forward_48px.svg
- icon/ic_loop_move_forward_48px.svg
- forward
-
-
-
-
-
-
-
diff --git a/res/skins/Deere/main_decks.xml b/res/skins/Deere/main_decks.xml
index ad5ac37eb90..42c6e8be632 100644
--- a/res/skins/Deere/main_decks.xml
+++ b/res/skins/Deere/main_decks.xml
@@ -5,368 +5,12 @@
-->
- MainDeckContainer
- vertical
- me,me
+ horizontal
+ me,max
-
-
-
- 2DecksNoQuickEffect
- vertical
-
-
-
- vertical
-
-
-
-
- DeckSplitter
- vertical
- -1me,-1me
- [Deere],WaveformSplitter2DecksNoQE
- 166,230
-
-
- StackedWaveformsContainer
- vertical
-
-
-
- DeckVisualRow1
-
-
- DeckVisualRow2
-
-
-
-
-
-
- horizontal
- -1,150min
- -1,230
-
-
- DecksMixerSingleton
-
-
-
-
-
-
-
-
-
- [Deere],show_parallel_waveforms
- visible
-
-
-
-
-
- vertical
- DeckSplitter
- vertical
- -1,155max
- -1,330
-
-
- DecksMixerSingleton
-
-
-
- [Deere],show_parallel_waveforms
- visible
-
-
-
-
-
-
-
-
- [QuickEffectRack1_[Channel1]_Effect1],loaded
- visible
-
-
-
-
-
-
-
- 2DecksWithQuickEffect
- vertical
-
-
-
- vertical
-
-
-
-
- DeckSplitter
- vertical
- -1me,-1me
- [Deere],WaveformSplitter2DecksWithQE
- 158,230
-
-
- StackedWaveformsContainer
- vertical
-
-
-
- DeckVisualRow1
-
-
- DeckVisualRow2
-
-
-
-
-
-
- horizontal
- -1,185min
- -1,230
-
-
- DecksMixerSingleton
-
-
-
-
-
-
-
-
-
- [Deere],show_parallel_waveforms
- visible
-
-
-
-
-
- vertical
- -1,160max
- -1,260
-
-
- DecksMixerSingleton
-
-
-
- [Deere],show_parallel_waveforms
- visible
-
-
-
-
-
-
-
-
- [QuickEffectRack1_[Channel1]_Effect1],loaded
- visible
-
-
-
+
+
+
-
- [Master],show_4decks
- visible
-
-
-
-
-
-
-
- MainDeckContainer
- vertical
- me,me
-
-
-
-
- 4DecksNoQuickEffect
- vertical
-
-
- vertical
-
-
-
-
- DeckSplitter
- vertical
- -1me,-1me
- [Deere],WaveformSplitter4DecksNoQE
- 220,362
-
-
- StackedWaveformsContainer
- vertical
-
-
-
- DeckVisualRow3
-
-
- DeckVisualRow1
-
-
- DeckVisualRow2
-
-
- DeckVisualRow4
-
-
-
-
-
-
- horizontal
- -1,310min
- -1,460
-
-
- DecksMixerSingleton
-
-
-
-
-
-
-
-
-
- [Deere],show_parallel_waveforms
- visible
-
-
-
-
-
- vertical
- -1me,-1me
- -1,630
-
-
- DecksMixerSingleton
-
-
-
- [Deere],show_parallel_waveforms
- visible
-
-
-
-
-
-
-
-
- [QuickEffectRack1_[Channel1]_Effect1],loaded
- visible
-
-
-
-
-
-
-
- 4DecksWithQuickEffect
- vertical
-
-
- vertical
-
-
-
-
- DeckSplitter
- vertical
- -1me,-1me
- [Deere],WaveformSplitter4DecksWithQE
- 149,350
-
-
- StackedWaveformsContainer
- vertical
-
-
-
- DeckVisualRow3
-
-
- DeckVisualRow1
-
-
- DeckVisualRow2
-
-
- DeckVisualRow4
-
-
-
-
-
-
- horizontal
- -1,350min
- -1,460
-
-
- DecksMixerSingleton
-
-
-
-
-
-
-
-
-
- [Deere],show_parallel_waveforms
- visible
-
-
-
-
-
- vertical
- -1,630
-
-
- DecksMixerSingleton
-
-
-
- [Deere],show_parallel_waveforms
- visible
-
-
-
-
-
-
-
-
- [QuickEffectRack1_[Channel1]_Effect1],loaded
- visible
-
-
-
-
-
- [Master],show_4decks
- visible
-
diff --git a/res/skins/Deere/microphone.xml b/res/skins/Deere/microphone.xml
index 9edcf26d512..b64e89e0671 100644
--- a/res/skins/Deere/microphone.xml
+++ b/res/skins/Deere/microphone.xml
@@ -10,26 +10,26 @@
[Microphone]
MicrophoneContainer
- vertical
- max,max
+ horizontal
+ max,me
-
- horizontal
- MicLabelContainer
-
-
-
-
-
MicrophoneControls
- horizontal
+ vertical
+
+ horizontal
+ MicLabelContainer
+
+
+
+
+
microphone_pregain
pregain
@@ -38,44 +38,58 @@
mute
Gain
+
+
+
+
+ MicrophoneButtonsAndMeter
+ vertical
+
- MicrophoneButtonsAndMeter
- vertical
+ MicrophoneControlButtons
+ horizontal
+
+ microphone_talkover
+ Talk
+
-
- MicrophoneControlButtons
- horizontal
-
-
- microphone_talkover
- Talk
-
+
+ pfl
+ MicPFLButton
+
+
+
+
+ icon/ic_headphones_48px.svg
+ icon/ic_headphones_48px.svg
+
+ icon/ic_headphones_48px.svg
+ icon/ic_headphones_48px.svg
+ ,pfl
+
-
- pfl
- MicPFLButton
-
-
-
-
- icon/ic_headphones_48px.svg
- icon/ic_headphones_48px.svg
-
- icon/ic_headphones_48px.svg
- icon/ic_headphones_48px.svg
- ,pfl
-
+
+
-
+
+ microphone_VuMeter
+ VuMeter
+
-
-
+
+ ButtonGrid
+ horizontal
+
+
+ 1
+ microphone
+
-
- microphone_VuMeter
- VuMeter
+
+ 2
+ microphone
@@ -83,36 +97,19 @@
horizontal
- 1
+ 3
microphone
- 2
+ 4
microphone
-
-
- ButtonGrid
- horizontal
-
-
- 3
- microphone
-
-
-
- 4
- microphone
-
-
-
- [Master],show_4effectunits
- visible
-
-
-
+
+ [Master],show_4effectunits
+ visible
+
diff --git a/res/skins/Deere/microphone_rack.xml b/res/skins/Deere/microphone_rack.xml
index f1176b066c6..090e4afcc06 100644
--- a/res/skins/Deere/microphone_rack.xml
+++ b/res/skins/Deere/microphone_rack.xml
@@ -12,198 +12,211 @@
me,f
-
- MicrophonesContainer
+
+
+ MicAuxRack
me,min
+ horizontal
+
+
+
+
+
+
+
- MicrophoneRackExpanded
- me,min
horizontal
+ max,me
+
+ 2
+
+
+
+ [Microphone2],enabled
+ visible
+
+
-
-
+
+ horizontal
+ max,me
+
+
+ 3
+
+
+
+ [Microphone3],enabled
+ visible
+
+
+
+ horizontal
+ max,me
+
-
+ 4
+
+
+ [Microphone4],enabled
+ visible
+
+
-
- horizontal
-
-
- 2
-
-
-
- [Microphone2],enabled
- visible
-
-
+
+ MicDuckingContainer
+ horizontal
+ max,me
+
- horizontal
+ MicDuckingControls
+ vertical
+ min,me
-
- 3
-
-
-
- [Microphone3],enabled
- visible
-
-
-
- horizontal
-
-
- 4
+
+ ,0f
-
-
- [Microphone4],enabled
- visible
-
-
-
-
- MicDuckingContainer
- vertical
- max,e
-
horizontal
+ min,min
+
+ ,2f
+
+
+
+
+
+ 66f,20f
+ 3
+
+ 0
+ OFF
+
+
+ 1
+ AUTO
+
+
+ 2
+ MANUAL
+
+
+ [Master],talkoverDucking
+ true
+
+
+
+
+ ,2me
+
+
+
+
+
+
+ MicDuckingControls
+ vertical
+ min,me
+
+
- MicDuckingControls
horizontal
-
-
+
+ [Master]
+ duckStrength
-
- 70f,20f
- 3
-
- 0
- OFF
-
-
- 1
- AUTO
-
-
- 2
- MANUAL
-
-
- [Master],talkoverDucking
- true
-
-
-
-
-
- vertical
-
-
-
- horizontal
-
-
- [Master]
- duckStrength
-
-
- blue
-
-
-
-
-
-
-
-
+
+ blue
+
+
-
+
+
-
+
-
- 1
-
+
-
- horizontal
-
-
- 2
-
-
-
- [Auxiliary2],enabled
- visible
-
-
+
+ 1
+
-
- horizontal
-
-
- 3
-
-
-
- [Auxiliary3],enabled
- visible
-
-
+
+ horizontal
+
+
+ 2
+
+
+
+ [Auxiliary2],enabled
+ visible
+
+
-
- horizontal
-
-
- 4
-
-
-
- [Auxiliary4],enabled
- visible
-
-
+
+ horizontal
+
+
+ 3
+
+
+
+ [Auxiliary3],enabled
+ visible
+
+
+
+ horizontal
+
+
+ 4
+
+
+ [Auxiliary4],enabled
+ visible
+
-
- [Microphone],show_microphone
- visible
-
-
+
+
+
+ [Microphone],show_microphone
+ visible
+
diff --git a/res/skins/Deere/mixer.xml b/res/skins/Deere/mixer.xml
index 2ec79ebd43c..47444ffa302 100644
--- a/res/skins/Deere/mixer.xml
+++ b/res/skins/Deere/mixer.xml
@@ -5,264 +5,247 @@
-->
- Mixer
+ MixerBorder
vertical
- f,min
+ min,me
- DeckControls
- min,min
- horizontal
+ Mixer
+ vertical
+ max,min
-
- DeckControlsSplitWaveforms
- horizontal
+ DeckControls
+ max,me
+ vertical
- DeckControlsSplitWaveforms2Decks
+ DeckControls_SplitWaveforms
horizontal
-
- 1
-
+
+ DeckControls_SplitWaveforms_2Decks
+ horizontal
+
-
+
+ 1
+
-
- 2
-
+
-
-
- [Master],show_4decks
- visible
-
-
-
-
-
+
+ 2
+
-
- DeckControlsSplitWaveforms4Decks
- horizontal
-
+
+
+ [Master],show_4decks
+ visible
+
+
+
+
+
-
- 3
-
-
- 1
-
+
+ DeckControls_SplitWaveforms_4Decks
+ horizontal
+
-
+
+ 3
+
+
+ 1
+
-
- 2
-
-
- 4
-
+
-
-
- [Master],show_4decks
- visible
-
-
-
-
-
- [Deere],show_parallel_waveforms
- visible
-
-
-
-
-
+
+ 2
+
+
+ 4
+
-
- DeckControlsStackedWaveforms
- horizontal
-
-
- DeckControlsStackedWaveforms2Decks
- horizontal
-
-
- 1
-
-
-
+
+
+ [Master],show_4decks
+ visible
+
+
-
- 2
-
- [Master],show_4decks
+ [Deere],show_parallel_waveforms
visible
-
+
- DeckControlsStackedWaveforms4Decks
+ DeckControls_StackedWaveforms
horizontal
+ DeckControls_StackedWaveforms_2Decks
horizontal
+
+ 1
+
-
- DeckControlsStackedWaveforms4DecksNoEQs
- horizontal
-
-
- 3
-
-
- 1
-
-
-
+
-
- 2
-
-
- 4
-
-
-
- [Master],show_eqs
- visible
-
-
-
-
-
+
+ 2
+
+
+
+ [Master],show_4decks
+ visible
+
+
+
+
+
+
+ DeckControls_StackedWaveforms_4Decks
+ horizontal
+
- DeckControlsStackedWaveforms4DecksWithEQs
horizontal
-
- 3
-
-
- 1
-
-
+
+ DeckControls_StackedWaveforms_4Decks_NoEQs
+ horizontal
+
+
+ 3
+
+
+ 1
+
+
+
+
+
+ 2
+
+
+ 4
+
+
+
+ [Master],show_eqs
+ visible
+
+
+
+
+
+
+
+ DeckControls_StackedWaveforms_4Decks_WithEQs
+ horizontal
+
+
+ 3
+
+
+ 1
+
+
+
+
+
+ 2
+
+
+ 4
+
+
+
+ [Master],show_eqs
+ visible
+
+
-
- 2
-
-
- 4
-
-
- [Master],show_eqs
- visible
-
-
+
-
+
+ [Master],show_4decks
+ visible
+
+
- [Master],show_4decks
+ [Deere],show_parallel_waveforms
visible
-
+
-
- [Deere],show_parallel_waveforms
- visible
-
-
-
-
-
+
-
- CrossfaderContainer
- horizontal
-
-
- Crossfader
- me,min
+
horizontal
-
-
- crossfader
- me,min
- -1,40
- -1,40
- slider-horizontal.svg
- handle-horizontal.svg
- true
-
- [Master],crossfader
- false
-
-
-
-
- [AutoDJ],enabled
- visible
-
-
-
-
-
-
-
-
- CrossfaderAutoDjActive
me,min
- horizontal
-
- crossfader
+
+ CrossfaderContainer
+ horizontal
me,min
- -1,40
- -1,40
- slider-horizontal.svg
- handle-horizontal.svg
- true
-
- [Master],crossfader
- false
-
-
+
+
+
+ Crossfader
+ me,min
+ horizontal
+
+
+ crossfader
+ 1me,40f
+ slider-crossfader.svg
+ handle-crossfader.svg
+ true
+
+ [Master],crossfader
+ false
+
+
+
+
+ [AutoDJ],enabled
+ highlight
+
+
+
+
+
- [AutoDJ],enabled
+ [Deere],show_crossfader
visible
-
-
-
-
- [Deere],show_crossfader
- visible
-
-
+
+
+
[Master],show_mixer
visible
-
+
diff --git a/res/skins/Deere/mixer_column_eq_left.xml b/res/skins/Deere/mixer_column_eq_left.xml
new file mode 100644
index 00000000000..949829a2e2c
--- /dev/null
+++ b/res/skins/Deere/mixer_column_eq_left.xml
@@ -0,0 +1,145 @@
+
+
+
+ [Channel]
+
+ DeckMixer_Column1
+ vertical
+ min,min
+
+
+
+
+ vertical
+ 40,34
+ -1,40
+ me,me
+
+
+ vertical
+ me,min
+
+
+ pregain
+ pregain
+ red
+ mute
+ mute
+
+
+
+ [Master],show_killswitches
+ visible
+
+
+
+
+ horizontal
+ me,min
+
+
+ 0me,1min
+
+
+
+
+ pregain
+ pregain
+ red
+
+
+
+ [Master],show_killswitches
+ visible
+
+
+
+
+
+
+ [Master],show_4decks
+ visible
+
+
+
+
+
+ vertical
+ min,min
+
+
+ vertical
+ min,min
+
+
+ vertical
+ 0min,34f
+
+
+
+ [QuickEffectRack1_[Channel1]_Effect1],loaded
+
+ visible
+
+
+
+
+ [Deere],show_parallel_waveforms
+
+ visible
+
+
+
+
+ [Master],show_4decks
+
+ visible
+
+
+
+
+ 4
+ yellow
+
+
+
+ EqualizerRack_effect_parameter
+ EqualizerRack_effect_button_parameter
+ 3
+ yellow
+
+
+
+ EqualizerRack_effect_parameter
+ EqualizerRack_effect_button_parameter
+ 2
+ yellow
+
+
+
+ EqualizerRack_effect_parameter
+ EqualizerRack_effect_button_parameter
+ 1
+ yellow
+
+
+
+ QuickEffectRack_super1
+ QuickEffectRack_enabled
+ 1
+ blue
+
+
+
+
+ [Master],show_eqs
+ visible
+
+
+
diff --git a/res/skins/Deere/mixer_column_eq_right.xml b/res/skins/Deere/mixer_column_eq_right.xml
new file mode 100644
index 00000000000..0fd93e835cd
--- /dev/null
+++ b/res/skins/Deere/mixer_column_eq_right.xml
@@ -0,0 +1,145 @@
+
+
+
+ [Channel]
+
+ DeckMixer_Column1
+ vertical
+ min,min
+
+
+
+
+ vertical
+ 40,34
+ -1,40
+ me,me
+
+
+ vertical
+ me,min
+
+
+ pregain
+ pregain
+ red
+ mute
+ mute
+
+
+
+ [Master],show_killswitches
+ visible
+
+
+
+
+ horizontal
+ me,min
+
+
+ pregain
+ pregain
+ red
+
+
+
+ 0me,1min
+
+
+
+
+ [Master],show_killswitches
+ visible
+
+
+
+
+
+
+ [Master],show_4decks
+ visible
+
+
+
+
+
+ vertical
+ min,min
+
+
+ vertical
+ min,min
+
+
+ vertical
+ 0min,34f
+
+
+
+ [QuickEffectRack1_[Channel1]_Effect1],loaded
+
+ visible
+
+
+
+
+ [Deere],show_parallel_waveforms
+
+ visible
+
+
+
+
+ [Master],show_4decks
+
+ visible
+
+
+
+
+ 4
+ yellow
+
+
+
+ EqualizerRack_effect_parameter
+ EqualizerRack_effect_button_parameter
+ 3
+ yellow
+
+
+
+ EqualizerRack_effect_parameter
+ EqualizerRack_effect_button_parameter
+ 2
+ yellow
+
+
+
+ EqualizerRack_effect_parameter
+ EqualizerRack_effect_button_parameter
+ 1
+ yellow
+
+
+
+ QuickEffectRack_super1
+ QuickEffectRack_enabled
+ 1
+ blue
+
+
+
+
+ [Master],show_eqs
+ visible
+
+
+
diff --git a/res/skins/Deere/deck_mixer_controls_col3.xml b/res/skins/Deere/mixer_column_gain_levels.xml
similarity index 88%
rename from res/skins/Deere/deck_mixer_controls_col3.xml
rename to res/skins/Deere/mixer_column_gain_levels.xml
index 45539d7375f..9ece1083c98 100644
--- a/res/skins/Deere/deck_mixer_controls_col3.xml
+++ b/res/skins/Deere/mixer_column_gain_levels.xml
@@ -6,9 +6,9 @@
[Channel]
- DeckMixer_Column3
+ DeckMixer_Column3
vertical
- 40f,160me
+ 40f,-1me
@@ -17,11 +17,10 @@
horizontal
-
+
pregain
pregain
red
- Gain
@@ -46,11 +45,10 @@
40,34
40,46
-
+
pregain
pregain
red
- Gain
@@ -63,13 +61,14 @@
- 22min,100me
+ Channel_VU_Container
+ 22me,90me
horizontal
channel_VuMeter_Group
horizontal
- 22,130
+ 22,150
diff --git a/res/skins/Deere/mixer_column_master_vu.xml b/res/skins/Deere/mixer_column_master_vu.xml
new file mode 100644
index 00000000000..c015c5bb5e7
--- /dev/null
+++ b/res/skins/Deere/mixer_column_master_vu.xml
@@ -0,0 +1,236 @@
+
+
+
+
+ vertical
+
+
+
+ MasterVu2Deck
+ vertical
+ min,me
+
+
+
+
+ -1,34f
+ vertical
+
+
+
+
+
+
+
+ [Master],show_4decks
+ visible
+
+
+
+
+
+
+
+ MasterVu4Deck_Container
+ vertical
+ min,me
+
+
+
+
+
+ vertical
+ min,me
+
+
+ vertical
+ min,me
+
+
+ min,me
+ vertical
+
+
+ MasterVU_Spacer
+ 10min,0me
+ vertical
+
+
+
+
+ min,p
+ vertical
+
+
+
+
+ 10f,136f
+
+
+
+
+
+ [Master],show_faders
+ visible
+
+
+
+
+ min,me
+ vertical
+
+
+ MasterVU_Spacer
+ 10min,me
+ vertical
+
+
+
+
+ MasterVU
+ 10min,me
+ vertical
+
+
+
+
+
+
+ [Master],show_faders
+
+ visible
+
+
+
+
+ [Master],show_eqs
+ visible
+
+
+
+
+ vertical
+ min,me
+
+
+ min,me
+ vertical
+
+
+ 10f,34f
+
+
+
+
+
+
+
+ min,me
+ vertical
+
+
+
+ [Master],show_faders
+ visible
+
+
+
+
+ [Master],show_eqs
+
+ visible
+
+
+
+
+ [Deere],show_parallel_waveforms
+
+ visible
+
+
+
+
+ vertical
+ min,me
+
+
+ min,me
+ vertical
+
+
+ MasterVU_Spacer
+ 10min,0me
+ vertical
+
+
+
+
+ min,p
+ vertical
+
+
+
+
+ 10f,28f
+
+
+
+
+
+ [Master],show_eqs
+ visible
+
+
+
+
+ vertical
+ min,me
+
+
+ min,me
+ vertical
+
+
+ 10f,34f
+
+
+
+
+
+
+
+ min,me
+ vertical
+
+
+
+ [Master],show_faders
+ visible
+
+
+
+
+ [Master],show_eqs
+
+ visible
+
+
+
+
+ [Deere],show_parallel_waveforms
+ visible
+
+
+
+
+
+ [Master],show_4decks
+ visible
+
+
+
+
+
+
diff --git a/res/skins/Deere/deck_mixer_controls_col2.xml b/res/skins/Deere/mixer_column_volume.xml
similarity index 87%
rename from res/skins/Deere/deck_mixer_controls_col2.xml
rename to res/skins/Deere/mixer_column_volume.xml
index 79e0d8ea51d..7cc5f390910 100644
--- a/res/skins/Deere/deck_mixer_controls_col2.xml
+++ b/res/skins/Deere/mixer_column_volume.xml
@@ -6,18 +6,14 @@
[Channel]
- DeckMixer_Column2
+ DeckMixer_Column2
vertical
max,me
-
- [Master],show_faders
- visible
-
-
- DeckPFLButton2Decks
+
+ ButtonContainer
horizontal
40f,35f
@@ -43,11 +39,11 @@
-
+
-
- DeckPFLButton4Decks
- 40f,25f
+
+ ButtonContainer
+ -1me,28f
horizontal
@@ -70,7 +66,7 @@
[Master],show_4decks
visible
-
+
VolumeSlider
@@ -78,14 +74,14 @@
- ChannelVolume
+ ChannelVolume
vertical
channel_volume
min,me
40,50
- 40,130
+ 40,150
slider-vertical.svg
handle-vertical.svg
false
@@ -105,13 +101,14 @@
- ChannelVolume
+ ChannelVolume
vertical
+ 40min,80me
channel_volume
min,me
- 40,110
+ 40,80
slider-vertical.svg
handle-vertical.svg
false
@@ -128,12 +125,16 @@
-
+
+ ButtonContainer
horizontal
+ -1me,28f
-
+
+ Deck
+
[Master],show_4decks
@@ -141,5 +142,9 @@
+
+ [Master],show_faders
+ visible
+
diff --git a/res/skins/Deere/deck_mixer_controls_condensed_left.xml b/res/skins/Deere/mixer_controls_condensed_left.xml
similarity index 71%
rename from res/skins/Deere/deck_mixer_controls_condensed_left.xml
rename to res/skins/Deere/mixer_controls_condensed_left.xml
index d6f6af0d3ab..5e324300535 100644
--- a/res/skins/Deere/deck_mixer_controls_condensed_left.xml
+++ b/res/skins/Deere/mixer_controls_condensed_left.xml
@@ -6,7 +6,7 @@
[Channel]
- DeckMixer_ColumnCondensed
+ DeckMixer_ColumnCondensed
vertical
@@ -14,7 +14,7 @@
vertical
-
+
@@ -29,7 +29,7 @@
CondensedButtonContainerLeft
- -1me,30f
+ min,min
horizontal
@@ -53,10 +53,6 @@
CondensedVolumeAndMonoMeter
horizontal
60,141
-
- [Master],show_faders
- visible
-
horizontal
@@ -64,7 +60,6 @@
- L
channel_VuMeter
channel_PeakIndicator
@@ -85,29 +80,23 @@
-
-
-
- 4DecksMixerCondensedStereoMeterLeft
- horizontal
- 60,141
[Master],show_faders
visible
-
-
-
+
+
+
+ horizontal
+ me,min
-
- 15
-
+
channel_VuMeter_Group
horizontal
- 22,141
+ 22max,-1min
@@ -124,31 +113,28 @@
+
+ 9
+
+
+
+ [Master],show_faders
+
+ visible
+
CondensedButtonContainerLeft
- -1me,25f
- horizontal
+ me,min
+ vertical
-
- orientation
- OrientationButton
-
-
-
-
- icon/ic_orientation_left_48px.svg
- icon/ic_orientation_left_48px.svg
-
- icon/ic_orientation_48px.svg
- icon/ic_orientation_48px.svg
-
- icon/ic_orientation_right_48px.svg
- icon/ic_orientation_right_48px.svg
- ,orientation
+
+
+ Deck
+
diff --git a/res/skins/Deere/deck_mixer_controls_condensed_right.xml b/res/skins/Deere/mixer_controls_condensed_right.xml
similarity index 69%
rename from res/skins/Deere/deck_mixer_controls_condensed_right.xml
rename to res/skins/Deere/mixer_controls_condensed_right.xml
index 267dba69a15..a5ab9b1ae39 100644
--- a/res/skins/Deere/deck_mixer_controls_condensed_right.xml
+++ b/res/skins/Deere/mixer_controls_condensed_right.xml
@@ -6,7 +6,7 @@
[Channel]
- DeckMixer_ColumnCondensed
+ DeckMixer_ColumnCondensed
vertical
@@ -14,7 +14,7 @@
vertical
-
+
@@ -29,7 +29,7 @@
CondensedButtonContainerRight
- -1me,30f
+ min,min
horizontal
@@ -47,16 +47,13 @@
,pfl
-
+
-
+
CondensedVolumeAndMonoMeter
horizontal
60,141
-
- [Master],show_faders
- visible
-
+ min,min
channel_volume
@@ -78,7 +75,6 @@
- L
channel_VuMeter
channel_PeakIndicator
@@ -86,25 +82,25 @@
-
-
-
- 4DecksMixerCondensedStereoMeterRight
- horizontal
- 60,141
[Master],show_faders
visible
-
-
-
+
+
+
+ horizontal
+ me,min
+
+ 9
+
+
channel_VuMeter_Group
horizontal
- 22,141
+ 22max,-1min
@@ -121,41 +117,32 @@
-
- 15
-
+
-
+
+ [Master],show_faders
+ visible
+
+
+
CondensedButtonContainerRight
- -1me,25f
- horizontal
+ me,min
+ vertical
-
- orientation
- OrientationButton
-
-
-
-
- icon/ic_orientation_left_48px.svg
- icon/ic_orientation_left_48px.svg
-
- icon/ic_orientation_48px.svg
- icon/ic_orientation_48px.svg
-
- icon/ic_orientation_right_48px.svg
- icon/ic_orientation_right_48px.svg
- ,orientation
+
+
+ Deck
+
-
+
-
+
diff --git a/res/skins/Deere/left_deck_mixer_controls.xml b/res/skins/Deere/mixer_controls_left.xml
similarity index 75%
rename from res/skins/Deere/left_deck_mixer_controls.xml
rename to res/skins/Deere/mixer_controls_left.xml
index 3159f5ed11c..2ae62cb0b0a 100644
--- a/res/skins/Deere/left_deck_mixer_controls.xml
+++ b/res/skins/Deere/mixer_controls_left.xml
@@ -6,7 +6,7 @@
[Channel]
- DeckMixer
+ DeckMixer
vertical
min,me
@@ -16,12 +16,12 @@
horizontal
min,min
-
+
horizontal
-
-
+
+
@@ -37,14 +37,15 @@
vertical
+ min,min
-
+
vertical
4DecksMixerCol2ContainerLeft
-
-
+
+
diff --git a/res/skins/Deere/right_deck_mixer_controls.xml b/res/skins/Deere/mixer_controls_right.xml
similarity index 73%
rename from res/skins/Deere/right_deck_mixer_controls.xml
rename to res/skins/Deere/mixer_controls_right.xml
index a87f4106032..46355f2d6c5 100644
--- a/res/skins/Deere/right_deck_mixer_controls.xml
+++ b/res/skins/Deere/mixer_controls_right.xml
@@ -6,7 +6,7 @@
[Channel]
- DeckMixer
+ DeckMixer
vertical
min,me
@@ -14,15 +14,16 @@
horizontal
+ min,min
horizontal
-
-
+
+
-
+
[Master],show_4decks
@@ -36,14 +37,15 @@
vertical
+ min,min
-
+
vertical
4DecksMixerCol2ContainerRight
-
-
+
+
diff --git a/res/skins/Deere/quick_effect_superknob_left.xml b/res/skins/Deere/quick_effect_superknob_left.xml
index ceffcbb4a7d..6684976abe9 100644
--- a/res/skins/Deere/quick_effect_superknob_left.xml
+++ b/res/skins/Deere/quick_effect_superknob_left.xml
@@ -13,93 +13,53 @@
[QuickEffectRack__Effect1]
horizontal
+ me,me
-
-
- vertical
-
+
+
+
+ 15f,15f
+ QuickEffectKillButton
+ 2
+
+ 0
+
+ icon/ic_radio_button_on_48px.svg
+ icon/ic_radio_button_on_48px.svg
+
+
+ 1
+
+ icon/ic_radio_button_off_48px.svg
+ icon/ic_radio_button_off_48px.svg
+
+
+ ,enabled
+ LeftButton
+
+
+ [Master],show_killswitches
+ visible
+
+
-
- vertical
- 15f,12f
-
-
-
-
-
- 15f,15f
- CircleButton
- 2
-
- 0
-
- icon/ic_radio_button_off_48px.svg
- icon/ic_radio_button_off_48px.svg
-
-
- 1
-
- icon/ic_radio_button_on_48px.svg
- icon/ic_radio_button_on_48px.svg
-
-
- ,enabled
- LeftButton
-
-
-
-
- vertical
- 15f,-1me
-
-
-
-
+
+ TEST1
+ 0me,1min
+
+
+ [Master],show_killswitches
+
+ visible
+
-
-
-
-
- EQKnobNoLabel
- 40,34
- 40,41
- vertical
-
-
-
- super1
-
-
-
-
-
-
- EQKnobWithLabel
- 40,42
- 40,45
- vertical
-
-
-
- super1
-
-
-
- 40f,10f
- KnobLabel
-
-
- 1
- middle
-
-
-
-
-
-
+
+
+ super1
+
+
diff --git a/res/skins/Deere/quick_effect_superknob_right.xml b/res/skins/Deere/quick_effect_superknob_right.xml
index fa3f01881c1..5e49022a84f 100644
--- a/res/skins/Deere/quick_effect_superknob_right.xml
+++ b/res/skins/Deere/quick_effect_superknob_right.xml
@@ -13,92 +13,52 @@
[QuickEffectRack__Effect1]
horizontal
+ me,me
-
-
+
+
+ super1
+
+
-
- EQKnobNoLabel
- 40,34
- 40,41
- vertical
-
-
-
- super1
-
-
-
-
+
+
+
+ 15f,15f
+ QuickEffectKillButton
+ 2
+
+ 0
+
+ icon/ic_radio_button_on_48px.svg
+ icon/ic_radio_button_on_48px.svg
+
+
+ 1
+
+ icon/ic_radio_button_off_48px.svg
+ icon/ic_radio_button_off_48px.svg
+
+
+ ,enabled
+ LeftButton
+
+
+ [Master],show_killswitches
+ visible
+
+
-
- EQKnobWithLabel
- 40,42
- 40,45
- vertical
-
-
-
- super1
-
-
-
- 40f,10f
- KnobLabel
-
-
- 1
- middle
-
-
-
-
-
-
-
-
-
- vertical
-
-
-
- vertical
- 15f,12f
-
-
-
-
-
- 15f,15f
- CircleButton
- 2
-
- 0
-
- icon/ic_radio_button_off_48px.svg
- icon/ic_radio_button_off_48px.svg
-
-
- 1
-
- icon/ic_radio_button_on_48px.svg
- icon/ic_radio_button_on_48px.svg
-
-
- ,enabled
- LeftButton
-
-
-
-
- vertical
- 15f,-1me
-
-
-
-
+
+ TEST1
+ 0me,1min
+
+
+ [Master],show_killswitches
+
+ visible
+
diff --git a/res/skins/Deere/sample_decks.xml b/res/skins/Deere/sample_decks.xml
index e5c738aa966..9d4fe34043d 100644
--- a/res/skins/Deere/sample_decks.xml
+++ b/res/skins/Deere/sample_decks.xml
@@ -141,6 +141,10 @@
+
+ [Samplers],show_samplers
+ visible
+
vertical
[Sampler]
@@ -11,10 +12,18 @@
Sampler
vertical
me,f
- 167,-1
-
+
+
+ [SamplerRow],expanded
+ visible
+
+ horizontal
+
+
+
+
diff --git a/res/skins/Deere/sampler_controls_row.xml b/res/skins/Deere/sampler_controls_row.xml
index f70a896f2ce..ebdb59473c4 100644
--- a/res/skins/Deere/sampler_controls_row.xml
+++ b/res/skins/Deere/sampler_controls_row.xml
@@ -74,276 +74,50 @@
horizontal
+ ButtonGrid
-
- ButtonGrid
- vertical
-
-
- cueset
- SamplerCueButton
-
-
-
- CUE
- CUE
- ,cue_set
- ,cue_indicator
-
-
-
- beatsync_beatsync_tempo
- BeatsyncButton
-
-
-
- Sync
-
-
- ,beatsync
- ,beatsync_tempo
-
-
-
-
-
-
-
- vertical
- min,max
- 44,42
- 600,60
-
-
- ButtonGrid
- horizontal
- p,me
- 44,22
- 600,30
-
-
-
- pfl
- SamplerPflButton
-
-
-
-
- icon/ic_headphones_48px.svg
- icon/ic_headphones_48px.svg
-
- icon/ic_headphones_48px.svg
- icon/ic_headphones_48px.svg
- ,pfl
-
-
-
- eject
- EjectButton
-
-
-
-
- icon/ic_eject_48px.svg
- icon/ic_eject_48px.svg
- ,eject
-
-
-
-
-
- ButtonGrid
- horizontal
- p,me
- 44,22
- 60,30
-
-
-
- orientation
- OrientationButton
-
-
-
-
- icon/ic_orientation_left_48px.svg
- icon/ic_orientation_left_48px.svg
-
- icon/ic_orientation_48px.svg
- icon/ic_orientation_48px.svg
-
- icon/ic_orientation_right_48px.svg
- icon/ic_orientation_right_48px.svg
- ,orientation
-
-
-
- keylock
- KeylockButton
-
-
-
-
- icon/ic_key_48px.svg
- icon/ic_key_48px.svg
-
- icon/ic_key_48px.svg
- icon/ic_key_48px.svg
- ,keylock
-
-
-
-
-
-
-
-
-
- ButtonGrid
- vertical
- p,me
- 26,44
- 26,50
-
-
-
- 1
- sampler
-
-
-
- 2
- sampler
-
-
-
-
- [Master],show_4effectunits
- visible
-
-
-
-
-
-
-
- vertical
-
-
-
- horizontal
-
-
- pregain
- 24f,20f
- knob_red.svg
- knob_bg.svg
- -135
- 135
- 0.9423
-
- ,pregain
-
-
-
-
-
-
- vumeter_v
- vertical
-
-
- PeakIndicator
- sampler_PeakIndicator
- 8f,6f
- vumeter_clip.svg
-
- ,PeakIndicator
-
-
-
-
- sampler_VuMeter
- 3me,me
- 8,15
- 8,-1
- vumeter_v.svg
- false
- 5
- 600
- 100
- 1
-
- ,VuMeter
-
-
-
-
-
-
-
-
-
-
- rate
- 20f,-1me
- slider-vertical.svg
- handle-vertical.svg
-
- ,rate
-
-
-
-
-
-
-
- ButtonGrid
- horizontal
-
-
- 1
- sampler
-
+
+ cueset
+ SamplerCueButton
+
+
+
+ CUE
+ CUE
+ ,cue_set
+ ,cue_indicator
+
-
- 2
- sampler
-
+
+ beatsync_beatsync_tempo
+ BeatsyncButton
+
+
+
+ Sync
+
+
+ ,beatsync
+ ,beatsync_tempo
+
-
- 3
- sampler
-
+
+ Sampler
+
-
- 4
- sampler
-
-
-
- [Master],show_4effectunits
- visible
-
-
+
+ eject
+ EjectButton
+
+
+
+
+ icon/ic_eject_48px.svg
+ icon/ic_eject_48px.svg
+ ,eject
+
-
- ButtonGrid
- horizontal
-
-
- 1
-
-
- 2
-
-
- 3
-
-
- 4
-
diff --git a/res/skins/Deere/sampler_row.xml b/res/skins/Deere/sampler_row.xml
index 56b15a1d0ae..bee7378c098 100644
--- a/res/skins/Deere/sampler_row.xml
+++ b/res/skins/Deere/sampler_row.xml
@@ -1,6 +1,7 @@
SamplerRow
+ min,min
horizontal
@@ -10,7 +11,7 @@
20f,-1me
- 4
+ 3
@@ -23,96 +24,37 @@
-
- SamplerRowCollapsed
- horizontal
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SamplerMiddleSpacer
- -1me,-1max
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [SamplerRow],expanded
- visible
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- SamplerRowExpanded
- horizontal
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SamplerMiddleSpacer
- -1me,-1max
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [SamplerRow],expanded
- visible
-
+ SamplerMiddleSpacer
+ me,min
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/skins/Deere/sampler_simple.xml b/res/skins/Deere/sampler_simple.xml
deleted file mode 100644
index af273086e8c..00000000000
--- a/res/skins/Deere/sampler_simple.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- [Sampler]
-
- Sampler
- horizontal
- me,f
-
-
-
-
-
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 724ae8e8962..705d34cc823 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -26,11 +26,11 @@
1
1
0
- 0
1
1
1
+ 1
1
0
@@ -53,8 +53,8 @@
15,15
f,f
- 50,20
- 50,20
+ 50,18
+ 50,22
f,f
34,22
@@ -143,7 +143,7 @@
-
+
DeckVisualRow4
@@ -158,73 +158,9 @@
- DecksMixerSingleton
+ Library
-
- horizontal
- me,min
-
-
-
-
-
-
-
-
-
-
-
-
- BelowDecks
-
-
- vertical
- -1me,-1me
-
-
- vertical
-
-
-
- horizontal
-
-
-
-
- [EffectRack1],show
- visible
-
-
-
- horizontal
-
-
-
-
- [Samplers],show_samplers
- visible
-
-
-
-
-
-
- [Master],maximize_library
- visible
-
-
-
-
-
-
-
-
-
+
@@ -234,204 +170,94 @@
-
- vertical
+
+ WaveformSplitter
+ vertical
+ [Deere],StackedWaveformSplitter
-1me,-1me
+
+ [Master],maximize_library
+ visible
+
+
-
+
+ Waveforms
vertical
- -1me,-1me
-
-
-
- LibraryVerticalSplitter
- vertical
- [Deere],LibrarySplitter2DecksSplit
- 246,454
- -1me,-1me
-
-
- vertical
- -1me,-1me
- -1,300
-
-
-
-
- [Master],maximize_library
- visible
-
-
-
-
-
-
-
- BelowDecks
-
-
-
-
-
-
- visible
[Deere],show_parallel_waveforms
-
-
-
+ visible
-
-
-
- vertical
- -1me,-1me
-
- LibraryVerticalSplitter
- vertical
- [Deere],LibrarySplitter2DecksStacked
- 395,233
- -1me,-1me
+
+
+ [Master],show_4decks
+ visible
+
+ vertical
-
- vertical
- -1me,-1me
-
-
-
-
- [Master],maximize_library
- visible
-
-
-
-
-
-
- BelowDecks
+ DeckVisualRow3
-
-
-
-
-
- visible
- [Deere],show_parallel_waveforms
-
-
+
-
-
- visible
- [Master],show_4decks
-
-
-
-
-
+
+ DeckVisualRow1
+
-
- vertical
- -1me,-1me
-
-
-
- vertical
- -1me,-1me
-
+
+ DeckVisualRow2
+
-
- LibraryVerticalSplitter
- vertical
- [Deere],LibrarySplitter4DecksSplit
- 519,181
- -1me,-1me
+
+
+ [Master],show_4decks
+ visible
+
+ vertical
-
- vertical
- -1me,-1me
- -1,700
-
-
-
-
- [Master],maximize_library
- visible
-
-
-
-
-
-
- BelowDecks
+ DeckVisualRow4
-
-
+
-
- visible
- [Deere],show_parallel_waveforms
-
-
-
-
-
+
-
+
vertical
- -1me,-1me
+ min,max
-
-
- LibraryVerticalSplitter
- vertical
- [Deere],LibrarySplitter4DecksStacked
- 647,53
- -1me,-1me
-
-
- vertical
- -1me,-1me
-
-
-
-
- [Master],maximize_library
- visible
-
-
-
-
-
-
-
- BelowDecks
-
-
-
-
-
+
+
+
+
+
+ Library
+
-
- visible
- [Deere],show_parallel_waveforms
-
-
+
+
+
+
+
+ horizontal
+ me,me
+
+
+ Library
+
+ [Master],maximize_library
visible
- [Master],show_4decks
-
+
diff --git a/res/skins/Deere/skin_settings.xml b/res/skins/Deere/skin_settings.xml
index 336a8c410f5..f8080549fe6 100644
--- a/res/skins/Deere/skin_settings.xml
+++ b/res/skins/Deere/skin_settings.xml
@@ -222,24 +222,6 @@
-
- toggle_deck_controls
- 80me,20f
- 2
-
- 0
- ⚪ Minimal Controls
- left
-
-
- 1
- ⚫ Minimal Controls
- left
-
-
- [Deere],show_minimal_deck_controls
-
-
@@ -292,7 +274,26 @@
- show_eqs
+ show_killswitches
+ 80me,20f
+ 2
+
+ 0
+ ⚪ Kill Switches
+ left
+
+
+ 1
+ ⚫ Kill Switches
+ left
+
+
+ [Master],show_killswitches
+
+
+
+
+ show_faders
80me,20f
2
diff --git a/res/skins/Deere/slider-crossfader-AutoDJ.svg b/res/skins/Deere/slider-crossfader-AutoDJ.svg
new file mode 100644
index 00000000000..bb33e75eda7
--- /dev/null
+++ b/res/skins/Deere/slider-crossfader-AutoDJ.svg
@@ -0,0 +1,65 @@
+
+
diff --git a/res/skins/Deere/slider-horizontal.svg b/res/skins/Deere/slider-crossfader.svg
similarity index 73%
rename from res/skins/Deere/slider-horizontal.svg
rename to res/skins/Deere/slider-crossfader.svg
index be1da24081f..11f1c9d4375 100644
--- a/res/skins/Deere/slider-horizontal.svg
+++ b/res/skins/Deere/slider-crossfader.svg
@@ -11,7 +11,7 @@
width="180"
height="40"
id="svg2"
- inkscape:version="0.91 r13725"
+ inkscape:version="0.48.4 r9939"
sodipodi:docname="slider-horizontal.svg">
@@ -36,16 +36,19 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
- inkscape:window-height="702"
+ inkscape:window-height="746"
id="namedview72"
showgrid="false"
inkscape:zoom="2.5388889"
- inkscape:cx="13.588622"
- inkscape:cy="20.787746"
+ inkscape:cx="88.665961"
+ inkscape:cy="52.335148"
inkscape:window-x="0"
- inkscape:window-y="27"
+ inkscape:window-y="0"
inkscape:window-maximized="1"
- inkscape:current-layer="svg2" />
+ inkscape:current-layer="svg2"
+ inkscape:snap-page="true"
+ inkscape:snap-bbox="true"
+ inkscape:bbox-paths="true" />
@@ -54,20 +57,20 @@
+ transform="matrix(0,1,-1.0808731,0,52.353048,-15.054704)">
+ style="fill:none;stroke:#222222;stroke-width:2.40465426;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
- Spacer
+ Spacer
horizontal
- min,min
-
-
diff --git a/res/skins/Deere/spacer_vx.xml b/res/skins/Deere/spacer_vx.xml
index 0f05c0e206f..96a9c32d826 100644
--- a/res/skins/Deere/spacer_vx.xml
+++ b/res/skins/Deere/spacer_vx.xml
@@ -6,10 +6,7 @@ Description: Spacer.
Spacer
horizontal
- min,min
-
-
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 80fef43abd2..92c7f472013 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -22,18 +22,13 @@
*******************************************************************************/
/* These definitions put a faint border around all the widgets. We have to be
tricky with top/bottom-ness to get things right. */
-#Mixer {
- border-color: #222;
- border-style: solid;
- border-width: 3px 1.5px 3px 1.5px;
-}
-
#DeckControls {
- padding: 7.5px;
+ padding: 5px 7.5px 2px 7.5px;
+ /* background-color: #456789; */
}
#CrossfaderContainer {
- padding: 0px 7.5px 7.5px 7.5px;
+ padding: 3px;
}
#DeckTextRow {
@@ -71,12 +66,17 @@
border-top: 1px solid #222;
background-color: transparent;
margin: 0;
- padding: 0 4px 0 0;
+ padding: 0 3px 0 0;
}
#ControlsRow {
border-top: 1px solid #222;
- padding: 4px;
+ padding: 3px;
+ qproperty-layoutAlignment: 'AlignBottom';
+}
+
+#MixerBorder {
+ background-color: #222;
}
/* Rounded corners to split things up */
@@ -84,7 +84,7 @@
#Deck1, #Deck3 {
border-bottom-right-radius:5px;
border-top-right-radius:5px;
- border-width: 3px 1.5px 3px 3px;
+ border-width: 0px 1.5px 3px 3px;
border-style: solid;
border-color: #222;
}
@@ -92,7 +92,7 @@
#Deck2, #Deck4 {
border-bottom-left-radius:5px;
border-top-left-radius:5px;
- border-width: 3px 3px 3px 1.5px;
+ border-width: 0px 3px 3px 1.5px;
border-style: solid;
border-color: #222;
}
@@ -111,7 +111,32 @@
/* FIXME */
border-style: solid;
border-color: #222;
- border-width: 1px 0px;
+ border-width: 0px 2px;
+}
+
+#Spacer22 {
+ background-color: #222222;
+}
+
+TEST1 {
+ background-color: #00B824;
+}
+
+#AlignLeft {
+ qproperty-layoutAlignment: 'AlignLeft';
+}
+
+#AlignRight {
+ qproperty-layoutAlignment: 'AlignRight';
+}
+
+#SampleDecksContainer {
+ border-color: #222;
+ border-style: solid;
+ border-width: 1px 0px 2px 0px;
+}
+
+#SamplerRows {
}
#SamplerRow1,
@@ -121,11 +146,15 @@
#SamplerRow6,
#SamplerRow7,
#SamplerRow8 {
- border-top: 1px solid #222;
+ border-color: #222;
+ border-style: solid;
+ border-width: 0px 0px 1px 0px;
}
#SamplerRow5 {
- border-top: 2px solid #222;
+ border-color: #222;
+ border-style: solid;
+ border-width: 1px 0px 1px 0px;
}
/*******************************************************************************
@@ -148,6 +177,17 @@ QTableView {
gridline-color: red;
}
+/* Colors aren't applied to selected items, define them manually */
+QTableView::item:selected,
+QTreeView::item:selected,
+#LibraryBPMButton::item:selected,
+QTreeView::branch:selected,
+/* This won't style the Preview button */
+#LibraryPreviewButton::item:selected {
+ color: #D6D6D6;
+ background-color: #006596;
+}
+
/* checkbox in library "Played" column */
QTableView::indicator {
width: 12px;
@@ -175,16 +215,17 @@ QTableView::indicator:unchecked {
QPushButton#LibraryPreviewButton {
width: 23px;
height: 12px;
- background: transparent;
border: none;
}
QPushButton#LibraryPreviewButton:!checked {
image: url(skin:/image/style_library_preview_play.png);
+ background-color: #1A1A1A;
}
QPushButton#LibraryPreviewButton:checked {
image: url(skin:/image/style_library_preview_pause.png);
+ background-color: #006596;
}
/* library header row */
@@ -317,27 +358,27 @@ QTreeView::branch:open:has-children:has-siblings {
/* vertical splitters */
#LibraryCoverArtSplitter::handle,
#LibraryVerticalSplitter::handle,
-#DeckSplitter::handle {
+#WaveformSplitter::handle {
image: url(skin:/image/style_handle_vertical_unchecked.svg);
- background: none;
+ background: #222;
}
#LibraryCoverArtSplitter::handle:pressed,
#LibraryVerticalSplitter::handle:pressed,
-#DeckSplitter::handle:pressed {
+#WaveformSplitter::handle:pressed {
image: url(skin:/image/style_handle_vertical_checked.svg);
- background: none;
+ background: #222;
}
#LibraryCoverArtSplitter::handle:horizontal,
#LibraryVerticalSplitter::handle:horizontal,
-#DeckSplitter::handle:horizontal {
+#WaveformSplitter::handle:horizontal {
width: 6px;
}
#LibraryCoverArtSplitter::handle:vertical,
#LibraryVerticalSplitter::handle:vertical,
-#DeckSplitter::handle::vertical {
+#WaveformSplitter::handle::vertical {
height: 6px;
}
@@ -395,9 +436,7 @@ WLibrary QRadioButton::indicator:unchecked {
margin: 9px 3px 6px 3px;
padding: 4px;
color: #D2D2D2;
- background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
- stop: 0 #4B4B4B,
- stop: 1 #4B4B4B);
+ background-color: #4B4B4B;
border: 1px solid #4B4B4B;
border-radius: 2px;
outline: none;
@@ -412,10 +451,7 @@ WLibrary QRadioButton::indicator:unchecked {
margin: 9px 3px 6px 3px;
padding: 4px;
color: #808080; /* Default #A3A3A3 -90L HSL*/
- background-color: qlineargradient(spread:pad,
- x1:0, y1:0, x2:1, y2:0,
- stop:0 rgba(95, 95, 95, 127),
- stop:1 rgba(95, 95, 95, 127));
+ background-color: rgba(95, 95, 95, 127);
/* 50% #5F5F5F = RGBA#5F5F5F7F */
border: 0px solid #5F5F5F;
border-radius: 2px;
@@ -430,9 +466,7 @@ WLibrary QRadioButton::indicator:unchecked {
margin: 9px 3px 6px 3px;
padding: 4px;
color: #D2D2D2;
- background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
- stop: 0 #5F5F5F,
- stop: 1 #5F5F5F);
+ background-color: #5F5F5F;
border: 0px solid #5F5F5F;
border-radius: 2px;
outline: none;
@@ -445,9 +479,7 @@ WLibrary QRadioButton::indicator:unchecked {
margin: 9px 3px 6px 3px;
padding: 4px;
color: #FDFDFD;
- background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
- stop: 0 #006596,
- stop: 1 #006596);
+ background-color: #006596;
border: 0px solid #006596;
border-radius: 2px;
outline: none;
@@ -460,9 +492,7 @@ WLibrary QRadioButton::indicator:unchecked {
margin: 9px 3px 6px 3px;
padding: 4px;
color: #FDFDFD;
- background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
- stop: 0 #0080BE,
- stop: 1 #0080BE);
+ background-color: #0080BE;
border: 0px solid #0080BE;
border-radius: 2px;
outline: none;
@@ -476,9 +506,7 @@ WLibrary QRadioButton::indicator:unchecked {
margin: 9px 3px 6px 3px;
padding: 4px;
color: #FDFDFD;
- background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
- stop: 0 #006596,
- stop: 1 #006596);
+ background-color: #006596;
border: 0px solid #006596;
border-radius: 2px;
outline: none;
@@ -616,11 +644,7 @@ WWidget, QLabel {
/* Start spacing for Deck overview row (small waveform, option grid) */
#OptionGrid, #ButtonGrid {
background-color: #333333;
- padding: 1px;
- qproperty-layoutSpacing: 2;
-}
-
-#ButtonGrid {
+ /*padding: 1px;*/
qproperty-layoutSpacing: 2;
}
@@ -633,6 +657,10 @@ WWidget, QLabel {
}
/* End spacing for Deck overview row */
+#Waveforms {
+ background-color: #333;
+}
+
#WaveformZoomContainer {
background-color: #333333;
padding: 1px;
@@ -654,12 +682,6 @@ WWidget, QLabel {
/* Start spacing for Deck controls row (transport, beatgrid, looping, hotcue, vinylcontrol) */
-#FullControlsRow, #MinimalControlsContainer {
- qproperty-layoutSpacing: 3;
- qproperty-layoutAlignment: 'AlignBottom';
-}
-
-#BeatjumpContainer, #LoopContainer,
#HotcueGrid, #HotcueGridExtended,
#VinylControlsContainer {
background-color: #333333;
@@ -667,8 +689,6 @@ WWidget, QLabel {
qproperty-layoutSpacing: 2;
}
-#BeatjumpContainer WWidgetGroup,
-#LoopContainer WWidgetGroup, #LoopButtons, #LoopButtons WWidgetGroup,
#HotcueGrid WWidgetGroup, #HotcueGridExtended WWidgetGroup,
#VinylControlsContainer WWidgetGroup {
qproperty-layoutSpacing: 2;
@@ -677,12 +697,9 @@ WWidget, QLabel {
WBeatSpinBox {
color: #c1cabe;
background-color: #1f1e1e;
-
border: 1px solid #444342;
border-radius: 3px;
-
padding: 2px;
-
font: 15px;
}
@@ -733,6 +750,9 @@ WBeatSpinBox {
padding: 0px 4px 0px 4px;
qproperty-layoutSpacing: 5;
background-color: #111111;
+ border-width: 0px 0px 3px 0px;
+ border-style: solid;
+ border-color: #222;
}
#ToolBarLeft {
@@ -775,16 +795,23 @@ WBeatSpinBox {
#BPMGutter, #PositionGutter {
qproperty-layoutAlignment: 'AlignRight | AlignTop';
- qproperty-layoutSpacing: 10;
+ qproperty-layoutSpacing: 4;
padding: 2px;
}
/* Start editable widgets in decks */
-#BpmEditRow:hover, #KeyEditRow:hover, #PositionGutter:hover, #StarratingGutter:hover {
+#BpmEditRowCollapsed:hover, #KeyEditRowCollapsed:hover,
+#BpmEditRowExpanded:hover, #KeyEditRowExpanded:hover,
+#PositionGutter:hover, #StarratingGutter:hover {
/* emphasize editable widgets on hover */
border: 1px solid #FF6600;
background-color: rgba(255, 102, 0, 128);
}
+#BpmEditRowCollapsed, #KeyEditRowCollapsed {
+ qproperty-layoutAlignment: 'AlignCenter';
+ /* emphasize active widget */
+ border: 1px solid #666666;
+}
#BpmEditRowExpanded, #KeyEditRowExpanded {
/* emphasize active widget */
@@ -802,11 +829,15 @@ WBeatSpinBox {
#BpmEditRowControls, #KeyEditRowControls {
/* Make room between buttons */
background-color: #333333;
- padding-left: 2px;
- padding-right: 2px;
- margin-left: 2px;
+ padding-left: 1px;
+ padding-right: 1px;
+ margin-right: 2px;
qproperty-layoutSpacing: 2;
}
+
+#BpmEditTriggerLabel, #KeyEditTriggerLabel {
+ padding-right: 1px;
+}
/* End editable widgets in decks */
#DeckTextRow #ArtistGutter WLabel, #DeckTextRow #BPMGutter WLabel, #DeckTextRow #PositionGutter WLabel {
@@ -848,8 +879,11 @@ WBeatSpinBox {
#EffectUnit1, #EffectUnit2, #EffectUnit3, #EffectUnit4 {
qproperty-layoutAlignment: 'AlignTop';
+}
+
+#EffectUnitFiller {
border: 1px solid #222;
- border-left:none;
+ border-width: 1px 0px 0px 0px;
}
#EffectButtonControls {
@@ -870,10 +904,6 @@ WBeatSpinBox {
font: 10px;
}
-#EffectUnit1 {
- border-left: 1px solid #222;
-}
-
#EffectUnitNameContainer {
padding: 2px;
qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
@@ -883,6 +913,11 @@ WBeatSpinBox {
qproperty-alignment: 'AlignHCenter';
}
+#EffectUnitGroupControls {
+ border: 1px solid #222222;
+ border-width: 0px 0px 1px 0px;
+}
+
#EffectUnitGroupControlsLeft {
qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
}
@@ -988,12 +1023,12 @@ WEffectSelector {
margin-top: 1px;
}
-#Mixer {
- qproperty-layoutAlignment: 'AlignTop';
+#Crossfader[highlight="0"] {
+ border-image: none;
}
-#CrossfaderAutoDjActive {
- background-color: #001726;
+#Crossfader[highlight="1"] {
+ border-image: url(skin:slider-crossfader-AutoDJ.svg) 0 0 0 0 stretch stretch;
}
#MasterControls {
@@ -1005,27 +1040,15 @@ WEffectSelector {
}
#MainDecks, #MainDeckContainer {
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #333333,
- stop: 1.0 #333333);
+ background-color: #333333;
}
#LeftGutter, #RightGutter {
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #222222,
- stop: 1.0 #222222);
-}
-
-#Deck1, #Deck2 {
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #333333,
- stop: 1.0 #333333);
+ background-color: #222222;
}
-#Deck3, #Deck4 {
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #333333,
- stop: 1.0 #333333);
+#Deck1, #Deck2, #Deck3, #Deck4 {
+ background-color: #333333;
}
WWidget, WLabel {
@@ -1050,49 +1073,85 @@ WNumberRate {
qproperty-layoutAlignment: 'AlignHCenter';
}
-#DeckMixer1_Column2, #DeckMixer2_Column2, #DeckMixer3_Column2, #DeckMixer4_Column2 {
- qproperty-layoutSpacing: 5;
+#Mixer {
+ qproperty-layoutAlignment: 'AlignTop';
+ background-color: #333;
+ margin: 0px 1.5px 3px 1.5px;
+}
+
+#DeckMixer {
+ background-color: #333333;
+}
+
+#DeckMixer_Column2, #DeckMixer_Column3 {
+ /* qproperty-layoutSpacing: 5; */
+ /* background-color: #006596; */
}
-#CircleButton {
+#CircleButton, #QuickEffectKillButton {
border: 3px solid #333333;
border-radius: 2px;
}
+#QuickEffectKillButton[value="0"] {
+ background-color: #006596;
+}
+
+#QuickEffectKillButton[value="1"] {
+ background-color: #4B4B4B;
+}
+
#SmallCircleButton {
border: 2px solid #333333;
border-radius: 1px;
}
-#DeckControlsSplitWaveforms4Decks #channel_VuMeter_Group,
-#DeckControlsStackedWaveforms4Decks #channel_VuMeter_Group {
- padding-bottom: 5px;
+#DeckControls_SplitWaveforms_4Decks #channel_VuMeter_Group,
+#DeckControls_StackedWaveforms_4Decks #channel_VuMeter_Group {
+ /* padding-bottom: 5px; */
+ /* background-color: #116611; */
}
-#DeckMixer1_ColumnCondensed, #DeckMixer2_ColumnCondensed, #DeckMixer3_ColumnCondensed,
-#DeckMixer4_ColumnCondensed {
- padding: 5;
+#DeckMixer_ColumnCondensed {
+ padding: 0px 5px 0px 5px;
qproperty-layoutAlignment: 'AlignHCenter';
+ /* background-color: #911661; */
}
/* pad 4 deck mixer colums left/right
to avoid EQ kill buttons from shifting center of rest of column */
-#4DecksMixerCol2ContainerRight,
+#4DecksMixerCol2ContainerRight {
+ qproperty-layoutAlignment: 'AlignLeft';
+ padding-right: 6px;
+}
+
+#4DecksMixerCol2ContainerLeft {
+ qproperty-layoutAlignment: 'AlignRight';
+ padding-left: 6px;
+}
+
+#ButtonContainer {
+ qproperty-layoutAlignment: 'AlignCenter';
+ padding: 3px 0px 3px 0px;
+}
+
#CondensedButtonContainerRight {
- padding-right: 14px;
+ qproperty-layoutAlignment: 'AlignLeft';
+ padding: 3px 0px 3px 9px;
}
-#4DecksMixerCol2ContainerLeft,
+
#CondensedButtonContainerLeft {
- padding-left: 14px;
+ qproperty-layoutAlignment: 'AlignRight';
+ padding: 3px 9px 3px 0px;
}
#4DecksMixerCondensedMonoMeterLeft {
- padding-left: 2px;
+ padding-left: 3px;
padding-right: 4px;
}
#4DecksMixerCondensedMonoMeterRight {
padding-left: 4px;
- padding-right: 2px;
+ padding-right: 3px;
}
#CondensedVolumeAndMonoMeter {
@@ -1100,26 +1159,26 @@ to avoid EQ kill buttons from shifting center of rest of column */
}
#channel_VuMeter_Group {
- qproperty-layoutSpacing: 3;
+ qproperty-layoutSpacing: 2;
qproperty-layoutAlignment: 'AlignHCenter';
+ /* background-color: #828315; */
}
#master_VuMeter_Group {
- qproperty-layoutSpacing: 3;
+ qproperty-layoutSpacing: 2;
qproperty-layoutAlignment: 'AlignHCenter';
padding-left: 5px;
padding-right: 5px;
+ /* background-color: #828315; */
}
-#MasterVumeter {
- qproperty-layoutSpacing: 3;
- qproperty-layoutAlignment: 'AlignHCenter';
- padding-left: 10px;
- padding-right: 10px;
+#MasterVu {
+ qproperty-layoutAlignment: 'AlignCenter';
+ /* background-color: #582831; */
}
#vumeter_v, #vumeter_h {
- qproperty-layoutSpacing: 3;
+ qproperty-layoutSpacing: 2;
}
WVuMeter, #PeakIndicator {
@@ -1136,19 +1195,17 @@ WStarRating {
}
#SampleDecksContainer {
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #333333,
- stop: 1.0 #333333);
+ background-color: #333333;
}
#MicrophonesContainer {
}
-#MicrophoneRackExpanded {
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #333333,
- stop: 1.0 #333333);
- qproperty-layoutSpacing: 6;
+#MicAuxRack {
+ background-color: #333333;
+ qproperty-layoutSpacing: 3;
+ padding-left: 2px;
+ border-bottom: 2px solid #222222;
}
#MicLabelContainer,
@@ -1157,9 +1214,22 @@ WStarRating {
}
#MicrophoneContainer, #MicDuckingContainer, #AuxiliaryContainer {
- padding: 2px 5px;
- margin: 2px 0px;
+ padding: 4px 4px;
+ margin: 0px;
+}
+
+#MicrophoneContainer, #MicDuckingContainer {
+ border: 3px solid #222222;
+ border-width: 0px 3px 0px 0px;
+}
+
+#MicDuckingContainer {
+ qproperty-layoutSpacing: 2;
+}
+
+#AuxiliaryContainer {
border: 3px solid #222222;
+ border-width: 0px 0px 0px 3px;
}
#MicrophoneContainer, #AuxiliaryContainer,
@@ -1172,23 +1242,31 @@ WStarRating {
qproperty-layoutSpacing: 4;
}
+#AuxLabel, #MicLabel, #DuckingLabel {
+ font-weight: bold;
+}
+
#MicrophoneButtonsAndMeter, #AuxiliaryButtonsAndMeter {
qproperty-layoutSpacing: 3;
}
#LibraryContainer {
- background-color: #222;
- padding-top: 4px;
+ qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
+ background-color: #222222;
+ padding-top: 2px;
}
-#LibraryExpanded, #LibraryCollapsed {
- qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
+#LibrarySplitter {
+ background-color: #222222;
}
#EffectRackContainer {
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #333333,
- stop: 1.0 #333333);
+ background-color: #333333;
+}
+
+#EffectUnitsRow {
+ border: 1px solid #222222;
+ border-width: 0px 0px 3px 0px;
}
#EffectUnitNoParameters {
@@ -1227,18 +1305,9 @@ WStarRating {
font-size: 15px;
}
-#EffectUnit1, #EffectUnit2 {
- /*border-bottom: none;*/
-}
-
#SampleDecksContainer {
}
-#SamplerBankContainer {
- padding: 4px;
- qproperty-layoutSpacing: 2;
-}
-
#SamplerTopRowOuter {
padding: 2px;
}
@@ -1247,10 +1316,6 @@ WStarRating {
qproperty-layoutSpacing: 2;
}
-#SamplerBankGrid {
- qproperty-layoutSpacing: 2;
-}
-
#SamplerExpansion {
padding: 2px;
qproperty-layoutSpacing: 2;
@@ -1294,14 +1359,16 @@ WPushButton:hover {
}
/*"Pressed" state*/
-WPushButton[value="1"] {
+WPushButton[value="1"],
+WPushButton[value="2"] {
/*color: #FDFDFD;*/
color: #FDFDFD;
background-color: #006596;
border: 0px solid #006596;
}
-WPushButton[value="1"]:hover {
+WPushButton[value="1"]:hover,
+WPushButton[value="2"]:hover {
color: #FDFDFD;
background-color: #0080BE;
border: 0px solid #0080BE;
@@ -1311,7 +1378,6 @@ WPushButton[value="1"]:hover {
0 -- disconnected / off
1 -- connecting / enabling
2 -- connected / enabled
-*/
WPushButton[value="2"] {
color: #FDFDFD;
background-color: #4B4B4B;
@@ -1323,6 +1389,15 @@ WPushButton[value="2"]:hover {
background-color: #4B4B4B;
border: 0px solid #0080BE;
}
+*/
+
+#PlayToggle[value="0"] {
+ image: url(skin:/icon/ic_play_48px.svg) no-repeat center center;
+}
+
+#PlayToggle[value="1"] {
+ image: url(skin:/icon/ic_pause_48px.svg) no-repeat center center;
+}
#ToolbarButton[value="1"] {
color: #D2D2D2;
@@ -1338,12 +1413,25 @@ WPushButton[value="2"]:hover {
border-radius: 3px;
}
+WRecordingDuration {
+ font-weight: bold;
+}
+
/* Special case "orientation" controls
- 1 -- center / default (off)
- 2 -- right
0 -- left
+ 1 -- center / off
+ 2 -- right
*/
-#OrientationButton[value="1"] {
+/* Default xfader positions:
+ left decks = left xfader
+ right decks = right xfader
+ auxiliary = center */
+#OrientationButtonDeck1[value="0"],
+#OrientationButtonDeck3[value="0"],
+#OrientationButtonDeck2[value="2"],
+#OrientationButtonDeck4[value="2"],
+#OrientationButtonAux[value="1"],
+#OrientationButtonSampler[value="1"] {
color: #D2D2D2;
background-color: #4B4B4B;
border: 1px solid #4B4B4B;
@@ -1351,31 +1439,49 @@ WPushButton[value="2"]:hover {
outline: none;
}
-#OrientationButton:hover {
+#OrientationButtonDeck1[value="0"]:hover,
+#OrientationButtonDeck3[value="0"]:hover,
+#OrientationButtonDeck2[value="2"]:hover,
+#OrientationButtonDeck4[value="2"]:hover,
+#OrientationButtonAux[value="1"]:hover,
+#OrientationButtonSampler[value="1"]:hover {
color: #D2D2D2;
background-color: #5F5F5F;
border: 0px solid #5F5F5F;
}
-#OrientationButton[value="2"] {
- color: #FDFDFD;
- background-color: #006596;
- border: 0px solid #006596;
-}
-
-#OrientationButton[value="2"]:hover {
- color: #FDFDFD;
- background-color: #0080BE;
- border: 0px solid #0080BE;
-}
-
-#OrientationButton[value="0"] {
+/* Highlight xfader special positions != default */
+#OrientationButtonDeck1[value="1"],
+#OrientationButtonDeck1[value="2"],
+#OrientationButtonDeck3[value="1"],
+#OrientationButtonDeck3[value="2"],
+#OrientationButtonDeck2[value="0"],
+#OrientationButtonDeck2[value="1"],
+#OrientationButtonDeck4[value="0"],
+#OrientationButtonDeck4[value="1"],
+#OrientationButtonAux[value="0"],
+#OrientationButtonAux[value="2"],
+#OrientationButtonSampler[value="0"],
+#OrientationButtonSampler[value="2"] {
color: #FDFDFD;
background-color: #006596;
border: 0px solid #006596;
+ border-radius: 2px;
+ outline: none;
}
-#OrientationButton[value="0"]:hover {
+#OrientationButtonDeck1[value="1"]:hover,
+#OrientationButtonDeck1[value="2"]:hover,
+#OrientationButtonDeck3[value="1"]:hover,
+#OrientationButtonDeck3[value="2"]:hover,
+#OrientationButtonDeck2[value="0"]:hover,
+#OrientationButtonDeck2[value="1"]:hover,
+#OrientationButtonDeck4[value="0"]:hover,
+#OrientationButtonDeck4[value="1"]:hover,
+#OrientationButtonAux[value="0"]:hover,
+#OrientationButtonAux[value="2"]:hover,
+#OrientationButtonSampler[value="0"]:hover,
+#OrientationButtonSampler[value="2"]:hover {
color: #FDFDFD;
background-color: #0080BE;
border: 0px solid #0080BE;
@@ -1516,9 +1622,7 @@ WPushButton[value="2"]:hover {
#SampleDeckToggle[value="1"], #LibraryToggle[value="1"], #EffectRackToggle[value="1"] {
color: #D2D2D2;
- background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
- stop: 0 #4B4B4B,
- stop: 1 #4B4B4B);
+ background-color: #4B4B4B;
border: 1px solid #4B4B4B;
border-radius: 2px;
outline: none;
@@ -1526,9 +1630,7 @@ WPushButton[value="2"]:hover {
#SampleDeckToggle[value="1"]:hover, #LibraryToggle[value="1"]:hover, #EffectRackToggle[value="1"]:hover {
color: #D2D2D2;
- background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
- stop: 0 #5F5F5F,
- stop: 1 #5F5F5F);
+ background-color: #5F5F5F;
border: 0px solid #5F5F5F;
}
diff --git a/res/skins/Deere/tool_bar.xml b/res/skins/Deere/tool_bar.xml
index 185535531f5..a9de248cdd5 100644
--- a/res/skins/Deere/tool_bar.xml
+++ b/res/skins/Deere/tool_bar.xml
@@ -43,6 +43,10 @@
HeadphoneControls
me,min
horizontal
+
+ [Master],headEnabled
+ visible
+
@@ -58,7 +62,7 @@
[Master]
headGain
red
- Head Gain
+ Head
@@ -72,13 +76,13 @@
[Master],headSplit
+
+ 15
+
+
-
- 15
-
-
MasterControls
min,min
@@ -97,9 +101,31 @@
[Master]
gain
red
- Gain
+ Master
+
+
+
+
+
+
+ BoothControls
+ horizontal
+
+ [Master],booth_enabled
+ visible
+
+
+
+ 15
+
+ booth_gain
+ [Master]
+ booth_gain
+ red
+ Booth
+
@@ -118,103 +144,6 @@
NotificationsContainer
horizontal
-
-
-
- horizontal
-
- [Recording],status
- visible
-
-
-
-
-
-
-
-
- Recording active
- RecordingNotification
-
-
-
- icon/ic_recording_32px.svg
- icon/ic_recording_32px.svg
- icon/ic_recording_32px.svg
- [Recording],status
-
-
-
-
-
- AutoDJ active
- AutoDjNotification
-
-
-
- icon/ic_autodj_32px.svg
- icon/ic_autodj_32px.svg
- icon/ic_autodj_32px.svg
- [AutoDJ],enabled
-
-
-
-
-
- Live Broadcasting active
- LiveBroadcastingNotification
-
-
-
- icon/ic_broadcast_32px.svg
- icon/ic_broadcast_32px.svg
- icon/ic_broadcast_32px.svg
- [Shoutcast],status
-
vinylcontrol_status
@@ -267,9 +196,78 @@
icon/ic_vinylcontrol_3_32px.svg
[Channel4],vinylcontrol_status
+
+
+
+
+ AutoDJ active
+ AutoDjNotification
+
+
+
+ icon/ic_autodj_32px.svg
+ icon/ic_autodj_32px.svg
+ icon/ic_autodj_32px.svg
+ [AutoDJ],enabled
+
+
+ horizontal
+
+
+
+ horizontal
+
+ [Recording],status
+ visible
+
+
+
+
+
+ 2f,
+
+
+
+
+
+
+ Recording active
+ RecordingNotification
+
+
+
+ icon/ic_recording_0_32px.svg
+ icon/ic_recording_1_32px.svg
+ icon/ic_recording_2_32px.svg
+ icon/ic_recording_3_32px.svg
+ [Recording],toggle_recording
+ [Recording],status
+
+
+
+
+
+ broadcast_enabled
+ LiveBroadcastingNotification
+
+
+
+ icon/ic_broadcast_0_32px.svg
+ icon/ic_broadcast_1_32px.svg
+ icon/ic_broadcast_2_32px.svg
+ icon/ic_broadcast_3_32px.svg
+ [Shoutcast],enabled
+ [Shoutcast],status
+
+
diff --git a/res/skins/Deere/vinylcontrol.xml b/res/skins/Deere/vinylcontrol.xml
index 4462f95a55b..12947e45082 100644
--- a/res/skins/Deere/vinylcontrol.xml
+++ b/res/skins/Deere/vinylcontrol.xml
@@ -1,16 +1,15 @@
-
-
- VinylControlsContainer
- vertical
+
+ horizontal
min,min
-
- [VinylControl],show_vinylcontrol
- visible
-
+
+ VinylControlsContainer
+ vertical
+ min,min
+
vinylcontrol_enabled
VinylToggleButtonUL
@@ -22,17 +21,6 @@
,vinylcontrol_enabled
-
- passthrough_enabled
- VinylToggleButtonLL
-
-
-
- PASS
- PASS
- ,passthrough
-
-
TristateButton
@@ -43,6 +31,24 @@
CONST
,vinylcontrol_mode
+
+
+
+
+ VinylControlsContainer
+ vertical
+ min,min
+
+
+ passthrough_enabled
+ VinylToggleButtonLL
+
+
+
+ PASS
+ PASS
+ ,passthrough
+
VinylCueButton
@@ -52,10 +58,16 @@
CUE
CUE
- HOTCUE
+ HOT
,vinylcontrol_cueing
+
+
+
+ [VinylControl],show_vinylcontrol
+ visible
+
diff --git a/res/skins/Deere/vumeter_master.xml b/res/skins/Deere/vumeter_master.xml
index 0b008e3a81f..9a9be570787 100644
--- a/res/skins/Deere/vumeter_master.xml
+++ b/res/skins/Deere/vumeter_master.xml
@@ -2,84 +2,31 @@
+ MasterVu
vertical
+ 28,90
+ 28,150
+ min,me
- MasterVu2Deck
- vertical
+ master_VuMeter_Group
+ f,me
+ horizontal
-
-
-
- -1,-1me
- -1,15
- vertical
-
-
-
-
- master_VuMeter_Group
- 22min,-1me
- -1,160
- horizontal
-
-
- [Master]
- L
- master_VuMeterL
- master_PeakIndicatorL
-
-
- [Master]
- R
- master_VuMeterR
- master_PeakIndicatorR
-
-
-
-
-
-
- [Master],show_4decks
- visible
-
-
-
-
-
-
-
- MasterVu4Deck
- vertical
-
-
-
- master_VuMeter_Group
- 22min,-1me
- -1,120
- horizontal
-
-
- [Master]
- L
- master_VuMeterL
- master_PeakIndicatorL
-
-
- [Master]
- R
- master_VuMeterR
- master_PeakIndicatorR
-
-
-
-
+
+ [Master]
+ L
+ master_VuMeterL
+ master_PeakIndicatorL
+
+
+ [Master]
+ R
+ master_VuMeterR
+ master_PeakIndicatorR
+
-
- [Master],show_4decks
- visible
-
diff --git a/res/skins/Deere/vumeter_v.xml b/res/skins/Deere/vumeter_v.xml
index d7f954ed99f..dec9ccb5345 100644
--- a/res/skins/Deere/vumeter_v.xml
+++ b/res/skins/Deere/vumeter_v.xml
@@ -12,6 +12,7 @@
vumeter_v
vertical
+ 8f,-1
PeakIndicator
diff --git a/src/skin/tooltips.cpp b/src/skin/tooltips.cpp
index fcc813ed3fd..61f0a4562bf 100644
--- a/src/skin/tooltips.cpp
+++ b/src/skin/tooltips.cpp
@@ -165,6 +165,11 @@ void Tooltips::addStandardTooltips() {
<< tr("Adjusts the master output gain.")
<< QString("%1: %2").arg(rightClick, resetToDefault);
+ add("booth_gain")
+ << tr("Booth Gain")
+ << tr("Adjusts the booth output gain.")
+ << QString("%1: %2").arg(rightClick, resetToDefault);
+
add("crossfader")
<< tr("Crossfader")
<< tr("Determines the master output by fading between the left and right channels.")