Merge tag 'upstream/0.5.1'

Upstream version 0.5.1

2 files changed, 138 insertions, 4 deletions

diff --git a/resources/themes/slim/slice_caption.svg b/resources/themes/slim/slice_caption.svg
new file mode 100644
index 0000000..d2aa2cb
--- /dev/null
+++ b/resources/themes/slim/slice_caption.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="100"
+   height="100"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="slice_caption.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3767">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop3769" />
+      <stop
+         id="stop4739"
+         offset="0.39852998"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.7605178"
+         offset="0.58575326"
+         id="stop4703" />
+      <stop
+         id="stop4713"
+         offset="0.66058904"
+         style="stop-color:#ffffff;stop-opacity:0.45490196;" />
+      <stop
+         id="stop4711"
+         offset="0.70194155"
+         style="stop-color:#ffffff;stop-opacity:0.34901961;" />
+      <stop
+         id="stop4709"
+         offset="0.74285865"
+         style="stop-color:#ffffff;stop-opacity:0.25490196;" />
+      <stop
+         id="stop4707"
+         offset="0.8251282"
+         style="stop-color:#ffffff;stop-opacity:0.1254902;" />
+      <stop
+         id="stop4705"
+         offset="0.90009141"
+         style="stop-color:#ffffff;stop-opacity:0.05490196;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop3771" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter3780"
+       x="-0.19497946"
+       width="1.3899589"
+       y="-1.3648562"
+       height="3.7297125">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.1182109"
+         id="feGaussianBlur3782" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#6e6e6e"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.61176471"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="-41.757409"
+     inkscape:cy="36.683022"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1033"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       orientation="0,1"
+       position="50,49.75"
+       id="guide3916" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="50,43.125"
+       id="guide3918" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-952.36218)">
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3780)"
+       id="rect2998"
+       width="63"
+       height="9"
+       x="18.5"
+       y="960.36218"
+       rx="5.9261422"
+       ry="3.2917278"
+       transform="matrix(1.2461533,0,0,-2.080723,-12.774861,3038.7488)" />
+  </g>
+</svg>
diff --git a/resources/themes/slim/theme.xml b/resources/themes/slim/theme.xml
index 07eaafc..97c8c42 100644
--- a/resources/themes/slim/theme.xml
+++ b/resources/themes/slim/theme.xml
@@ -2,7 +2,7 @@
 
 <theme name="Slim" description="Well... quite simplistic" author="Simon Schneegans" email="code@simonschneegans.de">
     <pie radius="120" maxZoom="1.3" zoomRange="0.2" transitionTime="0.2" springiness="1.5" 
-          fadeInTime="0.3" fadeOutTime="0.3" fadeInZoom="0.8" fadeOutZoom="0.8" fadeInRotation="0.3" fadeOutRotation="-0.3">
+          fadeInTime="0.3" fadeOutTime="0.3" fadeInZoom="0.8" wobble="0.1" fadeOutZoom="0.8" fadeInRotation="0.3" fadeOutRotation="-0.3">
         <center radius="120" activeRadius="35">
             <center_layer file="bg.svg" 
                           active_scale="1.0"   active_rotationMode="auto"   active_rotationSpeed="0"    active_colorize="false"    active_alpha="1"
@@ -23,12 +23,16 @@
                           active_scale="0.7"     active_rotationMode="turn_to_mouse"   active_rotationSpeed="9.0"    active_colorize="true"    active_alpha="1.0" 
                           inactive_scale="0.5" inactive_rotationMode="auto" inactive_rotationSpeed="1.0"  inactive_colorize="false" inactive_alpha="1.0" />
         </center>
-        <slices radius="24">
+        <slices radius="35" minGap="0">
             <activeSlice>
-                <slice_layer type="icon" />
+                <slice_layer type="icon" scale="0.7" />
+                <slice_layer type="file" file="slice_caption.svg" scale="1" colorize="false" visibility="with_caption" />
+                <slice_layer type="caption" y="28" font="sans bold 10" width="85" height="20" visibility="with_caption" />
             </activeSlice>
             <inactiveSlice>
-                <slice_layer type="icon" />
+                <slice_layer type="icon" scale="0.7" />
+                <slice_layer type="file" file="slice_caption.svg" scale="1" colorize="false" visibility="with_caption" />
+                <slice_layer type="caption" y="28" font="sans bold 10" width="85" height="20" visibility="with_caption" />
             </inactiveSlice>
         </slices>
     </pie>