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

Tango64: adjust template to new folder structure #3807 #3886

Merged
merged 1 commit into from
May 21, 2021
Merged

Tango64: adjust template to new folder structure #3807 #3886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions res/skins/Tango (64 Samplers)/sampler_rack.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<SingletonDefinition>
<ObjectName>SamplerRow1</ObjectName>
<Children>
<Template src="skin:../Tango/sampler_row.xml">
<Template src="skin:../Tango/mic_aux_sampler/sampler_row.xml">
<SetVariable name="row">1</SetVariable>
<SetVariable name="sampler1">1</SetVariable>
<SetVariable name="sampler2">2</SetVariable>
Expand All @@ -24,7 +24,7 @@
<SingletonDefinition>
<ObjectName>SamplerRow2</ObjectName>
<Children>
<Template src="skin:../Tango/sampler_row.xml">
<Template src="skin:../Tango/mic_aux_sampler/sampler_row.xml">
<SetVariable name="row">2</SetVariable>
<SetVariable name="sampler1">9</SetVariable>
<SetVariable name="sampler2">10</SetVariable>
Expand All @@ -41,7 +41,7 @@
<SingletonDefinition>
<ObjectName>SamplerRow3</ObjectName>
<Children>
<Template src="skin:../Tango/sampler_row.xml">
<Template src="skin:../Tango/mic_aux_sampler/sampler_row.xml">
<SetVariable name="row">3</SetVariable>
<SetVariable name="sampler1">17</SetVariable>
<SetVariable name="sampler2">18</SetVariable>
Expand All @@ -58,7 +58,7 @@
<SingletonDefinition>
<ObjectName>SamplerRow4</ObjectName>
<Children>
<Template src="skin:../Tango/sampler_row.xml">
<Template src="skin:../Tango/mic_aux_sampler/sampler_row.xml">
<SetVariable name="row">4</SetVariable>
<SetVariable name="sampler1">25</SetVariable>
<SetVariable name="sampler2">26</SetVariable>
Expand All @@ -75,7 +75,7 @@
<SingletonDefinition>
<ObjectName>SamplerRow5</ObjectName>
<Children>
<Template src="skin:../Tango/sampler_row.xml">
<Template src="skin:../Tango/mic_aux_sampler/sampler_row.xml">
<SetVariable name="row">5</SetVariable>
<SetVariable name="sampler1">33</SetVariable>
<SetVariable name="sampler2">34</SetVariable>
Expand All @@ -92,7 +92,7 @@
<SingletonDefinition>
<ObjectName>SamplerRow6</ObjectName>
<Children>
<Template src="skin:../Tango/sampler_row.xml">
<Template src="skin:../Tango/mic_aux_sampler/sampler_row.xml">
<SetVariable name="row">6</SetVariable>
<SetVariable name="sampler1">41</SetVariable>
<SetVariable name="sampler2">42</SetVariable>
Expand All @@ -109,7 +109,7 @@
<SingletonDefinition>
<ObjectName>SamplerRow7</ObjectName>
<Children>
<Template src="skin:../Tango/sampler_row.xml">
<Template src="skin:../Tango/mic_aux_sampler/sampler_row.xml">
<SetVariable name="row">7</SetVariable>
<SetVariable name="sampler1">49</SetVariable>
<SetVariable name="sampler2">50</SetVariable>
Expand All @@ -126,7 +126,7 @@
<SingletonDefinition>
<ObjectName>SamplerRow8</ObjectName>
<Children>
<Template src="skin:../Tango/sampler_row.xml">
<Template src="skin:../Tango/mic_aux_sampler/sampler_row.xml">
<SetVariable name="row">8</SetVariable>
<SetVariable name="sampler1">57</SetVariable>
<SetVariable name="sampler2">58</SetVariable>
Expand Down Expand Up @@ -336,4 +336,3 @@
</Connection>
</WidgetGroup>
</Template>

28 changes: 13 additions & 15 deletions res/skins/Tango (64 Samplers)/skin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
<SingletonDefinition>
<ObjectName>SpinnyCoverMini_Singleton1</ObjectName>
<Children>
<Template src="skin:../Tango/spinny_cover_mini.xml">
<Template src="skin:../Tango/decks/spinny_cover_mini.xml">
<SetVariable name="chanNum">1</SetVariable>
<SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_12"/></SetVariable>
</Template>
Expand All @@ -257,7 +257,7 @@
<SingletonDefinition>
<ObjectName>SpinnyCoverMini_Singleton2</ObjectName>
<Children>
<Template src="skin:../Tango/spinny_cover_mini.xml">
<Template src="skin:../Tango/decks/spinny_cover_mini.xml">
<SetVariable name="chanNum">2</SetVariable>
<SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_12"/></SetVariable>
</Template>
Expand All @@ -267,7 +267,7 @@
<SingletonDefinition>
<ObjectName>SpinnyCoverMini_Singleton3</ObjectName>
<Children>
<Template src="skin:../Tango/spinny_cover_mini.xml">
<Template src="skin:../Tango/decks/spinny_cover_mini.xml">
<SetVariable name="chanNum">3</SetVariable>
<SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_34"/></SetVariable>
</Template>
Expand All @@ -277,7 +277,7 @@
<SingletonDefinition>
<ObjectName>SpinnyCoverMini_Singleton4</ObjectName>
<Children>
<Template src="skin:../Tango/spinny_cover_mini.xml">
<Template src="skin:../Tango/decks/spinny_cover_mini.xml">
<SetVariable name="chanNum">4</SetVariable>
<SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_34"/></SetVariable>
</Template>
Expand All @@ -287,7 +287,7 @@
<SingletonDefinition>
<ObjectName>VUMeterDeck1</ObjectName>
<Children>
<Template src="skin:../Tango/vumeter_single.xml">
<Template src="skin:../Tango/mixer/vumeter_single.xml">
<SetVariable name="group">[Channel1]</SetVariable>
</Template>
</Children>
Expand All @@ -296,7 +296,7 @@
<SingletonDefinition>
<ObjectName>VUMeterDeck2</ObjectName>
<Children>
<Template src="skin:../Tango/vumeter_single.xml">
<Template src="skin:../Tango/mixer/vumeter_single.xml">
<SetVariable name="group">[Channel2]</SetVariable>
</Template>
</Children>
Expand All @@ -305,7 +305,7 @@
<SingletonDefinition>
<ObjectName>VUMeterDeck3</ObjectName>
<Children>
<Template src="skin:../Tango/vumeter_single.xml">
<Template src="skin:../Tango/mixer/vumeter_single.xml">
<SetVariable name="group">[Channel3]</SetVariable>
</Template>
</Children>
Expand All @@ -314,7 +314,7 @@
<SingletonDefinition>
<ObjectName>VUMeterDeck4</ObjectName>
<Children>
<Template src="skin:../Tango/vumeter_single.xml">
<Template src="skin:../Tango/mixer/vumeter_single.xml">
<SetVariable name="group">[Channel4]</SetVariable>
</Template>
</Children>
Expand All @@ -333,7 +333,7 @@
<MaximumSize>-1,136</MaximumSize>
<SizePolicy>min,me</SizePolicy>
<Children>
<Template src="skin:../Tango/vumeter_single.xml">
<Template src="skin:../Tango/mixer/vumeter_single.xml">
<SetVariable name="group">[Master]</SetVariable>
</Template>
<WidgetGroup><Size>0f,5f</Size></WidgetGroup>
Expand Down Expand Up @@ -504,9 +504,7 @@
</Splitter>
<!-- regular library with decks etc. -->

<!-- maximized library:
[minimal decks]
[Library] -->
<!-- maximized library with minimal decks -->
<WidgetGroup>
<Layout>vertical</Layout>
<SizePolicy>me,me</SizePolicy>
Expand Down Expand Up @@ -555,19 +553,19 @@

</Children>
</WidgetStack>
<!-- regular / maximized library -->
<!-- regular / maximized library -->

</Children>
</WidgetGroup><!-- topbar + skin elements -->

<Template src="skin:skin_settings.xml"/>
<Template src="skin:../Tango/skin_settings.xml"/>

</Children>
</WidgetGroup><!-- visible skin + size settings menu -->

<!-- Detect if Star rating fits into deck buttons row.
Do this here, so it doesn't interfere with expanded skin menu -->
<Template src="skin:../Tango/size_detector_stars.xml"/>
<Template src="skin:../Tango/helpers/size_detector_stars.xml"/>

</Children>
</WidgetGroup>
Expand Down