Skip to content

Commit b2034e7

Browse files
author
Milkii Brewster
committed
Deere: add per-channel mute buttons
Add mute buttons next to gain knobs in all mixer layouts. Buttons use existing EQKillButton styling and show_eq_kill_buttons setting. 2-deck layout: mute button on outside edge of gain knob, above fader. 4-deck layout: mute button next to gain knob with conditional spacers. Extend channel and main VU meters to full mixer height. Remove crossfader orientation buttons from PFL column. Center align faders horizontally and crossfader buttons vertically. Reduce effect selector font from 15px to 14px.
1 parent 8864c3c commit b2034e7

8 files changed

Lines changed: 217 additions & 47 deletions

‎res/skins/Deere/mixer.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
<Layout>vertical</Layout>
131131
<Children>
132132
<WidgetGroup>
133-
<Size>0min,2f</Size>
133+
<Size>0min,1me</Size>
134134
<Connection>
135135
<ConfigKey>[Deere],xfader_buttons_fit</ConfigKey>
136136
<BindProperty>visible</BindProperty>
@@ -151,7 +151,7 @@
151151
</Connection>
152152
</WidgetGroup>
153153
<WidgetGroup>
154-
<Size>0min,0e</Size>
154+
<Size>0min,1me</Size>
155155
<Connection>
156156
<ConfigKey>[Deere],xfader_buttons_fit</ConfigKey>
157157
<BindProperty>visible</BindProperty>
@@ -195,7 +195,7 @@
195195
<Layout>vertical</Layout>
196196
<Children>
197197
<WidgetGroup>
198-
<Size>0min,2f</Size>
198+
<Size>0min,1me</Size>
199199
<Connection>
200200
<ConfigKey>[Deere],xfader_buttons_fit</ConfigKey>
201201
<BindProperty>visible</BindProperty>
@@ -216,7 +216,7 @@
216216
</Connection>
217217
</WidgetGroup>
218218
<WidgetGroup>
219-
<Size>0min,0e</Size>
219+
<Size>0min,1me</Size>
220220
<Connection>
221221
<ConfigKey>[Deere],xfader_buttons_fit</ConfigKey>
222222
<BindProperty>visible</BindProperty>

‎res/skins/Deere/mixer_column_main_vu_2decks.xml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,6 @@
66
<SizePolicy>me,me</SizePolicy>
77
<Children>
88

9-
<!-- 2 Decks: Spacer sized like channel Gain knob -->
10-
<WidgetGroup>
11-
<Size>0min,28f</Size>
12-
<Connection>
13-
<ConfigKey>[Skin],large_vu</ConfigKey>
14-
<Transform><Not/></Transform>
15-
<BindProperty>visible</BindProperty>
16-
</Connection>
17-
</WidgetGroup>
18-
199
<WidgetGroup>
2010
<Layout>horizontal</Layout>
2111
<SizePolicy>me,me</SizePolicy>

‎res/skins/Deere/mixer_column_pfl_levels.xml‎

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
88
<WidgetGroup>
99
<Layout>vertical</Layout>
10-
<Size>30f,-1me</Size>
10+
<SizePolicy>min,me</SizePolicy>
1111
<Children>
1212

1313
<WidgetGroup>
@@ -33,13 +33,14 @@
3333

3434
<WidgetGroup>
3535
<ObjectName>Channel_VU_Container</ObjectName>
36-
<Size>22me,50me</Size>
36+
<SizePolicy>min,me</SizePolicy>
3737
<Layout>horizontal</Layout>
3838
<Children>
3939
<WidgetGroup>
4040
<ObjectName>channel_VuMeter_Group</ObjectName>
4141
<Layout>horizontal</Layout>
42-
<MaximumSize>22,150</MaximumSize>
42+
<SizePolicy>min,me</SizePolicy>
43+
<MinimumSize>22,50</MinimumSize>
4344
<Children>
4445
<Template src="skin:vumeter_v.xml">
4546
<SetVariable name="group"><Variable name="group"/></SetVariable>
@@ -58,29 +59,6 @@
5859
</Children>
5960
</WidgetGroup>
6061

61-
<WidgetGroup>
62-
<Layout>vertical</Layout>
63-
<Children>
64-
<WidgetGroup>
65-
<Layout>vertical</Layout>
66-
<Size>28f,28min</Size>
67-
<Children>
68-
<Template src="skin:crossfader_orientation_button.xml">
69-
<SetVariable name="Unit">Deck<Variable name="i"/></SetVariable>
70-
</Template>
71-
</Children>
72-
<Connection>
73-
<ConfigKey>[Deere],xfader_buttons_fit</ConfigKey>
74-
<Transform><Not/></Transform>
75-
<BindProperty>visible</BindProperty>
76-
</Connection>
77-
</WidgetGroup>
78-
</Children>
79-
<Connection>
80-
<ConfigKey>[Skin],show_xfader</ConfigKey>
81-
<BindProperty>visible</BindProperty>
82-
</Connection>
83-
</WidgetGroup>
8462
</Children>
8563
</WidgetGroup>
8664
</Template>

‎res/skins/Deere/mixer_controls_2decks_left.xml‎

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,80 @@
1111
<SizePolicy>min,min</SizePolicy>
1212
<Children>
1313
<Template src="skin:mixer_column_eq_left.xml"/>
14-
<Template src="skin:mixer_column_volume_gain.xml"/>
14+
15+
<!-- Fader column with gain/mute above -->
16+
<WidgetGroup>
17+
<ObjectName>DeckMixer_Column2</ObjectName>
18+
<Layout>vertical</Layout>
19+
<SizePolicy>max,me</SizePolicy>
20+
<Children>
21+
<!-- Gain knob and mute button above fader -->
22+
<WidgetGroup>
23+
<Layout>horizontal</Layout>
24+
<SizePolicy>me,min</SizePolicy>
25+
<Children>
26+
<!-- mute button on outside edge (left) -->
27+
<PushButton>
28+
<TooltipId>mute</TooltipId>
29+
<Size>15f,20f</Size>
30+
<ObjectName>EQKillButton</ObjectName>
31+
<NumberStates>2</NumberStates>
32+
<State>
33+
<Number>0</Number>
34+
</State>
35+
<State>
36+
<Number>1</Number>
37+
</State>
38+
<Connection>
39+
<ConfigKey><Variable name="group"/>,mute</ConfigKey>
40+
<ButtonState>LeftButton</ButtonState>
41+
</Connection>
42+
<Connection>
43+
<ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
44+
<BindProperty>visible</BindProperty>
45+
</Connection>
46+
</PushButton>
47+
<!-- Gain knob on inside -->
48+
<WidgetGroup>
49+
<Layout>vertical</Layout>
50+
<Size>40f,-1</Size>
51+
<MinimumSize>40,34</MinimumSize>
52+
<MaximumSize>40,46</MaximumSize>
53+
<Children>
54+
<Template src="skin:knob.xml">
55+
<SetVariable name="TooltipId">pregain</SetVariable>
56+
<SetVariable name="control">pregain</SetVariable>
57+
<SetVariable name="color">green</SetVariable>
58+
</Template>
59+
</Children>
60+
</WidgetGroup>
61+
</Children>
62+
</WidgetGroup>
63+
64+
<WidgetGroup><Size>0min,2f</Size></WidgetGroup>
65+
66+
<SliderComposed>
67+
<TooltipId>channel_volume</TooltipId>
68+
<SizePolicy>me,me</SizePolicy>
69+
<MinimumSize>40,50</MinimumSize>
70+
<MaximumSize>40,150</MaximumSize>
71+
<Slider scalemode="STRETCH">slider-vertical.svg</Slider>
72+
<Handle scalemode="STRETCH_ASPECT">handle-volume-deck<Variable name="i"/>.svg</Handle>
73+
<Horizontal>false</Horizontal>
74+
<Connection>
75+
<ConfigKey><Variable name="group"/>,volume</ConfigKey>
76+
<EmitOnDownPress>false</EmitOnDownPress>
77+
</Connection>
78+
</SliderComposed>
79+
80+
<WidgetGroup><Size>0min,5f</Size></WidgetGroup>
81+
</Children>
82+
<Connection>
83+
<ConfigKey>[Skin],show_faders</ConfigKey>
84+
<BindProperty>visible</BindProperty>
85+
</Connection>
86+
</WidgetGroup>
87+
1588
<Template src="skin:mixer_column_pfl_levels.xml"/>
1689
</Children>
1790
</WidgetGroup>

‎res/skins/Deere/mixer_controls_2decks_right.xml‎

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,80 @@
1111
<SizePolicy>min,min</SizePolicy>
1212
<Children>
1313
<Template src="skin:mixer_column_pfl_levels.xml"/>
14-
<Template src="skin:mixer_column_volume_gain.xml"/>
14+
15+
<!-- Fader column with gain/mute above -->
16+
<WidgetGroup>
17+
<ObjectName>DeckMixer_Column2</ObjectName>
18+
<Layout>vertical</Layout>
19+
<SizePolicy>max,me</SizePolicy>
20+
<Children>
21+
<!-- Gain knob and mute button above fader -->
22+
<WidgetGroup>
23+
<Layout>horizontal</Layout>
24+
<SizePolicy>me,min</SizePolicy>
25+
<Children>
26+
<!-- Gain knob on inside -->
27+
<WidgetGroup>
28+
<Layout>vertical</Layout>
29+
<Size>40f,-1</Size>
30+
<MinimumSize>40,34</MinimumSize>
31+
<MaximumSize>40,46</MaximumSize>
32+
<Children>
33+
<Template src="skin:knob.xml">
34+
<SetVariable name="TooltipId">pregain</SetVariable>
35+
<SetVariable name="control">pregain</SetVariable>
36+
<SetVariable name="color">green</SetVariable>
37+
</Template>
38+
</Children>
39+
</WidgetGroup>
40+
<!-- mute button on outside edge (right) -->
41+
<PushButton>
42+
<TooltipId>mute</TooltipId>
43+
<Size>15f,20f</Size>
44+
<ObjectName>EQKillButton</ObjectName>
45+
<NumberStates>2</NumberStates>
46+
<State>
47+
<Number>0</Number>
48+
</State>
49+
<State>
50+
<Number>1</Number>
51+
</State>
52+
<Connection>
53+
<ConfigKey><Variable name="group"/>,mute</ConfigKey>
54+
<ButtonState>LeftButton</ButtonState>
55+
</Connection>
56+
<Connection>
57+
<ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
58+
<BindProperty>visible</BindProperty>
59+
</Connection>
60+
</PushButton>
61+
</Children>
62+
</WidgetGroup>
63+
64+
<WidgetGroup><Size>0min,2f</Size></WidgetGroup>
65+
66+
<SliderComposed>
67+
<TooltipId>channel_volume</TooltipId>
68+
<SizePolicy>me,me</SizePolicy>
69+
<MinimumSize>40,50</MinimumSize>
70+
<MaximumSize>40,150</MaximumSize>
71+
<Slider scalemode="STRETCH">slider-vertical.svg</Slider>
72+
<Handle scalemode="STRETCH_ASPECT">handle-volume-deck<Variable name="i"/>.svg</Handle>
73+
<Horizontal>false</Horizontal>
74+
<Connection>
75+
<ConfigKey><Variable name="group"/>,volume</ConfigKey>
76+
<EmitOnDownPress>false</EmitOnDownPress>
77+
</Connection>
78+
</SliderComposed>
79+
80+
<WidgetGroup><Size>0min,5f</Size></WidgetGroup>
81+
</Children>
82+
<Connection>
83+
<ConfigKey>[Skin],show_faders</ConfigKey>
84+
<BindProperty>visible</BindProperty>
85+
</Connection>
86+
</WidgetGroup>
87+
1588
<Template src="skin:mixer_column_eq_right.xml"/>
1689
</Children>
1790
</WidgetGroup>

‎res/skins/Deere/mixer_controls_4decks_left.xml‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,36 @@
8787
<Layout>horizontal</Layout>
8888
<SizePolicy>me,min</SizePolicy>
8989
<Children>
90-
<!-- Expanding spacer to push EQ knob to right side -->
91-
<WidgetGroup><Size>0me,1min</Size></WidgetGroup>
90+
<!-- mute button for gain stage -->
91+
<PushButton>
92+
<TooltipId>mute</TooltipId>
93+
<Size>15f,20f</Size>
94+
<ObjectName>EQKillButton</ObjectName>
95+
<NumberStates>2</NumberStates>
96+
<State>
97+
<Number>0</Number>
98+
</State>
99+
<State>
100+
<Number>1</Number>
101+
</State>
102+
<Connection>
103+
<ConfigKey><Variable name="group"/>,mute</ConfigKey>
104+
<ButtonState>LeftButton</ButtonState>
105+
</Connection>
106+
<Connection>
107+
<ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
108+
<BindProperty>visible</BindProperty>
109+
</Connection>
110+
</PushButton>
111+
<!-- expanding spacer to push gain knob to right side when kill buttons hidden -->
112+
<WidgetGroup>
113+
<Size>0me,1min</Size>
114+
<Connection>
115+
<ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
116+
<Transform><Not/></Transform>
117+
<BindProperty>visible</BindProperty>
118+
</Connection>
119+
</WidgetGroup>
92120
<Template src="skin:knob.xml">
93121
<SetVariable name="TooltipId">pregain</SetVariable>
94122
<SetVariable name="control">pregain</SetVariable>

‎res/skins/Deere/mixer_controls_4decks_right.xml‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,36 @@
9292
<SetVariable name="control">pregain</SetVariable>
9393
<SetVariable name="color">green</SetVariable>
9494
</Template>
95-
<!-- Expanding spacer to push EQ knob to left side -->
96-
<WidgetGroup><Size>0me,1min</Size></WidgetGroup>
95+
<!-- mute button for gain stage -->
96+
<PushButton>
97+
<TooltipId>mute</TooltipId>
98+
<Size>15f,20f</Size>
99+
<ObjectName>EQKillButton</ObjectName>
100+
<NumberStates>2</NumberStates>
101+
<State>
102+
<Number>0</Number>
103+
</State>
104+
<State>
105+
<Number>1</Number>
106+
</State>
107+
<Connection>
108+
<ConfigKey><Variable name="group"/>,mute</ConfigKey>
109+
<ButtonState>LeftButton</ButtonState>
110+
</Connection>
111+
<Connection>
112+
<ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
113+
<BindProperty>visible</BindProperty>
114+
</Connection>
115+
</PushButton>
116+
<!-- expanding spacer to push gain knob to left side when kill buttons hidden -->
117+
<WidgetGroup>
118+
<Size>0me,1min</Size>
119+
<Connection>
120+
<ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
121+
<Transform><Not/></Transform>
122+
<BindProperty>visible</BindProperty>
123+
</Connection>
124+
</WidgetGroup>
97125
</Children>
98126
</WidgetGroup>
99127

‎res/skins/Deere/style.qss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2240,7 +2240,7 @@ WEffectChainPresetSelector:!editable,
22402240
}
22412241
WEffectSelector:!editable,
22422242
#fadeModeCombobox:!editable {
2243-
font: 15px;
2243+
font: 14px;
22442244
}
22452245
WEffectChainPresetSelector:!editable {
22462246
font: 13px;

0 commit comments

Comments
 (0)