Skip to content

Commit a3f9e12

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 a3f9e12

File tree

4 files changed

+137
-12
lines changed

4 files changed

+137
-12
lines changed

‎res/skins/Deere/mixer_controls_2decks_left.xml‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,46 @@
77
<SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
88
<WidgetGroup>
99
<ObjectName>DeckMixer</ObjectName>
10-
<Layout>horizontal</Layout>
10+
<Layout>vertical</Layout>
1111
<SizePolicy>min,min</SizePolicy>
1212
<Children>
13-
<Template src="skin:mixer_column_eq_left.xml"/>
14-
<Template src="skin:mixer_column_volume_gain.xml"/>
15-
<Template src="skin:mixer_column_pfl_levels.xml"/>
13+
<!-- mute button at top left -->
14+
<WidgetGroup>
15+
<Layout>horizontal</Layout>
16+
<SizePolicy>min,min</SizePolicy>
17+
<Children>
18+
<PushButton>
19+
<TooltipId>mute</TooltipId>
20+
<Size>15f,20f</Size>
21+
<ObjectName>EQKillButton</ObjectName>
22+
<NumberStates>2</NumberStates>
23+
<State>
24+
<Number>0</Number>
25+
</State>
26+
<State>
27+
<Number>1</Number>
28+
</State>
29+
<Connection>
30+
<ConfigKey><Variable name="group"/>,mute</ConfigKey>
31+
<ButtonState>LeftButton</ButtonState>
32+
</Connection>
33+
<Connection>
34+
<ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
35+
<BindProperty>visible</BindProperty>
36+
</Connection>
37+
</PushButton>
38+
</Children>
39+
</WidgetGroup>
40+
<!-- main mixer columns -->
41+
<WidgetGroup>
42+
<Layout>horizontal</Layout>
43+
<SizePolicy>min,min</SizePolicy>
44+
<Children>
45+
<Template src="skin:mixer_column_eq_left.xml"/>
46+
<Template src="skin:mixer_column_volume_gain.xml"/>
47+
<Template src="skin:mixer_column_pfl_levels.xml"/>
48+
</Children>
49+
</WidgetGroup>
1650
</Children>
1751
</WidgetGroup>
1852
</Template>

‎res/skins/Deere/mixer_controls_2decks_right.xml‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,47 @@
77
<SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
88
<WidgetGroup>
99
<ObjectName>DeckMixer</ObjectName>
10-
<Layout>horizontal</Layout>
10+
<Layout>vertical</Layout>
1111
<SizePolicy>min,min</SizePolicy>
1212
<Children>
13-
<Template src="skin:mixer_column_pfl_levels.xml"/>
14-
<Template src="skin:mixer_column_volume_gain.xml"/>
15-
<Template src="skin:mixer_column_eq_right.xml"/>
13+
<!-- mute button at top right -->
14+
<WidgetGroup>
15+
<Layout>horizontal</Layout>
16+
<SizePolicy>min,min</SizePolicy>
17+
<Children>
18+
<WidgetGroup><Size>0me,1min</Size></WidgetGroup>
19+
<PushButton>
20+
<TooltipId>mute</TooltipId>
21+
<Size>15f,20f</Size>
22+
<ObjectName>EQKillButton</ObjectName>
23+
<NumberStates>2</NumberStates>
24+
<State>
25+
<Number>0</Number>
26+
</State>
27+
<State>
28+
<Number>1</Number>
29+
</State>
30+
<Connection>
31+
<ConfigKey><Variable name="group"/>,mute</ConfigKey>
32+
<ButtonState>LeftButton</ButtonState>
33+
</Connection>
34+
<Connection>
35+
<ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
36+
<BindProperty>visible</BindProperty>
37+
</Connection>
38+
</PushButton>
39+
</Children>
40+
</WidgetGroup>
41+
<!-- main mixer columns -->
42+
<WidgetGroup>
43+
<Layout>horizontal</Layout>
44+
<SizePolicy>min,min</SizePolicy>
45+
<Children>
46+
<Template src="skin:mixer_column_pfl_levels.xml"/>
47+
<Template src="skin:mixer_column_volume_gain.xml"/>
48+
<Template src="skin:mixer_column_eq_right.xml"/>
49+
</Children>
50+
</WidgetGroup>
1651
</Children>
1752
</WidgetGroup>
1853
</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)