Skip to content

Commit 77c3137

Browse files
author
Milkii Brewster
committed
Deere: add per-channel mute buttons
adds mute button for channel muting: - 2-deck layout: positioned at top outside of mixer strip, allows longer faders - 4-deck layout: positioned inline next to gain knob button uses existing EQKillButton styling and is controlled by show_eq_kill_buttons setting. uses [Channel],mute control for channel muting. closes #15623
1 parent 604b32c commit 77c3137

4 files changed

Lines changed: 192 additions & 6 deletions

File tree

‎res/skins/Deere/mixer_controls_2decks_left.xml‎

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,73 @@
1010
<Layout>horizontal</Layout>
1111
<SizePolicy>min,min</SizePolicy>
1212
<Children>
13+
<!-- mute button column on outside -->
14+
<WidgetGroup>
15+
<Layout>vertical</Layout>
16+
<Size>15f,-1me</Size>
17+
<SizePolicy>f,me</SizePolicy>
18+
<Children>
19+
<WidgetGroup><Size>0min,34min</Size></WidgetGroup>
20+
<PushButton>
21+
<TooltipId>mute</TooltipId>
22+
<Size>15f,20f</Size>
23+
<ObjectName>EQKillButton</ObjectName>
24+
<NumberStates>2</NumberStates>
25+
<State>
26+
<Number>0</Number>
27+
</State>
28+
<State>
29+
<Number>1</Number>
30+
</State>
31+
<Connection>
32+
<ConfigKey><Variable name="group"/>,mute</ConfigKey>
33+
<ButtonState>LeftButton</ButtonState>
34+
</Connection>
35+
<Connection>
36+
<ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
37+
<BindProperty>visible</BindProperty>
38+
</Connection>
39+
</PushButton>
40+
</Children>
41+
</WidgetGroup>
1342
<Template src="skin:mixer_column_eq_left.xml"/>
14-
<Template src="skin:mixer_column_volume_gain.xml"/>
43+
<WidgetGroup>
44+
<ObjectName>DeckMixer_Column2</ObjectName>
45+
<Layout>vertical</Layout>
46+
<SizePolicy>max,me</SizePolicy>
47+
<Children>
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+
<SliderComposed>
62+
<TooltipId>channel_volume</TooltipId>
63+
<SizePolicy>min,me</SizePolicy>
64+
<MinimumSize>40,50</MinimumSize>
65+
<MaximumSize>40,150</MaximumSize>
66+
<Slider scalemode="STRETCH">slider-vertical.svg</Slider>
67+
<Handle scalemode="STRETCH_ASPECT">handle-volume-deck<Variable name="i"/>.svg</Handle>
68+
<Horizontal>false</Horizontal>
69+
<Connection>
70+
<ConfigKey><Variable name="group"/>,volume</ConfigKey>
71+
<EmitOnDownPress>false</EmitOnDownPress>
72+
</Connection>
73+
</SliderComposed>
74+
</Children>
75+
<Connection>
76+
<ConfigKey>[Skin],show_faders</ConfigKey>
77+
<BindProperty>visible</BindProperty>
78+
</Connection>
79+
</WidgetGroup>
1580
<Template src="skin:mixer_column_pfl_levels.xml"/>
1681
</Children>
1782
</WidgetGroup>

‎res/skins/Deere/mixer_controls_2decks_right.xml‎

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,73 @@
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+
<WidgetGroup>
15+
<ObjectName>DeckMixer_Column2</ObjectName>
16+
<Layout>vertical</Layout>
17+
<SizePolicy>max,me</SizePolicy>
18+
<Children>
19+
<WidgetGroup>
20+
<Layout>vertical</Layout>
21+
<Size>40f,-1</Size>
22+
<MinimumSize>40,34</MinimumSize>
23+
<MaximumSize>40,46</MaximumSize>
24+
<Children>
25+
<Template src="skin:knob.xml">
26+
<SetVariable name="TooltipId">pregain</SetVariable>
27+
<SetVariable name="control">pregain</SetVariable>
28+
<SetVariable name="color">green</SetVariable>
29+
</Template>
30+
</Children>
31+
</WidgetGroup>
32+
<SliderComposed>
33+
<TooltipId>channel_volume</TooltipId>
34+
<SizePolicy>min,me</SizePolicy>
35+
<MinimumSize>40,50</MinimumSize>
36+
<MaximumSize>40,150</MaximumSize>
37+
<Slider scalemode="STRETCH">slider-vertical.svg</Slider>
38+
<Handle scalemode="STRETCH_ASPECT">handle-volume-deck<Variable name="i"/>.svg</Handle>
39+
<Horizontal>false</Horizontal>
40+
<Connection>
41+
<ConfigKey><Variable name="group"/>,volume</ConfigKey>
42+
<EmitOnDownPress>false</EmitOnDownPress>
43+
</Connection>
44+
</SliderComposed>
45+
</Children>
46+
<Connection>
47+
<ConfigKey>[Skin],show_faders</ConfigKey>
48+
<BindProperty>visible</BindProperty>
49+
</Connection>
50+
</WidgetGroup>
1551
<Template src="skin:mixer_column_eq_right.xml"/>
52+
<!-- mute button column on outside -->
53+
<WidgetGroup>
54+
<Layout>vertical</Layout>
55+
<Size>15f,-1me</Size>
56+
<SizePolicy>f,me</SizePolicy>
57+
<Children>
58+
<WidgetGroup><Size>0min,34min</Size></WidgetGroup>
59+
<PushButton>
60+
<TooltipId>mute</TooltipId>
61+
<Size>15f,20f</Size>
62+
<ObjectName>EQKillButton</ObjectName>
63+
<NumberStates>2</NumberStates>
64+
<State>
65+
<Number>0</Number>
66+
</State>
67+
<State>
68+
<Number>1</Number>
69+
</State>
70+
<Connection>
71+
<ConfigKey><Variable name="group"/>,mute</ConfigKey>
72+
<ButtonState>LeftButton</ButtonState>
73+
</Connection>
74+
<Connection>
75+
<ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
76+
<BindProperty>visible</BindProperty>
77+
</Connection>
78+
</PushButton>
79+
</Children>
80+
</WidgetGroup>
1681
</Children>
1782
</WidgetGroup>
1883
</Template>

‎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

0 commit comments

Comments
 (0)