From d2a639419192164a1e414d4a29cf2eef4dab5944 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Thu, 1 Oct 2020 22:55:20 +0200
Subject: [PATCH 1/5] Shade: fix skin crash by removing unnecessary Singletons

---
 res/skins/Shade/deck.xml |  4 +---
 res/skins/Shade/skin.xml | 34 ++++------------------------------
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/res/skins/Shade/deck.xml b/res/skins/Shade/deck.xml
index 24fe0df86ec..9acbc85d45c 100644
--- a/res/skins/Shade/deck.xml
+++ b/res/skins/Shade/deck.xml
@@ -159,9 +159,7 @@
                                 <Layout>horizontal</Layout>
                                 <Size>0e,81f</Size>
                                 <Children>
-                                  <SingletonContainer>
-                                    <ObjectName>Waveform<Variable name="channum"/></ObjectName>
-                                  </SingletonContainer>
+                                  <Template src="skin:waveform.xml"/>
                                 </Children>
                               </WidgetGroup>
 
diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml
index f4a702bd6b3..2d913750656 100644
--- a/res/skins/Shade/skin.xml
+++ b/res/skins/Shade/skin.xml
@@ -255,24 +255,6 @@
     ############################################################################################
     ############################################################################################
     -->
-    <SingletonDefinition>
-      <ObjectName>Waveform1</ObjectName>
-      <Children>
-        <Template src="skin:waveform.xml">
-          <SetVariable name="channum">1</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>Waveform2</ObjectName>
-      <Children>
-        <Template src="skin:waveform.xml">
-          <SetVariable name="channum">2</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
     <SingletonDefinition>
       <ObjectName>Overview1</ObjectName>
       <Children>
@@ -291,15 +273,6 @@
       </Children>
     </SingletonDefinition>
 
-    <SingletonDefinition>
-      <ObjectName>LibraryTable</ObjectName>
-      <Children>
-        <Library>
-          <ShowButtonText>false</ShowButtonText>
-          <TrackTableBackgroundColorOpacity>0.125</TrackTableBackgroundColorOpacity>
-        </Library>
-      </Children>
-    </SingletonDefinition>
     <!--
     ############################################################################################
     ############################################################################################
@@ -474,9 +447,10 @@
                   </Children>
                 </WidgetGroup><!-- Sidebar etc. -->
 
-                <SingletonContainer>
-                  <ObjectName>LibraryTable</ObjectName>
-                </SingletonContainer>
+                <Library>
+                  <ShowButtonText>false</ShowButtonText>
+                  <TrackTableBackgroundColorOpacity>0.125</TrackTableBackgroundColorOpacity>
+                </Library>
 
               </Children>
             </Splitter>

From cd1eff5ba89e4260e9ab4b2acdded640b1aad669 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 5 Oct 2020 12:41:40 +0200
Subject: [PATCH 2/5] Deere/Deere64: fix skin change/reload crash by
 refactoring instantiation/loading of Spinny singletons

---
 res/skins/Deere (64 Samplers)/skin.xml        | 177 +++-------------
 res/skins/Deere/deck.xml                      |  12 +-
 .../Deere/{coverart.xml => deck_coverart.xml} |   0
 res/skins/Deere/deck_singletons.xml           |  40 ++++
 res/skins/Deere/deck_spinny.xml               |  87 ++++++++
 res/skins/Deere/deck_visual_row.xml           |  50 ++++-
 res/skins/Deere/skin.xml                      | 177 +++-------------
 res/skins/Deere/spinny.xml                    | 196 ------------------
 8 files changed, 235 insertions(+), 504 deletions(-)
 rename res/skins/Deere/{coverart.xml => deck_coverart.xml} (100%)
 create mode 100644 res/skins/Deere/deck_singletons.xml
 create mode 100644 res/skins/Deere/deck_spinny.xml
 delete mode 100644 res/skins/Deere/spinny.xml

diff --git a/res/skins/Deere (64 Samplers)/skin.xml b/res/skins/Deere (64 Samplers)/skin.xml
index b24013cd65c..41e4c8e9e04 100644
--- a/res/skins/Deere (64 Samplers)/skin.xml	
+++ b/res/skins/Deere (64 Samplers)/skin.xml	
@@ -136,141 +136,37 @@
     main_decks.xml, left_deck.xml, and right_deck.xml, so define them in singletons. This makes
     toggling between 2/4 decks and stacked/split waveforms slower, but it makes Mixxx startup
     and shutdown much faster and saves a lot of memory.-->
-    <SingletonDefinition>
-      <ObjectName>DeckVisualRow1</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_visual_row.xml">
-          <SetVariable name="i">1</SetVariable>
-          <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-          <!-- Traditional Blue -->
-          <SetVariable name="DeckSignalColor">#007BCD</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckVisualRow2</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_visual_row.xml">
-          <SetVariable name="i">2</SetVariable>
-          <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-          <!-- Traditional Orange -->
-          <SetVariable name="DeckSignalColor">#E67A00</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckVisualRow3</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_visual_row.xml">
-          <SetVariable name="i">3</SetVariable>
-          <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-          <!-- Violet -->
-          <SetVariable name="DeckSignalColor">#B500B5</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckVisualRow4</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_visual_row.xml">
-          <SetVariable name="i">4</SetVariable>
-          <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-          <!-- Lime -->
-          <SetVariable name="DeckSignalColor">#AABD00</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckCoverArt1</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/coverart.xml">
-          <SetVariable name="group">[Channel1]</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckCoverArt2</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/coverart.xml">
-          <SetVariable name="group">[Channel2]</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckCoverArt3</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/coverart.xml">
-          <SetVariable name="group">[Channel3]</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckCoverArt4</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/coverart.xml">
-          <SetVariable name="group">[Channel4]</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckOverview1</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_overview.xml">
-          <SetVariable name="group">[Channel1]</SetVariable>
-          <SetVariable name="DeckSignalColor">#007BCD</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-          <SetVariable name="PlayedOverlayColor">#88000000</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckOverview2</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_overview.xml">
-          <SetVariable name="group">[Channel2]</SetVariable>
-          <SetVariable name="DeckSignalColor">#E67A00</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-          <SetVariable name="PlayedOverlayColor">#88000000</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckOverview3</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_overview.xml">
-          <SetVariable name="group">[Channel3]</SetVariable>
-          <SetVariable name="DeckSignalColor">#B500B5</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
-          <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckOverview4</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_overview.xml">
-          <SetVariable name="group">[Channel4]</SetVariable>
-          <SetVariable name="DeckSignalColor">#AABD00</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
-          <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
+    <Template src="skin:../Deere/deck_singletons.xml">
+      <SetVariable name="i">1</SetVariable>
+      <!-- Traditional Blue -->
+      <SetVariable name="DeckSignalColor">#007BCD</SetVariable>
+      <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
+      <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
+    </Template>
+
+    <Template src="skin:../Deere/deck_singletons.xml">
+      <SetVariable name="i">2</SetVariable>
+      <!-- Traditional Orange -->
+      <SetVariable name="DeckSignalColor">#E67A00</SetVariable>
+      <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
+      <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
+    </Template>
+
+    <Template src="skin:../Deere/deck_singletons.xml">
+      <SetVariable name="i">3</SetVariable>
+      <!-- Violet -->
+      <SetVariable name="DeckSignalColor">#B500B5</SetVariable>
+      <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
+      <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
+    </Template>
+
+    <Template src="skin:../Deere/deck_singletons.xml">
+      <SetVariable name="i">4</SetVariable>
+      <!-- Lime -->
+      <SetVariable name="DeckSignalColor">#AABD00</SetVariable>
+      <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
+      <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
+    </Template>
 
     <SingletonDefinition>
       <ObjectName>Library</ObjectName>
@@ -297,11 +193,6 @@
               <SplitSizesConfigKey>[Skin],stackedWaveforms_splitSize</SplitSizesConfigKey>
               <SplitSizes>90,540</SplitSizes>
               <Size>-1me,-1me</Size>
-              <Connection>
-                <ConfigKey>[Master],maximize_library</ConfigKey>
-                <BindProperty>visible</BindProperty>
-                <Transform><Not/></Transform>
-              </Connection>
               <Children>
 
                 <WidgetGroup><!-- Parallel Waveforms -->
@@ -368,13 +259,9 @@
             </Splitter><!-- regular library with decks etc. -->
 
             <!-- maximized Library with minimal decks -->
-            <WidgetGroup>
+            <WidgetGroup trigger="[Master],maximize_library" on_hide_select="0">
               <Layout>vertical</Layout>
               <SizePolicy>me,me</SizePolicy>
-              <Connection>
-                <ConfigKey>[Master],maximize_library</ConfigKey>
-                <BindProperty>visible</BindProperty>
-              </Connection>
               <Children>
                 <Template src="skin:../Deere/decks_small.xml"/>
                 <SingletonContainer>
diff --git a/res/skins/Deere/deck.xml b/res/skins/Deere/deck.xml
index 4fc363fa489..1d1b8564aef 100644
--- a/res/skins/Deere/deck.xml
+++ b/res/skins/Deere/deck.xml
@@ -19,24 +19,18 @@
         <SizePolicy>me,me</SizePolicy>
         <Children>
           <Template src="skin:deck_text_row.xml"/>
-          <!--Hides if the stacked waveforms option is activated in the skin settings -->
+          <!-- Hides if the 'Parallel Waveforms' option is activated in the skin settings -->
           <WidgetGroup>
             <Layout>vertical</Layout>
             <Children>
-              <WidgetGroup>
-                <ObjectName>Spacer22</ObjectName>
-                <Size>0me,1f</Size>
-              </WidgetGroup>
               <SingletonContainer>
-                <ObjectName>DeckVisualRow<Variable name="i" /></ObjectName>
+                <ObjectName>DeckVisualRow<Variable name="i"/></ObjectName>
               </SingletonContainer>
             </Children>
             <Connection>
               <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <Transform><Not/></Transform>
               <BindProperty>visible</BindProperty>
-              <Transform>
-                <Not/>
-              </Transform>
             </Connection>
           </WidgetGroup>
           <Template src="skin:deck_overview_row.xml"/>
diff --git a/res/skins/Deere/coverart.xml b/res/skins/Deere/deck_coverart.xml
similarity index 100%
rename from res/skins/Deere/coverart.xml
rename to res/skins/Deere/deck_coverart.xml
diff --git a/res/skins/Deere/deck_singletons.xml b/res/skins/Deere/deck_singletons.xml
new file mode 100644
index 00000000000..26b20fd69ad
--- /dev/null
+++ b/res/skins/Deere/deck_singletons.xml
@@ -0,0 +1,40 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    Some widgets and containers that are used in multiple places,
+    depending on skin configuration.
+  Variables:
+    i: the deck number (1-4)
+-->
+<Template>
+  <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
+
+  <!-- Is used in DeckVisualRowN so must be instantiated beforehand -->
+  <SingletonDefinition>
+    <ObjectName>SpinnySingleton<Variable name="i"/></ObjectName>
+    <Children>
+      <Template src="skin:../Deere/deck_spinny.xml"/>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>DeckVisualRow<Variable name="i"/></ObjectName>
+    <Children>
+      <Template src="skin:../Deere/deck_visual_row.xml"/>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>DeckCoverArt<Variable name="i"/></ObjectName>
+    <Children>
+      <Template src="skin:../Deere/deck_coverart.xml"/>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>DeckOverview<Variable name="i"/></ObjectName>
+    <Children>
+      <Template src="skin:../Deere/deck_overview.xml"/>
+    </Children>
+  </SingletonDefinition>
+</Template>
diff --git a/res/skins/Deere/deck_spinny.xml b/res/skins/Deere/deck_spinny.xml
new file mode 100644
index 00000000000..6126f39d0db
--- /dev/null
+++ b/res/skins/Deere/deck_spinny.xml
@@ -0,0 +1,87 @@
+<!--
+Spinny template
+
+Stacked waveforms: always show cover art in spinny
+
+Split waveforms: show cover art in spinny when it is not showing in deck text row,
+but do not show cover art in spinny when the cover art is showing right above it
+in the deck text row.
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <WidgetGroup><!-- Parallel waves -->
+        <Layout>horizontal</Layout>
+        <Connection>
+          <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+        <Children>
+          <Spinny>
+            <TooltipId>spinny</TooltipId>
+            <ObjectName>Spinny_NoCover<Variable name="i"/></ObjectName>
+            <Group><Variable name="group"/></Group>
+            <PathBackground scalemode="STRETCH">image/vinyl_spinny_background.svg</PathBackground>
+            <PathForeground scalemode="STRETCH">image/vinyl_spinny_foreground.svg</PathForeground>
+            <PathGhost scalemode="STRETCH">image/vinyl_spinny_foreground_ghost.svg</PathGhost>
+            <PathMask scalemode="STRETCH">image/vinyl_spinny_cover_mask.svg</PathMask>
+            <ShowCover>true</ShowCover>
+          </Spinny>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup><!-- Split waves -->
+        <Layout>horizontal</Layout>
+        <Connection>
+          <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+        <Children>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Connection>
+              <ConfigKey>[Skin],show_coverart</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform><Not/></Transform>
+            </Connection>
+            <Children>
+              <Spinny>
+                <TooltipId>spinny</TooltipId>
+                <ObjectName>Spinny_NoCover<Variable name="i"/></ObjectName>
+                <Group><Variable name="group"/></Group>
+                <PathBackground scalemode="STRETCH">image/vinyl_spinny_background.svg</PathBackground>
+                <PathForeground scalemode="STRETCH">image/vinyl_spinny_foreground.svg</PathForeground>
+                <PathGhost scalemode="STRETCH">image/vinyl_spinny_foreground_ghost.svg</PathGhost>
+                <PathMask scalemode="STRETCH">image/vinyl_spinny_cover_mask.svg</PathMask>
+                <ShowCover>true</ShowCover>
+              </Spinny>
+            </Children>
+          </WidgetGroup>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Connection>
+              <ConfigKey>[Skin],show_coverart</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+            <Children>
+              <Spinny>
+                <TooltipId>spinny</TooltipId>
+                <ObjectName>Spinny_NoCover<Variable name="i"/></ObjectName>
+                <Group><Variable name="group"/></Group>
+                <PathBackground scalemode="STRETCH">image/vinyl_spinny_background.svg</PathBackground>
+                <PathForeground scalemode="STRETCH">image/vinyl_spinny_foreground.svg</PathForeground>
+                <PathGhost scalemode="STRETCH">image/vinyl_spinny_foreground_ghost.svg</PathGhost>
+                <PathMask scalemode="STRETCH">image/vinyl_spinny_cover_mask.svg</PathMask>
+                <ShowCover>false</ShowCover>
+              </Spinny>
+            </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- Split waves -->
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/deck_visual_row.xml b/res/skins/Deere/deck_visual_row.xml
index ee788fb7bff..9ac21790801 100644
--- a/res/skins/Deere/deck_visual_row.xml
+++ b/res/skins/Deere/deck_visual_row.xml
@@ -2,7 +2,9 @@
 <!--
   Description:
     Deck visual row (waveform and spinny).
+    Use smaller spinny sizes for 4 decks than 2 decks.
   Variables:
+    i: deck number, used for to construct group name
     group: the group to connect to
 -->
 <Template>
@@ -14,7 +16,45 @@
 
       <Template src="skin:vinylcontrol.xml"/>
 
-      <Template src="skin:spinny.xml"/>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Size>75f,75f</Size>
+            <Connection>
+              <ConfigKey>[Skin],show_4decks</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>SpinnySingleton<Variable name="i"/></ObjectName>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Size>55f,55f</Size>
+            <Connection>
+              <ConfigKey>[Skin],show_4decks</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>SpinnySingleton<Variable name="i"/></ObjectName>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_spinnies</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
 
       <Visual>
         <TooltipId>waveform_display</TooltipId>
@@ -168,14 +208,6 @@
             <SetVariable name="left_connection_control"><Variable name="group"/>,waveform_zoom_up</SetVariable>
           </Template>
         </Children>
-        <!--The zoom buttons shift the center line off center in stacked waveform mode.-->
-        <Connection>
-          <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
-          <BindProperty>visible</BindProperty>
-          <Transform>
-            <Not/>
-          </Transform>
-        </Connection>
       </WidgetGroup>
 
     </Children>
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 2e17a881b6a..2c8519da376 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -136,141 +136,37 @@
     main_decks.xml, left_deck.xml, and right_deck.xml, so define them in singletons. This makes
     toggling between 2/4 decks and stacked/split waveforms slower, but it makes Mixxx startup
     and shutdown much faster and saves a lot of memory.-->
-    <SingletonDefinition>
-      <ObjectName>DeckVisualRow1</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_visual_row.xml">
-          <SetVariable name="i">1</SetVariable>
-          <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-          <!-- Traditional Blue -->
-          <SetVariable name="DeckSignalColor">#007BCD</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckVisualRow2</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_visual_row.xml">
-          <SetVariable name="i">2</SetVariable>
-          <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-          <!-- Traditional Orange -->
-          <SetVariable name="DeckSignalColor">#E67A00</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckVisualRow3</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_visual_row.xml">
-          <SetVariable name="i">3</SetVariable>
-          <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-          <!-- Violet -->
-          <SetVariable name="DeckSignalColor">#B500B5</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckVisualRow4</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_visual_row.xml">
-          <SetVariable name="i">4</SetVariable>
-          <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-          <!-- Lime -->
-          <SetVariable name="DeckSignalColor">#AABD00</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckCoverArt1</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/coverart.xml">
-          <SetVariable name="group">[Channel1]</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckCoverArt2</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/coverart.xml">
-          <SetVariable name="group">[Channel2]</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckCoverArt3</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/coverart.xml">
-          <SetVariable name="group">[Channel3]</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckCoverArt4</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/coverart.xml">
-          <SetVariable name="group">[Channel4]</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckOverview1</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_overview.xml">
-          <SetVariable name="group">[Channel1]</SetVariable>
-          <SetVariable name="DeckSignalColor">#007BCD</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-          <SetVariable name="PlayedOverlayColor">#88000000</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckOverview2</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_overview.xml">
-          <SetVariable name="group">[Channel2]</SetVariable>
-          <SetVariable name="DeckSignalColor">#E67A00</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-          <SetVariable name="PlayedOverlayColor">#88000000</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckOverview3</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_overview.xml">
-          <SetVariable name="group">[Channel3]</SetVariable>
-          <SetVariable name="DeckSignalColor">#B500B5</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
-          <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>DeckOverview4</ObjectName>
-      <Children>
-        <Template src="skin:../Deere/deck_overview.xml">
-          <SetVariable name="group">[Channel4]</SetVariable>
-          <SetVariable name="DeckSignalColor">#AABD00</SetVariable>
-          <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
-          <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
+    <Template src="skin:../Deere/deck_singletons.xml">
+      <SetVariable name="i">1</SetVariable>
+      <!-- Traditional Blue -->
+      <SetVariable name="DeckSignalColor">#007BCD</SetVariable>
+      <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
+      <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
+    </Template>
+
+    <Template src="skin:../Deere/deck_singletons.xml">
+      <SetVariable name="i">2</SetVariable>
+      <!-- Traditional Orange -->
+      <SetVariable name="DeckSignalColor">#E67A00</SetVariable>
+      <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
+      <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
+    </Template>
+
+    <Template src="skin:../Deere/deck_singletons.xml">
+      <SetVariable name="i">3</SetVariable>
+      <!-- Violet -->
+      <SetVariable name="DeckSignalColor">#B500B5</SetVariable>
+      <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
+      <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
+    </Template>
+
+    <Template src="skin:../Deere/deck_singletons.xml">
+      <SetVariable name="i">4</SetVariable>
+      <!-- Lime -->
+      <SetVariable name="DeckSignalColor">#AABD00</SetVariable>
+      <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
+      <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
+    </Template>
 
     <SingletonDefinition>
       <ObjectName>Library</ObjectName>
@@ -297,11 +193,6 @@
               <SplitSizesConfigKey>[Skin],stackedWaveforms_splitSize</SplitSizesConfigKey>
               <SplitSizes>90,540</SplitSizes>
               <Size>-1me,-1me</Size>
-              <Connection>
-                <ConfigKey>[Master],maximize_library</ConfigKey>
-                <BindProperty>visible</BindProperty>
-                <Transform><Not/></Transform>
-              </Connection>
               <Children>
 
                 <WidgetGroup><!-- Parallel Waveforms -->
@@ -368,13 +259,9 @@
             </Splitter><!-- regular library with decks etc. -->
 
             <!-- maximized Library with minimal decks -->
-            <WidgetGroup>
+            <WidgetGroup trigger="[Master],maximize_library" on_hide_select="0">
               <Layout>vertical</Layout>
               <SizePolicy>me,me</SizePolicy>
-              <Connection>
-                <ConfigKey>[Master],maximize_library</ConfigKey>
-                <BindProperty>visible</BindProperty>
-              </Connection>
               <Children>
                 <Template src="skin:../Deere/decks_small.xml"/>
                 <SingletonContainer>
diff --git a/res/skins/Deere/spinny.xml b/res/skins/Deere/spinny.xml
deleted file mode 100644
index a5759aa6115..00000000000
--- a/res/skins/Deere/spinny.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<!--
-Spinny template
-Stacked waveforms: always show cover art in spinny
-Split waveforms: show cover art in spinny when it is not showing in deck text row,
-but do not show cover art in spinny when the cover art is showing right above it
-in the deck text row.
-
-Use smaller spinny sizes for 4 decks than 2 decks.
--->
-<Template>
-  <SingletonDefinition>
-    <ObjectName>SpinnySingletonWithCover<Variable name="group"/></ObjectName>
-    <Children>
-      <Spinny>
-        <TooltipId>spinny</TooltipId>
-        <Group><Variable name="group"/></Group>
-        <PathBackground scalemode="STRETCH">image/vinyl_spinny_background.svg</PathBackground>
-        <PathForeground>image/vinyl_spinny_foreground.svg</PathForeground>
-        <PathGhost>image/vinyl_spinny_foreground_ghost.svg</PathGhost>
-        <PathMask>image/vinyl_spinny_cover_mask.svg</PathMask>
-        <ShowCover>true</ShowCover>
-      </Spinny>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>SpinnySingletonNoCover<Variable name="group"/></ObjectName>
-    <Children>
-      <Spinny>
-        <TooltipId>spinny</TooltipId>
-        <Group><Variable name="group"/></Group>
-        <PathBackground scalemode="STRETCH">image/vinyl_spinny_background.svg</PathBackground>
-        <PathForeground>image/vinyl_spinny_foreground.svg</PathForeground>
-        <PathGhost>image/vinyl_spinny_foreground_ghost.svg</PathGhost>
-        <PathMask>image/vinyl_spinny_cover_mask.svg</PathMask>
-        <ShowCover>false</ShowCover>
-      </Spinny>
-    </Children>
-  </SingletonDefinition>
-
-  <WidgetGroup>
-    <ObjectName>SpinnyHolder</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>max,max</SizePolicy>
-    <Children>
-
-      <!-- ===================== TWO DECKS ===================== -->
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Connection>
-              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-            <Children>
-              <SingletonContainer>
-                  <ObjectName>SpinnySingletonWithCover<Variable name="group"/></ObjectName>
-                  <Size>75f,75f</Size>
-              </SingletonContainer>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Connection>
-              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
-              <BindProperty>visible</BindProperty>
-              <Transform>
-                <Not/>
-              </Transform>
-            </Connection>
-            <Children>
-
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <Connection>
-                  <ConfigKey>[Skin],show_coverart</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-                <Children>
-                  <SingletonContainer>
-                      <ObjectName>SpinnySingletonNoCover<Variable name="group"/></ObjectName>
-                      <Size>75f,75f</Size>
-                  </SingletonContainer>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <Connection>
-                  <ConfigKey>[Skin],show_coverart</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                  <Transform>
-                    <Not/>
-                  </Transform>
-                </Connection>
-                <Children>
-                  <SingletonContainer>
-                      <ObjectName>SpinnySingletonWithCover<Variable name="group"/></ObjectName>
-                      <Size>75f,75f</Size>
-                  </SingletonContainer>
-                </Children>
-              </WidgetGroup>
-
-            </Children>
-          </WidgetGroup>
-
-        </Children>
-        <Connection>
-          <ConfigKey>[Skin],show_4decks</ConfigKey>
-          <Transform>
-            <Not/>
-          </Transform>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-
-      <!-- ===================== FOUR DECKS ===================== -->
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Connection>
-              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-            <Children>
-              <SingletonContainer>
-                  <ObjectName>SpinnySingletonWithCover<Variable name="group"/></ObjectName>
-                  <Size>55f,55f</Size>
-              </SingletonContainer>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Connection>
-              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
-              <BindProperty>visible</BindProperty>
-              <Transform>
-                <Not/>
-              </Transform>
-            </Connection>
-            <Children>
-
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <Connection>
-                  <ConfigKey>[Skin],show_coverart</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-                <Children>
-                  <SingletonContainer>
-                      <ObjectName>SpinnySingletonNoCover<Variable name="group"/></ObjectName>
-                      <Size>55f,55f</Size>
-                  </SingletonContainer>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <Connection>
-                  <ConfigKey>[Skin],show_coverart</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                  <Transform>
-                    <Not/>
-                  </Transform>
-                </Connection>
-                <Children>
-                  <SingletonContainer>
-                      <ObjectName>SpinnySingletonWithCover<Variable name="group"/></ObjectName>
-                      <Size>55f,55f</Size>
-                  </SingletonContainer>
-                </Children>
-              </WidgetGroup>
-
-            </Children>
-          </WidgetGroup>
-        </Children>
-        <Connection>
-          <ConfigKey>[Skin],show_4decks</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-    </Children>
-    <Connection>
-      <ConfigKey>[Skin],show_spinnies</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>

From d20c5bc4db1e6f922ae5a2422852dd59ac4e561a Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Wed, 28 Oct 2020 20:24:19 +0100
Subject: [PATCH 3/5] Deere: use separate Spinny instances instead of
 Singletons, fixes crash on skin switch/reload on Linux with Qt 5.12.8

---
 res/skins/Deere/deck.xml                      |  40 ++++++-
 res/skins/Deere/deck_singletons.xml           |  12 +-
 res/skins/Deere/deck_spinny.xml               |  89 +++------------
 ...{deck_visual_row.xml => deck_waveform.xml} |  40 -------
 res/skins/Deere/skin.xml                      | 108 +++++++++++++++---
 5 files changed, 151 insertions(+), 138 deletions(-)
 rename res/skins/Deere/{deck_visual_row.xml => deck_waveform.xml} (85%)

diff --git a/res/skins/Deere/deck.xml b/res/skins/Deere/deck.xml
index 1d1b8564aef..9c2a55513a1 100644
--- a/res/skins/Deere/deck.xml
+++ b/res/skins/Deere/deck.xml
@@ -19,12 +19,47 @@
         <SizePolicy>me,me</SizePolicy>
         <Children>
           <Template src="skin:deck_text_row.xml"/>
+
           <!-- Hides if the 'Parallel Waveforms' option is activated in the skin settings -->
           <WidgetGroup>
-            <Layout>vertical</Layout>
+            <Layout>horizontal</Layout>
             <Children>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <Connection>
+                      <ConfigKey>[Skin],show_coverart</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                      <Transform><Not/></Transform>
+                    </Connection>
+                    <Children>
+                      <Template src="skin:../Deere/deck_spinny.xml">
+                        <SetVariable name="cover">true</SetVariable>
+                        <SetVariable name="Size">55f,55f</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <Connection>
+                      <ConfigKey>[Skin],show_coverart</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                    <Children>
+                      <Template src="skin:../Deere/deck_spinny.xml">
+                        <SetVariable name="cover">false</SetVariable>
+                        <SetVariable name="Size">55f,55f</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+                </Children>
+              </WidgetGroup>
+
               <SingletonContainer>
-                <ObjectName>DeckVisualRow<Variable name="i"/></ObjectName>
+                <ObjectName>DeckWaveform<Variable name="i"/></ObjectName>
               </SingletonContainer>
             </Children>
             <Connection>
@@ -33,6 +68,7 @@
               <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup>
+
           <Template src="skin:deck_overview_row.xml"/>
           <Template src="skin:deck_controls_row.xml"/>
         </Children>
diff --git a/res/skins/Deere/deck_singletons.xml b/res/skins/Deere/deck_singletons.xml
index 26b20fd69ad..d44420765ec 100644
--- a/res/skins/Deere/deck_singletons.xml
+++ b/res/skins/Deere/deck_singletons.xml
@@ -9,18 +9,10 @@
 <Template>
   <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
 
-  <!-- Is used in DeckVisualRowN so must be instantiated beforehand -->
   <SingletonDefinition>
-    <ObjectName>SpinnySingleton<Variable name="i"/></ObjectName>
+    <ObjectName>DeckWaveform<Variable name="i"/></ObjectName>
     <Children>
-      <Template src="skin:../Deere/deck_spinny.xml"/>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>DeckVisualRow<Variable name="i"/></ObjectName>
-    <Children>
-      <Template src="skin:../Deere/deck_visual_row.xml"/>
+      <Template src="skin:../Deere/deck_waveform.xml"/>
     </Children>
   </SingletonDefinition>
 
diff --git a/res/skins/Deere/deck_spinny.xml b/res/skins/Deere/deck_spinny.xml
index 6126f39d0db..66cd9901d75 100644
--- a/res/skins/Deere/deck_spinny.xml
+++ b/res/skins/Deere/deck_spinny.xml
@@ -8,80 +8,27 @@ but do not show cover art in spinny when the cover art is showing right above it
 in the deck text row.
 -->
 <Template>
+  <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
+
   <WidgetGroup>
     <Layout>horizontal</Layout>
+    <Size><Variable name="Size"/></Size>
     <Children>
-
-      <WidgetGroup><!-- Parallel waves -->
-        <Layout>horizontal</Layout>
-        <Connection>
-          <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-        <Children>
-          <Spinny>
-            <TooltipId>spinny</TooltipId>
-            <ObjectName>Spinny_NoCover<Variable name="i"/></ObjectName>
-            <Group><Variable name="group"/></Group>
-            <PathBackground scalemode="STRETCH">image/vinyl_spinny_background.svg</PathBackground>
-            <PathForeground scalemode="STRETCH">image/vinyl_spinny_foreground.svg</PathForeground>
-            <PathGhost scalemode="STRETCH">image/vinyl_spinny_foreground_ghost.svg</PathGhost>
-            <PathMask scalemode="STRETCH">image/vinyl_spinny_cover_mask.svg</PathMask>
-            <ShowCover>true</ShowCover>
-          </Spinny>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup><!-- Split waves -->
-        <Layout>horizontal</Layout>
-        <Connection>
-          <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
-          <Transform><Not/></Transform>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-        <Children>
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Connection>
-              <ConfigKey>[Skin],show_coverart</ConfigKey>
-              <BindProperty>visible</BindProperty>
-              <Transform><Not/></Transform>
-            </Connection>
-            <Children>
-              <Spinny>
-                <TooltipId>spinny</TooltipId>
-                <ObjectName>Spinny_NoCover<Variable name="i"/></ObjectName>
-                <Group><Variable name="group"/></Group>
-                <PathBackground scalemode="STRETCH">image/vinyl_spinny_background.svg</PathBackground>
-                <PathForeground scalemode="STRETCH">image/vinyl_spinny_foreground.svg</PathForeground>
-                <PathGhost scalemode="STRETCH">image/vinyl_spinny_foreground_ghost.svg</PathGhost>
-                <PathMask scalemode="STRETCH">image/vinyl_spinny_cover_mask.svg</PathMask>
-                <ShowCover>true</ShowCover>
-              </Spinny>
-            </Children>
-          </WidgetGroup>
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Connection>
-              <ConfigKey>[Skin],show_coverart</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-            <Children>
-              <Spinny>
-                <TooltipId>spinny</TooltipId>
-                <ObjectName>Spinny_NoCover<Variable name="i"/></ObjectName>
-                <Group><Variable name="group"/></Group>
-                <PathBackground scalemode="STRETCH">image/vinyl_spinny_background.svg</PathBackground>
-                <PathForeground scalemode="STRETCH">image/vinyl_spinny_foreground.svg</PathForeground>
-                <PathGhost scalemode="STRETCH">image/vinyl_spinny_foreground_ghost.svg</PathGhost>
-                <PathMask scalemode="STRETCH">image/vinyl_spinny_cover_mask.svg</PathMask>
-                <ShowCover>false</ShowCover>
-              </Spinny>
-            </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup><!-- Split waves -->
-
+      <Spinny>
+        <TooltipId>spinny</TooltipId>
+        <ObjectName>Spinny<Variable name="i"/></ObjectName>
+        <Size><Variable name="Size"/></Size>
+        <Group><Variable name="group"/></Group>
+        <PathBackground scalemode="STRETCH">image/vinyl_spinny_background.svg</PathBackground>
+        <PathForeground scalemode="STRETCH">image/vinyl_spinny_foreground.svg</PathForeground>
+        <PathGhost scalemode="STRETCH">image/vinyl_spinny_foreground_ghost.svg</PathGhost>
+        <PathMask scalemode="STRETCH">image/vinyl_spinny_cover_mask.svg</PathMask>
+        <ShowCover><Variable name="cover"/></ShowCover>
+      </Spinny>
     </Children>
+    <Connection>
+      <ConfigKey>[Skin],show_spinnies</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/deck_visual_row.xml b/res/skins/Deere/deck_waveform.xml
similarity index 85%
rename from res/skins/Deere/deck_visual_row.xml
rename to res/skins/Deere/deck_waveform.xml
index 9ac21790801..52a290eb3fa 100644
--- a/res/skins/Deere/deck_visual_row.xml
+++ b/res/skins/Deere/deck_waveform.xml
@@ -16,46 +16,6 @@
 
       <Template src="skin:vinylcontrol.xml"/>
 
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Size>75f,75f</Size>
-            <Connection>
-              <ConfigKey>[Skin],show_4decks</ConfigKey>
-              <Transform><Not/></Transform>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-            <Children>
-              <SingletonContainer>
-                <ObjectName>SpinnySingleton<Variable name="i"/></ObjectName>
-              </SingletonContainer>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Size>55f,55f</Size>
-            <Connection>
-              <ConfigKey>[Skin],show_4decks</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-            <Children>
-              <SingletonContainer>
-                <ObjectName>SpinnySingleton<Variable name="i"/></ObjectName>
-              </SingletonContainer>
-            </Children>
-          </WidgetGroup>
-
-        </Children>
-        <Connection>
-          <ConfigKey>[Skin],show_spinnies</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
       <Visual>
         <TooltipId>waveform_display</TooltipId>
         <Group><Variable name="group"/></Group>
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 2c8519da376..937ca0e726d 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -205,37 +205,115 @@
                   <Children>
 
                     <WidgetGroup>
+                      <Layout>horizontal</Layout>
+                      <Children>
+                        <Template src="skin:../Deere/deck_spinny.xml">
+                          <SetVariable name="cover">true</SetVariable>
+                          <SetVariable name="Size">55f,55f</SetVariable>
+                          <SetVariable name="i">3</SetVariable>
+                        </Template>
+                        <SingletonContainer>
+                          <ObjectName>DeckWaveform3</ObjectName>
+                        </SingletonContainer>
+                      </Children>
                       <Connection>
                         <ConfigKey>[Skin],show_4decks</ConfigKey>
                         <BindProperty>visible</BindProperty>
                       </Connection>
-                      <Layout>vertical</Layout>
+                    </WidgetGroup>
+
+                    <WidgetGroup>
+                      <Layout>horizontal</Layout>
                       <Children>
+                        <WidgetGroup>
+                          <Layout>horizontal</Layout>
+                          <Children>
+                            <Template src="skin:../Deere/deck_spinny.xml">
+                              <SetVariable name="cover">true</SetVariable>
+                              <SetVariable name="Size">55f,55f</SetVariable>
+                              <SetVariable name="i">1</SetVariable>
+                            </Template>
+                          </Children>
+                          <Connection>
+                            <ConfigKey>[Skin],show_4decks</ConfigKey>
+                            <BindProperty>visible</BindProperty>
+                          </Connection>
+                        </WidgetGroup>
+                        <WidgetGroup>
+                          <Layout>horizontal</Layout>
+                          <Children>
+                            <Template src="skin:../Deere/deck_spinny.xml">
+                              <SetVariable name="cover">true</SetVariable>
+                              <SetVariable name="Size">75f,75f</SetVariable>
+                              <SetVariable name="i">1</SetVariable>
+                            </Template>
+                          </Children>
+                          <Connection>
+                            <ConfigKey>[Skin],show_4decks</ConfigKey>
+                            <Transform><Not/></Transform>
+                            <BindProperty>visible</BindProperty>
+                          </Connection>
+                        </WidgetGroup>
                         <SingletonContainer>
-                          <ObjectName>DeckVisualRow3</ObjectName>
+                          <ObjectName>DeckWaveform1</ObjectName>
                         </SingletonContainer>
                       </Children>
                     </WidgetGroup>
 
-                    <SingletonContainer>
-                      <ObjectName>DeckVisualRow1</ObjectName>
-                    </SingletonContainer>
-
-                    <SingletonContainer>
-                      <ObjectName>DeckVisualRow2</ObjectName>
-                    </SingletonContainer>
+                    <WidgetGroup>
+                      <Layout>horizontal</Layout>
+                      <Children>
+                        <WidgetGroup>
+                          <Layout>horizontal</Layout>
+                          <Children>
+                            <Template src="skin:../Deere/deck_spinny.xml">
+                              <SetVariable name="cover">true</SetVariable>
+                              <SetVariable name="Size">55f,55f</SetVariable>
+                              <SetVariable name="i">2</SetVariable>
+                            </Template>
+                          </Children>
+                          <Connection>
+                            <ConfigKey>[Skin],show_4decks</ConfigKey>
+                            <BindProperty>visible</BindProperty>
+                          </Connection>
+                        </WidgetGroup>
+                        <WidgetGroup>
+                          <Layout>horizontal</Layout>
+                          <Children>
+                            <Template src="skin:../Deere/deck_spinny.xml">
+                              <SetVariable name="cover">true</SetVariable>
+                              <SetVariable name="Size">75f,75f</SetVariable>
+                              <SetVariable name="i">2</SetVariable>
+                            </Template>
+                          </Children>
+                          <Connection>
+                            <ConfigKey>[Skin],show_4decks</ConfigKey>
+                            <Transform><Not/></Transform>
+                            <BindProperty>visible</BindProperty>
+                          </Connection>
+                        </WidgetGroup>
+                        <SingletonContainer>
+                          <ObjectName>DeckWaveform2</ObjectName>
+                        </SingletonContainer>
+                      </Children>
+                    </WidgetGroup>
 
                     <WidgetGroup>
-                      <Connection>
-                        <ConfigKey>[Skin],show_4decks</ConfigKey>
-                        <BindProperty>visible</BindProperty>
-                      </Connection>
-                      <Layout>vertical</Layout>
+                      <Layout>horizontal</Layout>
                       <Children>
+                        <Template src="skin:../Deere/deck_spinny.xml">
+                          <SetVariable name="cover">true</SetVariable>
+                          <SetVariable name="Size">55f,55f</SetVariable>
+                          <SetVariable name="i">4</SetVariable>
+                        </Template>
                         <SingletonContainer>
-                          <ObjectName>DeckVisualRow4</ObjectName>
+                          <ObjectName>DeckWaveform4</ObjectName>
                         </SingletonContainer>
                       </Children>
+                      <Connection>
+                        <ConfigKey>[Skin],show_4decks</ConfigKey>
+                        <BindProperty>visible</BindProperty>
+                      </Connection>
                     </WidgetGroup>
 
                   </Children>

From b13f6bbae3f5167f0ab9241ef4d3fb76c8d3e443 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 2 Nov 2020 15:01:22 +0100
Subject: [PATCH 4/5] Deere: move waveform/spinny row from skin.xml to separate
 template

---
 res/skins/Deere/parallel_waveforms.xml | 131 +++++++++++++++++++++++++
 res/skins/Deere/skin.xml               | 126 +-----------------------
 2 files changed, 134 insertions(+), 123 deletions(-)
 create mode 100644 res/skins/Deere/parallel_waveforms.xml

diff --git a/res/skins/Deere/parallel_waveforms.xml b/res/skins/Deere/parallel_waveforms.xml
new file mode 100644
index 00000000000..001f2ae5437
--- /dev/null
+++ b/res/skins/Deere/parallel_waveforms.xml
@@ -0,0 +1,131 @@
+<!DOCTYPE template>
+<!--
+-->
+<Template>
+  <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
+
+
+  <WidgetGroup><!-- Parallel Waveforms -->
+    <ObjectName>Waveforms</ObjectName>
+    <Layout>vertical</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:../Deere/deck_spinny.xml">
+            <SetVariable name="cover">true</SetVariable>
+            <SetVariable name="Size">55f,55f</SetVariable>
+            <SetVariable name="i">3</SetVariable>
+          </Template>
+          <SingletonContainer>
+            <ObjectName>DeckWaveform3</ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:../Deere/deck_spinny.xml">
+                <SetVariable name="cover">true</SetVariable>
+                <SetVariable name="Size">55f,55f</SetVariable>
+                <SetVariable name="i">1</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_4decks</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:../Deere/deck_spinny.xml">
+                <SetVariable name="cover">true</SetVariable>
+                <SetVariable name="Size">75f,75f</SetVariable>
+                <SetVariable name="i">1</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_4decks</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+          <SingletonContainer>
+            <ObjectName>DeckWaveform1</ObjectName>
+          </SingletonContainer>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:../Deere/deck_spinny.xml">
+                <SetVariable name="cover">true</SetVariable>
+                <SetVariable name="Size">55f,55f</SetVariable>
+                <SetVariable name="i">2</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_4decks</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:../Deere/deck_spinny.xml">
+                <SetVariable name="cover">true</SetVariable>
+                <SetVariable name="Size">75f,75f</SetVariable>
+                <SetVariable name="i">2</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_4decks</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+          <SingletonContainer>
+            <ObjectName>DeckWaveform2</ObjectName>
+          </SingletonContainer>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:../Deere/deck_spinny.xml">
+            <SetVariable name="cover">true</SetVariable>
+            <SetVariable name="Size">55f,55f</SetVariable>
+            <SetVariable name="i">4</SetVariable>
+          </Template>
+          <SingletonContainer>
+            <ObjectName>DeckWaveform4</ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>y
+  </WidgetGroup><!-- /Parallel Waveforms -->
+</Template>
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index a311c4e81f3..a03d2764507 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -195,129 +195,9 @@
               <Size>-1me,-1me</Size>
               <Children>
 
-                <WidgetGroup><!-- Parallel Waveforms -->
-                  <ObjectName>Waveforms</ObjectName>
-                  <Layout>vertical</Layout>
-                  <Connection>
-                    <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
-                    <BindProperty>visible</BindProperty>
-                  </Connection>
-                  <Children>
-
-                    <WidgetGroup>
-                      <Layout>horizontal</Layout>
-                      <Children>
-                        <Template src="skin:../Deere/deck_spinny.xml">
-                          <SetVariable name="cover">true</SetVariable>
-                          <SetVariable name="Size">55f,55f</SetVariable>
-                          <SetVariable name="i">3</SetVariable>
-                        </Template>
-                        <SingletonContainer>
-                          <ObjectName>DeckWaveform3</ObjectName>
-                        </SingletonContainer>
-                      </Children>
-                      <Connection>
-                        <ConfigKey>[Skin],show_4decks</ConfigKey>
-                        <BindProperty>visible</BindProperty>
-                      </Connection>
-                    </WidgetGroup>
-
-                    <WidgetGroup>
-                      <Layout>horizontal</Layout>
-                      <Children>
-                        <WidgetGroup>
-                          <Layout>horizontal</Layout>
-                          <Children>
-                            <Template src="skin:../Deere/deck_spinny.xml">
-                              <SetVariable name="cover">true</SetVariable>
-                              <SetVariable name="Size">55f,55f</SetVariable>
-                              <SetVariable name="i">1</SetVariable>
-                            </Template>
-                          </Children>
-                          <Connection>
-                            <ConfigKey>[Skin],show_4decks</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                          </Connection>
-                        </WidgetGroup>
-                        <WidgetGroup>
-                          <Layout>horizontal</Layout>
-                          <Children>
-                            <Template src="skin:../Deere/deck_spinny.xml">
-                              <SetVariable name="cover">true</SetVariable>
-                              <SetVariable name="Size">75f,75f</SetVariable>
-                              <SetVariable name="i">1</SetVariable>
-                            </Template>
-                          </Children>
-                          <Connection>
-                            <ConfigKey>[Skin],show_4decks</ConfigKey>
-                            <Transform><Not/></Transform>
-                            <BindProperty>visible</BindProperty>
-                          </Connection>
-                        </WidgetGroup>
-                        <SingletonContainer>
-                          <ObjectName>DeckWaveform1</ObjectName>
-                        </SingletonContainer>
-                      </Children>
-                    </WidgetGroup>
-
-                    <WidgetGroup>
-                      <Layout>horizontal</Layout>
-                      <Children>
-                        <WidgetGroup>
-                          <Layout>horizontal</Layout>
-                          <Children>
-                            <Template src="skin:../Deere/deck_spinny.xml">
-                              <SetVariable name="cover">true</SetVariable>
-                              <SetVariable name="Size">55f,55f</SetVariable>
-                              <SetVariable name="i">2</SetVariable>
-                            </Template>
-                          </Children>
-                          <Connection>
-                            <ConfigKey>[Skin],show_4decks</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                          </Connection>
-                        </WidgetGroup>
-                        <WidgetGroup>
-                          <Layout>horizontal</Layout>
-                          <Children>
-                            <Template src="skin:../Deere/deck_spinny.xml">
-                              <SetVariable name="cover">true</SetVariable>
-                              <SetVariable name="Size">75f,75f</SetVariable>
-                              <SetVariable name="i">2</SetVariable>
-                            </Template>
-                          </Children>
-                          <Connection>
-                            <ConfigKey>[Skin],show_4decks</ConfigKey>
-                            <Transform><Not/></Transform>
-                            <BindProperty>visible</BindProperty>
-                          </Connection>
-                        </WidgetGroup>
-                        <SingletonContainer>
-                          <ObjectName>DeckWaveform2</ObjectName>
-                        </SingletonContainer>
-                      </Children>
-                    </WidgetGroup>
-
-                    <WidgetGroup>
-                      <Layout>horizontal</Layout>
-                      <Children>
-                        <Template src="skin:../Deere/deck_spinny.xml">
-                          <SetVariable name="cover">true</SetVariable>
-                          <SetVariable name="Size">55f,55f</SetVariable>
-                          <SetVariable name="i">4</SetVariable>
-                        </Template>
-                        <SingletonContainer>
-                          <ObjectName>DeckWaveform4</ObjectName>
-                        </SingletonContainer>
-                      </Children>
-                      <Connection>
-                        <ConfigKey>[Skin],show_4decks</ConfigKey>
-                        <BindProperty>visible</BindProperty>
-                      </Connection>
-                    </WidgetGroup>
-
-                  </Children>
-                </WidgetGroup><!-- /Parallel Waveforms -->
+                <!-- Waveforms & spinnies are shown here as stack or
+                  separatley in each deck -->
+                <Template src="skin:../Deere/parallel_waveforms.xml"/>
 
                 <WidgetGroup><!-- Main section -->
                   <Layout>vertical</Layout>

From 3fa06a385fbecef02dcbe449fbd3b0cc8c6b7d84 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Mon, 2 Nov 2020 19:13:50 +0100
Subject: [PATCH 5/5] changelog: work around Linux skin chang crash

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5427b9bc1ff..053d599c199 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 * Add laptop battery widget to skins [#2283](https://github.com/mixxxdj/mixxx/pull/2283) [#2277](https://github.com/mixxxdj/mixxx/pull/2277) [#2250](https://github.com/mixxxdj/mixxx/pull/2250) [#2228](https://github.com/mixxxdj/mixxx/pull/2228) [#2221](https://github.com/mixxxdj/mixxx/pull/2221) [#2163](https://github.com/mixxxdj/mixxx/pull/2163) [#2160](https://github.com/mixxxdj/mixxx/pull/2160) [#2147](https://github.com/mixxxdj/mixxx/pull/2147) [#2281](https://github.com/mixxxdj/mixxx/pull/2281) [#2319](https://github.com/mixxxdj/mixxx/pull/2319) [#2287](https://github.com/mixxxdj/mixxx/pull/2287)
 * Show when passthrough mode is active on overview waveforms [#2575](https://github.com/mixxxdj/mixxx/pull/2575) [#2616](https://github.com/mixxxdj/mixxx/pull/2616)
 * Changed format of currently playing track in window title from "artist, title" to "artist - title" [#2807](https://github.com/mixxxdj/mixxx/pull/2807)
+* Workaround Linux skin change crash [#3144](https://github.com/mixxxdj/mixxx/pull/3144) [lp:1885009](https://bugs.launchpad.net/mixxx/+bug/1885009)
 
 ### Music Feature Analysis ###
 * Multithreaded analysis for much faster batch analysis on multicore CPUs [#1624](https://github.com/mixxxdj/mixxx/pull/1624) [#2142](https://github.com/mixxxdj/mixxx/pull/2142) [lp:1641153](https://bugs.launchpad.net/mixxx/+bug/1641153)