Merge pull request #440 from ywwg/spinny-svg

Spinny updates
mixxxdj · Dec 28, 2014 · ad12dc4 · ad12dc4
2 parents de87e07 + a3fe90b
commit ad12dc4
Show file tree

Hide file tree

Showing 10 changed files with 935 additions and 40 deletions.
diff --git a/res/skins/Deere/deck_visual_row.xml b/res/skins/Deere/deck_visual_row.xml
@@ -171,6 +171,7 @@
         <Children>
           <Spinny>
             <TooltipId>spinny</TooltipId>
+            <Size>118f,118f</Size>
             <Group><Variable name="group"/></Group>
             <PathBackground>image/vinyl_spinny_background.png</PathBackground>
             <PathForeground>image/vinyl_spinny_foreground.png</PathForeground>

diff --git a/res/skins/LateNight/spinny.xml b/res/skins/LateNight/spinny.xml
@@ -8,29 +8,31 @@
           <WidgetGroup>
             <ObjectName>SpinnyContainer</ObjectName>
             <Layout>horizontal</Layout>
-            <MinimumSize>96,96</MinimumSize>
             <SizePolicy>min,min</SizePolicy>
             <Children>
               <Spinny>
+                <Size>96f,96f</Size>
                 <Group>[Channel<Variable name="channum"/>]</Group>
-                <PathBackground>vinyl_spinny<Variable name="color"/>_background.png</PathBackground>
-                <PathForeground>vinyl_spinny<Variable name="color"/>_foreground.png</PathForeground>
-                <PathGhost>vinyl_spinny<Variable name="color"/>_foreground_ghost.png</PathGhost>
+                <PathBackground>spinny_bg.svg</PathBackground>
+                <PathMask>spinny<Variable name="color"/>_mask.svg</PathMask>
+                <PathForeground>spinny_indicator.svg</PathForeground>
+                <PathGhost>spinny_indicator_ghost.svg</PathGhost>
                 <ShowCover>true</ShowCover>
               </Spinny>
             </Children>
           </WidgetGroup>
           <WidgetGroup trigger="[Master],show_mixer">
             <ObjectName>SpinnyContainer</ObjectName>
             <Layout>horizontal</Layout>
-            <MinimumSize>50,50</MinimumSize>
             <SizePolicy>min,min</SizePolicy>
             <Children>
               <Spinny>
+                <Size>50f,50f</Size>
                 <Group>[Channel<Variable name="channum"/>]</Group>
-                <PathBackground>vinyl_spinny<Variable name="color"/>_background-s.png</PathBackground>
-                <PathForeground>vinyl_spinny<Variable name="color"/>_foreground-s.png</PathForeground>
-                <PathGhost>vinyl_spinny<Variable name="color"/>_foreground_ghost-s.png</PathGhost>
+                <PathBackground>spinny_bg.svg</PathBackground>
+                <PathMask>spinny<Variable name="color"/>_mask.svg</PathMask>
+                <PathForeground>spinny_indicator.svg</PathForeground>
+                <PathGhost>spinny_indicator_ghost.svg</PathGhost>
                 <ShowCover>true</ShowCover>
               </Spinny>
             </Children>

diff --git a/res/skins/LateNight/spinny1_mask.svg b/res/skins/LateNight/spinny1_mask.svg