From b20028cd25e0934cf1b5e03f38ff7b82ee1762de Mon Sep 17 00:00:00 2001
From: Stefan <nopeppermint@users.noreply.github.com>
Date: Sun, 22 Apr 2018 10:27:36 +0200
Subject: [PATCH] Latenight: group FX Buttons

---
 res/skins/LateNight/deck_row_1_keyVinylFx.xml | 173 +++++++++++++-------------
 1 file changed, 89 insertions(+), 84 deletions(-)

diff --git a/res/skins/LateNight/deck_row_1_keyVinylFx.xml b/res/skins/LateNight/deck_row_1_keyVinylFx.xml
index 52694d05c6..fe6d76de11 100644
--- a/res/skins/LateNight/deck_row_1_keyVinylFx.xml
+++ b/res/skins/LateNight/deck_row_1_keyVinylFx.xml
@@ -99,94 +99,99 @@
         <SizePolicy>min,min</SizePolicy>
         <Children></Children>
       </WidgetGroup>
-
-      <!-- FX buttons 1-4 -->
-      <PushButton>
-        <Size>30f,22f</Size>
-        <TooltipId>EffectUnit_deck_enabled</TooltipId>
-        <ObjectName>FxAssignButton</ObjectName>
-        <NumberStates>2</NumberStates>
-        <State>
-          <Number>0</Number>
-          <Text>FX&#8202;1</Text>
-        </State>
-        <State>
-          <Number>1</Number>
-          <Text>FX&#8202;1</Text>
-        </State>
-        <Connection>
-          <ConfigKey>[EffectRack1_EffectUnit1],group_<Variable name="group"/>_enable</ConfigKey>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-
-      <PushButton>
-        <Size>30f,22f</Size>
-        <TooltipId>EffectUnit_deck_enabled</TooltipId>
-        <ObjectName>FxAssignButton</ObjectName>
-        <NumberStates>2</NumberStates>
-        <State>
-          <Number>0</Number>
-          <Text>FX&#8202;2</Text>
-        </State>
-        <State>
-          <Number>1</Number>
-          <Text>FX&#8202;2</Text>
-        </State>
-        <Connection>
-          <ConfigKey>[EffectRack1_EffectUnit2],group_<Variable name="group"/>_enable</ConfigKey>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-
+      
       <WidgetGroup>
         <Layout>horizontal</Layout>
-        <Connection>
-          <ConfigKey>[Master],show_4effectunits</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-        <Children>
-          <PushButton>
-            <Size>30f,22f</Size>
-            <TooltipId>EffectUnit_deck_enabled</TooltipId>
-            <ObjectName>FxAssignButton</ObjectName>
-            <NumberStates>2</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Text>FX&#8202;3</Text>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Text>FX&#8202;3</Text>
-            </State>
-            <Connection>
-              <ConfigKey>[EffectRack1_EffectUnit3],group_<Variable name="group"/>_enable</ConfigKey>
-              <ButtonState>LeftButton</ButtonState>
-            </Connection>
-          </PushButton>
+          <ObjectName>AlignRightTop</ObjectName>
+           <Children>
+            <!-- FX buttons 1-4 -->
+            <PushButton>
+              <Size>30f,22f</Size>
+              <TooltipId>EffectUnit_deck_enabled</TooltipId>
+              <ObjectName>FxAssignButton</ObjectName>
+              <NumberStates>2</NumberStates>
+              <State>
+                <Number>0</Number>
+                <Text>FX&#8202;1</Text>
+              </State>
+              <State>
+                <Number>1</Number>
+                <Text>FX&#8202;1</Text>
+              </State>
+              <Connection>
+                <ConfigKey>[EffectRack1_EffectUnit1],group_<Variable name="group"/>_enable</ConfigKey>
+                <ButtonState>LeftButton</ButtonState>
+              </Connection>
+            </PushButton>
 
-          <PushButton>
-            <Size>30f,22f</Size>
-            <TooltipId>EffectUnit_deck_enabled</TooltipId>
-            <ObjectName>FxAssignButton</ObjectName>
-            <NumberStates>2</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Text>FX&#8202;4</Text>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Text>FX&#8202;4</Text>
-            </State>
-            <Connection>
-              <ConfigKey>[EffectRack1_EffectUnit4],group_<Variable name="group"/>_enable</ConfigKey>
-              <ButtonState>LeftButton</ButtonState>
-            </Connection>
-          </PushButton>
-        </Children>
-      </WidgetGroup>
-      <!-- /FX buttons 1-4 -->
+            <PushButton>
+              <Size>30f,22f</Size>
+              <TooltipId>EffectUnit_deck_enabled</TooltipId>
+              <ObjectName>FxAssignButton</ObjectName>
+              <NumberStates>2</NumberStates>
+              <State>
+                <Number>0</Number>
+                <Text>FX&#8202;2</Text>
+              </State>
+              <State>
+                <Number>1</Number>
+                <Text>FX&#8202;2</Text>
+              </State>
+              <Connection>
+                <ConfigKey>[EffectRack1_EffectUnit2],group_<Variable name="group"/>_enable</ConfigKey>
+                <ButtonState>LeftButton</ButtonState>
+              </Connection>
+            </PushButton>
+
+            <WidgetGroup>
+              <Layout>horizontal</Layout>
+              <Connection>
+                <ConfigKey>[Master],show_4effectunits</ConfigKey>
+                <BindProperty>visible</BindProperty>
+              </Connection>
+              <Children>
+                <PushButton>
+                  <Size>30f,22f</Size>
+                  <TooltipId>EffectUnit_deck_enabled</TooltipId>
+                  <ObjectName>FxAssignButton</ObjectName>
+                  <NumberStates>2</NumberStates>
+                  <State>
+                    <Number>0</Number>
+                    <Text>FX&#8202;3</Text>
+                  </State>
+                  <State>
+                    <Number>1</Number>
+                    <Text>FX&#8202;3</Text>
+                  </State>
+                  <Connection>
+                    <ConfigKey>[EffectRack1_EffectUnit3],group_<Variable name="group"/>_enable</ConfigKey>
+                    <ButtonState>LeftButton</ButtonState>
+                  </Connection>
+                </PushButton>
 
+                <PushButton>
+                  <Size>30f,22f</Size>
+                  <TooltipId>EffectUnit_deck_enabled</TooltipId>
+                  <ObjectName>FxAssignButton</ObjectName>
+                  <NumberStates>2</NumberStates>
+                  <State>
+                    <Number>0</Number>
+                    <Text>FX&#8202;4</Text>
+                  </State>
+                  <State>
+                    <Number>1</Number>
+                    <Text>FX&#8202;4</Text>
+                  </State>
+                  <Connection>
+                    <ConfigKey>[EffectRack1_EffectUnit4],group_<Variable name="group"/>_enable</ConfigKey>
+                    <ButtonState>LeftButton</ButtonState>
+                  </Connection>
+                </PushButton>
+              </Children>
+            </WidgetGroup>
+            <!-- /FX buttons 1-4 -->
+      </Children>
+     </WidgetGroup>
     </Children>
   </WidgetGroup>
 </Template>