Merge pull request #1531 from ronso0/tango-polish

Tango :: polish Play buttons & FX unit expand toggle
mixxxdj · Mar 8, 2018 · 3ed7563 · 3ed7563
2 parents 1426419 + 3d5ad43
commit 3ed7563
Show file tree

Hide file tree

Showing 93 changed files with 3,267 additions and 571 deletions.
diff --git a/res/skins/Tango/aux_unit.xml b/res/skins/Tango/aux_unit.xml
@@ -43,32 +43,9 @@ Variables:
 
           <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
 
-          <WidgetGroup>
-            <ObjectName>VUMeterMicAux</ObjectName>
-            <Size>5f,29f</Size>
-            <Layout>stacked</Layout>
-            <Children>
-              <StatusLight>
-                <PathStatusLight scalemode="STRETCH">skin:/graphics/vumeter_mini_clipping_over.png</PathStatusLight>
-                <PathBack scalemode="STRETCH">skin:/graphics/vumeter_mini_clipping.png</PathBack>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
-                </Connection>
-              </StatusLight>
-              <VuMeter>
-                <PathVu scalemode="STRETCH">skin:/graphics/vumeter_mini_over.png</PathVu>
-                <PathBack scalemode="STRETCH">skin:/graphics/vumeter_mini.png</PathBack>
-                <Horizontal>false</Horizontal>
-                <PeakHoldSize>5</PeakHoldSize>
-                <PeakHoldTime>500</PeakHoldTime>
-                <PeakFallTime>50</PeakFallTime>
-                <PeakFallStep>2</PeakFallStep>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,VuMeter</ConfigKey>
-                </Connection>
-              </VuMeter>
-            </Children>
-          </WidgetGroup>
+          <Template src="skin:vumeter_mini.xml">
+            <SetVariable name="Size">5f,29f</SetVariable>
+          </Template>
 
           <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
@@ -91,23 +68,18 @@ Variables:
                 <SetVariable name="TooltipId">pfl</SetVariable>
                 <SetVariable name="ObjectName">PflButton</SetVariable>
                 <SetVariable name="Size">18f,18f</SetVariable>
-                <SetVariable name="state_0_pressed">pfl_off.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
-                <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
-                <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
+                <SetVariable name="state_0_icon">pfl_off.svg</SetVariable>
+                <SetVariable name="state_1_icon">pfl_on.svg</SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
               </Template>
 
               <Template src="skin:button_3state_persist.xml">
                 <SetVariable name="TooltipId">orientation</SetVariable>
                 <SetVariable name="ObjectName">AuxXfaderButton</SetVariable>
                 <SetVariable name="Size">18f,15f</SetVariable>
-                <SetVariable name="state_0_pressed">aux_xfader_left.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">aux_xfader_left.svg</SetVariable>
-                <SetVariable name="state_1_pressed">aux_xfader_center.svg</SetVariable>
-                <SetVariable name="state_1_unpressed">aux_xfader_center.svg</SetVariable>
-                <SetVariable name="state_2_pressed">aux_xfader_right.svg</SetVariable>
-                <SetVariable name="state_2_unpressed">aux_xfader_right.svg</SetVariable>
+                <SetVariable name="state_0_icon">aux_xfader_left.svg</SetVariable>
+                <SetVariable name="state_1_icon">aux_xfader_center.svg</SetVariable>
+                <SetVariable name="state_2_icon">aux_xfader_right.svg</SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,orientation</SetVariable>
               </Template>
             </Children>

diff --git a/res/skins/Tango/button_2state.xml b/res/skins/Tango/button_2state.xml
@@ -23,15 +23,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>

diff --git a/res/skins/Tango/button_2state_display.xml b/res/skins/Tango/button_2state_display.xml
@@ -23,15 +23,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>

diff --git a/res/skins/Tango/button_2state_highlight.xml b/res/skins/Tango/button_2state_highlight.xml
@@ -23,15 +23,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>

diff --git a/res/skins/Tango/button_2state_persist.xml b/res/skins/Tango/button_2state_persist.xml
@@ -22,15 +22,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>

diff --git a/res/skins/Tango/button_2state_right.xml b/res/skins/Tango/button_2state_right.xml
@@ -24,15 +24,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>

diff --git a/res/skins/Tango/button_2state_right_display.xml b/res/skins/Tango/button_2state_right_display.xml
@@ -25,15 +25,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>

diff --git a/res/skins/Tango/button_3state.xml b/res/skins/Tango/button_3state.xml
@@ -21,22 +21,22 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>

diff --git a/res/skins/Tango/button_3state_display.xml b/res/skins/Tango/button_3state_display.xml
@@ -22,22 +22,22 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>

diff --git a/res/skins/Tango/button_3state_persist.xml b/res/skins/Tango/button_3state_persist.xml
@@ -21,22 +21,22 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>

diff --git a/res/skins/Tango/button_4state_display.xml b/res/skins/Tango/button_4state_display.xml
@@ -22,29 +22,29 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>3</Number>
       <Text><Variable name="state_3_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>