Skip to content

Commit

Permalink
Tango: style quick effect selector
Browse files Browse the repository at this point in the history
  • Loading branch information
@ronso0
ronso0 committed Nov 6, 2021
1 parent 72cb3f2 commit 9b17f93
Show file tree
Hide file tree
Showing 10 changed files with 395 additions and 597 deletions.
17 changes: 0 additions & 17 deletions res/skins/Tango/decks/deck_left.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,23 +110,6 @@ Variables:
<SizePolicy>f,min</SizePolicy>
<Children>
<Template src="skin:../Tango/mixer/mixer_channel_left.xml"/>

<WidgetGroup><!-- QuickEffect selector -->
<Size>0i,22f</Size>
<Layout>vertical</Layout>
<Children>
<EffectChainPresetSelector>
<ObjectName>EffectChainselectorLeft</ObjectName>
<Size>40me,22f</Size>
<EffectUnitGroup>[QuickEffectRack1_<Variable name="group"/>]</EffectUnitGroup>
</EffectChainPresetSelector>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0min,0me</Size></WidgetGroup>
</Children>
<Connection>
Expand Down
16 changes: 0 additions & 16 deletions res/skins/Tango/decks/deck_right.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,22 +146,6 @@ Variables:
<SizePolicy>f,min</SizePolicy>
<Children>
<Template src="skin:../Tango/mixer/mixer_channel_right.xml"/>

<WidgetGroup><!-- QuickEffect selector -->
<Size>0i,22f</Size>
<Layout>vertical</Layout>
<Children>
<EffectChainPresetSelector>
<Size>40me,22f</Size>
<EffectUnitGroup>[QuickEffectRack1_<Variable name="group"/>]</EffectUnitGroup>
</EffectChainPresetSelector>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0min,0me</Size></WidgetGroup>
</Children>
<Connection>
Expand Down
0 res/skins/Tango/eq_button.xml → res/skins/Tango/mixer/eq_button.xml
View file
File renamed without changes.
57 changes: 14 additions & 43 deletions res/skins/Tango/mixer/eq_knob_left.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,20 @@ Variables:

<WidgetGroup>
<ObjectName>EQKnobContainerLeft</ObjectName>
<SizePolicy>min,min</SizePolicy>
<SizePolicy>max,min</SizePolicy>
<Layout>vertical</Layout>
<Children>

<!-- Spacer when no EQ plugin is loaded -->
<WidgetGroup>
<Size>0min,26min</Size>
<Connection>
<ConfigKey><Variable name="FxUnit_FxNum"/>,loaded</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup><!-- EQ knob + Kill button -->
<SizePolicy>max,min</SizePolicy>
<Layout>horizontal</Layout>
Expand All @@ -28,9 +38,9 @@ Variables:
<SizePolicy>min,min</SizePolicy>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:eq_button.xml">
<Template src="skin:../Tango/mixer/eq_button.xml">
<SetVariable name="ObjectName">EQKillButton</SetVariable>
<SetVariable name="Size">12f,30f</SetVariable>
<SetVariable name="Size">12f,26f</SetVariable>
</Template>
</Children>
<Connection>
Expand Down Expand Up @@ -59,7 +69,7 @@ Variables:
</Connection>
</EffectParameterKnobComposed>

<Template src="skin:eq_button.xml">
<Template src="skin:../Tango/mixer/eq_button.xml">
<SetVariable name="ObjectName">EQKilledUnderlay</SetVariable>
<SetVariable name="Size">30f,26f</SetVariable>
</Template>
Expand All @@ -73,45 +83,6 @@ Variables:
</Connection>
</WidgetGroup><!-- /EQ knob + Kill button -->

<WidgetGroup><!-- Spacer when no EQ plugin is loaded -->
<Size>0min,26min</Size>
<Connection>
<ConfigKey><Variable name="FxUnit_FxNum"/>,loaded</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup><!-- /Spacer -->

<!-- One of those 4px spacers in between EQ knobs appears if
a) EQ Kill buttons are enabled or
b) EQ Kill buttons are hidden and no QuickEffect is loaded
This allows a narrow knob column. -->
<WidgetGroup>
<Size>0min,4f</Size>
<Connection>
<ConfigKey persist="true">[Skin],show_eq_kill_buttons</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup>
<Layout>horizontal</Layout>
<Children>
<WidgetGroup>
<Size>0min,4f</Size>
<Connection>
<ConfigKey persist="true"><Variable name="QuickFx"/>,loaded</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_eq_kill_buttons</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
</WidgetGroup>
</Template>
56 changes: 13 additions & 43 deletions res/skins/Tango/mixer/eq_knob_right.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ Variables:
<Layout>vertical</Layout>
<Children>

<!-- Spacer when no EQ plugin is loaded -->
<WidgetGroup>
<Size>0min,26min</Size>
<Connection>
<ConfigKey><Variable name="FxUnit_FxNum"/>,loaded</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup><!-- EQ knob + Kill button -->
<SizePolicy>max,min</SizePolicy>
<Layout>horizontal</Layout>
Expand All @@ -44,7 +54,7 @@ Variables:
</Connection>
</EffectParameterKnobComposed>

<Template src="skin:eq_button.xml">
<Template src="skin:../Tango/mixer/eq_button.xml">
<SetVariable name="ObjectName">EQKilledUnderlay</SetVariable>
<SetVariable name="Size">30f,26f</SetVariable>
</Template>
Expand All @@ -56,9 +66,9 @@ Variables:
<SizePolicy>min,min</SizePolicy>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:eq_button.xml">
<Template src="skin:../Tango/mixer/eq_button.xml">
<SetVariable name="ObjectName">EQKillButton</SetVariable>
<SetVariable name="Size">12f,30f</SetVariable>
<SetVariable name="Size">12f,26f</SetVariable>
</Template>
</Children>
<Connection>
Expand All @@ -74,46 +84,6 @@ Variables:
</Connection>
</WidgetGroup><!-- /EQ knob + Kill button -->

<WidgetGroup><!-- Spacer when no EQ plugin is loaded -->
<Size>0min,26min</Size>
<Connection>
<ConfigKey><Variable name="FxUnit_FxNum"/>,loaded</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup><!-- /Spacer -->

<!-- One of those 4px spacers in between EQ knobs appears if
a) EQ Kill buttons are enabled or
b) EQ Kill buttons are hidden and no QuickEffect is loaded
This allows a narrow knob column. -->
<WidgetGroup>
<Size>0min,4f</Size>
<Connection>
<ConfigKey persist="true">[Skin],show_eq_kill_buttons</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup>
<Layout>horizontal</Layout>
<Children>
<WidgetGroup>
<Size>0min,4f</Size>
<Connection>
<ConfigKey persist="true"><Variable name="QuickFx"/>,loaded</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_eq_kill_buttons</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

</Children>
</WidgetGroup>
</Template>
142 changes: 79 additions & 63 deletions res/skins/Tango/mixer/mixer_channel_left.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,83 +14,98 @@ Variables:
<WidgetGroup>
<ObjectName>MixerChannelLeft</ObjectName>
<Layout>horizontal</Layout>
<Size>-1min,136f</Size>
<Size>-1max,136f</Size>
<Children>
<WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>

<WidgetGroup><Size>2f,1min</Size></WidgetGroup>

<WidgetGroup><!-- EQ + QuickEffect knobs/buttons -->
<!-- EQ + QuickEffect | Vol + gain __ QuickEffect selector -->
<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>max,min</SizePolicy>
<Children>
<WidgetGroup><Size>1min,4f</Size></WidgetGroup>
<Template src="skin:../Tango/mixer/eq_knob_left.xml"><!-- High EQ -->
<SetVariable name="FxParameter">3</SetVariable>
</Template>
<Template src="skin:../Tango/mixer/eq_knob_left.xml"><!-- Mid EQ -->
<SetVariable name="FxParameter">2</SetVariable>
</Template>
<Template src="skin:../Tango/mixer/eq_knob_left.xml"><!-- Low EQ -->
<SetVariable name="FxParameter">1</SetVariable>
</Template>
<Template src="skin:../Tango/mixer/quick_fx_knob_left.xml"/><!-- Quick Effect -->
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup><!-- /EQ + QuickEffect knobs/buttons -->

<WidgetGroup><!-- Spacer when EQ plugin is loaded & Kill buttons are shown -->
<SizePolicy>min,min</SizePolicy>
<Layout>vertical</Layout>
<Children>
<WidgetGroup>
<Size>4f,0min</Size>
<WidgetGroup><!-- EQ + QuickEffect | Vol + gain -->
<Layout>horizontal</Layout>
<SizePolicy>max,me</SizePolicy>
<Children>

<WidgetGroup><!-- EQ + QuickEffect knobs/buttons -->
<Layout>vertical</Layout>
<SizePolicy>max,min</SizePolicy>
<Children>
<WidgetGroup><Size>1min,4f</Size></WidgetGroup>
<Template src="skin:../Tango/mixer/eq_knob_left.xml"><!-- High EQ -->
<SetVariable name="FxParameter">3</SetVariable>
</Template>
<Template src="skin:../Tango/mixer/eq_knob_left.xml"><!-- Mid EQ -->
<SetVariable name="FxParameter">2</SetVariable>
</Template>
<Template src="skin:../Tango/mixer/eq_knob_left.xml"><!-- Low EQ -->
<SetVariable name="FxParameter">1</SetVariable>
</Template>
<Template src="skin:../Tango/mixer/quick_fx_knob_left.xml"/><!-- Quick Effect -->
</Children>
<Connection>
<ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup><!-- /EQ + QuickEffect knobs/buttons -->

<WidgetGroup><!-- Volume Slider + Gain knob -->
<ObjectName>VolumeSliderGain</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>f,me</SizePolicy>
<Children>
<SliderComposed><!-- Volume slider -->
<Size>34f,89min</Size>
<ObjectName>VolumeSlider</ObjectName>
<TooltipId>channel_volume</TooltipId>
<Slider scalemode="STRETCH">skin:../Tango/knobs_sliders/volume_scale.svg</Slider>
<Handle scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/volume_handle.svg</Handle>
<Horizontal>false</Horizontal>
<Connection>
<ConfigKey><Variable name="group"/>,volume</ConfigKey>
</Connection>
</SliderComposed><!-- /Volume slider -->

<!-- Gain knob, centered below Volume slider -->
<Template src="skin:../Tango/controls/knob_textless.xml">
<SetVariable name="ObjectName">GainKnob</SetVariable>
<SetVariable name="TooltipId">pregain</SetVariable>
<SetVariable name="Size">34f,30f</SetVariable>
<SetVariable name="Color">yellow</SetVariable>
<SetVariable name="group"><Variable name="group"/></SetVariable>
<SetVariable name="ConfigKey">pregain</SetVariable>
</Template>

</Children>
</WidgetGroup><!-- /Volume Slider + Gain knob -->

</Children>
</WidgetGroup><!-- EQ + QuickEffect | Vol + gain -->

<WidgetGroup><!-- QuickEffect selector -->
<SizePolicy>i,f</SizePolicy>
<MinimumSize>,18</MinimumSize>
<MaximumSize>,18</MaximumSize>
<Layout>vertical</Layout>
<Children>
<EffectChainPresetSelector>
<ObjectName>QuickEffectSelectorLeft</ObjectName>
<Size>40min,18f</Size>
<EffectUnitGroup>[QuickEffectRack1_<Variable name="group"/>]</EffectUnitGroup>
</EffectChainPresetSelector>
</Children>
<Connection>
<ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
<ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
<Connection>
<ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,loaded</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup><!-- Volume Slider + Gain knob -->
<ObjectName>VolumeSliderGain</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>f,min</SizePolicy>
<Children>
<SliderComposed><!-- Volume slider -->
<Size>34f,103f</Size>
<ObjectName>VolumeSlider</ObjectName>
<TooltipId>channel_volume</TooltipId>
<Slider scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/volume_scale.svg</Slider>
<Handle scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/volume_handle.svg</Handle>
<Horizontal>false</Horizontal>
<Connection>
<ConfigKey><Variable name="group"/>,volume</ConfigKey>
</Connection>
</SliderComposed><!-- /Volume slider -->

<WidgetGroup><Size>1min,0me</Size></WidgetGroup>

<!-- Gain knob, centered below Volume slider -->
<Template src="skin:../Tango/controls/knob_textless.xml">
<SetVariable name="ObjectName">GainKnob</SetVariable>
<SetVariable name="TooltipId">pregain</SetVariable>
<SetVariable name="Size">34f,30f</SetVariable>
<SetVariable name="Color">yellow</SetVariable>
<SetVariable name="group"><Variable name="group"/></SetVariable>
<SetVariable name="ConfigKey">pregain</SetVariable>
</Template>

</Children>
</WidgetGroup><!-- /Volume Slider + Gain knob -->
</WidgetGroup><!-- EQ + QuickEffect | Vol + gain __ QuickEffect selector -->


<WidgetGroup><!-- VU Meter + Pfl button -->
<ObjectName>AlignCenter</ObjectName>
Expand Down Expand Up @@ -119,6 +134,7 @@ Variables:
</WidgetGroup><!-- /Pfl button, isolated with a 'gap' -->
</Children>
</WidgetGroup><!-- /VU Meter + Pfl button -->

</Children>
</WidgetGroup>
</Template>
Loading

0 comments on commit 9b17f93

Please sign in to comment.