Merge pull request #3245 from ronso0/skinfixes23

small Skin fixes

14 files changed, 132 insertions, 47 deletions

diff --git a/res/skins/Deere/deck_small.xml b/res/skins/Deere/deck_small.xml
index 3ac199ec68..2addce9989 100644
--- a/res/skins/Deere/deck_small.xml
+++ b/res/skins/Deere/deck_small.xml
@@ -49,7 +49,7 @@
 
                   <WidgetGroup><!-- Title/*** / PlayPos -->
                     <Layout>horizontal</Layout>
-                    <Size>200min,24f</Size>
+                    <Size>200min,23f</Size>
                     <Children>
 
                       <WidgetGroup>
@@ -103,10 +103,16 @@
                     </Children>
                   </WidgetGroup><!-- Title/*** / PlayPos -->
 
+                  <TrackWidgetGroup>
+                    <Size>0me,2f</Size>
+                    <Group><Variable name="group"/></Group>
+                    <TrackColorAlpha>255</TrackColorAlpha>
+                  </TrackWidgetGroup>
+
                   <WidgetGroup><!-- Artist / Key / BPM -->
                     <ObjectName>ArtistKeyBpmGutterSmall</ObjectName>
                     <Layout>horizontal</Layout>
-                    <Size>200min,22f</Size>
+                    <Size>200min,21f</Size>
                     <Children>
                       <!-- We allow to hide track/artist info (aka AM-Mode) in the skin settings,
                           display just a label with asterixes instead. -->
@@ -163,7 +169,7 @@
                       </NumberBpm>
 
                     </Children>
-                  </WidgetGroup><!-- PositionKeyBpmGutter -->
+                  </WidgetGroup><!-- ArtistKeyBpmGutterSmall -->
 
                 </Children>
               </WidgetGroup><!-- DeckTextRowSmall -->
@@ -189,7 +195,7 @@
                     <SetVariable name="left_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
                   </Template>
                 </Children>
-              </WidgetGroup>
+              </WidgetGroup><!-- PlayGutterSmall -->
 
             </Children>
           </WidgetGroup>
diff --git a/res/skins/Deere/deck_text_row.xml b/res/skins/Deere/deck_text_row.xml
index dccf4be6cc..f5583619db 100644
--- a/res/skins/Deere/deck_text_row.xml
+++ b/res/skins/Deere/deck_text_row.xml
@@ -320,6 +320,19 @@
           </WidgetGroup><!-- UpperTextRow -->
 
           <WidgetGroup>
+            <ObjectName>TrackColorWrapper</ObjectName>
+            <Layout>horizontal</Layout>
+            <Size>0me,2f</Size>
+            <Children>
+              <TrackWidgetGroup>
+                <Size>0me,2f</Size>
+                <Group><Variable name="group"/></Group>
+                <TrackColorAlpha>255</TrackColorAlpha>
+              </TrackWidgetGroup>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
             <ObjectName>LowerTextRow</ObjectName>
             <Layout>horizontal</Layout>
             <!-- When TextRow is laid out, we need to ignore our children. Otherwise
@@ -488,8 +501,8 @@
                               <Template src="skin:left_right_1state_button.xml">
                                 <SetVariable name="TooltipId">sync_reset_key</SetVariable>
                                 <SetVariable name="ObjectName">SyncKeyButton</SetVariable>
-                                <SetVariable name="MinimumSize">42,22</SetVariable>
-                                <SetVariable name="MaximumSize">42,22</SetVariable>
+                                <SetVariable name="MinimumSize">46,22</SetVariable>
+                                <SetVariable name="MaximumSize">46,22</SetVariable>
                                 <SetVariable name="SizePolicy">f,f</SetVariable>
                                 <SetVariable name="state_0_text">Match</SetVariable>
                                 <SetVariable name="state_0_pressed"></SetVariable>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 095476fbe7..1b87870f6e 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -1001,12 +1001,21 @@ WBeatSpinBox,
 
 #ArtistGutter, #TitleGutter {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  padding: 2px;
-}
+  }
+  #TitleGutter {
+    padding: 2px 2px 1px 2px;
+  }
+  #ArtistGutter {
+    padding: 1px 2px 2px 2px;
+  }
 #TitleGutterSmall {
   padding: 0px;
 }
 
+#TrackColorWrapper {
+  margin-right: 2px;
+}
+
 #ArtistKeyBpmGutterSmall {
   border-top: 1px solid #222;
 }
diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss
index 5dd47475da..3781db111b 100644
--- a/res/skins/LateNight/style_classic.qss
+++ b/res/skins/LateNight/style_classic.qss
@@ -818,6 +818,9 @@ WPushButton#FxSuperLinkInvertButton {
   #SamplerPlayBoxMini {
     padding: 1px;
   }
+  #SamplerBpmMini {
+    margin-left: 1px;
+  }
 
 #Sampler {
   padding: 1px 0px 2px 2px;
@@ -994,7 +997,8 @@ WPushButton#FxSuperLinkInvertButton {
 #Deck2 WLabel, #DeckCompact2 WLabel, #DeckMini2 WLabel,
   #Deck2 WStarRating, #DeckCompact2 WStarRating,
 #MicAuxLabel,
-#SamplerTitle, #SamplerTitleMini, #SamplerBpm,
+#SamplerTitle, #SamplerTitleMini,
+#SamplerBpm, #SamplerBpmMini,
 #PreviewDeckTextBox, #PreviewTitle, #PreviewBPM,
 #CategoryLabel,
 #SkinSettingsLabelButton,
diff --git a/res/skins/Shade/btn/btn_ducking_auto_over.png b/res/skins/Shade/btn/btn_ducking_auto_over.png
index 058d6d09fc..c99ec4cdde 100644
--- a/res/skins/Shade/btn/btn_ducking_auto_over.png
+++ b/res/skins/Shade/btn/btn_ducking_auto_over.png
diff --git a/res/skins/Shade/btn/btn_ducking_auto_overdown.png b/res/skins/Shade/btn/btn_ducking_auto_overdown.png
index ad33611a06..d10199defb 100644
--- a/res/skins/Shade/btn/btn_ducking_auto_overdown.png
+++ b/res/skins/Shade/btn/btn_ducking_auto_overdown.png
diff --git a/res/skins/Shade/btn/btn_ducking_man_over.png b/res/skins/Shade/btn/btn_ducking_man_over.png
index bac549e259..fc268340ae 100644
--- a/res/skins/Shade/btn/btn_ducking_man_over.png
+++ b/res/skins/Shade/btn/btn_ducking_man_over.png
diff --git a/res/skins/Shade/btn/btn_ducking_man_overdown.png b/res/skins/Shade/btn/btn_ducking_man_overdown.png
index 38aa50d484..b0f8490548 100644
--- a/res/skins/Shade/btn/btn_ducking_man_overdown.png
+++ b/res/skins/Shade/btn/btn_ducking_man_overdown.png
diff --git a/res/skins/Tango/buttons/btn_broadcast_connected.svg b/res/skins/Tango/buttons/btn_broadcast_connected.svg
index a198da741e..4491124edd 100644
--- a/res/skins/Tango/buttons/btn_broadcast_connected.svg
+++ b/res/skins/Tango/buttons/btn_broadcast_connected.svg
@@ -1,2 +1,60 @@
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg3101" width="20" height="30" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path5834" d="m10.239 8.75 1.5603 19.25-3.5997 1e-6 1.5646-19.25" fill="#00c800"/><path id="path3245" d="m12 8c0 1.1046-0.89543 2-2 2-1.1046 0-2-0.89543-2-2 0-1.1046 0.89543-2 2-2 1.1046 0 2 0.89543 2 2z" fill="#00c800"/><path id="path5888" d="m5 1.8125c-0.43163 0.34953-0.83797 0.75587-1.1875 1.1875-2.7581 3.406-2.2185 8.4294 1.1875 11.188l0.75-0.9375c-2.902-2.35-3.35-6.598-1-9.5l0.09375-0.09375c0.27528-0.32661 0.57414-0.63731 0.90625-0.90625l-0.75-0.9375z" color="#000000" fill="#ff8605" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path5908" d="m6.875 4.1562c-0.26844 0.21737-0.50138 0.45031-0.71875 0.71875-1.7136 2.1161-1.3974 5.2552 0.71875 6.9688l0.78125-0.9375c-1.6121-1.3055-1.868-3.6379-0.5625-5.25 0.16461-0.20327 0.35923-0.39789 0.5625-0.5625l-0.78125-0.9375z" color="#000000" fill="#e0c100" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path5888-5" d="m15 1.8125c0.43163 0.34953 0.83797 0.75587 1.1875 1.1875 2.7581 3.406 2.2185 8.4294-1.1875 11.188l-0.75-0.9375c2.902-2.35 3.35-6.598 1-9.5l-0.09375-0.09375c-0.27528-0.32661-0.57414-0.63731-0.90625-0.90625l0.75-0.9375z" color="#000000" fill="#ff8605" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path5908-3" d="m13.125 4.1562c0.26844 0.21737 0.50138 0.45031 0.71875 0.71875 1.7136 2.1161 1.3974 5.2552-0.71875 6.9688l-0.78125-0.9375c1.6121-1.3055 1.868-3.6379 0.5625-5.25-0.1646-0.20327-0.35923-0.39789-0.5625-0.5625l0.78125-0.9375z" color="#000000" fill="#e0c100" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
+<?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"
+   id="svg3101"
+   width="20"
+   height="30"
+   version="1.1">
+  <metadata
+     id="metadata13">
+    <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="defs11" />
+  <path
+     id="path5834"
+     d="m10.239 8.75 1.5603 19.25-3.5997 1e-6 1.5646-19.25"
+     fill="#00c800"
+     style="fill:#00c800;fill-opacity:1" />
+  <path
+     id="path3245"
+     d="m12 8c0 1.1046-0.89543 2-2 2-1.1046 0-2-0.89543-2-2 0-1.1046 0.89543-2 2-2 1.1046 0 2 0.89543 2 2z"
+     fill="#00c800"
+     style="fill:#00c800;fill-opacity:1" />
+  <path
+     id="path5888"
+     d="m5 1.8125c-0.43163 0.34953-0.83797 0.75587-1.1875 1.1875-2.7581 3.406-2.2185 8.4294 1.1875 11.188l0.75-0.9375c-2.902-2.35-3.35-6.598-1-9.5l0.09375-0.09375c0.27528-0.32661 0.57414-0.63731 0.90625-0.90625l-0.75-0.9375z"
+     color="#000000"
+     fill="#ff8605"
+     style="block-progression:tb;text-indent:0;text-transform:none;fill:#00c800;fill-opacity:1" />
+  <path
+     id="path5908"
+     d="m6.875 4.1562c-0.26844 0.21737-0.50138 0.45031-0.71875 0.71875-1.7136 2.1161-1.3974 5.2552 0.71875 6.9688l0.78125-0.9375c-1.6121-1.3055-1.868-3.6379-0.5625-5.25 0.16461-0.20327 0.35923-0.39789 0.5625-0.5625l-0.78125-0.9375z"
+     color="#000000"
+     fill="#e0c100"
+     style="block-progression:tb;text-indent:0;text-transform:none;fill:#00c800;fill-opacity:1" />
+  <path
+     id="path5888-5"
+     d="m15 1.8125c0.43163 0.34953 0.83797 0.75587 1.1875 1.1875 2.7581 3.406 2.2185 8.4294-1.1875 11.188l-0.75-0.9375c2.902-2.35 3.35-6.598 1-9.5l-0.09375-0.09375c-0.27528-0.32661-0.57414-0.63731-0.90625-0.90625l0.75-0.9375z"
+     color="#000000"
+     fill="#ff8605"
+     style="block-progression:tb;text-indent:0;text-transform:none;fill:#00c800;fill-opacity:1" />
+  <path
+     id="path5908-3"
+     d="m13.125 4.1562c0.26844 0.21737 0.50138 0.45031 0.71875 0.71875 1.7136 2.1161 1.3974 5.2552-0.71875 6.9688l-0.78125-0.9375c1.6121-1.3055 1.868-3.6379 0.5625-5.25-0.1646-0.20327-0.35923-0.39789-0.5625-0.5625l0.78125-0.9375z"
+     color="#000000"
+     fill="#e0c100"
+     style="block-progression:tb;text-indent:0;text-transform:none;fill:#00c800;fill-opacity:1" />
+</svg>
diff --git a/res/skins/Tango/deck_left_mini.xml b/res/skins/Tango/deck_left_mini.xml
index 7af4c1b7f1..b470067203 100644
--- a/res/skins/Tango/deck_left_mini.xml
+++ b/res/skins/Tango/deck_left_mini.xml
@@ -56,6 +56,12 @@ Variables:
                 </Children>
               </WidgetGroup>
 
+              <TrackWidgetGroup>
+                <Size>0me,2f</Size>
+                <Group><Variable name="group"/></Group>
+                <TrackColorAlpha>255</TrackColorAlpha>
+              </TrackWidgetGroup>
+
               <WidgetGroup><!-- by / Artist / Key / BPM -->
                 <Layout>horizontal</Layout>
                 <Size>200me,20f</Size>
@@ -94,20 +100,6 @@ Variables:
                         <SetVariable name="ConfigKeyRight"><Variable name="group"/>,reset_key</SetVariable>
                       </Template>
 
-                      <!-- Show/light up if key is not original, like with script.
-                            Not working, only once per skin load.
-                          Tried different controls: pitch (from script), pitch_adjust, ...
-                      <WidgetGroup>
-                        <ObjectName>KeyOffsetWarning</ObjectName>
-                        <Size>50f,13f</Size>
-                        <Layout>horizontal</Layout>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
-                          <Transform><Not/><IsEqual>1</IsEqual></Transform>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup> -->
-
                       <Key><!-- Actual Key display -->
                         <TooltipId>visual_key</TooltipId>
                         <ObjectName>KeyDisplay</ObjectName>
diff --git a/res/skins/Tango/deck_right_mini.xml b/res/skins/Tango/deck_right_mini.xml
index d125df49f4..ffd85d56e8 100644
--- a/res/skins/Tango/deck_right_mini.xml
+++ b/res/skins/Tango/deck_right_mini.xml
@@ -99,6 +99,12 @@ Variables:
                 </Children>
               </WidgetGroup><!-- Time / Title -->
 
+              <TrackWidgetGroup>
+                <Size>0me,2f</Size>
+                <Group><Variable name="group"/></Group>
+                <TrackColorAlpha>255</TrackColorAlpha>
+              </TrackWidgetGroup>
+
               <WidgetGroup><!-- BPM / Key / by / Artist -->
                 <Layout>horizontal</Layout>
                 <Size>200min,20f</Size>
@@ -150,20 +156,6 @@ Variables:
                         <SetVariable name="ConfigKeyRight"><Variable name="group"/>,reset_key</SetVariable>
                       </Template>
 
-                      <!-- Show/light up if key is not original, like with script.
-                            Not working, only once per skin load.
-                          Tried different controls: pitch (from script), pitch_adjust, ...
-                      <WidgetGroup>
-                        <ObjectName>KeyOffsetWarning</ObjectName>
-                        <Size>50f,13f</Size>
-                        <Layout>horizontal</Layout>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
-                          <Transform><Not/><IsEqual>1</IsEqual></Transform>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup> -->
-
                       <Key><!-- Actual Key display -->
                         <TooltipId>visual_key</TooltipId>
                         <ObjectName>KeyDisplay</ObjectName>
diff --git a/res/skins/Tango/deck_row_text_left.xml b/res/skins/Tango/deck_row_text_left.xml
index 884a52dd01..428a5d3708 100644
--- a/res/skins/Tango/deck_row_text_left.xml
+++ b/res/skins/Tango/deck_row_text_left.xml
@@ -33,7 +33,7 @@ Variables:
                 <Property>titleInfo</Property>
                 <Alignment>Left</Alignment>
                 <Elide>right</Elide>
-                <Size>1me,22f</Size>
+                <Size>1me,21f</Size>
                 <Channel><Variable name="chanNum"/></Channel>
               </TrackProperty>
             </Children>
@@ -55,6 +55,12 @@ Variables:
         </Children>
       </WidgetGroup><!-- /Title + Time -->
 
+      <TrackWidgetGroup>
+        <Size>0me,2f</Size>
+        <Group><Variable name="group"/></Group>
+        <TrackColorAlpha>255</TrackColorAlpha>
+      </TrackWidgetGroup>
+
       <WidgetGroup><!-- by Artist + Duration -->
         <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
@@ -64,7 +70,7 @@ Variables:
 
           <Label>
             <ObjectName>TrackBy</ObjectName>
-            <Size>22f,22f</Size>
+            <Size>22f,21f</Size>
             <Text>by </Text>
             <Alignment>left</Alignment>
           </Label>
@@ -73,14 +79,14 @@ Variables:
             <TooltipId>track_artist</TooltipId>
             <ObjectName>TrackArtist</ObjectName>
             <Elide>right</Elide>
-            <Size>1me,22f</Size>
+            <Size>1me,21f</Size>
             <Property>artist</Property>
             <Channel><Variable name="chanNum"/></Channel>
           </TrackProperty>
 
           <TrackProperty>
             <ObjectName>Duration</ObjectName>
-            <Size>60min,22f</Size>
+            <Size>60min,21f</Size>
             <TooltipId>track_duration</TooltipId>
             <Property>durationFormatted</Property>
             <Alignment>right</Alignment>
diff --git a/res/skins/Tango/deck_row_text_right.xml b/res/skins/Tango/deck_row_text_right.xml
index 61dd975f28..9da4c9ad70 100644
--- a/res/skins/Tango/deck_row_text_right.xml
+++ b/res/skins/Tango/deck_row_text_right.xml
@@ -53,7 +53,7 @@ Variables:
                 <Property>titleInfo</Property>
                 <Alignment>right</Alignment>
                 <Elide>right</Elide>
-                <Size>1me,22f</Size>
+                <Size>1me,21f</Size>
                 <Channel><Variable name="chanNum"/></Channel>
               </TrackProperty>
             </Children>
@@ -66,6 +66,12 @@ Variables:
         </Children>
       </WidgetGroup><!-- /Time + Title -->
 
+      <TrackWidgetGroup>
+        <Size>0me,2f</Size>
+        <Group><Variable name="group"/></Group>
+        <TrackColorAlpha>255</TrackColorAlpha>
+      </TrackWidgetGroup>
+
       <WidgetGroup><!-- Duration + by Artist -->
         <Layout>horizontal</Layout>
         <SizePolicy>min,me</SizePolicy>
@@ -75,7 +81,7 @@ Variables:
 
           <TrackProperty>
             <ObjectName>Duration</ObjectName>
-            <Size>80me,22f</Size>
+            <Size>80me,21f</Size>
             <TooltipId>track_duration</TooltipId>
             <Property>durationFormatted</Property>
             <Alignment>left</Alignment>
@@ -84,7 +90,7 @@ Variables:
 
           <Label>
             <ObjectName>TrackBy</ObjectName>
-            <Size>22f,22f</Size>
+            <Size>22f,21f</Size>
             <Text>by </Text>
             <Alignment>left</Alignment>
           </Label>
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 3395193975..d4cd922b4f 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -1180,7 +1180,6 @@ WBeatSpinBox,
 }
 
 #KeyDisplayMatch, #KeyControls {
-  margin-bottom: 1px;
 }
 #RateButtons {
   margin-top: 1px;