Merge pull request #3264 from ronso0/skinfixes23_pt2

Skin fixes pt2: ensure font settings are applied, small fixes

101 files changed, 569 insertions, 161 deletions

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 1b87870f6e..c636bb3545 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -809,17 +809,51 @@ WEffectSelector QAbstractScrollArea::corner,
 
 #Mixxx {
   background-color: black;
-  font-family: "Open Sans";
 }
 
 #WaveformSplitter {
   background-color: #222;
 }
 
+#Mixxx, WWidget,
+QToolTip,
+WLabel, QLabel,
+WNumber, WNumberPos,
+WPushButton,
+WKey,
+WTime,
+WTrackText,
+WTrackProperty,
+WRecordingDuration,
+QSpinBox,
+WBeatSpinBox,
+WOverview #PassthroughLabel,
+WBeatSpinBox QMenu,
+WCueMenuPopup,
+WCueMenuPopup QMenu,
+WCueMenuPopup QLabel,
+WCoverArtMenu,
+WTrackMenu,
+WTrackMenu QMenu,
+WOverview /* Hotcue labels in the overview */,
+QComboBox,
+WEffect,
+WEffectSelector,
+WEffectSelector QAbstractScrollArea,
+#fadeModeCombobox,
+#fadeModeCombobox QAbstractScrollArea
+#LibraryContainer QPushButton,
+#LibraryContainer QLabel,
+#LibraryContainer QRadioButton,
+#LibraryContainer QHeaderView,
+#LibraryContainer QHeaderView::item,
+#LibraryContainer QMenu {
+  font-family: "Open Sans";
+}
+
 WWidget,
 WLibrary QLabel,
 WLibrary QPushButton {
-  font-family: "Open Sans";
   font-size: 12px;
   font-weight: bold;
   text-transform: uppercase;
diff --git a/res/skins/Deere/tool_bar.xml b/res/skins/Deere/tool_bar.xml
index 639971cf87..c2208283f7 100644
--- a/res/skins/Deere/tool_bar.xml
+++ b/res/skins/Deere/tool_bar.xml
@@ -281,8 +281,7 @@
                 just displaying the AutoDJ status here.
               -->
               <Template src="skin:statuslight_3state.xml">
-                <SetVariable name="TooltipId"></SetVariable>
-                <SetVariable name="Tooltip">Auto DJ active</SetVariable>
+                <SetVariable name="TooltipId">autodj_status</SetVariable>
                 <SetVariable name="ObjectName">AutoDjNotification</SetVariable>
                 <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
                 <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
diff --git a/res/skins/LateNight/classic/style/autodj_status.svg b/res/skins/LateNight/classic/style/autodj_status.svg
new file mode 100644
index 0000000000..624f3cc92e
--- /dev/null
+++ b/res/skins/LateNight/classic/style/autodj_status.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="30"
+   height="22"
+   version="1.1"
+   id="svg18">
+  <metadata
+     id="metadata24">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs22" />
+  <path
+     d="m 12,4 c -0.554,0 -1,0.446 -1,1 v 3 h 8 V 5 C 19,4.446 18.554,4 18,4 Z m 1.25,1.5 C 13.66421,5.5 14,5.83579 14,6.25 14,6.66421 13.66421,7 13.25,7 12.83579,7 12.5,6.66421 12.5,6.25 12.5,5.83579 12.83579,5.5 13.25,5.5 Z m 3.5,0 c 0.41421,0 0.75,0.33579 0.75,0.75 C 17.5,6.66421 17.16421,7 16.75,7 16.33579,7 16,6.66421 16,6.25 16,5.83579 16.33579,5.5 16.75,5.5 Z"
+     color="#000001"
+     id="path2"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="12"
+     y="15"
+     width="2"
+     height="3"
+     rx="1"
+     ry="1"
+     id="rect4"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="16"
+     y="15"
+     width="2"
+     height="3"
+     rx="1"
+     ry="1"
+     id="rect6"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="8"
+     y="9"
+     width="2"
+     height="5"
+     rx="1"
+     ry="1"
+     color="#000001"
+     id="rect8"
+     style="fill:#e86317;fill-opacity:1" />
+  <path
+     d="m 11,9 v 6.4219 c 0,0.32317 0.223,0.57812 0.5,0.57812 h 7 c 0.277,0 0.5,-0.25496 0.5,-0.57812 V 9 h -7.5 z"
+     color="#000001"
+     id="path10"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="20"
+     y="9"
+     width="2"
+     height="5"
+     rx="1"
+     ry="1"
+     color="#000001"
+     id="rect12"
+     style="fill:#e86317;fill-opacity:1" />
+</svg>
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_master_headphone.xml b/res/skins/LateNight/mixer/mixer_main_headphone.xml
index a133b8eefb..fb86ce127a 100644
--- a/res/skins/LateNight/mixer/mixer_master_headphone.xml
+++ b/res/skins/LateNight/mixer/mixer_main_headphone.xml
@@ -286,7 +286,7 @@
 
     </Children>
     <Connection>
-      <ConfigKey persist="true">[Skin],show_master_head_mixer</ConfigKey>
+      <ConfigKey persist="true">[Skin],show_main_head_mixer</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/LateNight/mixer/vumeters_compact.xml b/res/skins/LateNight/mixer/vumeters_compact.xml
index 916d8e463a..d1a3fdf2c1 100644
--- a/res/skins/LateNight/mixer/vumeters_compact.xml
+++ b/res/skins/LateNight/mixer/vumeters_compact.xml
@@ -100,5 +100,9 @@
       </WidgetGroup><!-- 3 / dimmed Master / 4 -->
 
     </Children>
+    <Connection>
+      <ConfigKey persist="true">[Skin],show_vumeters_compact</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/palemoon/style/autodj_status.svg b/res/skins/LateNight/palemoon/style/autodj_status.svg
new file mode 100644
index 0000000000..624f3cc92e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/autodj_status.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   width="30"
+   height="22"
+   version="1.1"
+   id="svg18">
+  <metadata
+     id="metadata24">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs22" />
+  <path
+     d="m 12,4 c -0.554,0 -1,0.446 -1,1 v 3 h 8 V 5 C 19,4.446 18.554,4 18,4 Z m 1.25,1.5 C 13.66421,5.5 14,5.83579 14,6.25 14,6.66421 13.66421,7 13.25,7 12.83579,7 12.5,6.66421 12.5,6.25 12.5,5.83579 12.83579,5.5 13.25,5.5 Z m 3.5,0 c 0.41421,0 0.75,0.33579 0.75,0.75 C 17.5,6.66421 17.16421,7 16.75,7 16.33579,7 16,6.66421 16,6.25 16,5.83579 16.33579,5.5 16.75,5.5 Z"
+     color="#000001"
+     id="path2"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="12"
+     y="15"
+     width="2"
+     height="3"
+     rx="1"
+     ry="1"
+     id="rect4"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="16"
+     y="15"
+     width="2"
+     height="3"
+     rx="1"
+     ry="1"
+     id="rect6"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="8"
+     y="9"
+     width="2"
+     height="5"
+     rx="1"
+     ry="1"
+     color="#000001"
+     id="rect8"
+     style="fill:#e86317;fill-opacity:1" />
+  <path
+     d="m 11,9 v 6.4219 c 0,0.32317 0.223,0.57812 0.5,0.57812 h 7 c 0.277,0 0.5,-0.25496 0.5,-0.57812 V 9 h -7.5 z"
+     color="#000001"
+     id="path10"
+     style="fill:#e86317;fill-opacity:1" />
+  <rect
+     x="20"
+     y="9"
+     width="2"
+     height="5"
+     rx="1"
+     ry="1"
+     color="#000001"
+     id="rect12"
+     style="fill:#e86317;fill-opacity:1" />
+</svg>
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>
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 88db8bce7f..637aa281fa 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,11 +387,13 @@ 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>
                         <SetVariable name="Text">VU meters</SetVariable>
-                        <SetVariable name="Setting">[LateNight],show_vumeters_compact</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_vumeters_compact</SetVariable>
                       </Template>
 
                       <!-- Spinny -->
@@ -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 -->