Merge pull request #3886 from ronso0/tango64-path-repair

Tango64: adjust template to new folder structure #3807
mixxxdj · May 21, 2021 · 1d12947 · 1d12947
2 parents 9496cda + 1c15e13
commit 1d12947
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 24 deletions.
diff --git a/res/skins/Tango (64 Samplers)/sampler_rack.xml b/res/skins/Tango (64 Samplers)/sampler_rack.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -336,4 +336,3 @@
     </Connection>
   </WidgetGroup>
 </Template>
-
diff --git a/res/skins/Tango (64 Samplers)/skin.xml b/res/skins/Tango (64 Samplers)/skin.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>