Merge tag 'upstream/0.6.0'

Upstream version 0.6.0

4 files changed, 189 insertions, 39 deletions

diff --git a/resources/themes/unity/gloss.svg b/resources/themes/unity/gloss.svg
index 60a795f..7828bc9 100644
--- a/resources/themes/unity/gloss.svg
+++ b/resources/themes/unity/gloss.svg
@@ -14,11 +14,85 @@
    height="100"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="gloss.svg">
   <defs
      id="defs4">
     <linearGradient
+       id="linearGradient3845"
+       inkscape:collect="always">
+      <stop
+         id="stop3847"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.70098039" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.30980392;"
+         offset="0.35323018"
+         id="stop3849" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.25882353;"
+         offset="0.45295295"
+         id="stop3851" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.21568627;"
+         offset="0.54165924"
+         id="stop3853" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.15294118;"
+         offset="0.63540816"
+         id="stop3855" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.09019608;"
+         offset="0.75001973"
+         id="stop3857" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.05490196;"
+         offset="0.83893943"
+         id="stop3859" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.02745098;"
+         offset="0.91730076"
+         id="stop3861" />
+      <stop
+         id="stop3863"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3837">
+      <stop
+         id="stop3839"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.25980392" />
+      <stop
+         id="stop3841"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3815">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3817" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3819" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3805">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3807" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3809" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient3786"
        inkscape:collect="always">
       <stop
@@ -34,7 +108,7 @@
        inkscape:collect="always"
        id="linearGradient3772">
       <stop
-         style="stop-color:#ffffff;stop-opacity:0.64912281"
+         style="stop-color:#ffffff;stop-opacity:0.70098039"
          offset="0"
          id="stop3774" />
       <stop
@@ -79,7 +153,7 @@
        fx="49.10873"
        fy="-14.628683"
        r="48.035713"
-       gradientTransform="matrix(-1.156153,0.00571083,-0.00496751,-1.0056696,106.16882,941.03082)"
+       gradientTransform="matrix(-2.5683412,0.01057462,-0.00396829,-0.97428614,175.79722,942.94812)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
@@ -91,6 +165,46 @@
        y2="994.57111"
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(0,-952.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3805"
+       id="linearGradient3811"
+       x1="-1.632795"
+       y1="984.09278"
+       x2="93.813635"
+       y2="984.09278"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3815"
+       id="radialGradient3821"
+       cx="49.34042"
+       cy="955.34277"
+       fx="49.34042"
+       fy="955.34277"
+       r="47.723215"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3837"
+       id="linearGradient3825"
+       x1="46.617207"
+       y1="1002.8428"
+       x2="46.617207"
+       y2="1049.0981"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3845"
+       id="radialGradient3843"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.5683412,0.01057462,-0.00396829,-0.97428614,175.79722,942.94812)"
+       cx="49.10873"
+       cy="-14.628683"
+       fx="49.10873"
+       fy="-14.628683"
+       r="48.035713" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -100,17 +214,17 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="4"
-     inkscape:cx="-99.870026"
-     inkscape:cy="62.091167"
+     inkscape:cx="37.902498"
+     inkscape:cy="66.841167"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:showpageshadow="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1056"
+     inkscape:window-width="958"
+     inkscape:window-height="1024"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="30"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -130,27 +244,63 @@
      transform="translate(0,-952.36218)"
      style="display:inline">
     <path
-       style="fill:url(#linearGradient3784);fill-opacity:1;stroke:none;opacity:0.72491909"
+       style="fill:url(#linearGradient3784);fill-opacity:1;stroke:none;opacity:0.39705882"
        d="M 8.09375 31.78125 C 6.4638438 31.78125 4.9928252 32.769882 3.875 34.375 L 3.875 90.875 C 3.875 93.836 6.22655 96.1875 9.1875 96.1875 L 91 96.1875 C 93.96095 96.1875 96.3125 93.836 96.3125 90.875 L 96.3125 35.28125 C 95.156434 33.140485 93.450449 31.78125 91.53125 31.78125 L 8.09375 31.78125 z M 1.875 40.15625 C 1.8170155 40.70633 1.78125 41.266602 1.78125 41.84375 L 1.78125 87.78125 C 1.78125 88.358398 1.8170155 88.91867 1.875 89.46875 L 1.875 40.15625 z "
        transform="translate(0,952.36218)"
        id="rect3780" />
     <rect
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:0.31007752;stroke-dasharray:none"
+       style="opacity:0.59803922;fill:none;stroke:#ffffff;stroke-width:1.49218309;stroke-miterlimit:4;stroke-opacity:0.64088398;stroke-dasharray:none"
        id="rect3000"
-       width="94.446426"
-       height="94.446426"
-       x="2.8672049"
-       y="955.11957"
-       ry="6.3134527"
-       rx="6.3134527" />
+       width="93.954247"
+       height="93.954247"
+       x="3.1132965"
+       y="955.36566"
+       ry="6.2805519"
+       rx="6.2805519" />
     <rect
-       style="fill:url(#radialGradient3778);fill-opacity:1;stroke:none;opacity:0.73139159"
+       style="fill:url(#radialGradient3843);fill-opacity:1;stroke:none;opacity:0.87745098"
        id="rect3770"
-       width="96.071426"
-       height="56.071426"
-       x="1.7857143"
-       y="954.32648"
-       rx="6.3134527"
-       ry="6.3134527" />
+       width="92.571426"
+       height="54.321426"
+       x="3.7857144"
+       y="956.07648"
+       rx="6.083446"
+       ry="5.366394" />
+    <rect
+       style="opacity:1;fill:none;stroke:url(#linearGradient3825);stroke-width:1.49218308999999993;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3823"
+       width="93.954247"
+       height="93.954247"
+       x="3.1132965"
+       y="955.36566"
+       ry="6.2805519"
+       rx="6.2805519" />
+    <rect
+       rx="6.2805519"
+       ry="6.2805519"
+       y="955.36566"
+       x="3.1132965"
+       height="93.954247"
+       width="93.954247"
+       id="rect3813"
+       style="opacity:1;fill:none;stroke:url(#radialGradient3821);stroke-width:1.49218308999999993;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <rect
+       style="opacity:1;fill:none;stroke:url(#radialGradient3821);stroke-width:1.49218308999999993;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect3865"
+       width="93.954247"
+       height="93.954247"
+       x="3.1132965"
+       y="955.36566"
+       ry="6.2805519"
+       rx="6.2805519" />
+    <rect
+       rx="6.2805519"
+       ry="6.2805519"
+       y="955.36566"
+       x="3.1132965"
+       height="93.954247"
+       width="93.954247"
+       id="rect3867"
+       style="opacity:1;fill:none;stroke:url(#radialGradient3821);stroke-width:1.49218308999999993;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
 </svg>
diff --git a/resources/themes/unity/preview.png b/resources/themes/unity/preview.png
index 058f558..7ad2a64 100644
--- a/resources/themes/unity/preview.png
+++ b/resources/themes/unity/preview.png
diff --git a/resources/themes/unity/ring.svg b/resources/themes/unity/ring.svg
index 1fb2dcd..8177eab 100644
--- a/resources/themes/unity/ring.svg
+++ b/resources/themes/unity/ring.svg
@@ -14,7 +14,7 @@
    height="100"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="ring.svg">
   <defs
      id="defs4">
@@ -149,20 +149,20 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.959798"
-     inkscape:cx="-48.85178"
-     inkscape:cy="58.882718"
+     inkscape:zoom="5.6"
+     inkscape:cx="58.266215"
+     inkscape:cy="49.681706"
      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="1056"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="958"
+     inkscape:window-height="1024"
+     inkscape:window-x="960"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -181,14 +181,14 @@
      id="layer1"
      transform="translate(0,-952.36218)">
     <path
-       transform="matrix(0.90538035,0,0,0.90538035,4.7309822,957.09316)"
+       transform="matrix(0.98294109,0,0,0.98294109,0.85294503,953.21512)"
        d="M 98.57143,50 A 48.57143,48.57143 0 1 1 1.4285698,50 48.57143,48.57143 0 1 1 98.57143,50 z"
        sodipodi:ry="48.57143"
        sodipodi:rx="48.57143"
        sodipodi:cy="50"
        sodipodi:cx="50"
-       id="path3782"
-       style="opacity:0.36140351;fill:none;stroke:#000000;stroke-width:7.62110661999999994;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="path3780"
+       style="opacity:0.25490195999999998;fill:#000000;fill-opacity:0.75690606999999999;stroke:#ffffff;stroke-opacity:0.76795577999999998;stroke-width:1.01735497;stroke-miterlimit:4;stroke-dasharray:none"
        sodipodi:type="arc" />
     <path
        sodipodi:type="arc"
@@ -202,13 +202,13 @@
        transform="translate(0,952.36218)" />
     <path
        sodipodi:type="arc"
-       style="opacity:0.81403509;fill:#000000;fill-opacity:1;stroke:none"
+       style="opacity:0.59803921999999998;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-opacity:0.35359117;stroke-width:1.22634043999999998;stroke-miterlimit:4;stroke-dasharray:none"
        id="path3812"
        sodipodi:cx="50"
        sodipodi:cy="50"
        sodipodi:rx="48.57143"
        sodipodi:ry="48.57143"
        d="M 98.57143,50 A 48.57143,48.57143 0 1 1 1.4285698,50 48.57143,48.57143 0 1 1 98.57143,50 z"
-       transform="matrix(0.82999029,0,0,0.82999029,8.5004852,960.86266)" />
+       transform="matrix(0.81543425,0,0,0.81543425,9.2282872,961.59046)" />
   </g>
 </svg>
diff --git a/resources/themes/unity/theme.xml b/resources/themes/unity/theme.xml
index 3e9f3d1..6bf9cc8 100644
--- a/resources/themes/unity/theme.xml
+++ b/resources/themes/unity/theme.xml
@@ -2,7 +2,7 @@
 
 <theme name="Unity" description="A theme made for the Unity interface of Ubuntu" author="Simon Schneegans" email="code@simonschneegans.de">
     <pie radius="130" maxZoom="1.1" zoomRange="0.1" transitionTime="0.2" springiness="1.5" 
-          fadeInTime="0.3" fadeOutTime="0.3" fadeInZoom="1.5" fadeOutZoom="0.7" fadeInRotation="0.5" fadeOutRotation="-0.7">
+          fadeInTime="0.3" fadeOutTime="0.3" fadeInZoom="1.5" fadeOutZoom="0.7" fadeInRotation="0.2" fadeOutRotation="-0.3">
         <center radius="80" activeRadius="55">
             <center_layer file="ring.svg" 
                           active_scale="0.8"   active_rotationMode="auto"   active_rotationSpeed="0"    active_colorize="false"    active_alpha="1.0"