Merge pull request #2298 from ronso0/latenight-facelift

LateNight :: 3D facelift
mixxxdj · Oct 15, 2019 · 14037e9 · 14037e9
2 parents 2944e2f + 7d8543f
commit 14037e9
Show file tree

Hide file tree

Showing 321 changed files with 16,891 additions and 3,110 deletions.
diff --git a/res/skins/LateNight/aux_unit.xml b/res/skins/LateNight/aux_unit.xml
diff --git a/res/skins/LateNight/button_hotcue.xml b/res/skins/LateNight/button_hotcue.xml
@@ -12,7 +12,7 @@
     </State>
     <State>
       <Number>1</Number>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>.svg</Unpressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_set.svg</Unpressed>
       <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_pressed.svg</Pressed>
     </State>
     <Connection>

diff --git a/res/skins/LateNight/button_xfader_aux.xml b/res/skins/LateNight/button_xfader_aux.xml
@@ -0,0 +1,98 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A row of three buttons which set the deck's crossfader
+    orientation directly: L | M | R
+  Variables:
+    group:
+    xfaderLeft, xfaderRight: default | warning | off
+          Picks a colored icon for L,M,R depending on wether
+          the deck's orientation is the default, set to Master
+          or to the opposite side
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>CrossfaderButtonContainerAux</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>max,min</SizePolicy>
+    <Children>
+<!-- L -->
+      <PushButton>
+        <ObjectName>CrossfaderButton</ObjectName>
+        <TooltipId>orientation</TooltipId>
+        <Size>11f,13f</Size>
+        <NumberStates>2</NumberStates>
+        <RightClickIsPushButton>false</RightClickIsPushButton>
+        <State>
+          <Number>0</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_left.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_left.svg</Unpressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_left.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_left.svg</Unpressed>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
+          <Transform>
+            <IsEqual>0</IsEqual>
+          </Transform>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+      </PushButton>
+<!-- M -->
+      <PushButton>
+        <ObjectName>CrossfaderButton</ObjectName>
+        <TooltipId>orientation</TooltipId>
+        <Size>11f,13f</Size>
+        <NumberStates>2</NumberStates>
+        <RightClickIsPushButton>false</RightClickIsPushButton>
+        <State>
+          <Number>0</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_mid.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_mid.svg</Unpressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_mid.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_mid.svg</Unpressed>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
+          <Transform>
+            <Add>-1</Add>
+            <IsEqual>0</IsEqual>
+          </Transform>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+      </PushButton>
+<!-- R -->
+      <PushButton>
+        <ObjectName>CrossfaderButton</ObjectName>
+        <TooltipId>orientation</TooltipId>
+        <Size>11f,13f</Size>
+        <NumberStates>2</NumberStates>
+        <RightClickIsPushButton>false</RightClickIsPushButton>
+        <State>
+          <Number>0</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_right.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_right.svg</Unpressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_right.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_right.svg</Unpressed>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
+          <Transform>
+            <Add>-2</Add>
+            <IsEqual>0</IsEqual>
+          </Transform>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+      </PushButton>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/button_xfader_deck.xml b/res/skins/LateNight/button_xfader_deck.xml
@@ -1,37 +1,37 @@
 <!DOCTYPE template>
 <!--
   Description:
-    A standard knob.
+    A row of three buttons which set the deck's crossfader
+    orientation directly: L | M | R
   Variables:
-    group
-    control: The control to connect to
-    label
-    Size
-    TooltipId
-    PotiMinAngle
-    PotiMaxAngle
+    group:
+    xfaderLeft, xfaderRight: default | warning | off
+          Picks a colored icon for L,M,R depending on wether
+          the deck's orientation is the default, set to Master
+          or to the opposite side
 -->
 <Template>
   <WidgetGroup>
+    <ObjectName>CrossfaderButtonContainerDeck</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>min,min</SizePolicy>
     <Children>
-      <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 <!-- L -->
       <PushButton>
+        <ObjectName>CrossfaderButton</ObjectName>
         <TooltipId>orientation</TooltipId>
-        <Size>9f,15f</Size>
+        <Size>11f,15f</Size>
         <NumberStates>2</NumberStates>
         <RightClickIsPushButton>false</RightClickIsPushButton>
         <State>
           <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_left_off.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_left_off.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_left_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_left_off.svg</Unpressed>
         </State>
         <State>
           <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_left_<Variable name="xfaderLeft"/>.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_left_<Variable name="xfaderLeft"/>.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_left_<Variable name="xfaderLeft"/>.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_left_<Variable name="xfaderLeft"/>.svg</Unpressed>
         </State>
         <Connection>
           <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
@@ -43,19 +43,20 @@
       </PushButton>
 <!-- M -->
       <PushButton>
+        <ObjectName>CrossfaderButton</ObjectName>
         <TooltipId>orientation</TooltipId>
         <Size>11f,15f</Size>
         <NumberStates>2</NumberStates>
         <RightClickIsPushButton>false</RightClickIsPushButton>
         <State>
           <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_mid_off.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_mid_off.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_mid_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_mid_off.svg</Unpressed>
         </State>
         <State>
           <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_mid_warning.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_mid_warning.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_mid_warning.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_mid_warning.svg</Unpressed>
         </State>
         <Connection>
           <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
@@ -68,19 +69,20 @@
       </PushButton>
 <!-- R -->
       <PushButton>
+        <ObjectName>CrossfaderButton</ObjectName>
         <TooltipId>orientation</TooltipId>
-        <Size>10f,15f</Size>
+        <Size>11f,15f</Size>
         <NumberStates>2</NumberStates>
         <RightClickIsPushButton>false</RightClickIsPushButton>
         <State>
           <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_right_off.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_right_off.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_right_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_right_off.svg</Unpressed>
         </State>
         <State>
           <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_right_<Variable name="xfaderRight"/>.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_orientation_right_<Variable name="xfaderRight"/>.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_right_<Variable name="xfaderRight"/>.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_right_<Variable name="xfaderRight"/>.svg</Unpressed>
         </State>
         <Connection>
           <ConfigKey><Variable name="group"/>,orientation</ConfigKey>