LateNight: style Sync/Leader buttons, side by side

mixxxdj · Jul 23, 2021 · 8d2661d · 8d2661d
1 parent c797a81
commit 8d2661d
Show file tree

Hide file tree

Showing 18 changed files with 183 additions and 292 deletions.
diff --git a/res/skins/LateNight/classic/buttons/btn__sync_deck.svg b/res/skins/LateNight/classic/buttons/btn__sync_deck.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__sync_leader.svg b/res/skins/LateNight/classic/buttons/btn__sync_leader.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__sync_leader_active.svg b/res/skins/LateNight/classic/buttons/btn__sync_leader_active.svg
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_sync.svg b/res/skins/LateNight/classic/buttons/btn_embedded_sync.svg
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_sync_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_sync_active.svg
diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml
@@ -71,41 +71,33 @@
 
           <WidgetGroup>
             <ObjectName>SyncBox</ObjectName>
-            <Layout>vertical</Layout>
+            <Layout>horizontal</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
-              <Template src="skin:/controls/button_2state_right.xml">
-                <SetVariable name="TooltipId">sync_enabled</SetVariable>
-                <SetVariable name="ObjectName">SyncDeck</SetVariable>
-                <SetVariable name="Size">48f,22f</SetVariable>
-                <SetVariable name="BtnSize">sync</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="Group"/>,sync_enabled</SetVariable>
-                <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,sync_leader</SetVariable>
-              </Template>
               <PushButton>
-                  <TooltipId>sync_leader</TooltipId>
-                  <ObjectName>SyncLeader</ObjectName>
-                  <Size>48f,22f</Size>
-                  <NumberStates>3</NumberStates>
-                  <State>
-                      <Number>0</Number>
-                      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_sync.svg</Unpressed>
-                      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_sync_active.svg</Pressed>
-                  </State>
-                  <State>
-                      <Number>1</Number>
-                      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_sync_active.svg</Unpressed>
-                      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_sync_active.svg</Pressed>
-                  </State>
-                  <State>
-                      <Number>2</Number>
-                      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_sync_active.svg</Unpressed>
-                      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_sync_active.svg</Pressed>
-                  </State>
-                  <Connection>
-                      <ConfigKey><Variable name="Group"/>,sync_leader</ConfigKey>
-                      <ButtonState>LeftButton</ButtonState>
-                  </Connection>
+                <TooltipId>sync_enabled</TooltipId>
+                <ObjectName>SyncDeck</ObjectName>
+                <Size>40f,22f</Size>
+                <NumberStates>2</NumberStates>
+                <RightClickIsPushButton>true</RightClickIsPushButton>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,sync_enabled</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,sync_master</ConfigKey>
+                  <ButtonState>RightButton</ButtonState>
+                </Connection>
+              </PushButton>
+              <PushButton>
+                <TooltipId>sync_master</TooltipId>
+                <ObjectName>SyncLeader</ObjectName>
+                <Size>22f,22f</Size>
+                <NumberStates>3</NumberStates>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,sync_master</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
               </PushButton>
             </Children>
           </WidgetGroup>

diff --git a/res/skins/LateNight/decks/rate_controls_compact.xml b/res/skins/LateNight/decks/rate_controls_compact.xml
@@ -23,7 +23,7 @@
           <WidgetGroup><!-- BPM + rate + Tap overlay-->
             <ObjectName>BpmTapContainer</ObjectName>
             <Layout>stacked</Layout>
-            <Size>60f,42f</Size>
+            <Size>60f,40f</Size>
             <Children>
               <!-- In order to make the bpm display tappable, we use an old-style
               widget group and put the bpm pushbutton on top of the display. -->
@@ -71,6 +71,7 @@
             <Children>
               <!-- Rate controls with Sync button -->
               <WidgetGroup>
+                <ObjectName>AlignCenter</ObjectName>
                 <SizePolicy>min,min</SizePolicy>
                 <Layout>vertical</Layout>
                 <Children>
@@ -79,15 +80,31 @@
                     <Layout>horizontal</Layout>
                     <SizePolicy>min,min</SizePolicy>
                     <Children>
-                      <Template src="skin:/controls/button_2state_right.xml">
-                        <SetVariable name="TooltipId">sync_enabled</SetVariable>
-                        <SetVariable name="ObjectName">SyncDeck</SetVariable>
-                        <SetVariable name="Size">48f,22f</SetVariable>
-                        <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
-                        <SetVariable name="BtnSize">sync</SetVariable>
-                        <SetVariable name="ConfigKey"><Variable name="Group"/>,sync_enabled</SetVariable>
-                        <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beatsync_tempo</SetVariable>
-                      </Template>
+                      <PushButton>
+                        <TooltipId>sync_enabled</TooltipId>
+                        <ObjectName>SyncDeck</ObjectName>
+                        <Size>40f,22f</Size>
+                        <NumberStates>2</NumberStates>
+                        <RightClickIsPushButton>true</RightClickIsPushButton>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,sync_enabled</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,sync_master</ConfigKey>
+                          <ButtonState>RightButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+                      <PushButton>
+                        <TooltipId>sync_master</TooltipId>
+                        <ObjectName>SyncLeader</ObjectName>
+                        <Size>22f,22f</Size>
+                        <NumberStates>3</NumberStates>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,sync_master</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                      </PushButton>
                     </Children>
                   </WidgetGroup>