From 1bc9ccd89ab9b922556200344b9241f66b2c942e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Sun, 22 Jul 2018 13:07:33 +0200
Subject: [PATCH 1/2] Shade: remove superfluid margins and padding in
 sampler.xml

---
 res/skins/Shade/sampler.xml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/res/skins/Shade/sampler.xml b/res/skins/Shade/sampler.xml
index a4346092818..a27868fc0c1 100644
--- a/res/skins/Shade/sampler.xml
+++ b/res/skins/Shade/sampler.xml
@@ -3,18 +3,18 @@
 		<ObjectName>Sampler</ObjectName>
 		<Size>i,103f</Size>
 		<Layout>horizontal</Layout>
-		<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 10px; } </Style>
+		<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0px; } </Style>
 		<Children>
 			<WidgetGroup>
 				<ObjectName>SamplerLeftBorder</ObjectName>
 				<Size>5f,100f</Size>
 				<BackPath>style/style_bg_deck_border.png</BackPath>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
 			</WidgetGroup>
 			<WidgetGroup>
 				<Size>0e,103f</Size>
-		        <Layout>vertical</Layout>
-                <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
+				<Layout>vertical</Layout>
+				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
 				<Children>
 					<WidgetGroup>
 						<ObjectName>SamplerTop</ObjectName>
@@ -104,7 +104,7 @@
 					<WidgetGroup>
 						<ObjectName>SamplerMid</ObjectName>
 						<Size>0e,36f</Size>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
 						<Layout>horizontal</Layout>
 						<Children>	
 
@@ -112,7 +112,7 @@
 							<ObjectName>SamplerMid</ObjectName>
 							<Size>27f,36f</Size>
 							<BackPath>style/style_bg_sampler_mid.png</BackPath>
-							<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+							<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
 							<Children>	
 								<PushButton>
 									<TooltipId>play_start</TooltipId>
@@ -149,7 +149,7 @@
 							<ObjectName>SamplerMid</ObjectName>
 							<Size>0e,36f</Size>
 							<BackPath>style/style_bg_sampler_mid.png</BackPath>
-							<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+							<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
 							<Layout>horizontal</Layout>
 							<Children>					
 								<Overview>
@@ -183,7 +183,7 @@
 							<ObjectName>SamplerButtonGrid</ObjectName>
 							<Size>42f,36f</Size>
 							<BackPath>style/style_bg_sampler_woverview_buttons.png</BackPath>
-							<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+							<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
 							<Children>	
 								<PushButton>
 									<TooltipId>repeat</TooltipId>
@@ -274,18 +274,18 @@
 						<ObjectName>SamplerBottom</ObjectName>
 						<Size>0e,40f</Size>
 						<BackPath>style/style_bg_sampler_bottom.png</BackPath>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
 						<Layout>horizontal</Layout>
 						<Children>
 							<WidgetGroup>
 								<ObjectName>SamplerBottom</ObjectName>
 								<Size>0e,40f</Size>
-								<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+								<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
 							</WidgetGroup>
 							<WidgetGroup>
 								<ObjectName>SamplerBottom</ObjectName>
 								<Size>204f,40f</Size>
-								<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+								<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
 								<Children>
 									<PushButton>
 										<TooltipId>beatsync_beatsync_tempo</TooltipId>
@@ -484,7 +484,7 @@
 				<ObjectName>SamplerVUMeter</ObjectName>
 				<Size>8f,100f</Size>
 				<BackPath>style/style_bg_sampler_vu.png</BackPath>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
 				<Children>
 					<StatusLight>
 						<TooltipId>sampler_PeakIndicator</TooltipId>
@@ -517,7 +517,7 @@
 				<ObjectName>SamplerPitch</ObjectName>
 				<Size>21f,100f</Size>
 				<BackPath>style/style_bg_sampler_right.png</BackPath>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
 				<Children>
 					<SliderComposed>
 						<TooltipId>rate</TooltipId>
@@ -537,12 +537,12 @@
 				<ObjectName>SamplerRightBorder</ObjectName>
 				<Size>5f,100f</Size>
 				<BackPath>style/style_bg_deck_border.png</BackPath>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
 			</WidgetGroup>
 			<WidgetGroup>
 				<ObjectName>SamplerRightBorder</ObjectName>
 				<Size>3f,100f</Size>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
 			</WidgetGroup>
 		</Children>
 	</WidgetGroup>

From 97ceaca9b4bf608a8325c36963b405b9d97c4421 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 30 Jul 2018 16:23:36 +0200
Subject: [PATCH 2/2] Shade qt5.5: remove further obsolete 10px
 margins/paddings/borders

---
 res/skins/Shade/looping.xml | 10 +++++-----
 res/skins/Shade/skin.xml    | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/res/skins/Shade/looping.xml b/res/skins/Shade/looping.xml
index 1f45131202d..30849f9223a 100644
--- a/res/skins/Shade/looping.xml
+++ b/res/skins/Shade/looping.xml
@@ -8,7 +8,7 @@
         <ObjectName>EffectLeftBorder</ObjectName>
         <Size>5f,40f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
       </WidgetGroup>
 
       <WidgetGroup>
@@ -112,7 +112,7 @@
           <WidgetGroup>
             <Pos>100,10</Pos>
             <Size>50f,20f</Size>
-            <Style>QGroupBox { border: 10px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
+            <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
             <Layout>horizontal</Layout>
             <Children>
               <BeatSpinBox>
@@ -425,7 +425,7 @@
           <WidgetGroup>
             <Size>50f,20f</Size>
             <Pos>21,10</Pos>
-            <Style>QGroupBox { border: 10px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
+            <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
             <Layout>horizontal</Layout>
             <Children>
               <BeatSpinBox>
@@ -464,13 +464,13 @@
         <ObjectName>EffectRightBorder</ObjectName>
         <Size>5f,40f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
       </WidgetGroup>
 
       <WidgetGroup>
         <ObjectName>EffectRightBorder</ObjectName>
         <Size>3f,40f</Size>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
       </WidgetGroup>
 
     </Children>
diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml
index 575f6de2e89..669782ce6b3 100644
--- a/res/skins/Shade/skin.xml
+++ b/res/skins/Shade/skin.xml
@@ -40,7 +40,7 @@
 	https://qt-project.org/doc/qt-4.8/stylesheet.html
 
 	Debugging:
-	To outline WidgetGroups change all occurrences (exept this one ;-) of
+	To outline WidgetGroups change all occurrences (except this one ;-) of
 	"QGroupBox { border: 0px solid" to "QGroupBox { border: 1px solid"
 
 	Parent WidgedGroups are outlined one pixel solid red;
@@ -253,7 +253,7 @@
 					<Children>
 		                <WidgetGroup>
 			                <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
-							<Layout>vertical</Layout>			                
+							<Layout>vertical</Layout>
 							<Children>
 	      						<Template src="skin:deck.xml">
 								    <SetVariable name="channum">1</SetVariable>
@@ -389,13 +389,13 @@
 				    <WidgetGroup>
 				      <SizePolicy>me,min</SizePolicy>
 				      <Layout>horizontal</Layout>
-				      <Style>QGroupBox { border: 0px solid yellow; margin: 1px 0px 6px 0px;} </Style>
+				      <Style>QGroupBox { border: 0px solid yellow; margin: 0px;}</Style>
 				      <Children>
-						<WidgetGroup>
-							<ObjectName>EffectLeftBorder</ObjectName>
-							<Size>3f,44f</Size>
-							<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
-						</WidgetGroup>
+					<WidgetGroup>
+					  <ObjectName>EffectLeftBorder</ObjectName>
+					  <Size>3f,43f</Size>
+					  <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
+					</WidgetGroup>
 				        <Template src="skin:looping.xml">
 				          <SetVariable name="channum">1</SetVariable>
 				        </Template>
@@ -416,9 +416,9 @@
 				      <Not/>
 				    </Transform>
 				  </Connection>
-				</WidgetGroup>	
-			    <Template src="skin:effectrow.xml"/>	
-				<Template src="skin:srcrow.xml"/>	
+				</WidgetGroup>
+			    <Template src="skin:effectrow.xml"/>
+				<Template src="skin:srcrow.xml"/>
 			    <Template src="skin:samplerrow.xml">
 					<SetVariable name="rownum">1</SetVariable>
 					<SetVariable name="samplernum1">1</SetVariable>
@@ -433,7 +433,7 @@
 					<SetVariable name="samplernum2">4</SetVariable>
 	                <SetVariable name="samplernum3">7</SetVariable>
 	                <SetVariable name="samplernum4">8</SetVariable>
-				</Template>	
+				</Template>
 				<!--
 				**********************************************
 				Library / Preview Deck / Search / Tree view