Deere: bring back cover art option in deck text row

Automatically show cover art in spinnies with stacked waveforms. With split waveforms, show cover art in spinnies when it is not showing in deck text row, and hide it in spinnies when it is showing next to spinnies in deck text row.
Be-ing · Apr 13, 2017 · 8a2c33c · 8a2c33c
1 parent e8a5f57
commit 8a2c33c
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 56 deletions.
diff --git a/res/skins/Deere/deck_text_row.xml b/res/skins/Deere/deck_text_row.xml
@@ -12,6 +12,24 @@
     <SizePolicy>me,max</SizePolicy>
     <Children>
 
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <CoverArt>
+            <TooltipId>coverart</TooltipId>
+            <ObjectName>DeckCoverArt</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
+            <MinimumSize>58,58</MinimumSize>
+            <Group><Variable name="group"/></Group>
+          </CoverArt>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Master],show_coverart</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
       <WidgetGroup>
         <ObjectName>DeckTextColumn</ObjectName>
         <Layout>vertical</Layout>

diff --git a/res/skins/Deere/deck_visual_row.xml b/res/skins/Deere/deck_visual_row.xml
@@ -6,20 +6,6 @@
     group: the group to connect to
 -->
 <Template>
-  <SingletonDefinition>
-    <ObjectName>SpinnySingleton<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>
   <WidgetGroup>
     <ObjectName>VisualRow</ObjectName>
     <Layout>horizontal</Layout>
@@ -28,47 +14,7 @@
 
       <Template src="skin:vinylcontrol.xml"/>
 
-      <WidgetGroup>
-        <ObjectName>SpinnyHolder</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>max,max</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Children>
-              <SingletonContainer>
-                 <ObjectName>SpinnySingleton<Variable name="group"/></ObjectName>
-                 <Size>75f,75f</Size>
-              </SingletonContainer>
-            </Children>
-            <Connection>
-              <ConfigKey>[Master],show_4decks</ConfigKey>
-              <Transform>
-                <Not/>
-              </Transform>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Children>
-              <SingletonContainer>
-                 <ObjectName>SpinnySingleton<Variable name="group"/></ObjectName>
-                 <Size>55f,55f</Size>
-              </SingletonContainer>
-            </Children>
-            <Connection>
-              <ConfigKey>[Master],show_4decks</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-        </Children>
-        <Connection>
-          <ConfigKey>[Master],show_spinnies</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
+      <Template src="skin:spinny.xml"/>
 
       <Visual>
         <TooltipId>waveform_display</TooltipId>

diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
@@ -20,7 +20,8 @@
 
       <attribute persist="true" config_key="[Master],show_4decks">0</attribute>
       <attribute persist="true" config_key="[Master],show_4effectunits">0</attribute>
-      <attribute persist="true" config_key="[Master],show_spinnies">1</attribute>
+      <attribute persist="true" config_key="[Master],show_coverart">1</attribute>
+      <attribute persist="true" config_key="[Master],show_spinnies">0</attribute>
       <attribute persist="true" config_key="[Master],show_superknobs">1</attribute>
       <attribute persist="true" config_key="[Deere],show_starrating">0</attribute>
       <attribute persist="true" config_key="[Deere],show_track_info">1</attribute>

diff --git a/res/skins/Deere/skin_settings.xml b/res/skins/Deere/skin_settings.xml
@@ -96,6 +96,24 @@
         <SizePolicy>me,min</SizePolicy>
         <Children>
 
+          <PushButton>
+            <Size>80me,20f</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Text>&#9898; Cover Art</Text>
+              <Alignment>left</Alignment>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Text>&#9899; Cover Art</Text>
+              <Alignment>left</Alignment>
+            </State>
+            <Connection>
+              <ConfigKey>[Master],show_coverart</ConfigKey>
+            </Connection>
+          </PushButton>
+
           <PushButton>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>