Skip to content

Commit

Permalink
Tango: remove Passthrough hint from VC toggle & Play button
Browse files Browse the repository at this point in the history
  • Loading branch information
@ronso0
ronso0 committed Apr 15, 2020
1 parent 6a81b54 commit eea31b5
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 143 deletions.
46 changes: 6 additions & 40 deletions res/skins/Tango/deck_row_overview_left.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,46 +33,12 @@ Variables:

<Template src="skin:vinyl_controls_left.xml"/>

<WidgetGroup><!-- Vinyl Controls toggles -->
<Size>15f,50f</Size>
<Layout>vertical</Layout>
<Children>
<WidgetGroup><!-- Vinyl Controls toggle with passthrough -->
<Size>15f,50f</Size>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:button_2state.xml">
<SetVariable name="ObjectName">VinylTogglerLeftPassthrough</SetVariable>
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="Size">15f,50f</SetVariable>
<SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup><!-- Vinyl Controls toggle without passthrough -->
<Size>15f,50f</Size>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:button_2state.xml">
<SetVariable name="ObjectName">VinylTogglerLeft</SetVariable>
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="Size">15f,50f</SetVariable>
<SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
</WidgetGroup><!-- /Vinyl Controls toggles -->
<Template src="skin:button_2state.xml">
<SetVariable name="ObjectName">VinylTogglerLeft</SetVariable>
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="Size">15f,50f</SetVariable>
<SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
</Template>

<!-- Small Cover/Spinny when explicitly set 'small' -->
<WidgetGroup>
Expand Down
46 changes: 6 additions & 40 deletions res/skins/Tango/deck_row_overview_right.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,46 +71,12 @@ Variables:
</Connection>
</WidgetGroup><!-- / Small Cover/Spinny 2 -->

<WidgetGroup><!-- Vinyl Controls toggles -->
<Size>15f,50f</Size>
<Layout>vertical</Layout>
<Children>
<WidgetGroup><!-- Vinyl Controls toggle with passthrough -->
<Size>15f,50f</Size>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:button_2state.xml">
<SetVariable name="ObjectName">VinylTogglerRightPassthrough</SetVariable>
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="Size">15f,50f</SetVariable>
<SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

<WidgetGroup><!-- Vinyl Controls toggle without passthrough -->
<Size>15f,50f</Size>
<Layout>horizontal</Layout>
<Children>
<Template src="skin:button_2state.xml">
<SetVariable name="ObjectName">VinylTogglerRight</SetVariable>
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="Size">15f,50f</SetVariable>
<SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
</Template>
</Children>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
</Children>
</WidgetGroup><!-- /Vinyl Controls toggles -->
<Template src="skin:button_2state.xml">
<SetVariable name="ObjectName">VinylTogglerLeft</SetVariable>
<SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
<SetVariable name="Size">15f,50f</SetVariable>
<SetVariable name="ConfigKey">[Tango],vinylControlsDeck<Variable name="chanNum"/></SetVariable>
</Template>

<WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>

Expand Down
32 changes: 0 additions & 32 deletions res/skins/Tango/deck_row_transport_left.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,18 +207,6 @@ Variables:
<Children>
<!-- index 0 due to bug -->
<WidgetGroup><Size>0f,0f</Size></WidgetGroup>

<!-- Block Play button if passthrough is active,
show speaker icon instead -->
<WidgetGroup>
<ObjectName>PassthroughPlayCover</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<!-- Play -->
<Template src="skin:button_2state_right_display.xml">
<SetVariable name="ObjectName">PlayCue</SetVariable>
Expand Down Expand Up @@ -276,26 +264,6 @@ Variables:
<Children>
<!-- index 0 due to bug -->
<WidgetGroup><Size>0f,0f</Size></WidgetGroup>
<!-- Block Play button if passthrough is active,
show speaker icon instead -->
<WidgetGroup>
<ObjectName>PassthroughPlayCover</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<WidgetGroup>
<ObjectName>Spacer33</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<!-- Play -->
<Template src="skin:button_2state_right_display.xml">
<SetVariable name="ObjectName">PlayCue</SetVariable>
Expand Down
31 changes: 0 additions & 31 deletions res/skins/Tango/deck_row_transport_right.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,6 @@ Variables:
<Children>
<!-- index 0 due to bug -->
<WidgetGroup><Size>0f,0f</Size></WidgetGroup>
<!-- Block Play button if passthrough is active,
show speaker icon instead -->
<WidgetGroup>
<ObjectName>PassthroughPlayCover</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<WidgetGroup>
<ObjectName>Spacer33</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<!-- Play -->
<Template src="skin:button_2state_right_display.xml">
<SetVariable name="ObjectName">PlayCue</SetVariable>
Expand Down Expand Up @@ -89,17 +69,6 @@ Variables:
<Children>
<!-- index 0 due to bug -->
<WidgetGroup><Size>0f,0f</Size></WidgetGroup>
<!-- Block Play button if passthrough is active,
show speaker icon instead -->
<WidgetGroup>
<ObjectName>PassthroughPlayCover</ObjectName>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
<Connection>
<ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>
<!-- Play -->
<Template src="skin:button_2state_right_display.xml">
<SetVariable name="ObjectName">PlayCue</SetVariable>
Expand Down

0 comments on commit eea31b5

Please sign in to comment.