Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tango: style Quick Effect selector #4503

Merged
merged 5 commits into from
Dec 11, 2021
Merged

Tango: style Quick Effect selector #4503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
daf9c47
Tango: style quick effect selector
ronso0 Nov 6, 2021
1765882
Tango: fix fx mix mode button
ronso0 Nov 6, 2021
2286790
Tango: remove some unused icons
ronso0 Nov 16, 2021
d1cd681
Tango effect selector: smaller drop-down icon, clean up
ronso0 Nov 30, 2021
7993053
Tango: fix checkmark of effects & AutoDJ mode
ronso0 Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion res/skins/Tango/buttons/btn_arrow_down_black.svg
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions res/skins/Tango/buttons/btn_arrow_down_black_hover.svg
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions res/skins/Tango/buttons/btn_arrow_down_fx.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions res/skins/Tango/buttons/btn_arrow_down_fx_hover.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions res/skins/Tango/buttons/btn_arrow_down_fxquick.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions res/skins/Tango/buttons/btn_arrow_down_fxquick_hover.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion res/skins/Tango/buttons/btn_arrow_left_black.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion res/skins/Tango/buttons/btn_arrow_left_black_hover.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion res/skins/Tango/buttons/btn_arrow_right_black.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion res/skins/Tango/buttons/btn_arrow_right_black_hover.svg
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions res/skins/Tango/buttons/btn_arrow_up_black.svg
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions res/skins/Tango/buttons/btn_arrow_up_black_hover.svg
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion res/skins/Tango/buttons/btn_lib_checkmark_white.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 0 additions & 17 deletions res/skins/Tango/decks/deck_left.xml
View file
Open in desktop
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
Open in desktop
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
63 changes: 36 additions & 27 deletions res/skins/Tango/fx/toggle_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,46 +16,55 @@ Variables:

<WidgetGroup>
<ObjectName>FxToggleSelector</ObjectName>
<Layout>stacked</Layout>
<Layout>horizontal</Layout>
<Size>82f,20f</Size>
<Children>
<!-- invisible, clickable Overlay to toggle Effect -->
<Template src="skin:../Tango/controls/button_2state.xml">
<SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
<SetVariable name="ObjectName">FxToggleButton</SetVariable>
<SetVariable name="Size">69f,20f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,enabled</SetVariable>
</Template>

<WidgetGroup>
<ObjectName>FxNameContainer</ObjectName>
<Size>69f,20f</Size>
<Layout>horizontal</Layout>
<ObjectName>FxToggleSelector</ObjectName>
<Layout>stacked</Layout>
<Size>66f,20f</Size>
<Children>
<WidgetGroup><Size>0me,1min</Size></WidgetGroup>
<EffectName>
<ObjectName>FxName</ObjectName>
<EffectRack><Variable name="FxRack"/></EffectRack>
<EffectUnit><Variable name="FxUnit"/></EffectUnit>
<Effect><Variable name="FxNum"/></Effect>
</EffectName>
<WidgetGroup><Size>0me,1min</Size></WidgetGroup>
<!-- invisible, clickable Overlay to toggle Effect -->
<Template src="skin:../Tango/controls/button_2state.xml">
<SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
<SetVariable name="ObjectName">FxToggleButton</SetVariable>
<SetVariable name="Size">66f,20f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,enabled</SetVariable>
</Template>

<WidgetGroup>
<ObjectName>FxNameContainer</ObjectName>
<Size>66f,20f</Size>
<Layout>horizontal</Layout>
<Children>
<WidgetGroup><Size>0me,1min</Size></WidgetGroup>
<EffectName>
<ObjectName>FxName</ObjectName>
<EffectRack><Variable name="FxRack"/></EffectRack>
<EffectUnit><Variable name="FxUnit"/></EffectUnit>
<Effect><Variable name="FxNum"/></Effect>
</EffectName>
<WidgetGroup><Size>0me,1min</Size></WidgetGroup>
</Children>
</WidgetGroup>

<!-- Colored background to communicate the Effect's ON/OFF status -->
<Template src="skin:../Tango/controls/button_2state.xml">
<SetVariable name="ObjectName">FxToggleButtonUnderlay</SetVariable>
<SetVariable name="Size">66f,20f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,enabled</SetVariable>
</Template>

</Children>
</WidgetGroup>

<!-- Colored background to communicate the Effect's ON/OFF status -->
<Template src="skin:../Tango/controls/button_2state.xml">
<SetVariable name="ObjectName">FxToggleButtonUnderlay</SetVariable>
<SetVariable name="Size">69f,20f</SetVariable>
<SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,enabled</SetVariable>
</Template>

<EffectSelector>
<EffectRack><Variable name="FxRack"/></EffectRack>
<EffectUnit><Variable name="FxUnit"/></EffectUnit>
<Effect><Variable name="FxNum"/></Effect>
<Elide>right</Elide>
<Size>82f,20f</Size>
<Size>16f,20f</Size>
</EffectSelector>

</Children>
Expand Down
2 changes: 1 addition & 1 deletion res/skins/Tango/fx/unit_left_mini.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ Variables:
</Children>
</WidgetGroup>

<Template src="skin:button_2state_persist.xml">
<Template src="skin:../Tango/controls/button_2state_persist.xml">
<SetVariable name="ObjectName">MixModeButton</SetVariable>
<SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
<SetVariable name="Size">30f,18f</SetVariable>
Expand Down
0 res/skins/Tango/eq_button.xml → res/skins/Tango/mixer/eq_button.xml
View file
Open in desktop
File renamed without changes.
57 changes: 14 additions & 43 deletions res/skins/Tango/mixer/eq_knob_left.xml
View file
Open in desktop
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
Open in desktop
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>
Loading