Merge pull request #11185 from ronso0/skins-quickeffect-toggles-fix

Skin: fix QuickEffect toggles that were using _Effect1, clean up Tango
mixxxdj · Jan 5, 2023 · 125e1fd · 125e1fd
2 parents f20501e + 460360c
commit 125e1fd
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 14 deletions.
diff --git a/res/skins/Deere/quick_effect_superknob_left.xml b/res/skins/Deere/quick_effect_superknob_left.xml
@@ -8,9 +8,7 @@
     color: the knob ring color. carmine, yellow or light_blue
 -->
 <Template>
-  <SetVariable name="QuickEffectRackGroup">[QuickEffectRack1]</SetVariable>
   <SetVariable name="QuickEffectUnitGroup">[QuickEffectRack1_<Variable name="group"/>]</SetVariable>
-  <SetVariable name="QuickEffectEffectGroup">[QuickEffectRack1_<Variable name="group"/>_Effect1]</SetVariable>
   <WidgetGroup>
     <Layout>horizontal</Layout>
     <SizePolicy>me,min</SizePolicy>
@@ -28,7 +26,7 @@
           <Number>1</Number>
         </State>
         <Connection>
-          <ConfigKey><Variable name="QuickEffectEffectGroup"/>,enabled</ConfigKey>
+          <ConfigKey><Variable name="QuickEffectUnitGroup"/>,enabled</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
         </Connection>
         <Connection>

diff --git a/res/skins/Deere/quick_effect_superknob_right.xml b/res/skins/Deere/quick_effect_superknob_right.xml
@@ -8,9 +8,7 @@
     color: the knob ring color. carmine, yellow or light_blue
 -->
 <Template>
-  <SetVariable name="QuickEffectRackGroup">[QuickEffectRack1]</SetVariable>
   <SetVariable name="QuickEffectUnitGroup">[QuickEffectRack1_<Variable name="group"/>]</SetVariable>
-  <SetVariable name="QuickEffectEffectGroup">[QuickEffectRack1_<Variable name="group"/>_Effect1]</SetVariable>
   <WidgetGroup>
     <Layout>horizontal</Layout>
     <SizePolicy>me,me</SizePolicy>
@@ -34,7 +32,7 @@
           <Number>1</Number>
         </State>
         <Connection>
-          <ConfigKey><Variable name="QuickEffectEffectGroup"/>,enabled</ConfigKey>
+          <ConfigKey><Variable name="QuickEffectUnitGroup"/>,enabled</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
         </Connection>
         <Connection>

diff --git a/res/skins/Tango/mixer/eq_knob_left.xml b/res/skins/Tango/mixer/eq_knob_left.xml
@@ -10,8 +10,7 @@ Variables:
 -->
 <Template>
   <SetVariable name="FxUnit">[EqualizerRack1_<Variable name="group"/>]</SetVariable>
-  <SetVariable name="FxNum">1</SetVariable>
-  <SetVariable name="FxUnit_FxNum">[EqualizerRack1_<Variable name="group"/>_Effect<Variable name="FxNum"/>]</SetVariable>
+  <SetVariable name="FxUnit_FxNum">[EqualizerRack1_<Variable name="group"/>_Effect1]</SetVariable>
 
   <WidgetGroup>
     <ObjectName>EQKnobContainerLeft</ObjectName>
@@ -62,7 +61,7 @@ Variables:
                 <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                 <KnobCenterYOffset>2.000</KnobCenterYOffset>
                 <EffectUnitGroup><Variable name="FxUnit"/></EffectUnitGroup>
-                <Effect><Variable name="FxNum"/></Effect>
+                <Effect>1</Effect>
                 <EffectParameter><Variable name="FxParameter"/></EffectParameter>
                 <Connection>
                   <ConfigKey><Variable name="FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/></ConfigKey>

diff --git a/res/skins/Tango/mixer/eq_knob_right.xml b/res/skins/Tango/mixer/eq_knob_right.xml
@@ -10,8 +10,7 @@ Variables:
 -->
 <Template>
   <SetVariable name="FxUnit">[EqualizerRack1_<Variable name="group"/>]</SetVariable>
-  <SetVariable name="FxNum">1</SetVariable>
-  <SetVariable name="FxUnit_FxNum">[EqualizerRack1_<Variable name="group"/>_Effect<Variable name="FxNum"/>]</SetVariable>
+  <SetVariable name="FxUnit_FxNum">[EqualizerRack1_<Variable name="group"/>_Effect1]</SetVariable>
 
   <WidgetGroup>
     <ObjectName>EQKnobContainerRight</ObjectName>
@@ -47,7 +46,7 @@ Variables:
                 <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                 <KnobCenterYOffset>2.000</KnobCenterYOffset>
                 <EffectUnitGroup><Variable name="FxUnit"/></EffectUnitGroup>
-                <Effect><Variable name="FxNum"/></Effect>
+                <Effect>1</Effect>
                 <EffectParameter><Variable name="FxParameter"/></EffectParameter>
                 <Connection>
                   <ConfigKey><Variable name="FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/></ConfigKey>

diff --git a/res/skins/Tango/mixer/quick_fx_knob_left.xml b/res/skins/Tango/mixer/quick_fx_knob_left.xml
@@ -9,7 +9,6 @@ Variables:
 -->
 <Template>
   <SetVariable name="QuickFxGroup">[QuickEffectRack1_<Variable name="group"/>]</SetVariable>
-  <SetVariable name="QuickFx">[QuickEffectRack1_<Variable name="group"/>_Effect1]</SetVariable>
   <WidgetGroup>
     <ObjectName>EQKnobContainerLeft</ObjectName>
     <Layout>horizontal</Layout>

diff --git a/res/skins/Tango/mixer/quick_fx_knob_right.xml b/res/skins/Tango/mixer/quick_fx_knob_right.xml
@@ -9,7 +9,6 @@ Variables:
 -->
 <Template>
   <SetVariable name="QuickFxGroup">[QuickEffectRack1_<Variable name="group"/>]</SetVariable>
-  <SetVariable name="QuickFx">[QuickEffectRack1_<Variable name="group"/>_Effect1]</SetVariable>
   <WidgetGroup>
     <ObjectName>EQKnobContainerRight</ObjectName>
     <SizePolicy>min,min</SizePolicy>