Skip to content

Tango :: make Spinny/CoverArt selection persistent #1253

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

Merged
daschuer merged 2 commits into from
May 9, 2017
Merged

Tango :: make Spinny/CoverArt selection persistent #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aea9fcc
make Spinny/CoverArt selection persistent
May 9, 2017
f836171
remove trigger
May 9, 2017
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
14 changes: 7 additions & 7 deletions res/skins/Tango/crossfader12_skincontrols.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ Description:
<SetVariable name="TooltipId">show_spinny</SetVariable>
<SetVariable name="ObjectName">GuiToggleButton2</SetVariable>
<SetVariable name="Size">20f,20f</SetVariable>
<SetVariable name="state_0_pressed">spinny.svg</SetVariable>
<SetVariable name="state_0_unpressed">spinny.svg</SetVariable>
<SetVariable name="state_1_pressed">cover.svg</SetVariable>
<SetVariable name="state_1_unpressed">cover.svg</SetVariable>
<SetVariable name="state_2_pressed">cover_off.svg</SetVariable>
<SetVariable name="state_2_unpressed">cover_off.svg</SetVariable>
<SetVariable name="ConfigKeyPerm">[Tango],empty_spinny_cover</SetVariable>
<SetVariable name="state_0_pressed">cover.svg</SetVariable>
<SetVariable name="state_0_unpressed">cover.svg</SetVariable>
<SetVariable name="state_1_pressed">cover_off.svg</SetVariable>
<SetVariable name="state_1_unpressed">cover_off.svg</SetVariable>
<SetVariable name="state_2_pressed">spinny.svg</SetVariable>
<SetVariable name="state_2_unpressed">spinny.svg</SetVariable>
<SetVariable name="ConfigKeyPerm">[Tango],spinny_cover_none</SetVariable>
</Template>

<WidgetGroup><Size>1f,1min</Size><Children/></WidgetGroup>
Expand Down
14 changes: 7 additions & 7 deletions res/skins/Tango/crossfader_skincontrols_netbook.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ Description:
<SetVariable name="TooltipId">show_spinny</SetVariable>
<SetVariable name="ObjectName">GuiToggleButton2</SetVariable>
<SetVariable name="Size">20f,20f</SetVariable>
<SetVariable name="state_0_pressed">spinny.svg</SetVariable>
<SetVariable name="state_0_unpressed">spinny.svg</SetVariable>
<SetVariable name="state_1_pressed">cover.svg</SetVariable>
<SetVariable name="state_1_unpressed">cover.svg</SetVariable>
<SetVariable name="state_2_pressed">cover_off.svg</SetVariable>
<SetVariable name="state_2_unpressed">cover_off.svg</SetVariable>
<SetVariable name="ConfigKeyPerm">[Tango],empty_spinny_cover</SetVariable>
<SetVariable name="state_0_pressed">cover.svg</SetVariable>
<SetVariable name="state_0_unpressed">cover.svg</SetVariable>
<SetVariable name="state_1_pressed">cover_off.svg</SetVariable>
<SetVariable name="state_1_unpressed">cover_off.svg</SetVariable>
<SetVariable name="state_2_pressed">spinny.svg</SetVariable>
<SetVariable name="state_2_unpressed">spinny.svg</SetVariable>
<SetVariable name="ConfigKeyPerm">[Tango],spinny_cover_none</SetVariable>
</Template>

<WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size><Children/></WidgetGroup>
Expand Down
13 changes: 7 additions & 6 deletions res/skins/Tango/deck_left.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ Variables:
</Children>
</WidgetGroup><!-- /Mixer -->

<WidgetGroup><!-- [Spinny / Cover] + VUMeter -->
<WidgetGroup><!-- [Spinny / Cover / none] + VUMeter -->
<Layout>horizontal</Layout>
<SizePolicy>min,me</SizePolicy>
<Children>

<WidgetGroup><!-- [Spinny / Cover] -->
<WidgetGroup><!-- [Spinny / Cover / none] -->
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
Expand All @@ -98,10 +98,11 @@ Variables:
</WidgetGroup>
</Children>
<Connection>
<ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
<ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
<Transform><IsEqual>2</IsEqual><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup><!-- /[Spinny / Cover] -->
</WidgetGroup><!-- /[Spinny / Cover /none] -->

<WidgetGroup>
<Size>3f,1me</Size>
Expand All @@ -115,10 +116,10 @@ Variables:
<Template src="skin:vumeter_floating.xml"/>

</Children>
</WidgetGroup><!-- / [Spinny / Cover] + VUMeter -->
</WidgetGroup><!-- / [Spinny / Cover / none] + VUMeter -->

</Children>
</WidgetStack><!-- /Mixer / [ [Spinny / Cover] + VUMeter ] -->
</WidgetStack><!-- /Mixer / [ [Spinny / Cover / none] + VUMeter ] -->

<WidgetGroup><!-- Pitch slider & Key controls -->
<Size>3f,1me</Size>
Expand Down
7 changes: 4 additions & 3 deletions res/skins/Tango/deck_overview_left.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Variables:
</Connection>
</WidgetGroup><!-- /Vinyl Controls -->

<WidgetGroup><!-- Spinny / Cover -->
<WidgetGroup><!-- [Spinny / Cover / none] -->
<Layout>vertical</Layout>
<!-- Do not declare Size/Policy here. Otherwise this widget will always occupy 50x50px,
even when set invible. Maybe too many Connections... WidgetStack was buggy. -->
Expand Down Expand Up @@ -128,10 +128,11 @@ Variables:

</Children>
<Connection>
<ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
<ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
<Transform><IsEqual>2</IsEqual><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup><!-- /Spinny / Cover -->
</WidgetGroup><!-- /[Spinny / Cover / none] -->

</Children>
</WidgetGroup><!-- /Overview Row -->
Expand Down
7 changes: 4 additions & 3 deletions res/skins/Tango/deck_overview_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Variables:
<SizePolicy>me,f</SizePolicy>
<Children>

<WidgetGroup><!-- Spinny / CoverArt -->
<WidgetGroup><!-- [Spinny / Cover / none] -->
<Layout>vertical</Layout>
<!-- Do not declare Size/Policy here. Otherwise this widget will always occupy 50x50px,
even when set invible. Maybe too many Connections... WidgetStack was buggy. -->
Expand Down Expand Up @@ -71,10 +71,11 @@ Variables:

</Children>
<Connection>
<ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
<ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
<Transform><IsEqual>2</IsEqual><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup><!-- /Spinny / CoverArt -->
</WidgetGroup><!-- /[Spinny / Cover / none] -->

<WidgetGroup><!-- Vinyl Controls -->
<Layout>horizontal</Layout>
Expand Down
20 changes: 9 additions & 11 deletions res/skins/Tango/deck_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ Variables:

<WidgetGroup><Size>3f,1min</Size><Children/></WidgetGroup>

<WidgetGroup><!-- Mixer / [ [Spinny / Cover] + VUMeter ] + Pitch + spacer -->
<WidgetGroup><!-- Mixer / [ [Spinny / Cover / none] + VUMeter ] + Pitch + spacer -->
<Layout>vertical</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
<WidgetGroup><!-- Mixer / [ [Spinny / Cover] + VUMeter ] + Pitch -->
<WidgetGroup><!-- Mixer / [ [Spinny / Cover / none] + VUMeter ] + Pitch -->
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
Expand Down Expand Up @@ -58,7 +58,7 @@ Variables:
</Children>
</WidgetGroup><!-- /Mixer -->

<WidgetGroup><!-- [Spinny / Cover] + VUMeter -->
<WidgetGroup><!-- [Spinny / Cover / none] + VUMeter -->
<Layout>horizontal</Layout>
<SizePolicy>min,me</SizePolicy>
<Children>
Expand All @@ -74,7 +74,7 @@ Variables:
</Connection>
</WidgetGroup>

<WidgetGroup><!-- Spinny/Cover -->
<WidgetGroup><!-- [Spinny / Cover / none] -->
<Layout>horizontal</Layout>
<SizePolicy>min,min</SizePolicy>
<Children>
Expand All @@ -95,22 +95,20 @@ Variables:
</WidgetGroup>
</Children>
<Connection>
<ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
<ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
<Transform><IsEqual>2</IsEqual><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

</Children>
</WidgetGroup><!-- /[Spinny / Cover] + VUMeter -->
</WidgetGroup><!-- /[Spinny / Cover / none] + VUMeter -->

</Children>
</WidgetStack><!-- /Mixer / [ [Spinny / Cover] + VUMeter ] -->
</WidgetStack><!-- /Mixer / [ [Spinny / Cover / none] + VUMeter ] -->

</Children>
</WidgetGroup><!-- /Mixer / [ [Spinny / Cover] + VUMeter ] + Pitch -->

<!-- This was working and somehow necessary, but now (v38++) causes left decks
to grow by 3px (right decks shrink by 3px) when enabling extra deck buttons.
</WidgetGroup><!-- /Mixer / [ [Spinny / Cover / none] + VUMeter ] + Pitch -->

Expanding spacer, necessary because obviously WidgetStack breaks
qproperty-layoutAlignment of parent Widget -->
Expand Down
6 changes: 1 addition & 5 deletions res/skins/Tango/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
<attribute persist="true" config_key="[Tango],crossfader">1</attribute>
<attribute persist="true" config_key="[Tango],crossfader_logo_Stack">1</attribute>
<attribute persist="true" config_key="[Tango],deck_controls">1</attribute>
<attribute persist="true" config_key="[Tango],empty_spinny_cover">2</attribute>
<attribute persist="true" config_key="[Tango],eq_knobs">1</attribute>
<attribute persist="true" config_key="[Tango],hotcues">1</attribute>
<attribute persist="true" config_key="[Tango],key_controls">1</attribute>
Expand All @@ -91,12 +90,9 @@
<attribute persist="true" config_key="[Tango],stacked_waveforms">1</attribute>
<attribute persist="true" config_key="[Tango],stars">1</attribute>
<attribute persist="true" config_key="[Tango],trackComment">1</attribute>
<!-- keeps Spinny/Cover selection when switching between small and big version -->
<attribute persist="true" config_key="[Tango],spinny0_cover1_stack">1</attribute>
<attribute persist="true" config_key="[Tango],spinny_cover_none">1</attribute>
<attribute persist="true" config_key="[Tango],spinnyCoverBIG">1</attribute>
<attribute persist="true" config_key="[Tango],spinnyWithCoverArt">1</attribute>
<!-- keeps CoverArt option when switching between small and big Spinny -->
<attribute persist="true" config_key="[Tango],spinnyWithCoverArt_stack">1</attribute>
<attribute persist="true" config_key="[Tango],vinylControlsDeck1">0</attribute>
<attribute persist="true" config_key="[Tango],vinylControlsDeck2">0</attribute>
<attribute persist="true" config_key="[Tango],vinylControlsDeck3">0</attribute>
Expand Down
20 changes: 10 additions & 10 deletions res/skins/Tango/skin_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,10 @@ Description:
<Children>

<Template src="skin:skin_settings_button_3state.xml">
<SetVariable name="state_0_text"> Spinny / Cover</SetVariable>
<SetVariable name="state_1_text"> &#10004; Spinny&#9668; Cover</SetVariable>
<SetVariable name="state_2_text"> &#10004; Spinny &#9658;Cover</SetVariable>
<SetVariable name="Setting">[Tango],empty_spinny_cover</SetVariable>
<SetVariable name="state_0_text"> &#10004; Spinny &#9668; Cover</SetVariable>
<SetVariable name="state_1_text"> &#10004; Spinny &#9658; Cover</SetVariable>
<SetVariable name="state_2_text"> Spinny / Cover</SetVariable>
<SetVariable name="Setting">[Tango],spinny_cover_none</SetVariable>
</Template>

<WidgetGroup><!-- SpinnyCover submenu -->
Expand All @@ -240,9 +240,9 @@ Description:
<SizePolicy>me,me</SizePolicy>
<Children/>
<Connection>
<ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
<ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
<BindProperty>visible</BindProperty>
<Transform><Not/></Transform>
<Transform><IsEqual>2</IsEqual></Transform>
</Connection>
</WidgetGroup>

Expand All @@ -252,8 +252,8 @@ Description:
<Children>

<Template src="skin:skin_settings_button_2state.xml">
<SetVariable name="state_0_text"> °&#9668; O</SetVariable>
<SetVariable name="state_1_text"> ° &#9658;O</SetVariable>
<SetVariable name="state_0_text"> ° &#9668; O</SetVariable>
<SetVariable name="state_1_text"> ° &#9658; O</SetVariable>
<SetVariable name="Setting">[Tango],spinnyCoverBIG</SetVariable>
</Template>

Expand Down Expand Up @@ -281,8 +281,8 @@ Description:
<Children>

<Template src="skin:skin_settings_button_2state.xml">
<SetVariable name="state_0_text"> 2&#9668; 4 Effect Units</SetVariable>
<SetVariable name="state_1_text"> 2 &#9658;4 Effect Units</SetVariable>
<SetVariable name="state_0_text"> 2 &#9668; 4 Effect Units</SetVariable>
<SetVariable name="state_1_text"> 2 &#9658; 4 Effect Units</SetVariable>
<SetVariable name="Setting">[Tango],2or4_fxUnits</SetVariable>
</Template>

Expand Down
48 changes: 32 additions & 16 deletions res/skins/Tango/spinnyCover.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ Description:
Displayed next to decks where channel mixer would be.
Variables:
group : [ChannelN]
[Tango],spinny0_cover1_stack (show Spinny or CoverArt)
: keeps Spinny/Cover selection when switching between small and big version
[Tango],spinnyWithCoverArt_stack (show Spinny with or without Cover)
: keeps CoverArt option when switching between small and big Spinny
-->
<Template>
<WidgetStack currentpage="[Tango],spinny0_cover1_stack" persist="true">
<Template>
<WidgetGroup>
<ObjectName>SpinnyCover</ObjectName>
<Size>111f,136f</Size>
<SizePolicy>min,min</SizePolicy>
<Layout>vertical</Layout>
<Children>

<WidgetStack currentpage="[Tango],spinnyWithCoverArt_stack" persist="true">
<!-- spinny -->
<WidgetGroup>
<Size>111f,111f</Size>
<Layout>vertical</Layout>
<Children>
<Spinny><!-- no Cover on Spinny -->
<!-- no Cover on Spinny -->
<Spinny>
<TooltipId>spinny</TooltipId>
<Size>111f,111f</Size>
<Group><Variable name="group"/></Group>
Expand All @@ -27,9 +27,14 @@ Variables:
<PathForeground scalemode="STRETCH_ASPECT">skin:/graphics/spinny_indicator.svg</PathForeground>
<PathGhost scalemode="STRETCH_ASPECT">skin:/graphics/spinny_indicator_ghost.svg</PathGhost>
<ShowCover>false</ShowCover>
<Connection>
<ConfigKey persist="true">[Tango],spinnyWithCoverArt</ConfigKey>
<Transform><Not/></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</Spinny>
<!-- Cover on Spinny -->
<Spinny trigger="[Tango],spinnyWithCoverArt" persist="true" on-hide-select="0">
<Spinny>
<TooltipId>spinny</TooltipId>
<Size>111f,111f</Size>
<Group><Variable name="group"/></Group>
Expand All @@ -45,24 +50,35 @@ Variables:
</Spinny>
</Children>
<Connection>
<ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
<Transform><IsEqual>1</IsEqual></Transform>
<ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
<Transform><IsEqual>0</IsEqual></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetStack>
</WidgetGroup>

<CoverArt>
<TooltipId>coverart</TooltipId>
<Size>111f,111f</Size>
<Group><Variable name="group"/></Group>
<DefaultCover>skin:/graphics/cover_default.svg</DefaultCover>
<Connection>
<ConfigKey persist="true">[Tango],empty_spinny_cover</ConfigKey>
<Transform><IsEqual>2</IsEqual></Transform>
<ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
<Transform><IsEqual>1</IsEqual></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</CoverArt>

<!-- none -->
<WidgetGroup>
<Size>0f,0f</Size>
<Children/>
<Connection>
<ConfigKey persist="true">[Tango],spinny_cover_none</ConfigKey>
<Transform><IsEqual>2</IsEqual></Transform>
<BindProperty>visible</BindProperty>
</Connection>
</WidgetGroup>

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