Merge tag 'upstream/0.5.1'

Upstream version 0.5.1

3 files changed, 321 insertions, 3 deletions

diff --git a/resources/themes/bright/caption.svg b/resources/themes/bright/caption.svg
new file mode 100644
index 0000000..382efda
--- /dev/null
+++ b/resources/themes/bright/caption.svg
@@ -0,0 +1,161 @@
+<?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.2 r9819"
+   sodipodi:docname="caption.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2998">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop3000" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.74257426"
+         offset="1"
+         id="stop3002" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3786"
+       inkscape:collect="always">
+      <stop
+         id="stop3788"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.59649123" />
+      <stop
+         id="stop3790"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3772">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.64912281"
+         offset="0"
+         id="stop3774" />
+      <stop
+         id="stop3804"
+         offset="0.33709621"
+         style="stop-color:#ffffff;stop-opacity:0.30980392;" />
+      <stop
+         id="stop3802"
+         offset="0.41556084"
+         style="stop-color:#ffffff;stop-opacity:0.25882353;" />
+      <stop
+         id="stop3800"
+         offset="0.50963062"
+         style="stop-color:#ffffff;stop-opacity:0.21568627;" />
+      <stop
+         id="stop3798"
+         offset="0.61938298"
+         style="stop-color:#ffffff;stop-opacity:0.15294118;" />
+      <stop
+         id="stop3796"
+         offset="0.75001973"
+         style="stop-color:#ffffff;stop-opacity:0.09019608;" />
+      <stop
+         id="stop3794"
+         offset="0.83893943"
+         style="stop-color:#ffffff;stop-opacity:0.05490196;" />
+      <stop
+         id="stop3792"
+         offset="0.91730076"
+         style="stop-color:#ffffff;stop-opacity:0.02745098;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop3776" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3772"
+       id="radialGradient3778"
+       cx="49.10873"
+       cy="-14.628683"
+       fx="49.10873"
+       fy="-14.628683"
+       r="48.035713"
+       gradientTransform="matrix(-1.156153,0.00571083,-0.00496751,-1.0056696,106.16882,941.03082)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3784"
+       x1="48.214287"
+       y1="1050.13"
+       x2="48.214287"
+       y2="994.57111"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,2.9263432e-6)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2998"
+       id="linearGradient3774"
+       x1="55.794643"
+       y1="53.993038"
+       x2="55.794643"
+       y2="71.561378"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="10.91174"
+     inkscape:cy="27.435478"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="960"
+     inkscape:window-height="1033"
+     inkscape:window-x="960"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0" />
+  <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)"
+     style="display:inline">
+    <path
+       style="fill:url(#linearGradient3774);fill-opacity:1;stroke:none"
+       d="m 2.875,53.84375 0,37.03125 c 0,3.497653 2.8148472,6.34375 6.3125,6.34375 l 81.8125,0 c 3.497653,0 6.3125,-2.846097 6.3125,-6.34375 l 0,-37.03125 z"
+       id="rect3000"
+       transform="translate(0,952.36218)"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csssscc" />
+  </g>
+</svg>
diff --git a/resources/themes/bright/caption_mask.svg b/resources/themes/bright/caption_mask.svg
new file mode 100644
index 0000000..59d4801
--- /dev/null
+++ b/resources/themes/bright/caption_mask.svg
@@ -0,0 +1,153 @@
+<?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.2 r9819"
+   sodipodi:docname="caption_mask.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2997">
+      <stop
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0"
+         id="stop2999" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop3001" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3785">
+      <stop
+         style="stop-color:#abab9f;stop-opacity:1"
+         offset="0"
+         id="stop3787" />
+      <stop
+         id="stop3797"
+         offset="0.29400957"
+         style="stop-color:#c2c2bb;stop-opacity:1" />
+      <stop
+         style="stop-color:#d3d3d2;stop-opacity:1"
+         offset="1"
+         id="stop3789" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3009">
+      <stop
+         style="stop-color:#fafcfc;stop-opacity:1"
+         offset="0"
+         id="stop3011" />
+      <stop
+         id="stop3795"
+         offset="0.95082122"
+         style="stop-color:#e5e8e8;stop-opacity:1;" />
+      <stop
+         style="stop-color:#d2d6d6;stop-opacity:1"
+         offset="1"
+         id="stop3013" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3785"
+       id="linearGradient3791"
+       x1="44.385059"
+       y1="958.93121"
+       x2="44.385059"
+       y2="1045.9142"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.59160385,0,0,0.59160385,20.456735,409.35291)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3009"
+       id="linearGradient3793"
+       x1="51.33149"
+       y1="958.94989"
+       x2="51.33149"
+       y2="1045.7374"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.59160385,0,0,0.59160385,20.456735,409.35291)" />
+    <filter
+       inkscape:collect="always"
+       id="filter3921"
+       x="-0.28370607"
+       width="1.5674121"
+       y="-0.28370607"
+       height="1.5674121">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="9.4292716"
+         id="feGaussianBlur3923" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2997"
+       id="linearGradient3773"
+       x1="52.830833"
+       y1="1031.3591"
+       x2="52.830833"
+       y2="1010.1867"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-7.1765038e-7,-5.2013983e-6)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="20.693791"
+     inkscape:cy="49.374216"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:showpageshadow="false"
+     inkscape:window-width="1517"
+     inkscape:window-height="834"
+     inkscape:window-x="335"
+     inkscape:window-y="111"
+     inkscape:window-maximized="0" />
+  <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)"
+     style="display:inline">
+    <rect
+       y="952.63806"
+       x="0.38571933"
+       height="99.409401"
+       width="99.409401"
+       id="rect3799"
+       style="fill:url(#linearGradient3773);fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/resources/themes/bright/theme.xml b/resources/themes/bright/theme.xml
index 9ea3606..c1db9a9 100644
--- a/resources/themes/bright/theme.xml
+++ b/resources/themes/bright/theme.xml
@@ -11,16 +11,20 @@
                           active_scale="1.0"   active_rotationMode="turn_to_mouse"   active_rotationSpeed="15.0"    active_colorize="true"    active_alpha="1.0" 
                           inactive_scale="1.0" inactive_rotationMode="auto" inactive_rotationSpeed="0.0"  inactive_colorize="true" inactive_alpha="0.0" />
         </center>
-        <slices radius="26">
+        <slices radius="28" minGap="14">
             <activeSlice>
                 <slice_layer type="file" file="icon_active.svg"   scale="1"   colorize="true" />
                 <slice_layer type="file" file="gloss.svg"   scale="1"   colorize="false" />
-                <slice_layer type="icon" scale="0.9" colorize="false" />
+                <slice_layer type="icon" scale="0.9" colorize="false" visibility="without_caption" />
+                <slice_layer type="icon" scale="0.9" colorize="false" file="caption_mask.svg" visibility="with_caption"/>
+                <slice_layer type="caption" y="21" font="sans 9" color="#000" width="55" height="20" visibility="with_caption" />
             </activeSlice>
             <inactiveSlice>
                 <slice_layer type="file" file="icon_inactive.svg"   scale="1"   colorize="false" />
                 <slice_layer type="file" file="gloss.svg"   scale="1"   colorize="false" />
-                <slice_layer type="icon" scale="0.9" colorize="false" />
+                <slice_layer type="icon" scale="0.9" colorize="false" visibility="without_caption"/>
+                <slice_layer type="icon" scale="0.9" colorize="false" file="caption_mask.svg" visibility="with_caption"/>
+                <slice_layer type="caption" y="21" font="sans 9" color="#000" width="55" height="20" visibility="with_caption" />
             </inactiveSlice>
         </slices>
         <caption position="0" font="sans 10" width="90" height="90" color="#000"/>