Merge tag 'upstream/0.6.0'

Upstream version 0.6.0

4 files changed, 176 insertions, 43 deletions

diff --git a/resources/themes/elementary/arrow.svg b/resources/themes/elementary/arrow.svg
new file mode 100644
index 0000000..708089e
--- /dev/null
+++ b/resources/themes/elementary/arrow.svg
@@ -0,0 +1,146 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   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.4 r9939"
+   sodipodi:docname="arrow.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3007">
+      <stop
+         id="stop3009"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="0.3680203"
+         id="stop3011" />
+      <stop
+         id="stop3013"
+         offset="0.57677984"
+         style="stop-color:#ffffff;stop-opacity:0.66666667;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.45490196;"
+         offset="0.66058904"
+         id="stop3015" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.34901961;"
+         offset="0.70194155"
+         id="stop3017" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.25490196;"
+         offset="0.74285865"
+         id="stop3019" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.1254902;"
+         offset="0.8251282"
+         id="stop3021" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.05490196;"
+         offset="0.90009141"
+         id="stop3023" />
+      <stop
+         id="stop3025"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3007"
+       id="radialGradient3005"
+       gradientUnits="userSpaceOnUse"
+       cx="50.002552"
+       cy="49.744911"
+       fx="50.002552"
+       fy="49.744911"
+       r="49.750011" />
+    <filter
+       inkscape:collect="always"
+       id="filter3779"
+       x="-0.34508318"
+       width="1.6901664"
+       y="-0.17993921"
+       height="1.3598784">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.1711771"
+         id="feGaussianBlur3781" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#1d1d1d"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="93.069485"
+     inkscape:cy="47.132012"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:showpageshadow="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1174"
+     inkscape:window-height="737"
+     inkscape:window-x="552"
+     inkscape:window-y="163"
+     inkscape:window-maximized="0">
+    <sodipodi:guide
+       orientation="0,1"
+       position="111.25,50"
+       id="guide2994" />
+  </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)">
+    <path
+       style="fill:#000000;fill-opacity:0.38823529;stroke:none;filter:url(#filter3779)"
+       d="m 92.583911,996.71428 5.377498,5.64532 -5.957855,5.9578 c 1.069709,-6.6202 1.461535,-5.4705 0.580357,-11.60312 z"
+       id="path3765"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       transform="matrix(0.86891864,0,0,0.86891864,13.789717,131.41113)" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="path3763"
+       d="m 92.066696,995.07163 7.213154,7.26447 -7.264507,7.3672 c 1.230548,-7.6156 1.065023,-7.577 0.05135,-14.63167 z"
+       style="fill:#000000;fill-opacity:0.38823529;stroke:none" />
+    <path
+       style="fill:#f5f5f5;fill-opacity:1;stroke:none"
+       d="m 90.03879,993.70843 8.627683,8.62767 -8.627683,8.6276 c 0.9685,-5.9938 0.797807,-11.70292 0,-17.25527 z"
+       id="rect2998"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/resources/themes/elementary/preview.png b/resources/themes/elementary/preview.png
index 4825ba1..67e91ad 100644
--- a/resources/themes/elementary/preview.png
+++ b/resources/themes/elementary/preview.png
diff --git a/resources/themes/elementary/ring.svg b/resources/themes/elementary/ring.svg
index 379a8db..ce05f78 100644
--- a/resources/themes/elementary/ring.svg
+++ b/resources/themes/elementary/ring.svg
@@ -14,7 +14,7 @@
    height="100"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="ring.svg">
   <defs
      id="defs4">
@@ -69,27 +69,11 @@
        r="49.750011" />
     <filter
        inkscape:collect="always"
-       id="filter3809"
-       x="-0.10553746"
-       width="1.2110749"
-       y="-0.10553746"
-       height="1.2110749">
+       id="filter3769">
       <feGaussianBlur
          inkscape:collect="always"
-         stdDeviation="4.3110167"
-         id="feGaussianBlur3811" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3855"
-       x="-0.14071661"
-       width="1.2814332"
-       y="-0.14071661"
-       height="1.2814332">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.7480223"
-         id="feGaussianBlur3857" />
+         stdDeviation="3.063616"
+         id="feGaussianBlur3771" />
     </filter>
   </defs>
   <sodipodi:namedview
@@ -99,9 +83,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="63.212651"
-     inkscape:cy="14.680618"
+     inkscape:zoom="1.979899"
+     inkscape:cx="20.734776"
+     inkscape:cy="39.641797"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -109,9 +93,9 @@
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:window-width="960"
-     inkscape:window-height="1034"
+     inkscape:window-height="1024"
      inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-y="30"
      inkscape:window-maximized="0" />
   <metadata
      id="metadata7">
@@ -121,7 +105,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -131,24 +115,24 @@
      id="layer1"
      transform="translate(0,-952.36218)">
     <path
-       transform="matrix(0.74722485,0,0,0.74722485,12.647398,967.71449)"
+       transform="matrix(0.89294434,0,0,0.89294434,5.3484126,957.94153)"
        d="m 99.107143,49.910713 a 49.017857,49.017857 0 1 1 -98.0357128,0 49.017857,49.017857 0 1 1 98.0357128,0 z"
        sodipodi:ry="49.017857"
        sodipodi:rx="49.017857"
        sodipodi:cy="49.910713"
        sodipodi:cx="50.089287"
        id="path3813"
-       style="opacity:0.58745871;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3855)"
+       style="opacity:0.26470588;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3769)"
        sodipodi:type="arc" />
     <path
-       sodipodi:type="arc"
-       style="fill:#383838;fill-opacity:1;stroke:#212121;stroke-width:1.33828521000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:0.82838284"
-       id="path2994"
-       sodipodi:cx="50.089287"
-       sodipodi:cy="49.910713"
-       sodipodi:rx="49.017857"
-       sodipodi:ry="49.017857"
+       transform="matrix(0.86629137,0,0,0.86629137,6.6834408,959.01656)"
        d="m 99.107143,49.910713 a 49.017857,49.017857 0 1 1 -98.0357128,0 49.017857,49.017857 0 1 1 98.0357128,0 z"
-       transform="matrix(0.74722485,0,0,0.74722485,12.647398,964.95926)" />
+       sodipodi:ry="49.017857"
+       sodipodi:rx="49.017857"
+       sodipodi:cy="49.910713"
+       sodipodi:cx="50.089287"
+       id="path3767"
+       style="fill:#f5f5f5;fill-opacity:1;stroke:#000000;stroke-opacity:0.38674033000000002;stroke-width:0.57717301;stroke-miterlimit:4;stroke-dasharray:none"
+       sodipodi:type="arc" />
   </g>
 </svg>
diff --git a/resources/themes/elementary/theme.xml b/resources/themes/elementary/theme.xml
index 0667707..0286f21 100644
--- a/resources/themes/elementary/theme.xml
+++ b/resources/themes/elementary/theme.xml
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <theme name="Elementary" description="Inspired by the style of Elementary OS" author="Simon Schneegans" email="code@simonschneegans.de">
-    <pie radius="120" maxZoom="1.2" zoomRange="0.1" wobble="0.1" transitionTime="0.15" springiness="1.3" 
-          fadeInTime="0.2" fadeOutTime="0.2" fadeInZoom="0.7" fadeOutZoom="0.8" fadeInRotation="0.2" fadeOutRotation="-0.2">
-        <center radius="70" activeRadius="35">
-            <center_layer file="ring.svg" 
+    <pie radius="100" maxZoom="1.2" zoomRange="0.3" wobble="0.1" transitionTime="0.15" springiness="0.3"
+          fadeInTime="0.2" fadeOutTime="0.2" fadeInZoom="0.5" fadeOutZoom="0.8" fadeInRotation="0.2" fadeOutRotation="-0.2">
+        <center radius="50" activeRadius="35">
+            <center_layer file="ring.svg"
                           active_scale="1.0"   active_rotationMode="auto"   active_rotationSpeed="0"    active_colorize="false"    active_alpha="1.0"
                           inactive_scale="1.0" inactive_rotationMode="auto" inactive_rotationSpeed="0" inactive_colorize="false" inactive_alpha="1.0" />
+	    <center_layer file="arrow.svg"
+                          active_scale="1.0"   active_rotationMode="turn_to_mouse"   active_rotationSpeed="15.0"    active_colorize="false"    active_alpha="1.0"
+                          inactive_scale="1.0" inactive_rotationMode="auto" inactive_rotationSpeed="0.0"  inactive_colorize="false" inactive_alpha="0.0" />
         </center>
         <slices radius="40" minGap="-5" >
             <activeSlice>
             	<slice_layer type="file" file="icon_bg.svg"   scale="1"   colorize="true" />
                 <slice_layer type="icon" scale="0.5" />
                 <slice_layer type="file" file="slice_caption.svg" scale="1" colorize="true" visibility="with_caption" />
-                <slice_layer type="caption" y="30" font="sans 10" width="85" color="#000" height="20" visibility="with_caption" />
+                <slice_layer type="caption" y="30" font="sans 9" width="85" color="#3a3a3a" height="20" visibility="with_caption" />
             </activeSlice>
             <inactiveSlice>
                 <slice_layer type="icon" scale="0.5" />
                 <slice_layer type="file" file="slice_caption.svg" scale="1" colorize="true" visibility="with_caption" />
-                <slice_layer type="caption" y="30" font="sans 10" width="85" color="#000" height="20" visibility="with_caption" />
+                <slice_layer type="caption" y="30" font="sans 9" width="85" color="#3a3a3a" height="20" visibility="with_caption" />
             </inactiveSlice>
         </slices>
-        <caption position="0" font="sans 10" width="90" height="90" />
+        <caption position="0" font="sans 9" width="70" height="70" color="#3a3a3a"/>
     </pie>
 </theme>