From a22b99c2fa3a0d4582f8ae2dfe31e5518b1c7c05 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 29 Jan 2019 16:06:05 +0100
Subject: [PATCH] fix spinny/cover init in color schemes

---
 res/skins/Tango (64 Samplers)/skin.xml           |  8 ++++----
 ...i_mask_blue.svg => spinny_mini_mask_blue.svg} |  0
 ...sk_purple.svg => spinny_mini_mask_purple.svg} |  0
 res/skins/Tango/skin.xml                         | 12 ++++++++----
 res/skins/Tango/spinny_cover_mini.xml            | 16 ++++++++--------
 5 files changed, 20 insertions(+), 16 deletions(-)
 rename res/skins/Tango/graphics/{spinnyMini_mask_blue.svg => spinny_mini_mask_blue.svg} (100%)
 rename res/skins/Tango/graphics/{spinnyMini_mask_purple.svg => spinny_mini_mask_purple.svg} (100%)

diff --git a/res/skins/Tango (64 Samplers)/skin.xml b/res/skins/Tango (64 Samplers)/skin.xml
index c34e5c4c5cf..cc16119f21b 100644
--- a/res/skins/Tango (64 Samplers)/skin.xml	
+++ b/res/skins/Tango (64 Samplers)/skin.xml	
@@ -147,8 +147,8 @@
         #Deck4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
           color: #d910f0;}
         <!-- Vinyl Controls toggle is transparent. This sets bg color so it matches those above -->
-        #DeckOverview1, #DeckOverview2 { background-color: #001D33;}
-        #DeckOverview3, #DeckOverview4 { background-color: #3A0440;}
+        #DeckOverviewRow1, #DeckOverviewRow2 { background-color: #001D33;}
+        #DeckOverviewRow3, #DeckOverviewRow4 { background-color: #3A0440;}
       </Style>
     </Scheme>
     <Scheme>
@@ -168,8 +168,8 @@
         #Deck3 WLabel, #RateContainer3 WLabel, #RateContainer3 WPushButton,
         #Deck4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
           color: #3693d9;}
-        #DeckOverview1, #DeckOverview2 { background-color: #3A0440;}
-        #DeckOverview3, #DeckOverview4 { background-color: #001D33;}
+        #DeckOverviewRow1, #DeckOverviewRow2 { background-color: #3A0440;}
+        #DeckOverviewRow3, #DeckOverviewRow4 { background-color: #001D33;}
         <!-- brighter, broader library focus borders -->
         QTreeView, QTableView { border-width: 2px;}
         QTreeView:focus, QTableView:focus, WSearchLineEdit:focus {
diff --git a/res/skins/Tango/graphics/spinnyMini_mask_blue.svg b/res/skins/Tango/graphics/spinny_mini_mask_blue.svg
similarity index 100%
rename from res/skins/Tango/graphics/spinnyMini_mask_blue.svg
rename to res/skins/Tango/graphics/spinny_mini_mask_blue.svg
diff --git a/res/skins/Tango/graphics/spinnyMini_mask_purple.svg b/res/skins/Tango/graphics/spinny_mini_mask_purple.svg
similarity index 100%
rename from res/skins/Tango/graphics/spinnyMini_mask_purple.svg
rename to res/skins/Tango/graphics/spinny_mini_mask_purple.svg
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index 020911d9595..ac211517961 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -141,8 +141,8 @@
         #Deck4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
           color: #d910f0;}
         <!-- Vinyl Controls toggle is transparent. This sets bg color so it matches those above -->
-        #DeckOverview1, #DeckOverview2 { background-color: #001D33;}
-        #DeckOverview3, #DeckOverview4 { background-color: #3A0440;}
+        #DeckOverviewRow1, #DeckOverviewRow2 { background-color: #001D33;}
+        #DeckOverviewRow3, #DeckOverviewRow4 { background-color: #3A0440;}
       </Style>
     </Scheme>
     <Scheme>
@@ -162,8 +162,8 @@
         #Deck3 WLabel, #RateContainer3 WLabel, #RateContainer3 WPushButton,
         #Deck4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
           color: #3693d9;}
-        #DeckOverview1, #DeckOverview2 { background-color: #3A0440;}
-        #DeckOverview3, #DeckOverview4 { background-color: #001D33;}
+        #DeckOverviewRow1, #DeckOverviewRow2 { background-color: #3A0440;}
+        #DeckOverviewRow3, #DeckOverviewRow4 { background-color: #001D33;}
         <!-- brighter, broader library focus borders -->
         QTreeView, QTableView { border-width: 2px;}
         QTreeView:focus, QTableView:focus, WSearchLineEdit:focus {
@@ -285,6 +285,7 @@
       <Children>
         <Template src="skin:spinny_cover_mini.xml">
           <SetVariable name="chanNum">1</SetVariable>
+          <SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_12"/></SetVariable>
         </Template>
       </Children>
     </SingletonDefinition>
@@ -294,6 +295,7 @@
       <Children>
         <Template src="skin:spinny_cover_mini.xml">
           <SetVariable name="chanNum">2</SetVariable>
+          <SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_12"/></SetVariable>
         </Template>
       </Children>
     </SingletonDefinition>
@@ -303,6 +305,7 @@
       <Children>
         <Template src="skin:spinny_cover_mini.xml">
           <SetVariable name="chanNum">3</SetVariable>
+          <SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_34"/></SetVariable>
         </Template>
       </Children>
     </SingletonDefinition>
@@ -312,6 +315,7 @@
       <Children>
         <Template src="skin:spinny_cover_mini.xml">
           <SetVariable name="chanNum">4</SetVariable>
+          <SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_34"/></SetVariable>
         </Template>
       </Children>
     </SingletonDefinition>
diff --git a/res/skins/Tango/spinny_cover_mini.xml b/res/skins/Tango/spinny_cover_mini.xml
index 37fcf58b7ad..3f4715d4fb2 100644
--- a/res/skins/Tango/spinny_cover_mini.xml
+++ b/res/skins/Tango/spinny_cover_mini.xml
@@ -23,10 +23,10 @@ Variables:
             <TooltipId>spinny</TooltipId>
             <Size>40me,40me</Size>
             <Group><Variable name="group"/></Group>
-            <PathBackground scalemode="STRETCH_ASPECT">graphics/spinnyMini_bg.svg</PathBackground>
-            <PathForeground scalemode="STRETCH_ASPECT">graphics/spinnyMini_indicator.svg</PathForeground>
-            <PathMask scalemode="STRETCH_ASPECT">graphics/spinnyMini_mask_<Variable name="SpinnyCoverColor"/>.svg</PathMask>
-            <PathGhost scalemode="STRETCH_ASPECT">graphics/spinnyMini_indicator_ghost.svg</PathGhost>
+            <PathBackground scalemode="STRETCH_ASPECT">graphics/spinny_mini_bg.svg</PathBackground>
+            <PathForeground scalemode="STRETCH_ASPECT">graphics/spinny_mini_indicator.svg</PathForeground>
+            <PathMask scalemode="STRETCH_ASPECT">graphics/spinny_mini_mask_<Variable name="SpinnyCoverColor"/>.svg</PathMask>
+            <PathGhost scalemode="STRETCH_ASPECT">graphics/spinny_mini_indicator_ghost.svg</PathGhost>
             <ShowCover>false</ShowCover>
             <Connection>
               <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
@@ -39,10 +39,10 @@ Variables:
             <TooltipId>spinny</TooltipId>
             <Size>40me,40me</Size>
             <Group><Variable name="group"/></Group>
-            <PathBackground scalemode="STRETCH_ASPECT">graphics/spinnyMini_bg.svg</PathBackground>
-            <PathForeground scalemode="STRETCH_ASPECT">graphics/spinnyMini_indicator.svg</PathForeground>
-            <PathMask scalemode="STRETCH_ASPECT">graphics/spinnyMini_mask_<Variable name="SpinnyCoverColor"/>.svg</PathMask>
-            <PathGhost scalemode="STRETCH_ASPECT">graphics/spinnyMini_indicator_ghost.svg</PathGhost>
+            <PathBackground scalemode="STRETCH_ASPECT">graphics/spinny_mini_bg.svg</PathBackground>
+            <PathForeground scalemode="STRETCH_ASPECT">graphics/spinny_mini_indicator.svg</PathForeground>
+            <PathMask scalemode="STRETCH_ASPECT">graphics/spinny_mini_mask_<Variable name="SpinnyCoverColor"/>.svg</PathMask>
+            <PathGhost scalemode="STRETCH_ASPECT">graphics/spinny_mini_indicator_ghost.svg</PathGhost>
             <ShowCover>true</ShowCover>
             <Connection>
               <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>