From 35e9d0d2513364b2a14fb881f0c98e4a02746ff0 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Sat, 31 Oct 2020 03:59:59 +0100
Subject: LateNight: enhance toggling number of samplers

---
 res/skins/LateNight/samplers_rack.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/skins/LateNight/samplers_rack.xml b/res/skins/LateNight/samplers_rack.xml
index 61b45bb93e..c532d639c5 100644
--- a/res/skins/LateNight/samplers_rack.xml
+++ b/res/skins/LateNight/samplers_rack.xml
@@ -22,10 +22,10 @@
         <Children>
 
           <!--4 Samplers -->
-          <Template trigger="[LateNight],show_4samplers" src="skin:/samplers/samplers_4decks.xml"/>
+          <Template trigger="[LateNight],show_4samplers"  on_hide_select="1" src="skin:/samplers/samplers_4decks.xml"/>
 
           <!--8 Samplers -->
-          <WidgetGroup trigger="[LateNight],show_8samplers">
+          <WidgetGroup trigger="[LateNight],show_8samplers" on_hide_select="0">
             <Layout>vertical</Layout>
             <Children>
               <SingletonContainer trigger="[LateNight],show_8samplers">
@@ -35,7 +35,7 @@
           </WidgetGroup>
 
           <!--16 Samplers -->
-          <WidgetGroup trigger="[LateNight],show_16samplers">
+          <WidgetGroup trigger="[LateNight],show_16samplers" on_hide_select="1">
             <Layout>vertical</Layout>
             <Children>
               <SingletonContainer>
-- 
cgit v1.2.3


From 2b0f0fe5228f7db2397a7db73167dfef9ec034b3 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 3 Nov 2020 11:05:02 +0100
Subject: LateNight: spread skin settings

---
 res/skins/LateNight/skin_settings.xml  | 18 ++++++++++++-----
 res/skins/LateNight/style_classic.qss  | 29 ++++++++++++++-------------
 res/skins/LateNight/style_palemoon.qss | 36 +++++++++++++++++++---------------
 3 files changed, 48 insertions(+), 35 deletions(-)

(limited to 'res')

diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml
index 88db8bce7f..cb4bb53ace 100644
--- a/res/skins/LateNight/skin_settings.xml
+++ b/res/skins/LateNight/skin_settings.xml
@@ -219,6 +219,8 @@ Description:
                         <SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable>
                       </Template>
 
+                      <WidgetGroup><Size>0me,6f</Size></WidgetGroup>
+
                       <!-- Rate Controls -->
                       <Template src="skin:/helpers/skin_settings_button_2state.xml">
                         <SetVariable name="TooltipId">rate_toggle</SetVariable>
@@ -264,6 +266,8 @@ Description:
                         <SetVariable name="Setting">[VinylControl],show_vinylcontrol</SetVariable>
                       </Template>
 
+                      <WidgetGroup><Size>0me,6f</Size></WidgetGroup>
+
                       <!-- Spinny -->
                       <Template src="skin:/helpers/skin_settings_button_2state.xml">
                         <SetVariable name="TooltipId">show_spinny</SetVariable>
@@ -329,6 +333,8 @@ Description:
                         <SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable>
                       </Template>
 
+                      <WidgetGroup><Size>0me,6f</Size></WidgetGroup>
+
                       <!-- Loop/Jump Controls in compact decks-->
                       <Template src="skin:/helpers/skin_settings_button_2state.xml">
                         <SetVariable name="TooltipId"></SetVariable>
@@ -381,6 +387,8 @@ Description:
                         <SetVariable name="Setting">[VinylControl],show_vinylcontrol</SetVariable>
                       </Template>
 
+                      <WidgetGroup><Size>0me,6f</Size></WidgetGroup>
+
                       <!-- Level meters -->
                       <Template src="skin:/helpers/skin_settings_button_2state.xml">
                         <SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
@@ -462,7 +470,7 @@ Description:
                         <SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable>
                       </Template>
 
-                      <WidgetGroup><Size>0me,108f</Size></WidgetGroup>
+                      <WidgetGroup><Size>0me,120f</Size></WidgetGroup>
 
                       <!-- Spinny -->
                       <Template src="skin:/helpers/skin_settings_button_2state.xml">
@@ -497,7 +505,7 @@ Description:
 <!-- Other skin options -->
           <WidgetGroup>
             <ObjectName>SkinSettingsSeparator</ObjectName>
-            <Size>1min,6f</Size>
+            <Size>1min,12f</Size>
           </WidgetGroup>
 
           <WidgetGroup><!--  Mixer -->
@@ -594,7 +602,7 @@ Description:
 
           <WidgetGroup>
             <ObjectName>SkinSettingsSeparator</ObjectName>
-            <Size>1min,6f</Size>
+            <Size>1min,12f</Size>
           </WidgetGroup>
 
           <WidgetGroup><!-- Effects -->
@@ -694,7 +702,7 @@ Description:
 
           <WidgetGroup>
             <ObjectName>SkinSettingsSeparator</ObjectName>
-            <Size>1min,6f</Size>
+            <Size>1min,12f</Size>
           </WidgetGroup>
 
           <WidgetGroup><!-- Samplers -->
@@ -859,7 +867,7 @@ Description:
 
           <WidgetGroup>
             <ObjectName>SkinSettingsSeparator</ObjectName>
-            <Size>1min,6f</Size>
+            <Size>1min,12f</Size>
           </WidgetGroup>
 
           <Label>
diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss
index 3781db111b..3858975777 100644
--- a/res/skins/LateNight/style_classic.qss
+++ b/res/skins/LateNight/style_classic.qss
@@ -186,23 +186,27 @@ WSearchLineEdit,
 
 #DeckRateSeparator,
 #DeckRateSeparatorCompact,
-#MasterMixerSeparator {
+#MasterMixerSeparator,
+#SkinSettingsSeparator {
   /* needs a background color to paint the borders */
   background-color: transparent;
   min-width: 0px;
   max-width: 0px;
   }
 
-#FxSlotSeparatorV {
-  min-width: 1px;
-  max-width: 1px;
-  image: url(skin:/classic/style/fx_separator.svg) repeat center center;
-  margin: 2px 1px;
-}
-#FxSlotSeparatorH {
-  min-height: 2px;
-  max-height: 2px;
-}
+  #FxSlotSeparatorV {
+    min-width: 1px;
+    max-width: 1px;
+    image: url(skin:/classic/style/fx_separator.svg) repeat center center;
+    margin: 2px 1px;
+  }
+  #FxSlotSeparatorH {
+    min-height: 2px;
+    max-height: 2px;
+  }
+  #SkinSettingsSeparator {
+    margin: 3px 4px 7px 4px;
+  }
 
 WBeatSpinBox,
 #spinBoxTransition  {
@@ -2495,9 +2499,6 @@ WEffectSelector,
         height: 0px;
         margin: 4px;
       }
-    #SkinSettingsSeparator {
-      margin: 0px 4px 4px 4px;
-    }
   WBeatSpinBox QMenu::item,
   #LibraryContainer QMenu::item,
   WCueMenuPopup QMenu::item,
diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
index e6729fa45d..46bb6f3dbd 100644
--- a/res/skins/LateNight/style_palemoon.qss
+++ b/res/skins/LateNight/style_palemoon.qss
@@ -275,15 +275,22 @@ WSearchLineEdit {
 #MasterHeadphoneSeparator,
 #FxSlotSeparatorV,
 #FxSlotSeparatorH,
-#SeparatorToolbar {
+#SeparatorToolbar,
+#SkinSettingsSeparator {
   /* needs a background color to paint the borders */
   background-color: transparent;
   }
   #DeckRateSeparator,
   #DeckRateSeparatorCompact,
-  #FxSlotSeparatorV {
+  #FxSlotSeparatorV,
+  #SkinSettingsSeparator {
     min-width: 0px;
     max-width: 0px;
+  }
+  #DeckRateSeparator,
+  #DeckRateSeparatorCompact,
+  #FxSlotSeparatorV,
+  #FxSlotSeparatorH {
     border-left: 1px solid #0c0c0c;
     border-right: 1px solid #333;
   }
@@ -291,20 +298,20 @@ WSearchLineEdit {
     border-left: 1px solid #0c0c0c;
     border-right: 1px solid #222;
   }
+  #FxSlotSeparatorH {
+    border-top: 1px solid #0c0c0c;
+    border-bottom: 1px solid #333;
+  }
+
   #FxSlotSeparatorV {
     margin: 0px 0px 0px 2px;
   }
-
-#FxSlotSeparatorH {
-  min-height: 0px;
-  max-height: 0px;
-  border-top: 1px solid #0c0c0c;
-  border-bottom: 1px solid #333;
-}
-
-#ToolbarSeparator {
-  margin: 0px 5px;
-}
+  #ToolbarSeparator {
+    margin: 0px 5px;
+  }
+  #SkinSettingsSeparator {
+    margin: 3px 4px 7px 4px;
+  }
 
 /* dynamic bottom border in #DeckRow1_ */
 #ExpandingBottomBorder {
@@ -2992,9 +2999,6 @@ WEffectSelector,
         height: 0px;
         margin: 4px;
       }
-    #SkinSettingsSeparator {
-      margin: 0px 4px 4px 4px;
-    }
   WBeatSpinBox QMenu::item,
   #LibraryContainer QMenu::item,
   WCueMenuPopup QMenu::item,
-- 
cgit v1.2.3


From a94918f4dd04c677a34c8dffe577c47acceeacfe Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 3 Nov 2020 11:07:13 +0100
Subject: LateNight: Master > Main

---
 res/skins/LateNight/mixer.xml                      |   4 +-
 res/skins/LateNight/mixer/mixer_main_headphone.xml | 293 +++++++++++++++++++++
 .../LateNight/mixer/mixer_master_headphone.xml     | 293 ---------------------
 res/skins/LateNight/skin.xml                       |   2 +-
 res/skins/LateNight/skin_settings.xml              |   4 +-
 5 files changed, 298 insertions(+), 298 deletions(-)
 create mode 100644 res/skins/LateNight/mixer/mixer_main_headphone.xml
 delete mode 100644 res/skins/LateNight/mixer/mixer_master_headphone.xml

(limited to 'res')

diff --git a/res/skins/LateNight/mixer.xml b/res/skins/LateNight/mixer.xml
index aa35146118..cda2293b97 100644
--- a/res/skins/LateNight/mixer.xml
+++ b/res/skins/LateNight/mixer.xml
@@ -21,12 +21,12 @@
               <Template src="skin:/mixer/mixer_4decks.xml"/>
             </Children>
             <Connection>
-              <ConfigKey persist="true">[Skin],show_master_head_mixer</ConfigKey>
+              <ConfigKey persist="true">[Skin],show_main_head_mixer</ConfigKey>
               <BindProperty>highlight</BindProperty>
             </Connection>
           </WidgetGroup>
 
-          <Template src="skin:/mixer/mixer_master_headphone.xml"/>
+          <Template src="skin:/mixer/mixer_main_headphone.xml"/>
 
         </Children>
       </WidgetGroup><!-- MixerContainer -->
diff --git a/res/skins/LateNight/mixer/mixer_main_headphone.xml b/res/skins/LateNight/mixer/mixer_main_headphone.xml
new file mode 100644
index 0000000000..fb86ce127a
--- /dev/null
+++ b/res/skins/LateNight/mixer/mixer_main_headphone.xml
@@ -0,0 +1,293 @@
+<Template>
+  <SetVariable name="BtnType"><Variable name="SubRegion_BtnType"/></SetVariable>
+  <SetVariable name="Group">[Master]</SetVariable>
+  <SetVariable name="KnobBg">master</SetVariable>
+  <SetVariable name="KnobIndicator">master</SetVariable>
+  <SetVariable name="ArcRadius"><Variable name="ArcRadiusCompact"/></SetVariable>
+  <SetVariable name="ArcThickness"><Variable name="ArcThicknessBig"/></SetVariable>
+
+  <WidgetGroup>
+    <SizePolicy>max,min</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <WidgetGroup><!--sized and styled in css -->
+        <ObjectName>MasterMixerSeparator</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children/>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>MixerMasterHeadphone</ObjectName>
+        <SizePolicy>min,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>MasterControls</ObjectName>
+            <SizePolicy>min,me</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <WidgetGroup>
+                <MinimumSize>0,0</MinimumSize>
+                <!-- <MaximumSize>,20</MaximumSize> -->
+                <SizePolicy>min,me</SizePolicy>
+              </WidgetGroup>
+
+              <!-- Master knobs
+                  Labels are separate so knobs are spaced equally -->
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/knob_with_label.xml">
+                        <SetVariable name="TooltipId">master_gain</SetVariable>
+                        <SetVariable name="Size">35f,30f</SetVariable>
+                        <SetVariable name="KnobColor">orange</SetVariable>
+                        <SetVariable name="ArcColor"><Variable name="ArcColorGainLow"/></SetVariable>
+                        <SetVariable name="ArcUnipolar">true</SetVariable>
+                        <SetVariable name="Control">gain</SetVariable>
+                        <SetVariable name="Label">Main</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/knob_with_label.xml">
+                        <SetVariable name="TooltipId">balance</SetVariable>
+                        <SetVariable name="Size">35f,30f</SetVariable>
+                        <SetVariable name="KnobColor">red</SetVariable>
+                        <SetVariable name="ArcColor"><Variable name="ArcColorMstBal"/></SetVariable>
+                        <SetVariable name="Control">balance</SetVariable>
+                        <SetVariable name="Label"> Bal</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <MinimumSize>0,0</MinimumSize>
+                <MaximumSize>,2</MaximumSize>
+                <SizePolicy>min,me</SizePolicy>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>BoothKnobBox</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <WidgetGroup><Size>5f,0min</Size></WidgetGroup>
+                  <Template src="skin:/controls/knob.xml">
+                    <SetVariable name="TooltipId">booth_gain</SetVariable>
+                    <SetVariable name="Size">35f,30f</SetVariable>
+                    <SetVariable name="KnobColor">orange</SetVariable>
+                    <SetVariable name="ArcColor"><Variable name="ArcColorGainLow"/></SetVariable>
+                    <SetVariable name="ArcUnipolar">true</SetVariable>
+                    <SetVariable name="Control">booth_gain</SetVariable>
+                  </Template>
+                  <WidgetGroup>
+                    <ObjectName>BoothLabelBox</ObjectName>
+                    <Layout>vertical</Layout>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Children>
+                      <Label>
+                        <ObjectName>KnobLabel</ObjectName>
+                        <SizePolicy>max,max</SizePolicy>
+                        <Alignment>left</Alignment>
+                        <Text>Booth</Text>
+                      </Label>
+                    </Children>
+                  </WidgetGroup><!-- BoothLabelBox -->
+                </Children>
+                <Connection>
+                  <ConfigKey>[Master],booth_enabled</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- BoothKnobBox -->
+
+              <WidgetGroup>
+                <MinimumSize>0,2</MinimumSize>
+                <MaximumSize>,20</MaximumSize>
+                <SizePolicy>min,me</SizePolicy>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>AlignCenter</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <Template src="skin:/fx/assign_buttons_master.xml">
+                    <SetVariable name="Type">master</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+
+                  <WidgetGroup>
+                    <MinimumSize>0,10</MinimumSize>
+                    <MaximumSize>,10</MaximumSize>
+                    <SizePolicy>min,me</SizePolicy>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <ObjectName>VuMeterMaster_4Decks</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>max,max</SizePolicy>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>VuMeterMaster_Light</ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                  </WidgetGroup><!-- VuMeterMaster_4Decks -->
+
+                  <WidgetGroup>
+                    <MinimumSize>0,20</MinimumSize>
+                    <MaximumSize>,20</MaximumSize>
+                    <SizePolicy>min,me</SizePolicy>
+                  </WidgetGroup>
+
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- /MasterVuMeter4ch -->
+
+            </Children>
+          </WidgetGroup><!-- MasterControls -->
+
+          <WidgetGroup><!-- sized and styled in css -->
+            <ObjectName>MasterHeadphoneSeparator</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children/>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>HeadphoneControls</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <WidgetGroup>
+                <MinimumSize>0,0</MinimumSize>
+                <!-- <MaximumSize>,20</MaximumSize> -->
+                <SizePolicy>min,me</SizePolicy>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- Headphone knobs -->
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/knob_with_label.xml">
+                        <SetVariable name="TooltipId">headphone_gain</SetVariable>
+                        <SetVariable name="Size">35f,30f</SetVariable>
+                        <SetVariable name="KnobColor">orange</SetVariable>
+                        <SetVariable name="ArcColor"><Variable name="ArcColorGainLow"/></SetVariable>
+                        <SetVariable name="ArcUnipolar">true</SetVariable>
+                        <SetVariable name="Control">headGain</SetVariable>
+                        <SetVariable name="Label">Head</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/knob_with_label.xml">
+                        <SetVariable name="TooltipId">headMix</SetVariable>
+                        <SetVariable name="Size">35f,30f</SetVariable>
+                        <SetVariable name="KnobColor">red</SetVariable>
+                        <SetVariable name="ArcColor"><Variable name="ArcColorMstBal"/></SetVariable>
+                        <SetVariable name="Control">headMix</SetVariable>
+                        <SetVariable name="Label">Mix</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <MinimumSize>0,0</MinimumSize>
+                <MaximumSize>,5</MaximumSize>
+                <SizePolicy>min,me</SizePolicy>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- HeadSplit button -->
+                <Layout>horizontal</Layout>
+                <SizePolicy>me,min</SizePolicy>
+                <Children>
+                  <PushButton>
+                    <TooltipId>headSplit</TooltipId>
+                    <ObjectName>SplitCue</ObjectName>
+                    <Size>48f,22f</Size>
+                    <NumberStates>2</NumberStates>
+                    <RightClickIsPushButton>false</RightClickIsPushButton>
+                    <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.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>
+                    <Connection>
+                      <ConfigKey>[Master],headSplit</ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                  </PushButton>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <MinimumSize>0,2</MinimumSize>
+                <MaximumSize>,5</MaximumSize>
+                <SizePolicy>min,me</SizePolicy>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>AlignCenter</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <Template src="skin:/fx/assign_buttons_master.xml">
+                    <SetVariable name="Group">[Headphone]</SetVariable>
+                    <SetVariable name="Type">headphones</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+
+            </Children>
+          </WidgetGroup><!-- HeadphoneControls -->
+
+        </Children>
+      </WidgetGroup><!-- MixerMasterHeadphone -->
+
+    </Children>
+    <Connection>
+      <ConfigKey persist="true">[Skin],show_main_head_mixer</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mixer/mixer_master_headphone.xml b/res/skins/LateNight/mixer/mixer_master_headphone.xml
deleted file mode 100644
index a133b8eefb..0000000000
--- a/res/skins/LateNight/mixer/mixer_master_headphone.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<Template>
-  <SetVariable name="BtnType"><Variable name="SubRegion_BtnType"/></SetVariable>
-  <SetVariable name="Group">[Master]</SetVariable>
-  <SetVariable name="KnobBg">master</SetVariable>
-  <SetVariable name="KnobIndicator">master</SetVariable>
-  <SetVariable name="ArcRadius"><Variable name="ArcRadiusCompact"/></SetVariable>
-  <SetVariable name="ArcThickness"><Variable name="ArcThicknessBig"/></SetVariable>
-
-  <WidgetGroup>
-    <SizePolicy>max,min</SizePolicy>
-    <Layout>horizontal</Layout>
-    <Children>
-
-      <WidgetGroup><!--sized and styled in css -->
-        <ObjectName>MasterMixerSeparator</ObjectName>
-        <Layout>horizontal</Layout>
-        <Children/>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>MixerMasterHeadphone</ObjectName>
-        <SizePolicy>min,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-
-          <WidgetGroup>
-            <ObjectName>MasterControls</ObjectName>
-            <SizePolicy>min,me</SizePolicy>
-            <Layout>vertical</Layout>
-            <Children>
-
-              <WidgetGroup>
-                <MinimumSize>0,0</MinimumSize>
-                <!-- <MaximumSize>,20</MaximumSize> -->
-                <SizePolicy>min,me</SizePolicy>
-              </WidgetGroup>
-
-              <!-- Master knobs
-                  Labels are separate so knobs are spaced equally -->
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>me,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:/controls/knob_with_label.xml">
-                        <SetVariable name="TooltipId">master_gain</SetVariable>
-                        <SetVariable name="Size">35f,30f</SetVariable>
-                        <SetVariable name="KnobColor">orange</SetVariable>
-                        <SetVariable name="ArcColor"><Variable name="ArcColorGainLow"/></SetVariable>
-                        <SetVariable name="ArcUnipolar">true</SetVariable>
-                        <SetVariable name="Control">gain</SetVariable>
-                        <SetVariable name="Label">Main</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
-
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>me,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:/controls/knob_with_label.xml">
-                        <SetVariable name="TooltipId">balance</SetVariable>
-                        <SetVariable name="Size">35f,30f</SetVariable>
-                        <SetVariable name="KnobColor">red</SetVariable>
-                        <SetVariable name="ArcColor"><Variable name="ArcColorMstBal"/></SetVariable>
-                        <SetVariable name="Control">balance</SetVariable>
-                        <SetVariable name="Label"> Bal</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <MinimumSize>0,0</MinimumSize>
-                <MaximumSize>,2</MaximumSize>
-                <SizePolicy>min,me</SizePolicy>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <ObjectName>BoothKnobBox</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <WidgetGroup><Size>5f,0min</Size></WidgetGroup>
-                  <Template src="skin:/controls/knob.xml">
-                    <SetVariable name="TooltipId">booth_gain</SetVariable>
-                    <SetVariable name="Size">35f,30f</SetVariable>
-                    <SetVariable name="KnobColor">orange</SetVariable>
-                    <SetVariable name="ArcColor"><Variable name="ArcColorGainLow"/></SetVariable>
-                    <SetVariable name="ArcUnipolar">true</SetVariable>
-                    <SetVariable name="Control">booth_gain</SetVariable>
-                  </Template>
-                  <WidgetGroup>
-                    <ObjectName>BoothLabelBox</ObjectName>
-                    <Layout>vertical</Layout>
-                    <SizePolicy>me,min</SizePolicy>
-                    <Children>
-                      <Label>
-                        <ObjectName>KnobLabel</ObjectName>
-                        <SizePolicy>max,max</SizePolicy>
-                        <Alignment>left</Alignment>
-                        <Text>Booth</Text>
-                      </Label>
-                    </Children>
-                  </WidgetGroup><!-- BoothLabelBox -->
-                </Children>
-                <Connection>
-                  <ConfigKey>[Master],booth_enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup><!-- BoothKnobBox -->
-
-              <WidgetGroup>
-                <MinimumSize>0,2</MinimumSize>
-                <MaximumSize>,20</MaximumSize>
-                <SizePolicy>min,me</SizePolicy>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <ObjectName>AlignCenter</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <Template src="skin:/fx/assign_buttons_master.xml">
-                    <SetVariable name="Type">master</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-
-                  <WidgetGroup>
-                    <MinimumSize>0,10</MinimumSize>
-                    <MaximumSize>,10</MaximumSize>
-                    <SizePolicy>min,me</SizePolicy>
-                  </WidgetGroup>
-
-                  <WidgetGroup>
-                    <ObjectName>VuMeterMaster_4Decks</ObjectName>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>max,max</SizePolicy>
-                    <Children>
-                      <SingletonContainer>
-                        <ObjectName>VuMeterMaster_Light</ObjectName>
-                      </SingletonContainer>
-                    </Children>
-                  </WidgetGroup><!-- VuMeterMaster_4Decks -->
-
-                  <WidgetGroup>
-                    <MinimumSize>0,20</MinimumSize>
-                    <MaximumSize>,20</MaximumSize>
-                    <SizePolicy>min,me</SizePolicy>
-                  </WidgetGroup>
-
-                </Children>
-                <Connection>
-                  <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup><!-- /MasterVuMeter4ch -->
-
-            </Children>
-          </WidgetGroup><!-- MasterControls -->
-
-          <WidgetGroup><!-- sized and styled in css -->
-            <ObjectName>MasterHeadphoneSeparator</ObjectName>
-            <Layout>horizontal</Layout>
-            <Children/>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <ObjectName>HeadphoneControls</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Layout>vertical</Layout>
-            <Children>
-
-              <WidgetGroup>
-                <MinimumSize>0,0</MinimumSize>
-                <!-- <MaximumSize>,20</MaximumSize> -->
-                <SizePolicy>min,me</SizePolicy>
-              </WidgetGroup>
-
-              <WidgetGroup><!-- Headphone knobs -->
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>me,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:/controls/knob_with_label.xml">
-                        <SetVariable name="TooltipId">headphone_gain</SetVariable>
-                        <SetVariable name="Size">35f,30f</SetVariable>
-                        <SetVariable name="KnobColor">orange</SetVariable>
-                        <SetVariable name="ArcColor"><Variable name="ArcColorGainLow"/></SetVariable>
-                        <SetVariable name="ArcUnipolar">true</SetVariable>
-                        <SetVariable name="Control">headGain</SetVariable>
-                        <SetVariable name="Label">Head</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
-
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>me,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:/controls/knob_with_label.xml">
-                        <SetVariable name="TooltipId">headMix</SetVariable>
-                        <SetVariable name="Size">35f,30f</SetVariable>
-                        <SetVariable name="KnobColor">red</SetVariable>
-                        <SetVariable name="ArcColor"><Variable name="ArcColorMstBal"/></SetVariable>
-                        <SetVariable name="Control">headMix</SetVariable>
-                        <SetVariable name="Label">Mix</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <MinimumSize>0,0</MinimumSize>
-                <MaximumSize>,5</MaximumSize>
-                <SizePolicy>min,me</SizePolicy>
-              </WidgetGroup>
-
-              <WidgetGroup><!-- HeadSplit button -->
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children>
-                  <PushButton>
-                    <TooltipId>headSplit</TooltipId>
-                    <ObjectName>SplitCue</ObjectName>
-                    <Size>48f,22f</Size>
-                    <NumberStates>2</NumberStates>
-                    <RightClickIsPushButton>false</RightClickIsPushButton>
-                    <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.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>
-                    <Connection>
-                      <ConfigKey>[Master],headSplit</ConfigKey>
-                      <ButtonState>LeftButton</ButtonState>
-                    </Connection>
-                  </PushButton>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <MinimumSize>0,2</MinimumSize>
-                <MaximumSize>,5</MaximumSize>
-                <SizePolicy>min,me</SizePolicy>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <ObjectName>AlignCenter</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <Template src="skin:/fx/assign_buttons_master.xml">
-                    <SetVariable name="Group">[Headphone]</SetVariable>
-                    <SetVariable name="Type">headphones</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
-
-            </Children>
-          </WidgetGroup><!-- HeadphoneControls -->
-
-        </Children>
-      </WidgetGroup><!-- MixerMasterHeadphone -->
-
-    </Children>
-    <Connection>
-      <ConfigKey persist="true">[Skin],show_master_head_mixer</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
index 965e57594a..a668ad00cc 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -72,7 +72,7 @@
 
     <!-- Mixer -->
       <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
-      <attribute persist="true" config_key="[Skin],show_master_head_mixer">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_main_head_mixer">1</attribute>
       <attribute persist="true" config_key="[Skin],show_eq_knobs">1</attribute>
       <attribute persist="true" config_key="[Skin],show_eq_kill_buttons">1</attribute>
       <attribute persist="true" config_key="[Skin],show_xfader">1</attribute>
diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml
index cb4bb53ace..f19816163e 100644
--- a/res/skins/LateNight/skin_settings.xml
+++ b/res/skins/LateNight/skin_settings.xml
@@ -555,8 +555,8 @@ Description:
                         <Children>
 
                           <Template src="skin:/helpers/skin_settings_button_2state.xml">
-                            <SetVariable name="Text">Master / Headphone Mixer</SetVariable>
-                            <SetVariable name="Setting">[Skin],show_master_head_mixer</SetVariable>
+                            <SetVariable name="Text">Main / Headphone Mixer</SetVariable>
+                            <SetVariable name="Setting">[Skin],show_main_head_mixer</SetVariable>
                           </Template>
 
                           <Template src="skin:/helpers/skin_settings_button_2state.xml">
-- 
cgit v1.2.3


From d3933df38646df07013f2eb4563f1b7a4b007083 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 3 Nov 2020 12:02:35 +0100
Subject: Tango: fix tooltip of preview deck VU meter

---
 res/skins/Tango/preview_deck.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/skins/Tango/preview_deck.xml b/res/skins/Tango/preview_deck.xml
index f1a8a793a0..a032ecce92 100644
--- a/res/skins/Tango/preview_deck.xml
+++ b/res/skins/Tango/preview_deck.xml
@@ -10,7 +10,7 @@ Description:
 Variables:
   PlayedOverlayColor  : defined in skin.xml
 -->
-<Template>	
+<Template>
   <SetVariable name="group">[PreviewDeck1]</SetVariable>
   <WidgetGroup>
     <Layout>stacked</Layout>
@@ -141,6 +141,7 @@ Variables:
 
               <Template src="skin:vumeter_mini.xml">
                 <SetVariable name="Size">5f,1me</SetVariable>
+                <SetVariable name="sourceType">preview</SetVariable>
               </Template>
 
               <WidgetGroup>
-- 
cgit v1.2.3


From be8dfff7a2cd2a483b48e1aaea647b2dfd710a4c Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Wed, 4 Nov 2020 22:13:57 +0100
Subject: Shade: correct knob arcs, add inverted arc, Master>Main, add AutoDJ
 status to mixer

---
 res/skins/Shade/deck_effect.xml                    |   8 ++--
 res/skins/Shade/ducking.xml                        |   2 +-
 res/skins/Shade/effect_parameter_knob.xml          |   2 +-
 res/skins/Shade/effectslotsmall.xml                |   4 +-
 .../knobs_no_center_inverted/knob_rotary_s0.png    | Bin 0 -> 6554 bytes
 .../knobs_no_center_inverted/knob_rotary_s1.png    | Bin 0 -> 6555 bytes
 .../knobs_no_center_inverted/knob_rotary_s10.png   | Bin 0 -> 6453 bytes
 .../knobs_no_center_inverted/knob_rotary_s11.png   | Bin 0 -> 6425 bytes
 .../knobs_no_center_inverted/knob_rotary_s12.png   | Bin 0 -> 6382 bytes
 .../knobs_no_center_inverted/knob_rotary_s13.png   | Bin 0 -> 6309 bytes
 .../knobs_no_center_inverted/knob_rotary_s14.png   | Bin 0 -> 6477 bytes
 .../knobs_no_center_inverted/knob_rotary_s15.png   | Bin 0 -> 6455 bytes
 .../knobs_no_center_inverted/knob_rotary_s16.png   | Bin 0 -> 6437 bytes
 .../knobs_no_center_inverted/knob_rotary_s17.png   | Bin 0 -> 6370 bytes
 .../knobs_no_center_inverted/knob_rotary_s18.png   | Bin 0 -> 6333 bytes
 .../knobs_no_center_inverted/knob_rotary_s19.png   | Bin 0 -> 6212 bytes
 .../knobs_no_center_inverted/knob_rotary_s2.png    | Bin 0 -> 6589 bytes
 .../knobs_no_center_inverted/knob_rotary_s20.png   | Bin 0 -> 6230 bytes
 .../knobs_no_center_inverted/knob_rotary_s21.png   | Bin 0 -> 6962 bytes
 .../knobs_no_center_inverted/knob_rotary_s22.png   | Bin 0 -> 6148 bytes
 .../knobs_no_center_inverted/knob_rotary_s23.png   | Bin 0 -> 6056 bytes
 .../knobs_no_center_inverted/knob_rotary_s24.png   | Bin 0 -> 5997 bytes
 .../knobs_no_center_inverted/knob_rotary_s25.png   | Bin 0 -> 5916 bytes
 .../knobs_no_center_inverted/knob_rotary_s26.png   | Bin 0 -> 5839 bytes
 .../knobs_no_center_inverted/knob_rotary_s27.png   | Bin 0 -> 5801 bytes
 .../knobs_no_center_inverted/knob_rotary_s28.png   | Bin 0 -> 5773 bytes
 .../knobs_no_center_inverted/knob_rotary_s29.png   | Bin 0 -> 5776 bytes
 .../knobs_no_center_inverted/knob_rotary_s3.png    | Bin 0 -> 6563 bytes
 .../knobs_no_center_inverted/knob_rotary_s30.png   | Bin 0 -> 5692 bytes
 .../knobs_no_center_inverted/knob_rotary_s31.png   | Bin 0 -> 5680 bytes
 .../knobs_no_center_inverted/knob_rotary_s32.png   | Bin 0 -> 5387 bytes
 .../knobs_no_center_inverted/knob_rotary_s33.png   | Bin 0 -> 5611 bytes
 .../knobs_no_center_inverted/knob_rotary_s34.png   | Bin 0 -> 5628 bytes
 .../knobs_no_center_inverted/knob_rotary_s35.png   | Bin 0 -> 5621 bytes
 .../knobs_no_center_inverted/knob_rotary_s36.png   | Bin 0 -> 5625 bytes
 .../knobs_no_center_inverted/knob_rotary_s37.png   | Bin 0 -> 5542 bytes
 .../knobs_no_center_inverted/knob_rotary_s38.png   | Bin 0 -> 5471 bytes
 .../knobs_no_center_inverted/knob_rotary_s39.png   | Bin 0 -> 5429 bytes
 .../knobs_no_center_inverted/knob_rotary_s4.png    | Bin 0 -> 6528 bytes
 .../knobs_no_center_inverted/knob_rotary_s40.png   | Bin 0 -> 5404 bytes
 .../knobs_no_center_inverted/knob_rotary_s41.png   | Bin 0 -> 5319 bytes
 .../knobs_no_center_inverted/knob_rotary_s42.png   | Bin 0 -> 5268 bytes
 .../knobs_no_center_inverted/knob_rotary_s43.png   | Bin 0 -> 5203 bytes
 .../knobs_no_center_inverted/knob_rotary_s44.png   | Bin 0 -> 5113 bytes
 .../knobs_no_center_inverted/knob_rotary_s45.png   | Bin 0 -> 5011 bytes
 .../knobs_no_center_inverted/knob_rotary_s46.png   | Bin 0 -> 4993 bytes
 .../knobs_no_center_inverted/knob_rotary_s47.png   | Bin 0 -> 4961 bytes
 .../knobs_no_center_inverted/knob_rotary_s48.png   | Bin 0 -> 4942 bytes
 .../knobs_no_center_inverted/knob_rotary_s49.png   | Bin 0 -> 4907 bytes
 .../knobs_no_center_inverted/knob_rotary_s5.png    | Bin 0 -> 6461 bytes
 .../knobs_no_center_inverted/knob_rotary_s50.png   | Bin 0 -> 4960 bytes
 .../knobs_no_center_inverted/knob_rotary_s51.png   | Bin 0 -> 4829 bytes
 .../knobs_no_center_inverted/knob_rotary_s52.png   | Bin 0 -> 4862 bytes
 .../knobs_no_center_inverted/knob_rotary_s53.png   | Bin 0 -> 4829 bytes
 .../knobs_no_center_inverted/knob_rotary_s54.png   | Bin 0 -> 4856 bytes
 .../knobs_no_center_inverted/knob_rotary_s55.png   | Bin 0 -> 4805 bytes
 .../knobs_no_center_inverted/knob_rotary_s56.png   | Bin 0 -> 4713 bytes
 .../knobs_no_center_inverted/knob_rotary_s57.png   | Bin 0 -> 4635 bytes
 .../knobs_no_center_inverted/knob_rotary_s58.png   | Bin 0 -> 4578 bytes
 .../knobs_no_center_inverted/knob_rotary_s59.png   | Bin 0 -> 4534 bytes
 .../knobs_no_center_inverted/knob_rotary_s6.png    | Bin 0 -> 6381 bytes
 .../knobs_no_center_inverted/knob_rotary_s60.png   | Bin 0 -> 4506 bytes
 .../knobs_no_center_inverted/knob_rotary_s61.png   | Bin 0 -> 4401 bytes
 .../knobs_no_center_inverted/knob_rotary_s62.png   | Bin 0 -> 4310 bytes
 .../knobs_no_center_inverted/knob_rotary_s63.png   | Bin 0 -> 4838 bytes
 .../knobs_no_center_inverted/knob_rotary_s7.png    | Bin 0 -> 6391 bytes
 .../knobs_no_center_inverted/knob_rotary_s8.png    | Bin 0 -> 6381 bytes
 .../knobs_no_center_inverted/knob_rotary_s9.png    | Bin 0 -> 6402 bytes
 res/skins/Shade/mixer_panel.xml                    |  46 +++++++++++++++------
 .../Shade/style/style_bg_mixer_panel_main.png      | Bin 2498 -> 232972 bytes
 res/skins/Shade/style/style_icon_autodj.png        | Bin 0 -> 1633 bytes
 71 files changed, 42 insertions(+), 20 deletions(-)
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s0.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s1.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s10.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s11.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s12.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s13.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s14.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s15.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s16.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s17.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s18.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s19.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s2.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s20.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s21.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s22.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s23.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s24.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s25.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s26.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s27.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s28.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s29.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s3.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s30.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s31.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s32.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s33.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s34.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s35.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s36.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s37.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s38.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s39.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s4.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s40.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s41.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s42.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s43.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s44.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s45.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s46.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s47.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s48.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s49.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s5.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s50.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s51.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s52.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s53.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s54.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s55.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s56.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s57.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s58.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s59.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s6.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s60.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s61.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s62.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s63.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s7.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s8.png
 create mode 100644 res/skins/Shade/knobs_no_center_inverted/knob_rotary_s9.png
 create mode 100644 res/skins/Shade/style/style_icon_autodj.png

(limited to 'res')

diff --git a/res/skins/Shade/deck_effect.xml b/res/skins/Shade/deck_effect.xml
index 93dd541c2a..394f6cfa65 100644
--- a/res/skins/Shade/deck_effect.xml
+++ b/res/skins/Shade/deck_effect.xml
@@ -94,8 +94,8 @@
 
       <Knob>
         <TooltipId>EffectUnit_mix</TooltipId>
-        <NumberStates>63</NumberStates>
-        <Path>knobs/knob_rotary_s%1.png</Path>
+        <NumberStates>64</NumberStates>
+        <Path>knobs_no_center/knob_rotary_s%1.png</Path>
         <Pos>49,21</Pos>
         <Connection>
           <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>],mix</ConfigKey>
@@ -130,8 +130,8 @@
 
       <Knob>
         <TooltipId>EffectUnit_super1</TooltipId>
-        <NumberStates>63</NumberStates>
-        <Path>knobs/knob_rotary_s%1.png</Path>
+        <NumberStates>64</NumberStates>
+        <Path>knobs_no_center/knob_rotary_s%1.png</Path>
         <Pos>77,21</Pos>
         <Connection>
           <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>],super1</ConfigKey>
diff --git a/res/skins/Shade/ducking.xml b/res/skins/Shade/ducking.xml
index a6c406be34..c8e7a2f400 100644
--- a/res/skins/Shade/ducking.xml
+++ b/res/skins/Shade/ducking.xml
@@ -32,7 +32,7 @@
       <Knob>
         <TooltipId></TooltipId>
         <NumberStates>64</NumberStates>
-        <Path>knobs/knob_rotary_s%1.png</Path>
+        <Path>knobs_no_center_inverted/knob_rotary_s%1.png</Path>
         <Pos>27,22</Pos>
         <Connection>
           <ConfigKey>[Master],duckStrength</ConfigKey>
diff --git a/res/skins/Shade/effect_parameter_knob.xml b/res/skins/Shade/effect_parameter_knob.xml
index 2c5c64c5b4..b68740520b 100644
--- a/res/skins/Shade/effect_parameter_knob.xml
+++ b/res/skins/Shade/effect_parameter_knob.xml
@@ -42,7 +42,7 @@
 						<Children>
 							<EffectParameterKnob>
 								<NumberStates>64</NumberStates>
-								<Path>knobs/knob_rotary_s%1.png</Path>
+								<Path>knobs_no_center/knob_rotary_s%1.png</Path>
 								<Connection>
 									<ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],parameter<Variable name="effectparameternum"/></ConfigKey>
 								</Connection>
diff --git a/res/skins/Shade/effectslotsmall.xml b/res/skins/Shade/effectslotsmall.xml
index aeac38fc41..7b3ff8ddfe 100644
--- a/res/skins/Shade/effectslotsmall.xml
+++ b/res/skins/Shade/effectslotsmall.xml
@@ -58,8 +58,8 @@
       <Knob>
         <Pos>38,3</Pos>
         <TooltipId>EffectSlot_metaknob</TooltipId>
-        <NumberStates>63</NumberStates>
-        <Path>knobs/knob_rotary_s%1.png</Path>
+        <NumberStates>64</NumberStates>
+        <Path>knobs_no_center/knob_rotary_s%1.png</Path>
         <Connection>
           <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>_Effect<Variable name="effectnum"/>],meta</ConfigKey>
         </Connection>
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s0.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s0.png
new file mode 100644
index 0000000000..1266113748
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s0.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s1.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s1.png
new file mode 100644
index 0000000000..199bfc95eb
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s1.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s10.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s10.png
new file mode 100644
index 0000000000..b827f680ae
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s10.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s11.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s11.png
new file mode 100644
index 0000000000..043d84d170
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s11.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s12.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s12.png
new file mode 100644
index 0000000000..e0f7bb8264
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s12.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s13.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s13.png
new file mode 100644
index 0000000000..107592746e
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s13.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s14.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s14.png
new file mode 100644
index 0000000000..f65271c07b
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s14.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s15.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s15.png
new file mode 100644
index 0000000000..67270cf7e3
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s15.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s16.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s16.png
new file mode 100644
index 0000000000..236004bae8
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s16.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s17.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s17.png
new file mode 100644
index 0000000000..0006636d9d
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s17.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s18.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s18.png
new file mode 100644
index 0000000000..f1c7f0eb57
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s18.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s19.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s19.png
new file mode 100644
index 0000000000..a2452d636a
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s19.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s2.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s2.png
new file mode 100644
index 0000000000..abbb1e290a
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s2.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s20.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s20.png
new file mode 100644
index 0000000000..054a5440c8
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s20.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s21.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s21.png
new file mode 100644
index 0000000000..edea1d80f2
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s21.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s22.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s22.png
new file mode 100644
index 0000000000..270abe982b
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s22.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s23.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s23.png
new file mode 100644
index 0000000000..c4f75fadd3
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s23.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s24.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s24.png
new file mode 100644
index 0000000000..6d2ffa88b9
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s24.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s25.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s25.png
new file mode 100644
index 0000000000..4850e76267
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s25.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s26.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s26.png
new file mode 100644
index 0000000000..59371b5b0d
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s26.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s27.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s27.png
new file mode 100644
index 0000000000..0633e05ee3
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s27.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s28.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s28.png
new file mode 100644
index 0000000000..14fb903341
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s28.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s29.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s29.png
new file mode 100644
index 0000000000..052ef387cc
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s29.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s3.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s3.png
new file mode 100644
index 0000000000..e894c66329
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s3.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s30.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s30.png
new file mode 100644
index 0000000000..c651c2c1c6
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s30.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s31.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s31.png
new file mode 100644
index 0000000000..5811a49af2
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s31.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s32.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s32.png
new file mode 100644
index 0000000000..910c80d0cb
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s32.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s33.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s33.png
new file mode 100644
index 0000000000..069bb40c9c
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s33.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s34.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s34.png
new file mode 100644
index 0000000000..1df01dc7e0
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s34.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s35.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s35.png
new file mode 100644
index 0000000000..5ca959e7a3
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s35.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s36.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s36.png
new file mode 100644
index 0000000000..cf6ed4602e
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s36.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s37.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s37.png
new file mode 100644
index 0000000000..062957c863
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s37.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s38.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s38.png
new file mode 100644
index 0000000000..d99df90f49
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s38.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s39.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s39.png
new file mode 100644
index 0000000000..4f918e8825
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s39.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s4.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s4.png
new file mode 100644
index 0000000000..4e0ce9a087
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s4.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s40.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s40.png
new file mode 100644
index 0000000000..fd3ef0b172
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s40.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s41.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s41.png
new file mode 100644
index 0000000000..8c993a3f80
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s41.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s42.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s42.png
new file mode 100644
index 0000000000..f783003f79
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s42.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s43.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s43.png
new file mode 100644
index 0000000000..d7d6d671c9
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s43.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s44.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s44.png
new file mode 100644
index 0000000000..ac677a4224
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s44.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s45.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s45.png
new file mode 100644
index 0000000000..513cc613e0
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s45.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s46.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s46.png
new file mode 100644
index 0000000000..6c206d0ece
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s46.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s47.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s47.png
new file mode 100644
index 0000000000..ed3c01ce71
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s47.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s48.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s48.png
new file mode 100644
index 0000000000..58b00a71ed
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s48.png differ
diff --git a/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s49.png b/res/skins/Shade/knobs_no_center_inverted/knob_rotary_s49.png
new file mode 100644
index 0000000000..50f9dcd10e
Binary files /dev/null and b/res/skins/Shade/knobs_no_center_inverted