Merge pull request #4503 from ronso0/fxrfct-tango

Tango: style Quick Effect selector
mixxxdj · Dec 11, 2021 · daac714 · daac714
2 parents d5cf277 + 7993053
commit daac714
Show file tree

Hide file tree

Showing 25 changed files with 475 additions and 639 deletions.
diff --git a/res/skins/Tango/buttons/btn_arrow_down_black.svg b/res/skins/Tango/buttons/btn_arrow_down_black.svg
diff --git a/res/skins/Tango/buttons/btn_arrow_down_black_hover.svg b/res/skins/Tango/buttons/btn_arrow_down_black_hover.svg
diff --git a/res/skins/Tango/buttons/btn_arrow_down_fx.svg b/res/skins/Tango/buttons/btn_arrow_down_fx.svg
diff --git a/res/skins/Tango/buttons/btn_arrow_down_fx_hover.svg b/res/skins/Tango/buttons/btn_arrow_down_fx_hover.svg
diff --git a/res/skins/Tango/buttons/btn_arrow_down_fxquick.svg b/res/skins/Tango/buttons/btn_arrow_down_fxquick.svg
diff --git a/res/skins/Tango/buttons/btn_arrow_down_fxquick_hover.svg b/res/skins/Tango/buttons/btn_arrow_down_fxquick_hover.svg
diff --git a/res/skins/Tango/buttons/btn_arrow_left_black.svg b/res/skins/Tango/buttons/btn_arrow_left_black.svg
diff --git a/res/skins/Tango/buttons/btn_arrow_left_black_hover.svg b/res/skins/Tango/buttons/btn_arrow_left_black_hover.svg
diff --git a/res/skins/Tango/buttons/btn_arrow_right_black.svg b/res/skins/Tango/buttons/btn_arrow_right_black.svg
diff --git a/res/skins/Tango/buttons/btn_arrow_right_black_hover.svg b/res/skins/Tango/buttons/btn_arrow_right_black_hover.svg
diff --git a/res/skins/Tango/buttons/btn_arrow_up_black.svg b/res/skins/Tango/buttons/btn_arrow_up_black.svg
diff --git a/res/skins/Tango/buttons/btn_arrow_up_black_hover.svg b/res/skins/Tango/buttons/btn_arrow_up_black_hover.svg
diff --git a/res/skins/Tango/buttons/btn_lib_checkmark_white.svg b/res/skins/Tango/buttons/btn_lib_checkmark_white.svg
diff --git a/res/skins/Tango/decks/deck_left.xml b/res/skins/Tango/decks/deck_left.xml
@@ -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>

diff --git a/res/skins/Tango/decks/deck_right.xml b/res/skins/Tango/decks/deck_right.xml
@@ -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>

diff --git a/res/skins/Tango/fx/toggle_selector.xml b/res/skins/Tango/fx/toggle_selector.xml
@@ -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>

diff --git a/res/skins/Tango/fx/unit_left_mini.xml b/res/skins/Tango/fx/unit_left_mini.xml
@@ -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>

diff --git a/res/skins/Tango/eq_button.xml → res/skins/Tango/mixer/eq_button.xml b/res/skins/Tango/eq_button.xml → res/skins/Tango/mixer/eq_button.xml
diff --git a/res/skins/Tango/mixer/eq_knob_left.xml b/res/skins/Tango/mixer/eq_knob_left.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/res/skins/Tango/mixer/eq_knob_right.xml b/res/skins/Tango/mixer/eq_knob_right.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>