diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-04-18 15:43:01 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-04-18 15:43:01 +0200 |
| commit | dd33244267d4c4be09521937de8b0e05ff216a5c (patch) | |
| tree | 4d1f734c1f55a6dcceb3d0bd5373c838e4667d3f | |
| parent | b1f493d50d3d891f35033dbf6f4a49ab5bcd00cf (diff) | |
| parent | 84a27086bbd9f493128b354300f9c77ccb32a56b (diff) | |
Merge tag 'upstream/0.6.0'
Upstream version 0.6.0
104 files changed, 9342 insertions, 6168 deletions
@@ -1,6 +1,7 @@ Code: Simon Schneegans <code@simonschneegans.de> +Gabriel Dubatti <gdubatti@gmail.com> Francesco Piccinno <stack.box@gmail.com> Translations: @@ -14,3 +15,4 @@ Alex Maxime <cad.maxime@gmail.com> Eugene Roskin <pams@imail.ru> Ting Zhou <tzhou@haverford.edu> Martin Dinov <martindinov@yahoo.com> +Gabriel Dubatti <gdubatti@gmail.com> diff --git a/resources/gnome-pie-symbolic.svg b/resources/gnome-pie-symbolic.svg index 63a662f..724ce61 100644 --- a/resources/gnome-pie-symbolic.svg +++ b/resources/gnome-pie-symbolic.svg @@ -14,7 +14,7 @@ width="16" height="16" id="svg2408" - inkscape:version="0.48.2 r9819" + inkscape:version="0.48.4 r9939" sodipodi:docname="gnome-pie-symbolic.svg"> <sodipodi:namedview pagecolor="#ffffff" @@ -25,17 +25,30 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="1117" - inkscape:window-height="801" + inkscape:window-width="958" + inkscape:window-height="1024" id="namedview93" showgrid="false" - inkscape:zoom="19.327586" - inkscape:cx="12.439174" - inkscape:cy="13.17699" - inkscape:window-x="272" - inkscape:window-y="129" + inkscape:zoom="27.333334" + inkscape:cx="10.22222" + inkscape:cy="4.5238255" + inkscape:window-x="960" + inkscape:window-y="30" inkscape:window-maximized="0" - inkscape:current-layer="svg2408" /> + inkscape:current-layer="svg2408" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-center="true" + inkscape:snap-object-midpoints="true"> + <sodipodi:guide + orientation="1,0" + position="8.0121949,11.487804" + id="guide3835" /> + <sodipodi:guide + orientation="0,1" + position="10.536585,8.0121949" + id="guide3837" /> + </sodipodi:namedview> <defs id="defs2410"> <linearGradient @@ -382,18 +395,6 @@ </cc:Work> </rdf:RDF> </metadata> - <path - style="fill:#bebebe;fill-opacity:1;stroke:none;display:inline" - d="m 12.589017,1.6792906 -4.0308085,5.9429262 6.9863825,1.297697 c 0.122606,-0.5066686 0.206573,-1.0289239 0.206572,-1.5731267 0,-2.3954977 -1.270177,-4.482987 -3.162146,-5.6674965 z m 0.358131,2.5663579 c 0.498554,0.00585 0.972501,0.3065623 1.173181,0.7970478 C 14.387905,5.696678 14.075779,6.440862 13.421794,6.7084377 12.767813,6.9760115 12.019151,6.6638827 11.751576,6.0099011 11.484,5.3559188 11.796136,4.607257 12.450111,4.3396825 c 0.163496,-0.066895 0.330852,-0.095991 0.497037,-0.094034 z" - id="path2505" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccsccssssc" /> - <path - style="fill:#bebebe;fill-opacity:1;stroke:none;display:inline" - d="m 6.8886625,1.4267538 c -3.6986717,0 -6.7003582,3.0016859 -6.7003582,6.7003574 0,3.6986728 3.0016865,6.7003588 6.7003582,6.7003588 3.1544675,0 5.7830925,-2.190332 6.4937865,-5.1272308 L 6.396067,8.4025416 10.426875,2.4596152 C 9.3976255,1.8152299 8.1918366,1.4267538 6.8886625,1.4267538 z M 6.7032767,2.8288473 c 0.6407264,0 1.1612552,0.5164675 1.1612552,1.1571946 0,0.6407263 -0.4596242,1.1287721 -1.1003506,1.1287721 -0.6407267,0 -1.2221588,-0.4880458 -1.2221588,-1.1287721 0,-0.6407271 0.5205275,-1.1571952 1.1612542,-1.1571946 z M 3.0940077,5.3394951 C 3.278494,5.3351846 3.4670226,5.3774583 3.6427308,5.4676645 4.2049976,5.7563332 4.428055,6.4434245 4.1393855,7.005691 3.8507166,7.5679571 3.1596196,7.7870098 2.597353,7.4983402 2.0350863,7.2096719 1.8120294,6.5225809 2.1006984,5.9603135 2.2991583,5.5737554 2.6881379,5.3489617 3.0940077,5.3394951 z M 4.219113,10.119282 c 0.3012407,1.59e-4 0.6024458,0.111968 0.8321637,0.341929 0.4594336,0.459922 0.4599205,1.204892 0,1.664326 -0.4599212,0.459436 -1.204893,0.459922 -1.6643274,0 -0.4594343,-0.459921 -0.4599211,-1.204892 0,-1.664326 C 3.61691,10.231493 3.9178722,10.119122 4.219113,10.119282 z m 5.4315502,0.09169 c 0.3720518,-0.01259 0.7470128,0.154998 0.9821828,0.478916 0.376269,0.518269 0.258518,1.243113 -0.259751,1.619383 -0.5182687,0.376271 -1.2431141,0.25852 -1.6193838,-0.25975 C 8.3774414,11.531257 8.4911351,10.810472 9.0094044,10.434201 9.2037536,10.2931 9.4274317,10.218531 9.6506632,10.210976 z" - id="path3971" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ssscccsssssscsssscssssssssssss" /> <g id="layer2" style="display:none" @@ -493,4 +494,55 @@ id="rect3171" style="opacity:0.1;fill:url(#linearGradient3613);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3794)" /> </g> + <path + style="fill:#e9e7e2;fill-opacity:1;stroke:none" + d="m 11.442561,9.2456523 c -0.005,-1.1601995 0.931553,-2.1047448 2.091752,-2.1097015 1.160198,-0.00495 2.104744,0.9315529 2.1097,2.0917522 0.0051,1.160199 -0.931552,2.104745 -2.091751,2.109701 -1.1602,0.005 -2.104745,-0.931551 -2.109701,-2.0917517 z" + id="path3845" + inkscape:export-filename="/home/simon/Desktop/gnome-pie-symbolic.png" + inkscape:export-xdpi="1637.5708" + inkscape:export-ydpi="1637.5708" + inkscape:connector-curvature="0" /> + <path + style="fill:#e9e7e2;fill-opacity:1;stroke:none" + inkscape:transform-center-x="-0.13300021" + d="m 8.8518067,12.241729 c 0.863249,-0.503328 1.9710783,-0.211552 2.4744043,0.651697 0.503327,0.863249 0.211551,1.971078 -0.651699,2.474404 -0.8632473,0.503328 -1.9710763,0.211553 -2.4744031,-0.651696 -0.5033266,-0.86325 -0.2115515,-1.971079 0.6516978,-2.474405 z" + id="path3903" + inkscape:export-filename="/home/simon/Desktop/gnome-pie-symbolic.png" + inkscape:export-xdpi="1637.5708" + inkscape:export-ydpi="1637.5708" + inkscape:connector-curvature="0" /> + <path + style="fill:#e9e7e2;fill-opacity:1;stroke:none" + d="m 5.3396508,12.146411 c 0.7811518,0.44656 1.0523924,1.441818 0.6058328,2.222969 -0.4465595,0.781152 -1.441816,1.052394 -2.2229679,0.605833 C 2.9413639,14.528654 2.6701234,13.533396 3.1166829,12.752244 3.5632425,11.971093 4.5584991,11.699852 5.3396508,12.146411 z" + id="path3905" + inkscape:export-filename="/home/simon/Desktop/gnome-pie-symbolic.png" + inkscape:export-xdpi="1637.5708" + inkscape:export-ydpi="1637.5708" + inkscape:connector-curvature="0" /> + <path + style="fill:#e9e7e2;fill-opacity:1;stroke:none" + inkscape:transform-center-x="-0.16631987" + d="M 3.785603,9.2289062 C 3.7898949,10.23354 2.9789583,11.051434 1.9743255,11.055725 0.96969266,11.060018 0.15179765,10.249081 0.14750565,9.2444489 0.14321376,8.2398161 0.95415032,7.4219211 1.958783,7.417629 2.9634159,7.413339 3.781311,8.2242736 3.785603,9.2289062 z" + id="path3907" + inkscape:export-filename="/home/simon/Desktop/gnome-pie-symbolic.png" + inkscape:export-xdpi="1637.5708" + inkscape:export-ydpi="1637.5708" + inkscape:connector-curvature="0" /> + <path + style="fill:#e9e7e2;fill-opacity:1;stroke:none" + d="M 5.087816,5.6404101 C 4.0175791,6.2644231 2.644118,5.9026869 2.020105,4.83245 1.3960922,3.762213 1.7578281,2.3887517 2.8280651,1.7647389 3.8983021,1.140726 5.2717632,1.5024621 5.8957762,2.572699 6.519789,3.6429361 6.158053,5.0163971 5.087816,5.6404101 z" + id="path3909" + inkscape:export-filename="/home/simon/Desktop/gnome-pie-symbolic.png" + inkscape:export-xdpi="1637.5708" + inkscape:export-ydpi="1637.5708" + inkscape:connector-curvature="0" /> + <path + style="fill:#e9e7e2;fill-opacity:1;stroke:none" + inkscape:transform-center-x="-0.17263349" + d="M 9.4519331,5.6125979 C 8.1156891,4.8487098 7.6517032,3.1462164 8.4155913,1.8099725 9.1794793,0.47372863 10.881971,0.00974236 12.218216,0.77363048 13.55446,1.5375185 14.018445,3.2400118 13.254557,4.5762559 12.49067,5.9124998 10.788176,6.3764859 9.4519331,5.6125979 z" + id="path3911" + inkscape:export-filename="/home/simon/Desktop/gnome-pie-symbolic.png" + inkscape:export-xdpi="1637.5708" + inkscape:export-ydpi="1637.5708" + inkscape:connector-curvature="0" /> </svg> diff --git a/resources/gnome-pie.svg b/resources/gnome-pie.svg index c001a21..99573c3 100644 --- a/resources/gnome-pie.svg +++ b/resources/gnome-pie.svg @@ -10,2887 +10,2315 @@ 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="256" - height="256" - id="svg2" - version="1.1" - inkscape:version="0.48.1 r9760" + version="1.0" + width="64" + height="64" + id="svg2408" + inkscape:version="0.48.4 r9939" sodipodi:docname="gnome-pie.svg"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="1" + inkscape:pageshadow="2" + inkscape:window-width="958" + inkscape:window-height="1024" + id="namedview93" + showgrid="false" + inkscape:zoom="5.6568543" + inkscape:cx="38.945966" + inkscape:cy="26.935301" + inkscape:window-x="960" + inkscape:window-y="30" + inkscape:window-maximized="0" + inkscape:current-layer="svg2408" + showguides="true" + inkscape:guide-bbox="true" + inkscape:snap-center="false" + inkscape:snap-object-midpoints="false" /> <defs - id="defs4"> - <linearGradient - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" - gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0" - id="linearGradient2918" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> - <linearGradient - gradientTransform="translate(0,-97)" - gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0" - id="linearGradient3721" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> + id="defs2410"> <linearGradient - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" - gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0" - id="linearGradient3725" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> + id="linearGradient4225"> + <stop + id="stop4227" + style="stop-color:#dac196;stop-opacity:1" + offset="0" /> + <stop + id="stop4233" + style="stop-color:#977d55;stop-opacity:1" + offset="1" /> + </linearGradient> <linearGradient - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" - gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0" - id="linearGradient3772" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> + id="linearGradient3858"> + <stop + offset="0" + style="stop-color:#ffffff;stop-opacity:1" + id="stop3860" /> + <stop + offset="1" + style="stop-color:#aaaaaa;stop-opacity:1" + id="stop3862" /> + </linearGradient> <linearGradient - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" - gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0" - id="linearGradient3780" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> + id="linearGradient3637"> + <stop + id="stop3639" + style="stop-color:#f0f0f0;stop-opacity:1" + offset="0" /> + <stop + id="stop3641" + style="stop-color:#aaaaaa;stop-opacity:1" + offset="1" /> + </linearGradient> <linearGradient - gradientTransform="matrix(1.0058652,0,0,0.994169,100,0)" - gradientUnits="userSpaceOnUse" - id="ButtonShadow-0" - y2="7.0165396" - x2="45.447727" + x1="45.447727" y1="92.539597" - x1="45.447727"> + x2="45.447727" + y2="7.0165396" + id="ButtonShadow" + gradientUnits="userSpaceOnUse" + gradientTransform="scale(1.0058652,0.994169)"> <stop - offset="0" + id="stop3750" style="stop-color:#000000;stop-opacity:1" - id="stop3750-8" /> + offset="0" /> <stop - offset="1" + id="stop3752" style="stop-color:#000000;stop-opacity:0.58823532" - id="stop3752-5" /> + offset="1" /> </linearGradient> <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3761" - id="linearGradient3817" - y2="46.568573" - x2="46.604744" - y1="64.036171" - x1="64.072342" /> + id="linearGradient3737"> + <stop + id="stop3739" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + <stop + id="stop3741" + style="stop-color:#ffffff;stop-opacity:0" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient3700"> + <stop + id="stop3702" + style="stop-color:#2276c5;stop-opacity:1" + offset="0" /> + <stop + id="stop3704" + style="stop-color:#68baf4;stop-opacity:1" + offset="1" /> + </linearGradient> <filter - id="filter3987" - color-interpolation-filters="sRGB"> + color-interpolation-filters="sRGB" + id="filter3174"> <feGaussianBlur - stdDeviation="0.42020394" - id="feGaussianBlur3989" /> + id="feGaussianBlur3176" + stdDeviation="1.71" /> </filter> <linearGradient - gradientTransform="matrix(0.72592593,-0.72592593,0.72592593,0.72592593,-20.03897,99.25749)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3871" - id="linearGradient3981" - y2="40.483921" - x2="61.802849" - y1="61.183025" - x1="53.034939" /> - <linearGradient - gradientTransform="matrix(0,-1.0266143,1.0266143,0,0.77836254,147)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3861" - id="linearGradient3979" - y2="60.715324" - x2="52.881298" - y1="39.683075" - x1="61.628212" /> - <linearGradient - gradientTransform="matrix(-0.72592593,-0.72592593,0.72592593,-0.72592593,49.25749,166.03897)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3851" - id="linearGradient3977" - y2="39.70118" - x2="60.324341" - y1="59.878456" - x1="53.469795" /> - <linearGradient - gradientTransform="matrix(-1.0266143,0,0,-1.0266143,96.999997,145.22164)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3921" - id="linearGradient3975" - y2="39.683075" - x2="60.999012" - y1="61.330303" - x1="53.87949" /> - <linearGradient - gradientTransform="matrix(-0.72592593,0.72592593,-0.72592593,-0.72592593,116.03897,96.742509)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3911" - id="linearGradient3973" - y2="40.223007" - x2="61.88982" - y1="59.182693" - x1="53.295853" /> - <linearGradient - gradientTransform="matrix(0,1.0266143,-1.0266143,0,95.221638,49.000001)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3901" - id="linearGradient3971" - y2="39.437084" - x2="61.982975" - y1="60.34634" - x1="53.387505" /> - <linearGradient - gradientTransform="matrix(0.72592593,0.72592593,-0.72592593,0.72592593,46.742509,29.961028)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3891" - id="linearGradient3969" - y2="38.831467" - x2="62.58559" - y1="60.139374" - x1="53.730709" /> - <linearGradient - gradientTransform="matrix(1.0266143,0,0,1.0266143,-0.9999987,50.778362)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3881" - id="linearGradient3967" - y2="39.92907" - x2="61.49099" - y1="59.608364" - x1="53.510502" /> + x1="36.357143" + y1="6" + x2="36.357143" + y2="63.893143" + id="linearGradient3188" + xlink:href="#linearGradient3737" + gradientUnits="userSpaceOnUse" /> <filter - id="filter3774" - color-interpolation-filters="sRGB"> + x="-0.192" + y="-0.192" + width="1.3839999" + height="1.3839999" + color-interpolation-filters="sRGB" + id="filter3794"> <feGaussianBlur - stdDeviation="0.27274118" - id="feGaussianBlur3776" /> + id="feGaussianBlur3796" + stdDeviation="5.28" /> </filter> + <linearGradient + x1="48" + y1="20.220806" + x2="48" + y2="138.66119" + id="linearGradient3613" + xlink:href="#linearGradient3737" + gradientUnits="userSpaceOnUse" /> <radialGradient - gradientTransform="matrix(1,0,0,0.61803397,0,19.862234)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3797" - id="radialGradient3803" - fy="52" - fx="41" - r="9.7082043" - cy="52" - cx="41" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3761" - id="linearGradient3791" - y2="41.697067" - x2="40.068184" - y1="58.17598" - x1="40.068184" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3761" - id="linearGradient3779" - y2="41.697067" - x2="40.068184" - y1="58.17598" - x1="40.068184" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3761" - id="linearGradient3775" - y2="41.697067" - x2="40.068184" - y1="58.17598" - x1="40.068184" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3761" - id="linearGradient3771" - y2="41.697067" - x2="40.068184" - y1="58.17598" - x1="40.068184" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3761" - id="linearGradient3767" - y2="49.665066" - x2="31.793724" - y1="58.17598" - x1="40.068184" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3727" - id="linearGradient3733" - y2="45.997448" - x2="67.957489" - y1="45.997448" - x1="33.199345" /> - <radialGradient + cx="48" + cy="90.171875" + r="42" + fx="48" + fy="90.171875" + id="radialGradient3619" + xlink:href="#linearGradient3737" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3681" - id="radialGradient3687" - fy="45.997448" - fx="47.729706" - r="13.637059" - cy="45.997448" - cx="47.729706" /> + gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)" /> + <clipPath + id="clipPath3613"> + <rect + width="84" + height="84" + rx="6" + ry="6" + x="6" + y="6" + id="rect3615" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /> + </clipPath> + <linearGradient + x1="48" + y1="90" + x2="48" + y2="5.9877172" + id="linearGradient2843" + xlink:href="#linearGradient3700" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,100)" /> + <clipPath + id="clipPath3625"> + <path + d="M 0,0 0,96 96,96 96,0 0,0 z m 12,6 72,0 c 3.324,0 6,2.676 6,6 l 0,72 c 0,3.324 -2.676,6 -6,6 L 12,90 C 8.676,90 6,87.324 6,84 L 6,12 C 6,8.676 8.676,6 12,6 z" + inkscape:connector-curvature="0" + id="path3627" + style="fill:#ffffff;fill-opacity:1;stroke:none" /> + </clipPath> + <linearGradient + x1="44.512066" + y1="6" + x2="44.512066" + y2="90.015434" + id="linearGradient3643" + xlink:href="#linearGradient3637" + gradientUnits="userSpaceOnUse" /> + <clipPath + id="clipPath3649"> + <rect + width="76" + height="76" + rx="4" + ry="4" + x="10" + y="10" + id="rect3651" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" /> + </clipPath> <filter - id="filter3833" color-interpolation-filters="sRGB" - height="1.48" - width="1.48" - y="-0.24000001" - x="-0.23999999"> + id="filter3657"> <feGaussianBlur - stdDeviation="2.8000002" - id="feGaussianBlur3835" /> + id="feGaussianBlur3659" + stdDeviation="1.14" /> </filter> - <clipPath - id="clipPath3798"> - <path - style="fill:#ff00ff;fill-opacity:1;stroke:none" - id="path3800" - transform="matrix(1.0266143,0,0,1.0266143,-0.999999,0.778362)" - d="m 61.366765,45.997448 a 13.637059,13.637059 0 1 1 -27.274118,0 13.637059,13.637059 0 1 1 27.274118,0 z" /> - </clipPath> <linearGradient + x1="45.447727" + y1="92.539597" + x2="45.447727" + y2="7.0165396" + id="ButtonShadow-0" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3746" - id="linearGradient3744" - y2="44.48222" - x2="76.771591" - y1="44.48222" - x1="16.162441" /> - <radialGradient - gradientTransform="matrix(1,0,0,0.99996543,0,0.00165947)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3732" - id="radialGradient3738" - fy="48.000935" - fx="48" - r="27.001867" - cy="48.000935" - cx="48" /> + gradientTransform="matrix(1.0058652,0,0,0.994169,100,0)"> + <stop + id="stop3750-8" + style="stop-color:#000000;stop-opacity:1" + offset="0" /> + <stop + id="stop3752-5" + style="stop-color:#000000;stop-opacity:0.58823532" + offset="1" /> + </linearGradient> <linearGradient + x1="32.251034" + y1="6.1317081" + x2="32.251034" + y2="90.238609" + id="linearGradient3780" + xlink:href="#ButtonShadow-0" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3650" - id="linearGradient3707" - y2="44.48222" - x2="76.771591" - y1="44.48222" - x1="16.162441" /> + gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)" /> <linearGradient + x1="32.251034" + y1="6.1317081" + x2="32.251034" + y2="90.238609" + id="linearGradient3772" + xlink:href="#ButtonShadow-0" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3719" - id="linearGradient3674" - y2="44.48222" - x2="76.771591" - y1="44.48222" - x1="16.162441" /> + gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)" /> <linearGradient + x1="32.251034" + y1="6.1317081" + x2="32.251034" + y2="90.238609" + id="linearGradient3725" + xlink:href="#ButtonShadow-0" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3664" - id="linearGradient3670" - y2="52.098946" - x2="76.838295" - y1="52.098946" - x1="16.162441" /> + gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)" /> <linearGradient + x1="32.251034" + y1="6.1317081" + x2="32.251034" + y2="90.238609" + id="linearGradient3721" + xlink:href="#ButtonShadow-0" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3641" - id="linearGradient3617" - y2="5.9877172" - x2="48" - y1="90" - x1="48" /> - <clipPath - id="clipPath3613"> - <rect - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" - id="rect3615" - y="6" - x="6" - ry="6" - rx="6" - height="84" - width="84" /> - </clipPath> - <radialGradient - gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3737" - id="radialGradient3619" - fy="90.171875" - fx="48" - r="42" - cy="90.171875" - cx="48" /> + gradientTransform="matrix(1,0,0,-1,0,97)" /> <linearGradient + x1="32.251034" + y1="6.1317081" + x2="32.251034" + y2="90.238609" + id="linearGradient3199" + xlink:href="#ButtonShadow-0" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3737" - id="linearGradient3613" - y2="138.66119" - x2="48" - y1="20.220806" - x1="48" /> - <filter - id="filter3794" - color-interpolation-filters="sRGB" - height="1.3839999" - width="1.3839999" - y="-0.192" - x="-0.192"> - <feGaussianBlur - stdDeviation="5.28" - id="feGaussianBlur3796" /> - </filter> + gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)" /> <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3737" - id="linearGradient3188" - y2="63.893143" - x2="36.357143" + x1="36.357143" y1="6" - x1="36.357143" /> - <filter - id="filter3174" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="1.71" - id="feGaussianBlur3176" /> - </filter> + x2="36.357143" + y2="63.893143" + id="linearGradient3188-8" + xlink:href="#linearGradient3737-3" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-7.3170732,-6.2926829)" /> <linearGradient - id="linearGradient3737"> + id="linearGradient3737-3"> <stop - offset="0" + id="stop3739-6" style="stop-color:#ffffff;stop-opacity:1" - id="stop3739" /> + offset="0" /> <stop - offset="1" + id="stop3741-1" style="stop-color:#ffffff;stop-opacity:0" - id="stop3741" /> + offset="1" /> </linearGradient> + <radialGradient + cx="48" + cy="90.171875" + r="42" + fx="48" + fy="90.171875" + id="radialGradient3619-3" + xlink:href="#linearGradient3737-3" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.1573129,0,0,0.99590774,-14.868094,-6.095551)" /> <linearGradient - gradientTransform="scale(1.0058652,0.994169)" + x1="104" + y1="8" + x2="120" + y2="8" + id="linearGradient3905" + xlink:href="#linearGradient3637" gradientUnits="userSpaceOnUse" - id="ButtonShadow" - y2="7.0165396" - x2="45.447727" - y1="92.539597" - x1="45.447727"> - <stop - offset="0" - style="stop-color:#000000;stop-opacity:1" - id="stop3750" /> - <stop - offset="1" - style="stop-color:#000000;stop-opacity:0.58823532" - id="stop3752" /> - </linearGradient> + gradientTransform="translate(-104,104)" /> + <linearGradient + x1="104" + y1="8" + x2="120" + y2="8" + id="linearGradient3913" + xlink:href="#linearGradient3183-0" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-144,104)" /> <linearGradient - id="linearGradient3641"> + id="linearGradient3183-0"> <stop - offset="0" - style="stop-color:#bdb8c4;stop-opacity:1" - id="stop3643" /> + id="stop3185-9" + style="stop-color:#c80000;stop-opacity:1" + offset="0" /> <stop - offset="1" - style="stop-color:#dbd9df;stop-opacity:1" - id="stop3645" /> + id="stop3187-6" + style="stop-color:#f3604d;stop-opacity:1" + offset="1" /> </linearGradient> <linearGradient - id="linearGradient3650"> + x1="13" + y1="3" + x2="13" + y2="19" + id="linearGradient3022" + xlink:href="#linearGradient3637" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.25,0,0,3.25,12.25,12.25)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3183-0" + id="linearGradient3077" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-144,104)" + x1="104" + y1="8" + x2="120" + y2="8" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3637" + id="linearGradient3082" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-104,104)" + x1="104" + y1="8" + x2="120" + y2="8" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3637" + id="linearGradient3102" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(5.2543554,0,0,5.2543554,-105.50523,-10.414634)" + x1="13" + y1="3" + x2="13" + y2="19" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3858" + id="linearGradient3983" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.4967108,0,0,1.4967108,-2.4094778,0.11280244)" + x1="13" + y1="3" + x2="13" + y2="19" /> + <linearGradient + gradientTransform="matrix(1.6169806,0,0,1.6169806,-92.976758,-21.262278)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4806-2" + id="linearGradient3061" + y2="40.495617" + x2="71.204407" + y1="15.369057" + x1="71.204407" /> + <radialGradient + gradientTransform="matrix(0,1.383947,-1.3045256,-1.5981176e-8,35.023057,-1.3375208)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3242-7-3-8-9-9-3" + id="radialGradient3034" + fy="8.5985041" + fx="8.894803" + r="19.99999" + cy="8.449769" + cx="18.164446" /> + <linearGradient + id="linearGradient3242-7-3-8-9-9-3"> <stop offset="0" - style="stop-color:#141414;stop-opacity:1" - id="stop3709" /> + style="stop-color:#eef87e;stop-opacity:1" + id="stop3244-5-8-5-3-6-0" /> <stop - offset="1" - style="stop-color:#616161;stop-opacity:1" - id="stop3654" /> - </linearGradient> - <linearGradient - id="linearGradient3664"> + offset="0.26238" + style="stop-color:#cde34f;stop-opacity:1" + id="stop3246-9-5-1-2-4-4" /> <stop - offset="0" - style="stop-color:#000000;stop-opacity:0.29838711" - id="stop3666" /> + offset="0.66093999" + style="stop-color:#93b723;stop-opacity:1" + id="stop3248-7-2-0-84-3-1" /> <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0.64516127" - id="stop3668" /> + style="stop-color:#5a7e0d;stop-opacity:1" + id="stop3250-8-2-8-3-37-9" /> </linearGradient> + <radialGradient + gradientTransform="matrix(1,0,0,0.1666667,0,155.14216)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3820-7-2-1" + id="radialGradient6873" + fy="186.17059" + fx="99.157013" + r="62.769119" + cy="186.17059" + cx="99.157013" /> <linearGradient - id="linearGradient3719"> + id="linearGradient3820-7-2-1"> <stop offset="0" - style="stop-color:#4b4b4b;stop-opacity:1" - id="stop3721" /> + style="stop-color:#3d3d3d;stop-opacity:1" + id="stop3822-2-6-3" /> <stop - offset="0.37373093" - style="stop-color:#232323;stop-opacity:1" - id="stop3723" /> + offset="0.5" + style="stop-color:#686868;stop-opacity:0.49803922" + id="stop3864-8-7-7" /> <stop offset="1" - style="stop-color:#5c5c5c;stop-opacity:1" - id="stop3725" /> + style="stop-color:#686868;stop-opacity:0" + id="stop3824-1-2-5" /> </linearGradient> <linearGradient - id="linearGradient3732"> + id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-63"> <stop offset="0" - style="stop-color:#000000;stop-opacity:0" - id="stop3734" /> + style="stop-color:#5bc2ee;stop-opacity:1" + id="stop3750-8-9-2" /> <stop - offset="0.94999999" - style="stop-color:#000000;stop-opacity:0" - id="stop3740" /> + offset="0.26238" + style="stop-color:#42baea;stop-opacity:1" + id="stop3752-3-2-6" /> + <stop + offset="0.704952" + style="stop-color:#3689e6;stop-opacity:1" + id="stop3754-7-2-0" /> <stop offset="1" - style="stop-color:#000000;stop-opacity:1" - id="stop3736" /> + style="stop-color:#2b63a0;stop-opacity:1" + id="stop3756-9-3-9" /> </linearGradient> - <linearGradient - id="linearGradient3746"> + <radialGradient + gradientTransform="matrix(-6.7138025e-8,1.1033078,-1.0394758,-7.5994237e-8,32.783451,3.7601342)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-63" + id="radialGradient3126-3" + fy="8.44977" + fx="-0.32174549" + r="19.99999" + cy="8.449769" + cx="15.645058" /> + <radialGradient + gradientTransform="matrix(0.8232,0.2312,0.2703,-0.9626,-96.2274,-315.3433)" + gradientUnits="userSpaceOnUse" + id="XMLID_2_-8-6-1-4" + fy="-289.9133" + fx="297.44989" + r="17.1528" + cy="-290.5918" + cx="299.44821"> <stop offset="0" - style="stop-color:#5d5d5d;stop-opacity:1" - id="stop3748" /> - <stop - offset="0.60000002" - style="stop-color:#0a0a0a;stop-opacity:1" - id="stop3753" /> + style="stop-color:#000000;stop-opacity:1" + id="stop228-2-7-9-3" /> <stop offset="1" - style="stop-color:#4e4e4e;stop-opacity:1" - id="stop3751" /> - </linearGradient> + style="stop-color:#000000;stop-opacity:0" + id="stop230-7-5-7-8" /> + </radialGradient> <linearGradient - id="linearGradient3681"> + gradientTransform="matrix(0.07029909,0,0,0.05907281,84.245539,-2.1013998)" + gradientUnits="userSpaceOnUse" + xlink:href="#XMLID_2_-8-6-1-4" + id="linearGradient6191-7-5" + y2="375.61926" + x2="-474.68497" + y1="539.40955" + x1="-1085.9586" /> + <linearGradient + id="linearGradient3242-7-3-8-9-9"> <stop offset="0" - style="stop-color:#ffffff;stop-opacity:0.18548387" - id="stop3683" /> + style="stop-color:#eef87e;stop-opacity:1" + id="stop3244-5-8-5-3-6" /> <stop - offset="0.3086735" - style="stop-color:#ffffff;stop-opacity:0.10887097" - id="stop3689" /> + offset="0.26238" + style="stop-color:#cde34f;stop-opacity:1" + id="stop3246-9-5-1-2-4" /> <stop - offset="0.43622452" - style="stop-color:#000000;stop-opacity:0" - id="stop3691" /> - <stop - offset="0.54464293" - style="stop-color:#000000;stop-opacity:0" - id="stop3693" /> - <stop - offset="0.58290821" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3695" /> - <stop - offset="0.61479598" - style="stop-color:#000000;stop-opacity:0.1814516" - id="stop3697" /> - <stop - offset="0.69132656" - style="stop-color:#000000;stop-opacity:0.43145162" - id="stop3699" /> - <stop - offset="0.78061229" - style="stop-color:#ffffff;stop-opacity:0.08064516" - id="stop3701" /> - <stop - offset="0.87627554" - style="stop-color:#000000;stop-opacity:0" - id="stop3703" /> + offset="0.66093999" + style="stop-color:#93b723;stop-opacity:1" + id="stop3248-7-2-0-84-3" /> <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3685" /> + style="stop-color:#5a7e0d;stop-opacity:1" + id="stop3250-8-2-8-3-37" /> </linearGradient> + <radialGradient + gradientTransform="matrix(0,1.383947,-1.3045256,-1.5981176e-8,35.023057,-1.3375208)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3242-7-3-8-9-9" + id="radialGradient3126-7-25-24" + fy="8.5985041" + fx="8.894803" + r="19.99999" + cy="8.449769" + cx="18.164446" /> <linearGradient - id="linearGradient3727"> + id="linearGradient4806-2"> <stop offset="0" style="stop-color:#ffffff;stop-opacity:1" - id="stop3729" /> + id="stop4808-4" /> <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3731" /> - </linearGradient> - <linearGradient - id="linearGradient3761"> + offset="0.42447853" + style="stop-color:#ffffff;stop-opacity:0.23529412" + id="stop4810-0" /> <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3763" /> + offset="0.82089913" + style="stop-color:#ffffff;stop-opacity:0.15686275" + id="stop4812-8" /> <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3765" /> + style="stop-color:#ffffff;stop-opacity:0.39215687" + id="stop4814-0" /> </linearGradient> <linearGradient - id="linearGradient3797"> + gradientTransform="matrix(1.6169806,0,0,1.6169806,-92.70737,-21.060237)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4806-2" + id="linearGradient4338-5-6" + y2="40.495617" + x2="71.204407" + y1="15.369057" + x1="71.204407" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4806-2" + id="linearGradient4058" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.11840253,0,0,0.11840253,-3.9022919,10.149362)" + x1="71.204407" + y1="15.369057" + x2="71.204407" + y2="40.495617" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3820-7-2-1" + id="radialGradient4073" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.16701358,0,0,0.05403384,23.732254,50.093166)" + cx="99.157013" + cy="186.17059" + fx="99.157013" + fy="186.17059" + r="62.769119" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3820-7-2-1" + id="radialGradient4077" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.12757373,0,0,0.04127387,6.8688275,53.573514)" + cx="99.157013" + cy="186.17059" + fx="99.157013" + fy="186.17059" + r="62.769119" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3242-7-3-8-9-9-3" + id="radialGradient4085" + cx="4.6305943" + cy="11.979008" + fx="4.6305943" + fy="11.979008" + r="1.7095779" + gradientTransform="matrix(2.7860628,0,0,2.3360267,-8.3132888,-16.467814)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + id="linearGradient3957-2"> <stop offset="0" style="stop-color:#ffffff;stop-opacity:1" - id="stop3799" /> - <stop - offset="0.5" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3805" /> + id="stop3959-62" /> <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3801" /> + style="stop-color:#c1c1c1;stop-opacity:1" + id="stop3961-5" /> </linearGradient> <linearGradient - id="linearGradient3851"> - <stop - offset="0" - style="stop-color:#55d400;stop-opacity:0" - id="stop3853" /> - <stop - offset="0.5" - style="stop-color:#55d400;stop-opacity:1" - id="stop3859" /> - <stop - offset="1" - style="stop-color:#55d400;stop-opacity:0" - id="stop3855" /> - </linearGradient> + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3957-2" + id="linearGradient3963-7" + y2="27.343702" + x2="22.805599" + y1="25.433903" + x1="21.013996" /> <linearGradient - id="linearGradient3861"> - <stop - offset="0" - style="stop-color:#ffcc00;stop-opacity:0" - id="stop3863" /> - <stop - offset="0.5" - style="stop-color:#ffcc00;stop-opacity:1" - id="stop3869" /> - <stop - offset="1" - style="stop-color:#ffcc00;stop-opacity:0" - id="stop3865" /> - </linearGradient> + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3957" + id="linearGradient3963" + y2="26" + x2="24" + y1="22" + x1="24" /> <linearGradient - id="linearGradient3871"> - <stop - offset="0" - style="stop-color:#ff6600;stop-opacity:0" - id="stop3873" /> - <stop - offset="0.5" - style="stop-color:#ff6600;stop-opacity:1" - id="stop3879" /> - <stop - offset="1" - style="stop-color:#ff6600;stop-opacity:0" - id="stop3875" /> - </linearGradient> + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4168" + id="linearGradient3951" + y2="22.986004" + x2="33.447899" + y1="15.149301" + x1="27.92535" /> + <radialGradient + gradientTransform="matrix(0.27083381,0,0,0.08762273,-2.855072,25.187228)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3820-7-2-1-7" + id="radialGradient3018" + fy="186.17059" + fx="99.157013" + r="62.769119" + cy="186.17059" + cx="99.157013" /> + <radialGradient + gradientTransform="matrix(0,2.4988347,-2.6434689,-6.8014435e-8,46.263548,-12.151655)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8" + id="radialGradient3015" + fy="8.4497671" + fx="3.9722471" + r="19.99999" + cy="8.4497671" + cx="3.9722471" /> + <linearGradient + gradientTransform="matrix(1.054054,0,0,1.054054,-51.611001,-2.7279009)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4011" + id="linearGradient3012" + y2="44.340794" + x2="71.204407" + y1="6.2375584" + x1="71.204407" /> <linearGradient - id="linearGradient3881"> + id="linearGradient3820-7-2-1-7"> <stop offset="0" - style="stop-color:#d40000;stop-opacity:0" - id="stop3883" /> + style="stop-color:#3d3d3d;stop-opacity:1" + id="stop3822-2-6-3-9" /> <stop offset="0.5" - style="stop-color:#d40000;stop-opacity:1" - id="stop3889" /> + style="stop-color:#686868;stop-opacity:0.49803922" + id="stop3864-8-7-7-7" /> <stop offset="1" - style="stop-color:#d40000;stop-opacity:0" - id="stop3885" /> + style="stop-color:#686868;stop-opacity:0" + id="stop3824-1-2-5-3" /> </linearGradient> <linearGradient - id="linearGradient3891"> + id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8"> <stop offset="0" - style="stop-color:#d42aff;stop-opacity:0" - id="stop3893" /> + style="stop-color:#90dbec;stop-opacity:1" + id="stop3750-8-9" /> <stop - offset="0.5" - style="stop-color:#d42aff;stop-opacity:1" - id="stop3899" /> + offset="0.26238" + style="stop-color:#42baea;stop-opacity:1" + id="stop3752-3-2" /> + <stop + offset="0.704952" + style="stop-color:#3689e6;stop-opacity:1" + id="stop3754-7-2" /> <stop offset="1" - style="stop-color:#d42aff;stop-opacity:0" - id="stop3895" /> + style="stop-color:#2b63a0;stop-opacity:1" + id="stop3756-9-3" /> </linearGradient> <linearGradient - id="linearGradient3901"> + id="linearGradient4011"> <stop offset="0" - style="stop-color:#6600ff;stop-opacity:0" - id="stop3903" /> + style="stop-color:#ffffff;stop-opacity:1" + id="stop4013" /> <stop - offset="0.5" - style="stop-color:#6600ff;stop-opacity:1" - id="stop3909" /> + offset="0.507761" + style="stop-color:#ffffff;stop-opacity:0.23529412" + id="stop4015" /> + <stop + offset="0.83456558" + style="stop-color:#ffffff;stop-opacity:0.15686275" + id="stop4017" /> <stop offset="1" - style="stop-color:#6600ff;stop-opacity:0" - id="stop3905" /> + style="stop-color:#ffffff;stop-opacity:0.39215687" + id="stop4019" /> </linearGradient> <linearGradient - id="linearGradient3911"> + id="linearGradient3957"> <stop offset="0" - style="stop-color:#2a7fff;stop-opacity:0" - id="stop3913" /> - <stop - offset="0.5" - style="stop-color:#2a7fff;stop-opacity:1" - id="stop3919" /> + style="stop-color:#ffffff;stop-opacity:1" + id="stop3959" /> <stop offset="1" - style="stop-color:#2a7fff;stop-opacity:0" - id="stop3915" /> + style="stop-color:#c1c1c1;stop-opacity:1" + id="stop3961" /> </linearGradient> <linearGradient - id="linearGradient3921"> + id="linearGradient4168"> <stop offset="0" - style="stop-color:#5fd3bc;stop-opacity:0" - id="stop3923" /> + style="stop-color:#f8b17e;stop-opacity:1" + id="stop4170" /> <stop - offset="0.5" - style="stop-color:#5fd3bc;stop-opacity:1" - id="stop3929" /> + offset="0.23208089" + style="stop-color:#e35d4f;stop-opacity:1" + id="stop4172" /> + <stop + offset="0.5908742" + style="stop-color:#c6262e;stop-opacity:1" + id="stop4174" /> <stop offset="1" - style="stop-color:#5fd3bc;stop-opacity:0" - id="stop3925" /> + style="stop-color:#690b54;stop-opacity:1" + id="stop4176" /> </linearGradient> - <linearGradient - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3242-7-3-8-9-9-3" + id="radialGradient4304" gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0-1" - id="linearGradient2969" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> + gradientTransform="matrix(2.8367722,0,0,2.3785451,-8.502932,-16.813888)" + cx="4.6305943" + cy="11.979008" + fx="4.6305943" + fy="11.979008" + r="1.7095779" /> <linearGradient - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" + inkscape:collect="always" + xlink:href="#linearGradient4806-2" + id="linearGradient4306" gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0-1" - id="linearGradient3780-1" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> - <linearGradient - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" + gradientTransform="matrix(0.10846024,0,0,0.10846024,-3.1442023,10.427328)" + x1="71.204407" + y1="15.369057" + x2="71.204407" + y2="40.495617" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-63" + id="radialGradient4316" gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0-1" - id="linearGradient3772-2" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> + gradientTransform="matrix(2.4584939,0,0,2.0613705,-6.9627376,-12.810133)" + cx="4.6754603" + cy="11.925498" + fx="4.6754603" + fy="11.925498" + r="1.7095779" /> <linearGradient - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" + inkscape:collect="always" + xlink:href="#linearGradient4806-2" + id="linearGradient4318" gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0-1" - id="linearGradient3725-0" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> - <linearGradient - gradientTransform="matrix(1.0058652,0,0,0.994169,100,0)" + gradientTransform="matrix(0.08721464,0,0,0.08721464,-1.8140028,10.858545)" + x1="71.204407" + y1="15.369057" + x2="71.204407" + y2="40.495617" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3846" + id="radialGradient4328" gradientUnits="userSpaceOnUse" - id="ButtonShadow-0-1" - y2="7.0165396" - x2="45.447727" - y1="92.539597" - x1="45.447727"> - <stop - offset="0" - style="stop-color:#000000;stop-opacity:1" - id="stop3750-8-6" /> - <stop - offset="1" - style="stop-color:#000000;stop-opacity:0.58823532" - id="stop3752-5-3" /> - </linearGradient> + gradientTransform="matrix(3.5789237,0,0,1.9103653,-12.061867,-10.073052)" + cx="4.6305943" + cy="11.348989" + fx="4.6305943" + fy="11.348989" + r="1.7095779" /> <linearGradient - gradientTransform="translate(0,-97)" + inkscape:collect="always" + xlink:href="#linearGradient4806-2" + id="linearGradient4330" gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0-1" - id="linearGradient3721-2" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> - <linearGradient - gradientTransform="translate(0,-96)" + gradientTransform="matrix(0.06769692,0,0,0.06769692,-0.34357466,11.66806)" + x1="71.204407" + y1="15.369057" + x2="71.204407" + y2="40.495617" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3242-7-3-8-9-9" + id="radialGradient4340" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3224" - id="linearGradient3757" - y2="5.9877172" - x2="48" - y1="90" - x1="48" /> - <linearGradient - id="linearGradient3224"> - <stop - offset="0" - style="stop-color:#80a2c8;stop-opacity:1" - id="stop3226" /> - <stop - offset="1" - style="stop-color:#2e4c6d;stop-opacity:1" - id="stop3228" /> - </linearGradient> + gradientTransform="matrix(2.6464944,0,0,2.2190029,-7.6316827,-14.469846)" + cx="4.6530275" + cy="11.818479" + fx="4.6530275" + fy="11.818479" + r="1.7095779" /> <linearGradient - gradientTransform="matrix(-1,0,0,-1,91.080609,91.12006)" + inkscape:collect="always" + xlink:href="#linearGradient4806-2" + id="linearGradient4342" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.09045592,0,0,0.09045592,-1.85142,10.998218)" + x1="71.204407" + y1="15.369057" + x2="71.204407" + y2="40.495617" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-9" + id="radialGradient4352" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3932" - id="linearGradient3938" - y2="45.617771" - x2="42.662289" - y1="48.267761" - x1="45.312279" /> + gradientTransform="matrix(2.5659794,0.13994291,-0.11733776,2.1514936,-6.0660038,-14.380471)" + cx="4.7574949" + cy="11.811036" + fx="4.7574949" + fy="11.811036" + r="1.7095779" /> <linearGradient - gradientTransform="matrix(0.44988627,0,0,0.44988627,-7.7869415e-6,-94.532869)" + inkscape:collect="always" + xlink:href="#linearGradient4806-2" + id="linearGradient4354" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5128" - id="linearGradient3916" - y2="66.807335" - x2="-6.5244856" - y1="62.878765" - x1="5.2744913" /> + gradientTransform="matrix(0.10904939,0.00594732,-0.00594732,0.10904939,-3.3404221,10.355658)" + x1="71.204407" + y1="15.369057" + x2="71.204407" + y2="40.495617" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3846" + id="radialGradient4356" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.1062583,0,0,1.9723143,-9.9165629,-12.111694)" + cx="4.6305943" + cy="11.979008" + fx="4.6305943" + fy="11.979008" + r="1.7095779" /> <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4806-2" + id="linearGradient4358" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5128" - id="linearGradient3887" - y2="66.807335" - x2="-6.5244856" - y1="62.878765" - x1="5.2744913" /> + gradientTransform="matrix(0.12558785,0,0,0.12558785,-4.538099,10.065665)" + x1="71.204407" + y1="15.369057" + x2="71.204407" + y2="40.495617" /> <linearGradient + y2="54.780239" + x2="167.98311" + y1="8.50811" + x1="167.98311" + gradientTransform="matrix(0.71090703,0,0,0.71090703,-91.334988,2.139763)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3309" - id="linearGradient3879" - y2="47.535378" - x2="36.821369" - y1="21.650217" - x1="32.237946" /> + id="linearGradient3895" + xlink:href="#linearGradient5803" + inkscape:collect="always" /> <linearGradient - gradientTransform="matrix(0.5,0.8660254,-0.8660254,0.5,91.523702,-24.523702)" + y2="609.50507" + x2="302.85715" + y1="366.64789" + x1="302.85715" + gradientTransform="matrix(0.06732488,0,0,0.01470022,58.039744,40.685614)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3865" - id="linearGradient3871-2" - y2="69.230995" - x2="69.693596" - y1="66.836105" - x1="60.755741" /> + id="linearGradient3892" + xlink:href="#linearGradient5048" + inkscape:collect="always" /> <radialGradient - gradientTransform="matrix(2.3125312,2.3348434,1.2717514,-1.2595982,-125.14605,4.532606)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3751" - id="radialGradient3811" - fy="54.10635" - fx="47.644325" - r="4.8616066" - cy="54.10635" - cx="47.644325" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3724" - id="linearGradient3800" - y2="52.871964" - x2="59.574085" - y1="71.888321" - x1="64.669502" /> + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(-0.02303994,0,0,0.01470022,80.003993,40.685644)" + gradientUnits="userSpaceOnUse" + id="radialGradient3889" + xlink:href="#linearGradient5060" + inkscape:collect="always" /> <radialGradient - gradientTransform="matrix(-0.01155242,1.9830883,-2.0305783,-0.02269268,158.07483,-40.252061)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3777" - id="radialGradient3791" - fy="53.8909" - fx="48.089584" - r="5.4927044" - cy="53.8909" - cx="48.089584" /> + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(0.02303995,0,0,0.01470022,84.741765,40.685644)" + gradientUnits="userSpaceOnUse" + id="radialGradient3886" + xlink:href="#linearGradient5060" + inkscape:collect="always" /> <linearGradient + y2="43.2943" + x2="13.990655" + y1="3.9626207" + x1="13.990655" + gradientTransform="matrix(0.8974359,0,0,1.1282051,60.842421,-0.9314546)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3741" - id="linearGradient3747" - y2="64.307716" - x2="54.767216" - y1="44.039856" - x1="52.51516" /> + id="linearGradient3883" + xlink:href="#linearGradient3895-9-0-3-9" + inkscape:collect="always" /> + <radialGradient + r="19.99999" + fy="8.4497671" + fx="7.4956832" + cy="8.4497671" + cx="7.4956832" + gradientTransform="matrix(1.7435804e-8,2.636604,-2.2186919,-4.8576309e-8,101.12841,-14.960458)" + gradientUnits="userSpaceOnUse" + id="radialGradient3881" + xlink:href="#linearGradient4644-104-3-3-6-2-0" + inkscape:collect="always" /> + <radialGradient + r="19.99999" + fy="8.4497671" + fx="7.4956832" + cy="8.4497671" + cx="7.4956832" + gradientTransform="matrix(0,1.5560981,-1.8943345,1.7612124e-6,82.930021,-28.952441)" + gradientUnits="userSpaceOnUse" + id="radialGradient3878" + xlink:href="#linearGradient4067-0-2" + inkscape:collect="always" /> <linearGradient + y2="43" + x2="23.99999" + y1="5.5641499" + x1="23.99999" + gradientTransform="matrix(0.89189189,0,0,1.1351351,60.975483,-1.0977633)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3700-4" - id="linearGradient2977" - y2="5.9877172" - x2="48" - y1="90" - x1="48" /> - <clipPath - id="clipPath2973"> - <rect - style="fill:url(#linearGradient2977);fill-opacity:1;fill-rule:nonzero;stroke:none" - id="rect2975" - y="6" - x="6" - ry="6" - rx="6" - height="84" - width="84" /> - </clipPath> + id="linearGradient3875" + xlink:href="#linearGradient3977" + inkscape:collect="always" /> <linearGradient - id="linearGradient3700-4"> + id="linearGradient3977"> <stop offset="0" - style="stop-color:#70a83e;stop-opacity:1" - id="stop3702-4" /> + style="stop-color:#ffffff;stop-opacity:1" + id="stop3979" /> + <stop + offset="0.03626217" + style="stop-color:#ffffff;stop-opacity:0.23529412" + id="stop3981" /> + <stop + offset="0.95056331" + style="stop-color:#ffffff;stop-opacity:0.15686275" + id="stop3983" /> <stop offset="1" - style="stop-color:#9fd058;stop-opacity:1" - id="stop3704-4" /> + style="stop-color:#ffffff;stop-opacity:0.39215687" + id="stop3985" /> </linearGradient> <linearGradient + gradientTransform="matrix(0.89189189,0,0,1.1351351,2.5945999,-4.7432313)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3700" - id="linearGradient3878" - y2="5.9877172" - x2="48" - y1="90" - x1="48" /> - <filter - id="filter3814" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="2.1999956" - id="feGaussianBlur3816" /> - </filter> - <linearGradient - gradientTransform="matrix(1.2790652,0,0,1.2790652,17.302433,18.5815)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3397" - id="linearGradient3806" - y2="45" - x2="37.201294" - y1="1" - x1="37.201294" /> - <linearGradient - gradientTransform="matrix(1.2790652,0,0,1.2790652,17.302433,18.5815)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3309" - id="linearGradient3804" - y2="45.017357" - x2="20.758585" - y1="1" - x1="20.758585" /> + xlink:href="#linearGradient3977" + id="linearGradient3988" + y2="43" + x2="23.99999" + y1="5.5641499" + x1="23.99999" /> <linearGradient - gradientTransform="matrix(0.41503146,0,0,0.41503146,21.437996,21.853023)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5128" - id="linearGradient3801" - y2="20.895" - x2="84.63858" - y1="105.105" - x1="86.132919" /> - <linearGradient - id="linearGradient3397"> + id="linearGradient4067-0-2"> <stop offset="0" - style="stop-color:#aaaaaa;stop-opacity:1" - id="stop3399" /> + style="stop-color:#ffe452;stop-opacity:1" + id="stop4069-2-9" /> <stop offset="1" - style="stop-color:#8c8c8c;stop-opacity:1" - id="stop3401" /> + style="stop-color:#ffeb41;stop-opacity:0" + id="stop4071-8-9" /> </linearGradient> - <linearGradient + <radialGradient + gradientTransform="matrix(0,1.5560981,-1.8943345,1.7612124e-6,40.006765,-10.021638)" gradientUnits="userSpaceOnUse" - id="linearGradient3309" - y2="122.8994" - x2="63.9995" - y1="3.1001" - x1="63.9995"> + xlink:href="#linearGradient4067-0-2" + id="radialGradient4232" + fy="8.4497671" + fx="7.4956832" + r="19.99999" + cy="8.4497671" + cx="7.4956832" /> + <linearGradient + id="linearGradient3895-9-0-3-9"> <stop offset="0" - style="stop-color:#f6f6f6;stop-opacity:1" - id="stop3311" /> + style="stop-color:#dc6838;stop-opacity:1" + id="stop3897-0-5-7-4" /> <stop offset="1" - style="stop-color:#d2d2d2;stop-opacity:1" - id="stop3313" /> + style="stop-color:#ba3d12;stop-opacity:1" + id="stop3899-8-7-06-1" /> </linearGradient> <linearGradient - id="linearGradient5128"> + gradientTransform="matrix(0.8974359,0,0,1.1282051,2.4615382,-4.5769226)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3895-9-0-3-9" + id="linearGradient4090-3" + y2="43.2943" + x2="13.990655" + y1="3.9626207" + x1="13.990655" /> + <linearGradient + id="linearGradient4644-104-3-3-6-2-0"> <stop offset="0" - style="stop-color:#e5e5e5;stop-opacity:1" - id="stop5130" /> + style="stop-color:#ff7a35;stop-opacity:1" + id="stop5237-6-5-1-7-8" /> <stop offset="1" - style="stop-color:#ababab;stop-opacity:1" - id="stop5132" /> + style="stop-color:#f0431a;stop-opacity:1" + id="stop5239-4-6-4-8-5" /> </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3700" - id="linearGradient3617-7" - y2="5.9877172" - x2="48" - y1="90" - x1="48" /> - <clipPath - id="clipPath3613-7"> - <rect - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" - id="rect3615-9" - y="6" - x="6" - ry="6" - rx="6" - height="84" - width="84" /> - </clipPath> <radialGradient - gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3737-5" - id="radialGradient3619-4" - fy="90.171875" - fx="48" - r="42" - cy="90.171875" - cx="48" /> - <linearGradient + gradientTransform="matrix(1.7435804e-8,2.636604,-2.2186919,-4.8576309e-8,42.747528,-18.605926)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3737-5" - id="linearGradient3613-6" - y2="138.66119" - x2="48" - y1="20.220806" - x1="48" /> - <filter - id="filter3794-7" - color-interpolation-filters="sRGB" - height="1.3839999" - width="1.3839999" - y="-0.192" - x="-0.192"> - <feGaussianBlur - stdDeviation="5.28" - id="feGaussianBlur3796-3" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3737-5" - id="linearGradient3188-2" - y2="63.893143" - x2="36.357143" - y1="6" - x1="36.357143" /> - <filter - id="filter3174-5" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="1.71" - id="feGaussianBlur3176-9" /> - </filter> + xlink:href="#linearGradient4644-104-3-3-6-2-0" + id="radialGradient4088-6" + fy="8.4497671" + fx="7.4956832" + r="19.99999" + cy="8.4497671" + cx="7.4956832" /> <linearGradient - id="linearGradient3700"> + id="linearGradient3038"> <stop offset="0" - style="stop-color:#70a83e;stop-opacity:1" - id="stop3702" /> + style="stop-color:#000000;stop-opacity:1" + id="stop3040" /> <stop offset="1" - style="stop-color:#9fd058;stop-opacity:1" - id="stop3704" /> + style="stop-color:#000000;stop-opacity:0" + id="stop3042" /> </linearGradient> + <radialGradient + gradientTransform="matrix(0.02303995,0,0,0.01470022,26.360882,37.040176)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient5060" + id="radialGradient3327" + fy="486.64789" + fx="605.71429" + r="117.14286" + cy="486.64789" + cx="605.71429" /> <linearGradient - id="linearGradient3737-5"> + id="linearGradient5060"> <stop offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3739-7" /> + style="stop-color:#000000;stop-opacity:1" + id="stop5062" /> <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3741-8" /> + style="stop-color:#000000;stop-opacity:0" + id="stop5064" /> </linearGradient> - <linearGradient - gradientTransform="scale(1.0058652,0.994169)" + <radialGradient + gradientTransform="matrix(-0.02303994,0,0,0.01470022,21.62311,37.040176)" gradientUnits="userSpaceOnUse" - id="ButtonShadow-4" - y2="7.0165396" - x2="45.447727" - y1="92.539597" - x1="45.447727"> + xlink:href="#linearGradient5060" + id="radialGradient3330" + fy="486.64789" + fx="605.71429" + r="117.14286" + cy="486.64789" + cx="605.71429" /> + <linearGradient + id="linearGradient5048"> <stop offset="0" + style="stop-color:#000000;stop-opacity:0" + id="stop5050" /> + <stop + offset="0.5" style="stop-color:#000000;stop-opacity:1" - id="stop3750-1" /> + id="stop5056" /> <stop offset="1" - style="stop-color:#000000;stop-opacity:0.58823532" - id="stop3752-6" /> + style="stop-color:#000000;stop-opacity:0" + id="stop5052" /> </linearGradient> <linearGradient - id="linearGradient3724"> + gradientTransform="matrix(0.06732488,0,0,0.01470022,-0.3411391,37.040146)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient5048" + id="linearGradient4286" + y2="609.50507" + x2="302.85715" + y1="366.64789" + x1="302.85715" /> + <linearGradient + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3702-501-757" + id="linearGradient6647" + y2="39.999443" + x2="25.058096" + y1="47.027729" + x1="25.058096" /> + <linearGradient + id="linearGradient3702-501-757"> <stop offset="0" - style="stop-color:#ffa92a;stop-opacity:1" - id="stop3726" /> + style="stop-color:#181818;stop-opacity:0" + id="stop2895" /> + <stop + offset="0.5" + style="stop-color:#181818;stop-opacity:1" + id="stop2897" /> <stop offset="1" - style="stop-color:#ffcf2a;stop-opacity:1" - id="stop3728" /> + style="stop-color:#181818;stop-opacity:0" + id="stop2899" /> </linearGradient> <linearGradient - id="linearGradient3741"> + id="linearGradient3688-464-309"> <stop offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3743" /> + style="stop-color:#181818;stop-opacity:1" + id="stop2889" /> <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3745" /> + style="stop-color:#181818;stop-opacity:0" + id="stop2891" /> </linearGradient> + <radialGradient + gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3688-464-309" + id="radialGradient3015-3" + fy="43.5" + fx="4.9929786" + r="2.5" + cy="43.5" + cx="4.9929786" /> <linearGradient - id="linearGradient3751"> + id="linearGradient3688-166-749"> <stop offset="0" - style="stop-color:#f89400;stop-opacity:1" - id="stop3753-2" /> + style="stop-color:#181818;stop-opacity:1" + id="stop2883" /> <stop offset="1" - style="stop-color:#f89400;stop-opacity:0" - id="stop3755" /> + style="stop-color:#181818;stop-opacity:0" + id="stop2885" /> </linearGradient> + <radialGradient + gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3688-166-749" + id="radialGradient3013" + fy="43.5" + fx="4.9929786" + r="2.5" + cy="43.5" + cx="4.9929786" /> <linearGradient - id="linearGradient3777"> + id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8"> <stop offset="0" - style="stop-color:#ff6600;stop-opacity:1" - id="stop3779" /> + style="stop-color:#ffcd7d;stop-opacity:1" + id="stop3750-1-0-7-6-6-1-3-9" /> + <stop + offset="0.26238" + style="stop-color:#fc8f36;stop-opacity:1" + id="stop3752-3-7-4-0-32-8-923-0" /> + <stop + offset="0.704952" + style="stop-color:#e23a0e;stop-opacity:1" + id="stop3754-1-8-5-2-7-6-7-1" /> <stop offset="1" - style="stop-color:#ff6600;stop-opacity:0" - id="stop3781" /> + style="stop-color:#ac441f;stop-opacity:1" + id="stop3756-1-6-2-6-6-1-96-6" /> </linearGradient> + <radialGradient + gradientTransform="matrix(0,9.4975523,-11.65996,0,140.93055,-79.160978)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4644-104-3-3-6-2-0" + id="radialGradient5521-1" + fy="9.9571075" + fx="6.2001843" + r="12.671875" + cy="9.9571075" + cx="6.7304144" /> <linearGradient - id="linearGradient3865"> + id="linearGradient3924-1"> <stop offset="0" - style="stop-color:#ffe99d;stop-opacity:1" - id="stop3867" /> + style="stop-color:#ffffff;stop-opacity:1" + id="stop3926-3" /> + <stop + offset="0.06316455" + style="stop-color:#ffffff;stop-opacity:0.23529412" + id="stop3928-91" /> + <stop + offset="0.95056331" + style="stop-color:#ffffff;stop-opacity:0.15686275" + id="stop3930-6" /> <stop offset="1" - style="stop-color:#ffe99d;stop-opacity:0" - id="stop3869-7" /> + style="stop-color:#ffffff;stop-opacity:0.39215687" + id="stop3932-6" /> </linearGradient> <linearGradient - id="linearGradient3932"> + gradientTransform="translate(4e-6,1.000006)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3924-1" + id="linearGradient3058" + y2="43" + x2="23.99999" + y1="4.999989" + x1="23.99999" /> + <linearGradient + id="linearGradient5803"> <stop offset="0" - style="stop-color:#000000;stop-opacity:1" - id="stop3934" /> + style="stop-color:#fff5ef;stop-opacity:1" + id="stop5805" /> <stop offset="1" - style="stop-color:#000000;stop-opacity:0" - id="stop3936" /> + style="stop-color:#fef8dd;stop-opacity:1" + id="stop5807" /> </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-4" - id="linearGradient4585" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.0058652,0.994169)" - x1="45.447727" - y1="92.539597" - x2="45.447727" - y2="7.0165396" /> - <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4587" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> - <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4589" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> - <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4591" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> - <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4593" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> - <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4595" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(0,-97)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3224" - id="linearGradient4597" + gradientTransform="matrix(0.71090703,0,0,0.71090703,-91.334988,2.139763)" gradientUnits="userSpaceOnUse" - gradientTransform="translate(0,-96)" - x1="48" - y1="90" - x2="48" - y2="5.9877172" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3737-5" - id="linearGradient4599" - gradientUnits="userSpaceOnUse" - x1="36.357143" - y1="6" - x2="36.357143" - y2="63.893143" /> + xlink:href="#linearGradient5803" + id="linearGradient5414" + y2="54.780239" + x2="167.98311" + y1="8.50811" + x1="167.98311" /> <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3737-5" - id="radialGradient4601" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)" - cx="48" - cy="90.171875" - fx="48" - fy="90.171875" - r="42" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3700" - id="linearGradient4603" - gradientUnits="userSpaceOnUse" - x1="48" - y1="90" - x2="48" - y2="5.9877172" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3700" - id="linearGradient4605" - gradientUnits="userSpaceOnUse" - x1="48" - y1="90" - x2="48" - y2="5.9877172" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3737-5" - id="linearGradient4607" - gradientUnits="userSpaceOnUse" - x1="48" - y1="20.220806" - x2="48" - y2="138.66119" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3309" - id="linearGradient4609" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2790652,0,0,1.2790652,17.302433,18.5815)" - x1="20.758585" - y1="1" - x2="20.758585" - y2="45.017357" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3397" - id="linearGradient4611" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2790652,0,0,1.2790652,17.302433,18.5815)" - x1="37.201294" - y1="1" - x2="37.201294" - y2="45" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5128" - id="linearGradient4613" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.41503146,0,0,0.41503146,21.437996,21.853023)" - x1="86.132919" - y1="105.105" - x2="84.63858" - y2="20.895" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5128" - id="linearGradient4615" - gradientUnits="userSpaceOnUse" - x1="5.2744913" - y1="62.878765" - x2="-6.5244856" - y2="66.807335" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5128" - id="linearGradient4617" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.44988627,0,0,0.44988627,-7.7869415e-6,-94.532869)" - x1="5.2744913" - y1="62.878765" - x2="-6.5244856" - y2="66.807335" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3932" - id="linearGradient4619" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-1,0,0,-1,91.080609,91.12006)" - x1="45.312279" - y1="48.267761" - x2="42.662289" - y2="45.617771" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3309" - id="linearGradient4621" - gradientUnits="userSpaceOnUse" - x1="32.237946" - y1="21.650217" - x2="36.821369" - y2="47.535378" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3724" - id="linearGradient4623" + gradientTransform="matrix(0.40120499,0,0,1.1999999,-6.0060239,-91.8)" gradientUnits="userSpaceOnUse" - x1="64.669502" - y1="71.888321" - x2="59.574085" - y2="52.871964" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3741" - id="linearGradient4625" - gradientUnits="userSpaceOnUse" - x1="52.51516" - y1="44.039856" - x2="54.767216" - y2="64.307716" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3777" - id="radialGradient4627" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.01155242,1.9830883,-2.0305783,-0.02269268,158.07483,-40.252061)" - cx="48.089584" - cy="53.8909" - fx="48.089584" - fy="53.8909" - r="5.4927044" /> + xlink:href="#linearGradient3681" + id="radialGradient3274" + fy="41.5" + fx="5" + r="5" + cy="41.5" + cx="5" /> + <linearGradient + gradientTransform="matrix(1.744139,0,0,1.090909,-16.929666,-2.181819)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3703" + id="linearGradient3271" + y2="34.999718" + x2="17.554192" + y1="46.000275" + x1="17.554192" /> <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3751" - id="radialGradient4629" + gradientTransform="matrix(0.40120499,0,0,1.1999999,41.993979,-91.8)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.3125312,2.3348434,1.2717514,-1.2595982,-125.14605,4.532606)" - cx="47.644325" - cy="54.10635" - fx="47.644325" - fy="54.10635" - r="4.8616066" /> + xlink:href="#linearGradient3681" + id="radialGradient3268" + fy="41.5" + fx="5" + r="5" + cy="41.5" + cx="5" /> + <linearGradient + gradientTransform="matrix(1.2822251,0,0,1.5572619,-6.0701918,-15.290756)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3199-5" + id="linearGradient3263" + y2="37.27668" + x2="24.996943" + y1="15.377745" + x1="24.822832" /> + <linearGradient + gradientTransform="matrix(1.2822251,0,0,1.1746872,-6.0701918,-5.303168)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient4559" + id="linearGradient3260" + y2="45.934479" + x2="43.00663" + y1="30.554907" + x1="23.451576" /> + <linearGradient + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3827" + id="linearGradient3257" + y2="8" + x2="26" + y1="22" + x1="26" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3865" - id="linearGradient4631" + gradientTransform="matrix(1.0540541,0,0,0.7027027,-1.2972909,13.635141)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.5,0.8660254,-0.8660254,0.5,91.523702,-24.523702)" - x1="60.755741" - y1="66.836105" - x2="69.693596" - y2="69.230995" /> + xlink:href="#linearGradient3977-6" + id="linearGradient3254" + y2="43" + x2="23.99999" + y1="5.5641499" + x1="23.99999" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5128" - id="linearGradient4695" + gradientTransform="matrix(1.0540541,0,0,0.21621621,-1.2972909,8.310813)" gradientUnits="userSpaceOnUse" - x1="5.2744913" - y1="62.878765" - x2="-6.5244856" - y2="66.807335" /> + xlink:href="#linearGradient3878" + id="linearGradient3251" + y2="43" + x2="23.99999" + y1="7.3472824" + x1="23.99999" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5128" - id="linearGradient4697" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.44988627,0,0,0.44988627,-7.7869415e-6,-94.532869)" - x1="5.2744913" - y1="62.878765" - x2="-6.5244856" - y2="66.807335" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3932" - id="linearGradient4699" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-1,0,0,-1,91.080609,91.12006)" - x1="45.312279" - y1="48.267761" - x2="42.662289" - y2="45.617771" /> + id="linearGradient4011-7"> + <stop + offset="0" + style="stop-color:#ffffff;stop-opacity:1" + id="stop4013-0" /> + <stop + offset="0.507761" + style="stop-color:#ffffff;stop-opacity:0.23529412" + id="stop4015-3" /> + <stop + offset="0.83456558" + style="stop-color:#ffffff;stop-opacity:0.15686275" + id="stop4017-8" /> + <stop + offset="1" + style="stop-color:#ffffff;stop-opacity:0.39215687" + id="stop4019-7" /> + </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3309" - id="linearGradient4701" - gradientUnits="userSpaceOnUse" - x1="32.237946" - y1="21.650217" - x2="36.821369" - y2="47.535378" /> + id="linearGradient8838"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop8840" /> + <stop + offset="1" + style="stop-color:#000000;stop-opacity:0" + id="stop8842" /> + </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3724" - id="linearGradient4703" - gradientUnits="userSpaceOnUse" - x1="64.669502" - y1="71.888321" - x2="59.574085" - y2="52.871964" /> + id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-9"> + <stop + offset="0" + style="stop-color:#90dbec;stop-opacity:1" + id="stop3750-8-9-6" /> + <stop + offset="0.26238" + style="stop-color:#42baea;stop-opacity:1" + id="stop3752-3-2-9" /> + <stop + offset="0.704952" + style="stop-color:#3689e6;stop-opacity:1" + id="stop3754-7-2-5" /> + <stop + offset="1" + style="stop-color:#2b63a0;stop-opacity:1" + id="stop3756-9-3-0" /> + </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3741" - id="linearGradient4705" + gradientTransform="matrix(0.5135135,0,0,0.5135135,-24.836132,-1.021284)" gradientUnits="userSpaceOnUse" - x1="52.51516" - y1="44.039856" - x2="54.767216" - y2="64.307716" /> + xlink:href="#linearGradient4011-7" + id="linearGradient3078" + y2="44.340794" + x2="71.204407" + y1="6.2375584" + x1="71.204407" /> <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3777" - id="radialGradient4707" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.01155242,1.9830883,-2.0305783,-0.02269268,158.07483,-40.252061)" - cx="48.089584" - cy="53.8909" - fx="48.089584" - fy="53.8909" - r="5.4927044" /> + gradientTransform="matrix(1.1294118,0,0,0.2823525,-58.729414,19.694118)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient8838" + id="radialGradient3090" + fy="4.625" + fx="62.625" + r="10.625" + cy="4.625" + cx="62.625" /> <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3751" - id="radialGradient4709" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.3125312,2.3348434,1.2717514,-1.2595982,-125.14605,4.532606)" - cx="47.644325" - cy="54.10635" - fx="47.644325" - fy="54.10635" - r="4.8616066" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3865" - id="linearGradient4711" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.5,0.8660254,-0.8660254,0.5,91.523702,-24.523702)" - x1="60.755741" - y1="66.836105" - x2="69.693596" - y2="69.230995" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3865" - id="linearGradient4716" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.5,0.8660254,-0.8660254,0.5,253.36599,768.22675)" - x1="60.755741" - y1="66.836105" - x2="69.693596" - y2="69.230995" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3751" - id="radialGradient4719" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.3125312,2.3348434,1.2717514,-1.2595982,36.69624,797.28306)" - cx="47.644325" - cy="54.10635" - fx="47.644325" - fy="54.10635" - r="4.8616066" /> + gradientTransform="matrix(0,1.2798909,-1.3539719,-3.4836662e-8,23.440807,-6.5314582)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-9" + id="radialGradient3100" + fy="8.4497671" + fx="3.9722471" + r="19.99999" + cy="8.4497671" + cx="3.9722471" /> <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3777" - id="radialGradient4722" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-1.4135694,1.3909409,-1.9726688,-2.0047611,389.83126,880.07421)" - cx="48.089584" - cy="53.8909" - fx="48.089584" - fy="53.8909" - r="5.4927044" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3741" - id="linearGradient4725" + gradientTransform="matrix(0.40120499,0,0,1.1999999,-6.0060239,-91.8)" gradientUnits="userSpaceOnUse" - x1="52.51516" - y1="44.039856" - x2="54.767216" - y2="64.307716" - gradientTransform="translate(161.84229,792.75045)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3724" - id="linearGradient4731" - gradientUnits="userSpaceOnUse" - x1="64.669502" - y1="71.888321" - x2="59.574085" - y2="52.871964" - gradientTransform="translate(161.84229,792.75045)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3309" - id="linearGradient4734" - gradientUnits="userSpaceOnUse" - x1="32.237946" - y1="21.650217" - x2="36.821369" - y2="47.535378" - gradientTransform="translate(161.84229,792.75045)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3932" - id="linearGradient4738" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-1,0,0,-1,252.9229,883.87051)" - x1="45.312279" - y1="48.267761" - x2="42.662289" - y2="45.617771" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5128" - id="linearGradient4741" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.44988627,0,0,0.44988627,446.11943,-769.53187)" - x1="5.2744913" - y1="62.878765" - x2="-6.5244856" - y2="66.807335" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5128" - id="linearGradient4744" - gradientUnits="userSpaceOnUse" - x1="5.2744913" - y1="62.878765" - x2="-6.5244856" - y2="66.807335" - gradientTransform="translate(-446.11944,674.999)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3309" - id="linearGradient4753" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2790652,0,0,1.2790652,17.302433,18.5815)" - x1="20.758585" - y1="1" - x2="20.758585" - y2="45.017357" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3397" - id="linearGradient4755" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2790652,0,0,1.2790652,17.302433,18.5815)" - x1="37.201294" - y1="1" - x2="37.201294" - y2="45" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5128" - id="linearGradient4757" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.41503146,0,0,0.41503146,21.437996,21.853023)" - x1="86.132919" - y1="105.105" - x2="84.63858" - y2="20.895" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5128" - id="linearGradient4761" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.41503146,0,0,0.41503146,183.28029,814.60347)" - x1="86.132919" - y1="105.105" - x2="84.63858" - y2="20.895" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3309" - id="linearGradient4764" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2790652,0,0,1.2790652,179.14472,811.33195)" - x1="20.758585" - y1="1" - x2="20.758585" - y2="45.017357" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3397" - id="linearGradient4766" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2790652,0,0,1.2790652,179.14472,811.33195)" - x1="37.201294" - y1="1" - x2="37.201294" - y2="45" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3737-5" - id="linearGradient4769" - gradientUnits="userSpaceOnUse" - x1="48" - y1="20.220806" - x2="48" - y2="138.66119" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3700" - id="linearGradient4772" - gradientUnits="userSpaceOnUse" - x1="48" - y1="90" - x2="48" - y2="5.9877172" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3700" - id="linearGradient4774" - gradientUnits="userSpaceOnUse" - x1="48" - y1="90" - x2="48" - y2="5.9877172" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3700" - id="linearGradient4777" - gradientUnits="userSpaceOnUse" - x1="48" - y1="90" - x2="48" - y2="5.9877172" - gradientTransform="translate(161.84229,792.75045)" /> + xlink:href="#linearGradient3681" + id="radialGradient3994" + fy="41.5" + fx="5" + r="5" + cy="41.5" + cx="5" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3700" - id="linearGradient4780" - gradientUnits="userSpaceOnUse" - x1="48" - y1="90" - x2="48" - y2="5.9877172" - gradientTransform="translate(161.84229,792.75045)" /> + id="linearGradient3703"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:0" + id="stop3705" /> + <stop + offset="0.5" + style="stop-color:#000000;stop-opacity:1" + id="stop3711" /> + <stop + offset="1" + style="stop-color:#000000;stop-opacity:0" + id="stop3707" /> + </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3224" - id="linearGradient4799" + gradientTransform="matrix(1.744139,0,0,1.090909,-16.929666,-2.181819)" gradientUnits="userSpaceOnUse" - gradientTransform="translate(0,-96)" - x1="48" - y1="90" - x2="48" - y2="5.9877172" /> + xlink:href="#linearGradient3703" + id="linearGradient3920" + y2="34.999718" + x2="17.554192" + y1="46.000275" + x1="17.554192" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3737-5" - id="linearGradient4801" - gradientUnits="userSpaceOnUse" - x1="36.357143" - y1="6" - x2="36.357143" - y2="63.893143" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3737-5" - id="radialGradient4803" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)" - cx="48" - cy="90.171875" - fx="48" - fy="90.171875" - r="42" /> + id="linearGradient3681"> + <stop + offset="0" + style="stop-color:#000000;stop-opacity:1" + id="stop3683" /> + <stop + offset="1" + style="stop-color:#000000;stop-opacity:0" + id="stop3685" /> + </linearGradient> <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3737-5" - id="radialGradient4806" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1573129,0,0,0.99590774,154.29127,792.94758)" - cx="48" - cy="90.171875" - fx="48" - fy="90.171875" - r="42" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3737-5" - id="linearGradient4809" + gradientTransform="matrix(0.40120499,0,0,1.1999999,41.993979,-91.8)" gradientUnits="userSpaceOnUse" - x1="36.357143" - y1="6" - x2="36.357143" - y2="63.893143" - gradientTransform="translate(161.84229,792.75045)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3224" - id="linearGradient4812" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(161.84229,-888.75045)" - x1="48" - y1="90" - x2="48" - y2="5.9877172" /> + xlink:href="#linearGradient3681" + id="radialGradient3917" + fy="41.5" + fx="5" + r="5" + cy="41.5" + cx="5" /> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4814" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + id="linearGradient3295"> + <stop + offset="0" + style="stop-color:#c9af8b;stop-opacity:1" + id="stop3297" /> + <stop + offset="0.23942046" + style="stop-color:#ad8757;stop-opacity:1" + id="stop3299" /> + <stop + offset="0.27582464" + style="stop-color:#c2a57f;stop-opacity:1" + id="stop3301" /> + <stop + offset="1" + style="stop-color:#9d7d53;stop-opacity:1" + id="stop3303" /> + </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4816" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + xlink:href="#linearGradient3295" + id="linearGradient3408" + y2="45.04248" + x2="15.464298" + y1="7.9756851" + x1="15.464298" /> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4818" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + id="linearGradient3199-5"> + <stop + offset="0" + style="stop-color:#dac196;stop-opacity:1" + id="stop3201" /> + <stop + offset="0.23942046" + style="stop-color:#c7ae8e;stop-opacity:1" + id="stop3203" /> + <stop + offset="0.27582464" + style="stop-color:#dac197;stop-opacity:1" + id="stop3205" /> + <stop + offset="1" + style="stop-color:#b19974;stop-opacity:1" + id="stop3207" /> + </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4820" + gradientTransform="matrix(1.2822251,0,0,1.5572619,-6.0701918,-15.290756)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + xlink:href="#linearGradient3199-5" + id="linearGradient3406" + y2="37.27668" + x2="24.996943" + y1="15.377745" + x1="24.822832" /> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4822" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(0,-97)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + id="linearGradient4559"> + <stop + offset="0" + style="stop-color:#ffffff;stop-opacity:0" + id="stop4561" /> + <stop + offset="1" + style="stop-color:#ffffff;stop-opacity:0" + id="stop4563" /> + </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4825" + gradientTransform="matrix(1.2822251,0,0,1.1746872,-6.0701918,-5.303168)" gradientUnits="userSpaceOnUse" - gradientTransform="translate(161.84229,-889.75045)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + xlink:href="#linearGradient4559" + id="linearGradient3400" + y2="45.934479" + x2="43.00663" + y1="30.554907" + x1="23.451576" /> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4828" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,1.0119048,160.69943,-890.82188)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + id="linearGradient3827"> + <stop + offset="0" + style="stop-color:#ffffff;stop-opacity:1" + id="stop3829" /> + <stop + offset="0.3021296" + style="stop-color:#ffffff;stop-opacity:1" + id="stop4295" /> + <stop + offset="0.34361121" + style="stop-color:#ffffff;stop-opacity:0.64347827" + id="stop4293" /> + <stop + offset="1" + style="stop-color:#ffffff;stop-opacity:0.39130434" + id="stop3832" /> + </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4831" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,-1.0119048,160.69943,890.82188)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + xlink:href="#linearGradient3827" + id="linearGradient3397" + y2="8" + x2="26" + y1="22" + x1="26" /> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4834" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,-1.0119048,160.69943,890.82188)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + id="linearGradient3977-6"> + <stop + offset="0" + style="stop-color:#ffffff;stop-opacity:1" + id="stop3979-0" /> + <stop + offset="0.03626217" + style="stop-color:#ffffff;stop-opacity:0.23529412" + id="stop3981-8" /> + <stop + offset="0.95056331" + style="stop-color:#ffffff;stop-opacity:0.15686275" + id="stop3983-7" /> + <stop + offset="1" + style="stop-color:#ffffff;stop-opacity:0.39215687" + id="stop3985-3" /> + </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4837" + gradientTransform="matrix(1.0540541,0,0,0.7027027,-1.2972909,13.635141)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,-1.0119048,160.69943,890.82188)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + xlink:href="#linearGradient3977-6" + id="linearGradient3033" + y2="43" + x2="23.99999" + y1="5.5641499" + x1="23.99999" /> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-4" - id="linearGradient4839" - gradientUnits="userSpaceOnUse" - gradientTransform="scale(1.0058652,0.994169)" - x1="45.447727" - y1="92.539597" - x2="45.447727" - y2="7.0165396" /> + id="linearGradient3878"> + <stop + offset="0" + style="stop-color:#ffffff;stop-opacity:1" + id="stop3880" /> + <stop + offset="0.08389385" + style="stop-color:#ffffff;stop-opacity:0.23529412" + id="stop3882" /> + <stop + offset="0.95056331" + style="stop-color:#ffffff;stop-opacity:0.15686275" + id="stop3884" /> + <stop + offset="1" + style="stop-color:#ffffff;stop-opacity:0.39215687" + id="stop3886" /> + </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-4" - id="linearGradient4842" + gradientTransform="matrix(1.0540541,0,0,0.21621621,-1.2972909,8.310813)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0058652,0,0,0.994169,161.84229,792.75045)" - x1="45.447727" - y1="92.539597" - x2="45.447727" - y2="7.0165396" /> + xlink:href="#linearGradient3878" + id="linearGradient3855" + y2="43" + x2="23.99999" + y1="7.3472824" + x1="23.99999" /> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4890" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,-1.0119048,160.69943,890.82188)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + xlink:href="#linearGradient3702-501-757-6-946" + id="linearGradient4469" + y2="39.999443" + x2="25.058096" + y1="47.027729" + x1="25.058096" /> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4892" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,-1.0119048,160.69943,890.82188)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + id="linearGradient3702-501-757-6-946"> + <stop + offset="0" + style="stop-color:#181818;stop-opacity:0" + id="stop3228" /> + <stop + offset="0.5" + style="stop-color:#181818;stop-opacity:1" + id="stop3230" /> + <stop + offset="1" + style="stop-color:#181818;stop-opacity:0" + id="stop3232" /> + </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4894" + id="linearGradient3688-464-309-8-331"> + <stop + offset="0" + style="stop-color:#181818;stop-opacity:1" + id="stop3222" /> + <stop + offset="1" + style="stop-color:#181818;stop-opacity:0" + id="stop3224" /> + </linearGradient> + <radialGradient + gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,-1.0119048,160.69943,890.82188)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + xlink:href="#linearGradient3688-464-309-8-331" + id="radialGradient3015-826" + fy="43.5" + fx="4.9929786" + r="2.5" + cy="43.5" + cx="4.9929786" /> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4896" + id="linearGradient3688-166-749-2-324"> + <stop + offset="0" + style="stop-color:#181818;stop-opacity:1" + id="stop3216" /> + <stop + offset="1" + style="stop-color:#181818;stop-opacity:0" + id="stop3218" /> + </linearGradient> + <radialGradient + gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0238095,0,0,1.0119048,160.69943,-890.82188)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + xlink:href="#linearGradient3688-166-749-2-324" + id="radialGradient3013-896" + fy="43.5" + fx="4.9929786" + r="2.5" + cy="43.5" + cx="4.9929786" /> <linearGradient - inkscape:collect="always" - xlink:href="#ButtonShadow-0-1" - id="linearGradient4898" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(161.84229,-889.75045)" - x1="32.251034" - y1="6.1317081" - x2="32.251034" - y2="90.238609" /> + id="linearGradient3856"> + <stop + offset="0" + style="stop-color:#b67926;stop-opacity:1" + id="stop3858" /> + <stop + offset="1" + style="stop-color:#eab41a;stop-opacity:1" + id="stop3860-5" /> + </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3224" - id="linearGradient4900" + gradientTransform="translate(-4.3e-5,1.0000004)" gradientUnits="userSpaceOnUse" - gradientTransform="translate(161.84229,-888.75045)" - x1="48" - y1="90" - x2="48" - y2="5.9877172" /> + xlink:href="#linearGradient3856" + id="linearGradient3157" + y2="3.8990016" + x2="24" + y1="44" + x1="24" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3737-5" - id="linearGradient4902" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(161.84229,792.75045)" - x1="36.357143" - y1="6" - x2="36.357143" - y2="63.893143" /> + id="linearGradient3846"> + <stop + offset="0" + style="stop-color:#fff3cb;stop-opacity:1" + id="stop3848" /> + <stop + offset="0.26238" + style="stop-color:#fdde76;stop-opacity:1" + id="stop3850" /> + <stop + offset="0.66093999" + style="stop-color:#f9c440;stop-opacity:1" + id="stop3852" /> + <stop + offset="1" + style="stop-color:#e48b20;stop-opacity:1" + id="stop3854" /> + </linearGradient> <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3737-5" - id="radialGradient4904" + gradientTransform="matrix(3.8129384e-8,1.5359591,-1.1262347,0,33.516497,2.0687784)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.1573129,0,0,0.99590774,154.29127,792.94758)" - cx="48" - cy="90.171875" - fx="48" - fy="90.171875" - r="42" /> + xlink:href="#linearGradient3846" + id="radialGradient3155" + fy="8.4497671" + fx="19.740461" + r="19.99999" + cy="8.4497671" + cx="19.740461" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3737-5" - id="linearGradient4906" - gradientUnits="userSpaceOnUse" - x1="48" - y1="20.220806" - x2="48" - y2="138.66119" /> + id="linearGradient3600"> + <stop + offset="0" + style="stop-color:#f4f4f4;stop-opacity:1" + id="stop3602" /> + <stop + offset="1" + style="stop-color:#dbdbdb;stop-opacity:1" + id="stop3604" /> + </linearGradient> <linearGradient - y2="19" - x2="13" - y1="3" - x1="13" - gradientTransform="matrix(4.941505,0,0,4.941505,-1.552318,-8.2232516)" + gradientTransform="matrix(0.71111115,0,0,0.60365893,6.9333345,3.070424)" gradientUnits="userSpaceOnUse" - id="linearGradient4019" - xlink:href="#linearGradient3637" - inkscape:collect="always" /> + xlink:href="#linearGradient3600" + id="linearGradient3086" + y2="45.243549" + x2="20.052792" + y1="10.636821" + x1="20.052792" /> <linearGradient - y2="19" - x2="13" - y1="3" - x1="13" - gradientTransform="matrix(4.941505,0,0,4.941505,-10.141081,-5.2223592)" - gradientUnits="userSpaceOnUse" - id="linearGradient3983" - xlink:href="#linearGradient3637" - inkscape:collect="always" /> + id="linearGradient3866"> + <stop + offset="0" + style="stop-color:#a0a0a0;stop-opacity:1" + id="stop3868" /> + <stop + offset="0.5" + style="stop-color:#8f8f8f;stop-opacity:0.63478261" + id="stop3872" /> + <stop + offset="1" + style="stop-color:#9d9d9d;stop-opacity:0" + id="stop3870" /> + </linearGradient> <linearGradient - y2="19" - x2="13" - y1="3" - x1="13" - gradientTransform="matrix(5.2543554,0,0,5.2543554,-105.50523,-10.414634)" + spreadMethod="reflect" + gradientTransform="matrix(0.73482181,0,0,0.63395351,6.3644351,1.1854308)" gradientUnits="userSpaceOnUse" - id="linearGradient3102" - xlink:href="#linearGradient3637" - inkscape:collect="always" /> + xlink:href="#linearGradient3866" + id="linearGradient3083" + y2="15.737678" + x2="25.525208" + y1="30.188753" + x1="25.525208" /> <linearGradient - y2="8" - x2="120" - y1="8" - x1="104" - gradientTransform="translate(-104,104)" - gradientUnits="userSpaceOnUse" - id="linearGradient3082" - xlink:href="#linearGradient3637" - inkscape:collect="always" /> - <linearGradient - y2="8" - x2="120" - y1="8" - x1="104" - gradientTransform="translate(-144,104)" - gradientUnits="userSpaceOnUse" - id="linearGradient3077" - xlink:href="#linearGradient3183-0" - inkscape:collect="always" /> + id="linearGradient3333-4"> + <stop + offset="0" + style="stop-color:#ffffff;stop-opacity:1" + id="stop3335-4" /> + <stop + offset="1" + style="stop-color:#ffffff;stop-opacity:0" + id="stop3337-7" /> + </linearGradient> <linearGradient - gradientTransform="matrix(3.25,0,0,3.25,12.25,12.25)" + spreadMethod="reflect" + gradientTransform="matrix(0.73482181,0,0,0.63395351,6.3644351,2.3644744)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3637" - id="linearGradient3022" - y2="19" - x2="13" - y1="3" - x1="13" /> + xlink:href="#linearGradient3333-4" + id="linearGradient3080" + y2="15.737678" + x2="25.525208" + y1="30.188753" + x1="25.525208" /> <linearGradient - id="linearGradient3183-0"> + id="linearGradient3495"> <stop offset="0" - style="stop-color:#c80000;stop-opacity:1" - id="stop3185-9" /> + style="stop-color:#000000;stop-opacity:1" + id="stop3497" /> + <stop + offset="0.5" + style="stop-color:#000000;stop-opacity:0.49803922" + id="stop3874" /> <stop offset="1" - style="stop-color:#f3604d;stop-opacity:1" - id="stop3187-6" /> + style="stop-color:#000000;stop-opacity:0" + id="stop3499" /> </linearGradient> <linearGradient - gradientTransform="translate(-144,104)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3183-0" - id="linearGradient3913" - y2="8" - x2="120" - y1="8" - x1="104" /> - <linearGradient - gradientTransform="translate(-104,104)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3637" - id="linearGradient3905" - y2="8" - x2="120" - y1="8" - x1="104" /> - <radialGradient - gradientTransform="matrix(1.1573129,0,0,0.99590774,-14.868094,-6.095551)" + gradientTransform="matrix(0.73336033,0,0,0.67656012,6.4700701,1.3465228)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3737-3" - id="radialGradient3619-3" - fy="90.171875" - fx="48" - r="42" - cy="90.171875" - cx="48" /> + xlink:href="#linearGradient3495" + id="linearGradient3077-6" + y2="20.443331" + x2="23.903786" + y1="35.75" + x1="23.903786" /> <linearGradient - id="linearGradient3737-3"> + id="linearGradient3333-4-4"> <stop offset="0" style="stop-color:#ffffff;stop-opacity:1" - id="stop3739-6" /> + id="stop3335-4-6" /> <stop offset="1" style="stop-color:#ffffff;stop-opacity:0" - id="stop3741-1" /> + id="stop3337-7-2" /> </linearGradient> <linearGradient - gradientTransform="translate(-7.3170732,-6.2926829)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3737-3" - id="linearGradient3188-8" - y2="63.893143" - x2="36.357143" - y1="6" - x1="36.357143" /> - <linearGradient - gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)" - gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0-9" - id="linearGradient3199" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> - <linearGradient - gradientTransform="matrix(1,0,0,-1,0,97)" - gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0-9" - id="linearGradient3721-1" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> - <linearGradient - gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)" + spreadMethod="reflect" + gradientTransform="matrix(0.73482181,0,0,0.63395351,6.3644351,-0.2093677)" gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0-9" - id="linearGradient3725-6" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> + xlink:href="#linearGradient3333-4-4" + id="linearGradient3074" + y2="15.737678" + x2="25.525208" + y1="30.188753" + x1="25.525208" /> <linearGradient - gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)" - gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0-9" - id="linearGradient3772-27" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> + id="linearGradient8265-821-176-38-919-66-249-7-7"> + <stop + offset="0" + style="stop-color:#ffffff;stop-opacity:1" + id="stop2687-1-9" /> + <stop + offset="1" + style="stop-color:#ffffff;stop-opacity:0" + id="stop2689-5-4" /> + </linearGradient> <linearGradient - gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)" + gradientTransform="matrix(0.69472025,0,0,0.70483487,7.2942149,5.9738337)" gradientUnits="userSpaceOnUse" - xlink:href="#ButtonShadow-0-9" - id="linearGradient3780-0" - y2="90.238609" - x2="32.251034" - y1="6.1317081" - x1="32.251034" /> + xlink:href="#linearGradient8265-821-176-38-919-66-249-7-7" + id="linearGradient3071" + y2="24.627615" + x2="20.054544" + y1="15.298182" + x1="16.626165" /> <linearGradient - gradientTransform="matrix(1.0058652,0,0,0.994169,100,0)" - gradientUnits="userSpaceOnUse" - id="ButtonShadow-0-9" - y2="7.0165396" - x2="45.447727" - y1="92.539597" - x1="45.447727"> + id="linearGradient3924-803-0"> <stop offset="0" - style="stop-color:#000000;stop-opacity:1" - id="stop3750-8-9" /> + style="stop-color:#ffffff;stop-opacity:1" + id="stop3252-06" /> + <stop + offset="0.06316455" + style="stop-color:#ffffff;stop-opacity:0.23529412" + id="stop3254-1" /> + <stop + offset="0.95056331" + style="stop-color:#ffffff;stop-opacity:0.15686275" + id="stop3256-0" /> <stop offset="1" - style="stop-color:#000000;stop-opacity:0.58823532" - id="stop3752-5-6" /> + style="stop-color:#ffffff;stop-opacity:0.39215687" + id="stop3258-2" /> </linearGradient> - <filter - id="filter3657" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="1.14" - id="feGaussianBlur3659" /> - </filter> - <clipPath - id="clipPath3649"> - <rect - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" - id="rect3651" - y="10" - x="10" - ry="4" - rx="4" - height="76" - width="76" /> - </clipPath> <linearGradient + gradientTransform="matrix(0.8378378,0,0,0.51351349,3.8918946,7.6756805)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3637" - id="linearGradient3643" - y2="90.015434" - x2="44.512066" - y1="6" - x1="44.512066" /> - <clipPath - id="clipPath3625"> - <path - style="fill:#ffffff;fill-opacity:1;stroke:none" - id="path3627" - inkscape:connector-curvature="0" - d="M 0,0 0,96 96,96 96,0 0,0 z m 12,6 72,0 c 3.324,0 6,2.676 6,6 l 0,72 c 0,3.324 -2.676,6 -6,6 L 12,90 C 8.676,90 6,87.324 6,84 L 6,12 C 6,8.676 8.676,6 12,6 z" /> - </clipPath> - <linearGradient - gradientTransform="translate(0,100)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3700-6" - id="linearGradient2843" - y2="5.9877172" - x2="48" - y1="90" - x1="48" /> - <clipPath - id="clipPath3613-8"> - <rect - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" - id="rect3615-2" - y="6" - x="6" - ry="6" - rx="6" - height="84" - width="84" /> - </clipPath> - <radialGradient - gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3737-0" - id="radialGradient3619-2" - fy="90.171875" - fx="48" - r="42" - cy="90.171875" - cx="48" /> + xlink:href="#linearGradient3924-803-0" + id="linearGradient3068" + y2="43" + x2="23.99999" + y1="4.999989" + x1="23.99999" /> <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3737-0" - id="linearGradient3613-7" - y2="138.66119" - x2="48" - y1="20.220806" - x1="48" /> - <filter - id="filter3794-9" - color-interpolation-filters="sRGB" - height="1.3839999" - width="1.3839999" - y="-0.192" - x="-0.192"> - <feGaussianBlur - stdDeviation="5.28" - id="feGaussianBlur3796-8" /> - </filter> + id="linearGradient4026"> + <stop + offset="0" + style="stop-color:#ffeeb6;stop-opacity:1" + id="stop4028" /> + <stop + offset="1" + style="stop-color:#feeeb7;stop-opacity:1" + id="stop4030" /> + </linearGradient> <linearGradient + gradientTransform="translate(0,-1)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient3737-0" - id="linearGradient3188-6" - y2="63.893143" - x2="36.357143" - y1="6" - x1="36.357143" /> - <filter - id="filter3174-7" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="1.71" - id="feGaussianBlur3176-5" /> - </filter> + xlink:href="#linearGradient4026" + id="linearGradient4004-9" + y2="34.480747" + x2="19.567474" + y1="38.228374" + x1="19.567474" /> <linearGradient - id="linearGradient3700-6"> + id="linearGradient3909-3"> <stop offset="0" - style="stop-color:#2276c5;stop-opacity:1" - id="stop3702-2" /> + style="stop-color:#fff0bf;stop-opacity:1" + id="stop3911-8" /> <stop offset="1" - style="stop-color:#68baf4;stop-opacity:1" - id="stop3704-6" /> + style="stop-color:#fdde76;stop-opacity:1" + id="stop3913-4" /> </linearGradient> <linearGradient - id="linearGradient3737-0"> + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3909-3" + id="linearGradient4004-8" + y2="6" + x2="15" + y1="32" + x1="15" /> + <linearGradient + id="linearGradient3924-803"> <stop offset="0" style="stop-color:#ffffff;stop-opacity:1" - id="stop3739-0" /> + id="stop3252" /> + <stop + offset="0.06316455" + style="stop-color:#ffffff;stop-opacity:0.23529412" + id="stop3254" /> + <stop + offset="0.95056331" + style="stop-color:#ffffff;stop-opacity:0.15686275" + id="stop3256" /> <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3741-4" /> + style="stop-color:#ffffff;stop-opacity:0.39215687" + id="stop3258" /> </linearGradient> <linearGradient - gradientTransform="scale(1.0058652,0.994169)" + gradientTransform="translate(1.17e-5,1.00001)" gradientUnits="userSpaceOnUse" - id="ButtonShadow-6" - y2="7.0165396" - x2="45.447727" - y1="92.539597" - x1="45.447727"> + xlink:href="#linearGradient3924-803" + id="linearGradient3473" + y2="43" + x2="23.99999" + y1="4.999989" + x1="23.99999" /> + <linearGradient + id="linearGradient3924-803-9"> <stop offset="0" - style="stop-color:#000000;stop-opacity:1" - id="stop3750-6" /> + style="stop-color:#ffffff;stop-opacity:1" + id="stop3252-4" /> + <stop + offset="0.06316455" + style="stop-color:#ffffff;stop-opacity:0.23529412" + id="stop3254-4" /> + <stop + offset="0.95056331" + style="stop-color:#ffffff;stop-opacity:0.15686275" + id="stop3256-1" /> <stop offset="1" - style="stop-color:#000000;stop-opacity:0.58823532" - id="stop3752-4" /> + style="stop-color:#ffffff;stop-opacity:0.39215687" + id="stop3258-8" /> </linearGradient> <linearGradient - id="linearGradient3637"> + gradientTransform="translate(1.17e-5,1.00001)" + gradientUnits="userSpaceOnUse" + xlink:href="#linearGradient3924-803-9" + id="linearGradient3473-5" + y2="37.992332" + x2="23.99999" + y1="4.999989" + x1="23.99999" /> + <linearGradient + id="linearGradient3856-8-9"> <stop offset="0" - style="stop-color:#f0f0f0;stop-opacity:1" - id="stop3639" /> + style="stop-color:#b67926;stop-opacity:1" + id="stop3858-7-5" /> <stop offset="1" - style="stop-color:#aaaaaa;stop-opacity:1" - id="stop3641" /> + style="stop-color:#eab41a;stop-opacity:1" + id="stop3860-2-2" /> </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3637" - id="linearGradient3570" + gradientTransform="matrix(-1,0,0,1,48.005853,1)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(9.826824,0,0,9.826824,28.191015,807.27776)" - x1="13" - y1="3" - x2="13" - y2="19" /> + xlink:href="#linearGradient3856-8-9" + id="linearGradient4184" + y2="3.8990016" + x2="24" + y1="44" + x1="24" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3637" - id="linearGradient3573" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(9.826824,0,0,9.826824,11.111145,813.24543)" - x1="13" - y1="3" - x2="13" - y2="19" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3183-0" - id="linearGradient3580" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.3378535,0,0,2.3378535,-1144.3993,258.54666)" - x1="104" - y1="8" - x2="120" - y2="8" /> + id="linearGradient3866-6"> + <stop + offset="0" + style="stop-color:#969696;stop-opacity:1" + id="stop3868-7" /> + <stop + offset="0.5" + style="stop-color:#858585;stop-opacity:0.63478261" + id="stop3872-0" /> + <stop + offset="1" + style="stop-color:#939393;stop-opacity:0" + id="stop3870-0" /> + </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3637" - id="linearGradient3585" + spreadMethod="reflect" + gradientTransform="matrix(0.73482181,0,0,0.63395351,6.3644351,1.1854308)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.3378535,0,0,2.3378535,564.61167,258.54666)" - x1="104" - y1="8" - x2="120" - y2="8" /> + xlink:href="#linearGradient3866-6" + id="linearGradient4330-7" + y2="15.737678" + x2="25.525208" + y1="35.429005" + x1="25.525208" /> </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1.4" - inkscape:cx="134.93952" - inkscape:cy="67.598387" - inkscape:document-units="px" - inkscape:current-layer="layer1" - showgrid="false" - showguides="true" - inkscape:guide-bbox="true" - inkscape:window-width="725" - inkscape:window-height="698" - inkscape:window-x="1073" - inkscape:window-y="355" - inkscape:window-maximized="0" /> <metadata - id="metadata7"> + id="metadata2413"> <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 /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> + <path + inkscape:connector-curvature="0" + d="m 50.776114,60.152666 a 10.483296,3.3916543 0 0 1 -20.966587,0 10.483296,3.3916543 0 1 1 20.966587,0 z" + id="path3818-0-5" + style="opacity:0.69672134;fill:url(#radialGradient4073);fill-opacity:1;stroke:none" /> <g - inkscape:label="Ebene 1" - inkscape:groupmode="layer" - id="layer1" - transform="translate(0,-796.36218)"> + id="layer2" + style="display:none" + transform="translate(0,-32)"> <rect - style="opacity:0.9;fill:url(#linearGradient4842);fill-opacity:1;fill-rule:nonzero;stroke:none;display:none;filter:url(#filter3174-5)" - id="rect3745" - y="799.75043" - x="166.84229" - ry="6" - rx="6" + width="86" height="85" - width="86" /> - <rect - style="opacity:0.9;fill:url(#linearGradient4780);fill-opacity:1;fill-rule:nonzero;stroke:none;display:none" - id="rect3873" - y="798.75043" - x="167.84229" - ry="6" rx="6" - height="84" - width="84" /> - <rect - style="opacity:0.9;fill:url(#linearGradient4777);fill-opacity:1;fill-rule:nonzero;stroke:none;display:none" - id="rect3880" - y="798.75043" - x="167.84229" ry="6" - rx="6" + x="5" + y="7" + clip-path="url(#clipPath3625)" + id="rect3745" + style="opacity:0.9;fill:url(#ButtonShadow);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174)" /> + </g> + <g + id="layer1" + style="display:none" + transform="translate(0,-32)"> + <rect + width="84" height="84" - width="84" /> - <g - id="g4844" - transform="matrix(2.7693269,0,0,2.7693269,-452.8745,-1409.2435)"> - <path - inkscape:connector-curvature="0" - d="m 173.84229,887.7817 c -5.51109,0 -10.03125,-4.52016 -10.03125,-10.03125 l 0,-71 c 0,-5.51109 4.52016,-10.03125 10.03125,-10.03125 l 72,0 c 5.51109,0 10.03125,4.52016 10.03125,10.03125 l 0,71 c 0,5.51109 -4.52016,10.03125 -10.03125,10.03125 l -72,0 z" - id="path3786" - style="opacity:0.07999998;fill:url(#linearGradient4890);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" /> - <path - inkscape:connector-curvature="0" - d="m 173.84229,886.7817 c -4.97163,0 -9.03125,-4.05962 -9.03125,-9.03125 l 0,-71 c 0,-4.97163 4.05962,-9.03125 9.03125,-9.03125 l 72,0 c 4.97163,0 9.03125,4.05962 9.03125,9.03125 l 0,71 c 0,4.97163 -4.05962,9.03125 -9.03125,9.03125 l -72,0 z" - id="path3778" - style="opacity:0.1;fill:url(#linearGradient4892);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" /> - <path - inkscape:connector-curvature="0" - d="m 173.84229,885.75045 c -4.40913,0 -8,-3.59087 -8,-8 l 0,-71 c 0,-4.40913 3.59087,-8 8,-8 l 72,0 c 4.40913,0 8,3.59087 8,8 l 0,71 c 0,4.40913 -3.59087,8 -8,8 l -72,0 z" - id="path3770" - style="opacity:0.2;fill:url(#linearGradient4894);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" /> - <rect - width="86" - height="85" - rx="7" - ry="7" - x="166.84229" - y="-884.75043" - transform="scale(1,-1)" - id="rect3723" - style="opacity:0.3;fill:url(#linearGradient4896);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" /> - <rect - width="84" - height="84" - rx="6" - ry="6" - x="167.84229" - y="-883.75043" - transform="scale(1,-1)" - id="rect3716" - style="opacity:0.45;fill:url(#linearGradient4898);fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" /> - <rect - width="84" - height="84" - rx="6" - ry="6" - x="167.84229" - y="-882.75043" - transform="scale(1,-1)" - id="rect2419" - style="fill:url(#linearGradient4900);fill-opacity:1;fill-rule:nonzero;stroke:none" /> - <path - d="m 173.84229,798.75045 c -3.324,0 -6,2.676 -6,6 l 0,2 0,68 0,2 c 0,0.33472 0.0414,0.6507 0.0937,0.96875 0.0487,0.2956 0.097,0.59691 0.1875,0.875 0.01,0.0304 0.0209,0.0636 0.0312,0.0937 0.0989,0.28777 0.23488,0.54745 0.375,0.8125 0.14459,0.27351 0.31562,0.53561 0.5,0.78125 0.18438,0.24563 0.37378,0.47347 0.59375,0.6875 0.43995,0.42806 0.94291,0.81453 1.5,1.09375 0.27854,0.13961 0.57347,0.24695 0.875,0.34375 -0.2562,-0.10022 -0.48671,-0.23627 -0.71875,-0.375 -0.007,-0.004 -0.0239,0.005 -0.0312,0 -0.0319,-0.0193 -0.0623,-0.0425 -0.0937,-0.0625 -0.1204,-0.0767 -0.23102,-0.16351 -0.34375,-0.25 -0.10617,-0.0808 -0.21328,-0.16111 -0.3125,-0.25 -0.17793,-0.16143 -0.34746,-0.34539 -0.5,-0.53125 -0.10758,-0.13026 -0.21839,-0.26528 -0.3125,-0.40625 -0.0251,-0.0384 -0.0384,-0.0859 -0.0625,-0.125 -0.0648,-0.10303 -0.13023,-0.20452 -0.1875,-0.3125 -0.10101,-0.19471 -0.20567,-0.4157 -0.28125,-0.625 -0.008,-0.0218 -0.0236,-0.0406 -0.0312,-0.0625 -0.0318,-0.0919 -0.0358,-0.18683 -0.0625,-0.28125 -0.0303,-0.10662 -0.0704,-0.20303 -0.0937,-0.3125 -0.0729,-0.34151 -0.125,-0.69821 -0.125,-1.0625 l 0,-2 0,-68 0,-2 c 0,-2.78185 2.21815,-5 5,-5 l 2,0 68,0 2,0 c 2.78185,0 5,2.21815 5,5 l 0,2 0,68 0,2 c 0,0.36429 -0.0521,0.72099 -0.125,1.0625 -0.0442,0.20689 -0.0884,0.39766 -0.15625,0.59375 -0.008,0.0219 -0.0233,0.0407 -0.0312,0.0625 -0.0627,0.17374 -0.13838,0.36745 -0.21875,0.53125 -0.0416,0.0828 -0.079,0.16995 -0.125,0.25 -0.0546,0.0972 -0.12677,0.18835 -0.1875,0.28125 -0.0941,0.14097 -0.20492,0.27599 -0.3125,0.40625 -0.14317,0.17445 -0.30314,0.347 -0.46875,0.5 -0.0112,0.0102 -0.02,0.0212 -0.0312,0.0312 -0.13839,0.12556 -0.28509,0.23444 -0.4375,0.34375 -0.10257,0.0732 -0.20432,0.15336 -0.3125,0.21875 -0.007,0.005 -0.0238,-0.004 -0.0312,0 -0.23204,0.13873 -0.46255,0.27478 -0.71875,0.375 0.30153,-0.0968 0.59645,-0.20414 0.875,-0.34375 0.55709,-0.27922 1.06005,-0.66569 1.5,-1.09375 0.21997,-0.21403 0.40937,-0.44187 0.59375,-0.6875 0.18438,-0.24564 0.35541,-0.50774 0.5,-0.78125 0.14012,-0.26505 0.27613,-0.52473 0.375,-0.8125 0.0104,-0.0308 0.0213,-0.0627 0.0312,-0.0937 0.0905,-0.27809 0.1388,-0.5794 0.1875,-0.875 0.0524,-0.31805 0.0937,-0.63403 0.0937,-0.96875 l 0,-2 0,-68 0,-2 c 0,-3.324 -2.676,-6 -6,-6 l -72,0 z" - inkscape:connector-curvature="0" - id="rect3728" - style="opacity:0.4;fill:url(#linearGradient4902);fill-opacity:1;fill-rule:nonzero;stroke:none" /> - <path - d="m 173.84229,882.75045 c -3.324,0 -6,-2.676 -6,-6 l 0,-2 0,-68 0,-2 c 0,-0.33472 0.0414,-0.6507 0.0937,-0.96875 0.0487,-0.2956 0.097,-0.59691 0.1875,-0.875 0.01,-0.0304 0.0209,-0.0636 0.0312,-0.0937 0.0989,-0.28777 0.23488,-0.54745 0.375,-0.8125 0.14459,-0.27351 0.31562,-0.53562 0.5,-0.78125 0.18438,-0.24564 0.37378,-0.47347 0.59375,-0.6875 0.43995,-0.42806 0.94291,-0.81453 1.5,-1.09375 0.27854,-0.13961 0.57347,-0.24695 0.875,-0.34375 -0.2562,0.10022 -0.48671,0.23627 -0.71875,0.375 -0.007,0.004 -0.0239,-0.005 -0.0312,0 -0.0319,0.0193 -0.0623,0.0425 -0.0937,0.0625 -0.1204,0.0767 -0.23102,0.16351 -0.34375,0.25 -0.10617,0.0808 -0.21328,0.16111 -0.3125,0.25 -0.17793,0.16143 -0.34746,0.34539 -0.5,0.53125 -0.10758,0.13026 -0.21839,0.26528 -0.3125,0.40625 -0.0251,0.0384 -0.0384,0.0859 -0.0625,0.125 -0.0648,0.10303 -0.13023,0.20452 -0.1875,0.3125 -0.10101,0.19471 -0.20567,0.4157 -0.28125,0.625 -0.008,0.0218 -0.0236,0.0406 -0.0312,0.0625 -0.0318,0.0919 -0.0358,0.18683 -0.0625,0.28125 -0.0303,0.10662 -0.0704,0.20303 -0.0937,0.3125 -0.0729,0.34151 -0.125,0.69821 -0.125,1.0625 l 0,2 0,68 0,2 c 0,2.78185 2.21815,5 5,5 l 2,0 68,0 2,0 c 2.78185,0 5,-2.21815 5,-5 l 0,-2 0,-68 0,-2 c 0,-0.36429 -0.0521,-0.72099 -0.125,-1.0625 -0.0442,-0.20689 -0.0884,-0.39766 -0.15625,-0.59375 -0.008,-0.0219 -0.0233,-0.0407 -0.0312,-0.0625 -0.0627,-0.17374 -0.13838,-0.36745 -0.21875,-0.53125 -0.0416,-0.0828 -0.079,-0.16995 -0.125,-0.25 -0.0546,-0.0972 -0.12677,-0.18835 -0.1875,-0.28125 -0.0941,-0.14097 -0.20492,-0.27599 -0.3125,-0.40625 -0.14317,-0.17445 -0.30314,-0.347 -0.46875,-0.5 -0.0112,-0.0102 -0.02,-0.0212 -0.0312,-0.0312 -0.13839,-0.12556 -0.28509,-0.23444 -0.4375,-0.34375 -0.10257,-0.0732 -0.20432,-0.15336 -0.3125,-0.21875 -0.007,-0.005 -0.0238,0.004 -0.0312,0 -0.23204,-0.13873 -0.46255,-0.27478 -0.71875,-0.375 0.30153,0.0968 0.59645,0.20414 0.875,0.34375 0.55709,0.27922 1.06005,0.66569 1.5,1.09375 0.21997,0.21403 0.40937,0.44186 0.59375,0.6875 0.18438,0.24563 0.35541,0.50774 0.5,0.78125 0.14012,0.26505 0.27613,0.52473 0.375,0.8125 0.0104,0.0308 0.0213,0.0627 0.0312,0.0937 0.0905,0.27809 0.1388,0.5794 0.1875,0.875 0.0524,0.31805 0.0937,0.63403 0.0937,0.96875 l 0,2 0,68 0,2 c 0,3.324 -2.676,6 -6,6 l -72,0 z" - inkscape:connector-curvature="0" - id="path3615" - style="opacity:0.2;fill:url(#radialGradient4904);fill-opacity:1;fill-rule:nonzero;stroke:none" /> - <g - transform="translate(161.84229,792.75045)" - clip-path="url(#clipPath2973)" - id="g3855" - style="opacity:0.9;fill:#aaccff"> - <path - d="M 48,48 72,-8 88,-8 48,48 z" - inkscape:connector-curvature="0" - id="path3819" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="M 48,48 103.25122,73.67688 102.769,89.669611 48,48 z" - inkscape:connector-curvature="0" - id="path3821" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="M 48,47.999999 -11.82794,59.515947 -20.796753,46.266027 48,47.999999 z" - inkscape:connector-curvature="0" - id="path3823" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="M 48,48 -1.3111997,12.217252 2.2248524,-3.3871168 48,48 z" - inkscape:connector-curvature="0" - id="path3825" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="M 48,48 65.519239,-14.073153 95.955194,-1.3588835 48,48 z" - inkscape:connector-curvature="0" - id="path3827" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="M 48,48 109.6356,28.998609 115.4895,61.459846 48,48 z" - inkscape:connector-curvature="0" - id="path3829" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="M 48,48 16.754067,104.42421 -9.9692451,85.088633 48,48 z" - inkscape:connector-curvature="0" - id="path3831" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="M 48,48 -14.811967,33.348835 -3.5083336,2.3612922 48,48 z" - inkscape:connector-curvature="0" - id="path3833" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="M 48,48 93.809637,93.403493 90.117903,102.42501 48,48 z" - inkscape:connector-curvature="0" - id="path3835" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="m 48,48 -2.970052,64.42964 -9.168463,3.30998 L 48,48 z" - inkscape:connector-curvature="0" - id="path3837" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="M 48,48 3.1405789,94.342551 -5.923902,90.757601 48,48 z" - inkscape:connector-curvature="0" - id="path3839" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="M 48,47.999999 -14.116138,65.366204 -20.132068,57.696441 48,47.999999 z" - inkscape:connector-curvature="0" - id="path3841" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="M 48.000001,47.999998 18.853372,-9.5367177 25.202646,-16.932892 48.000001,47.999998 z" - inkscape:connector-curvature="0" - id="path3843" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="m 48.000003,48.000001 59.481677,-24.938521 6.921,6.864135 -66.402677,18.074386 z" - inkscape:connector-curvature="0" - id="path3845" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="M 47.999999,47.999999 88.186743,93.793286 81.290444,108.23077 47.999999,47.999999 z" - inkscape:connector-curvature="0" - id="path3849" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - <path - d="M 48.000001,48 12.042033,-1.1835747 20.194136,-14.95104 48.000001,48 z" - inkscape:connector-curvature="0" - id="path3851" - style="opacity:0.15;fill:#aaccff;stroke:none" /> - </g> - <rect - transform="translate(161.84229,792.75045)" - width="66" - height="66" - rx="12" - ry="12" - x="15" - y="15" - clip-path="url(#clipPath3613-7)" - id="rect3171" - style="opacity:0.1;fill:url(#linearGradient4906);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3794-7)" /> - </g> - <path - style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:none;overflow:visible;filter:url(#filter3814);enable-background:accumulate" - id="path3808" - inkscape:connector-curvature="0" - d="m 206.04507,814.25055 c -1.08226,0 -1.95858,0.89778 -1.95858,1.99854 l 0,3.87716 c -1.93515,0.5156 -3.78419,1.2944 -5.47599,2.27834 l -2.75799,-2.75798 c -0.38918,-0.38918 -0.85537,-0.5953 -1.35901,-0.59957 -0.50363,-0.004 -1.01634,0.17696 -1.39897,0.55959 l -5.39606,5.39606 c -0.76526,0.76527 -0.73838,1.97963 0.0399,2.75798 l 2.75799,2.75799 c -0.98394,1.6918 -1.76273,3.54084 -2.27834,5.476 l -3.87716,0 c -1.10076,0 -1.99855,0.87631 -1.99855,1.95856 l 0,7.59446 c 0,1.08225 0.89779,1.95856 1.99855,1.95856 l 3.87716,0 c 0.51561,1.93516 1.2944,3.7842 2.27834,5.476 l -2.75799,2.75799 c -0.77835,0.77835 -0.80524,1.99271 -0.0399,2.75798 l 5.39606,5.39606 c 0.76526,0.76527 1.97963,0.73837 2.75798,-0.04 l 2.75799,-2.75799 c 1.6918,0.98394 3.54084,1.76274 5.47599,2.27834 l 0,3.87716 c 0,1.10076 0.87632,1.99854 1.95858,1.99854 l 7.59445,0 c 1.08225,0 1.95856,-0.89778 1.95856,-1.99854 l 0,-3.87716 c 1.93515,-0.5156 3.78419,-1.2944 5.476,-2.27834 l 2.75798,2.75799 c 0.77835,0.77835 1.99272,0.80524 2.75799,0.04 l 5.39605,-5.39606 c 0.76527,-0.76527 0.73838,-1.97963 -0.0399,-2.75798 l -2.75797,-2.75799 c 0.98393,-1.6918 1.76273,-3.54084 2.27832,-5.476 l 3.87718,0 c 1.10074,0 1.99854,-0.87631 1.99854,-1.95856 l 0,-7.59446 c 0,-1.08225 -0.8978,-1.95856 -1.99854,-1.95856 l -3.87718,0 c -0.51559,-1.93516 -1.29439,-3.7842 -2.27832,-5.476 l 2.75798,-2.75799 c 0.77835,-0.77835 0.80524,-1.99271 0.0399,-2.75798 l -5.39605,-5.39606 c -0.76528,-0.76527 -1.97964,-0.73838 -2.75799,0.04 l -2.75799,2.75799 c -1.69181,-0.98394 -3.54085,-1.76274 -5.47599,-2.27834 l 0,-3.87716 c 0,-1.10076 -0.87632,-1.99854 -1.95857,-1.99854 l -7.59445,0 z m 3.79722,19.18598 c 4.58929,0 8.31392,3.72463 8.31392,8.31392 0,4.58929 -3.72463,8.31392 -8.31392,8.31392 -4.58929,0 -8.31393,-3.72463 -8.31393,-8.31392 0,-4.58929 3.72464,-8.31392 8.31393,-8.31392 z" /> - <path - style="fill:url(#linearGradient4764);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4766);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:none;overflow:visible;enable-background:accumulate" - id="rect3267" - inkscape:connector-curvature="0" - d="m 206.04507,813.25055 c -1.08226,0 -1.95858,0.89778 -1.95858,1.99854 l 0,3.87716 c -1.93515,0.5156 -3.78419,1.2944 -5.47599,2.27834 l -2.75799,-2.75798 c -0.38918,-0.38918 -0.85537,-0.5953 -1.35901,-0.59957 -0.50363,-0.004 -1.01634,0.17696 -1.39897,0.55959 l -5.39606,5.39606 c -0.76526,0.76527 -0.73838,1.97963 0.0399,2.75798 l 2.75799,2.75799 c -0.98394,1.6918 -1.76273,3.54084 -2.27834,5.476 l -3.87716,0 c -1.10076,0 -1.99855,0.87631 -1.99855,1.95856 l 0,7.59446 c 0,1.08225 0.89779,1.95856 1.99855,1.95856 l 3.87716,0 c 0.51561,1.93516 1.2944,3.7842 2.27834,5.476 l -2.75799,2.75799 c -0.77835,0.77835 -0.80524,1.99271 -0.0399,2.75798 l 5.39606,5.39606 c 0.76526,0.76527 1.97963,0.73837 2.75798,-0.04 l 2.75799,-2.75799 c 1.6918,0.98394 3.54084,1.76274 5.47599,2.27834 l 0,3.87716 c 0,1.10076 0.87632,1.99854 1.95858,1.99854 l 7.59445,0 c 1.08225,0 1.95856,-0.89778 1.95856,-1.99854 l 0,-3.87716 c 1.93515,-0.5156 3.78419,-1.2944 5.476,-2.27834 l 2.75798,2.75799 c 0.77835,0.77835 1.99272,0.80524 2.75799,0.04 l 5.39605,-5.39606 c 0.76527,-0.76527 0.73838,-1.97963 -0.0399,-2.75798 l -2.75797,-2.75799 c 0.98393,-1.6918 1.76273,-3.54084 2.27832,-5.476 l 3.87718,0 c 1.10074,0 1.99854,-0.87631 1.99854,-1.95856 l 0,-7.59446 c 0,-1.08225 -0.8978,-1.95856 -1.99854,-1.95856 l -3.87718,0 c -0.51559,-1.93516 -1.29439,-3.7842 -2.27832,-5.476 l 2.75798,-2.75799 c 0.77835,-0.77835 0.80524,-1.99271 0.0399,-2.75798 l -5.39605,-5.39606 c -0.76528,-0.76527 -1.97964,-0.73838 -2.75799,0.04 l -2.75799,2.75799 c -1.69181,-0.98394 -3.54085,-1.76274 -5.47599,-2.27834 l 0,-3.87716 c 0,-1.10076 -0.87632,-1.99854 -1.95857,-1.99854 l -7.59445,0 z m 3.79722,19.18598 c 4.58929,0 8.31392,3.72463 8.31392,8.31392 0,4.58929 -3.72463,8.31392 -8.31392,8.31392 -4.58929,0 -8.31393,-3.72463 -8.31393,-8.31392 0,-4.58929 3.72464,-8.31392 8.31393,-8.31392 z" /> - <path - style="fill:none;stroke:url(#linearGradient4761);stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;display:none" - id="path28" - inkscape:connector-curvature="0" - d="m 209.84229,823.48307 c -9.52124,0 -17.26738,7.74614 -17.26738,17.26738 0,9.52123 7.74614,17.26738 17.26738,17.26738 9.52123,0 17.26738,-7.74615 17.26738,-17.26738 0,-9.52124 -7.74615,-17.26738 -17.26738,-17.26738 z" /> - <path - style="opacity:0.05;fill:#000000;fill-opacity:1;stroke:none;display:none" - id="path3315" - inkscape:connector-curvature="0" - d="m 209.84229,824.1226 c -9.16875,0 -16.62786,7.4591 -16.62786,16.62785 0,9.16875 7.45911,16.62785 16.62786,16.62785 9.16875,0 16.62785,-7.4591 16.62785,-16.62785 0,-9.16875 -7.4591,-16.62785 -16.62785,-16.62785 z m 0,7.67439 c 4.9423,0 8.95346,4.01115 8.95346,8.95346 0,4.94231 -4.01116,8.95346 -8.95346,8.95346 -4.94231,0 -8.95346,-4.01115 -8.95346,-8.95346 0,-4.94231 4.01115,-8.95346 8.95346,-8.95346 z" /> - <path - inkscape:transform-center-y="1.0292608" - inkscape:transform-center-x="0.55288406" - sodipodi:nodetypes="ssssssssss" - inkscape:connector-curvature="0" - style="opacity:0.1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" - d="m 77.723031,878.66456 c -6.871183,-0.18276 -29.925063,12.44733 -28.695793,21.02021 7.414192,51.70624 19.812703,25.26599 26.683883,25.44876 6.871176,0.18275 20.296404,-13.74161 20.479167,-20.61279 0.182755,-6.87118 -11.596082,-25.67342 -18.467257,-25.85618 z m -1.631426,17.04792 c 4.836178,0.12865 8.666437,4.13188 8.537802,8.96804 -0.128625,4.83618 -4.167231,8.6655 -9.003408,8.53686 -4.836173,-0.12862 -8.665492,-4.16723 -8.536858,-9.0034 0.128645,-4.83617 4.166288,-8.63013 9.002464,-8.5015 z" - id="path3885" /> - <path - inkscape:transform-center-y="1.2564107" - inkscape:transform-center-x="-1.3978974" - id="path3887" - d="m 76.236238,881.15963 c -9.747853,-0.25927 -26.371314,11.01217 -26.630593,20.76003 -0.259276,9.74785 15.575715,28.11977 25.323566,28.37905 9.747851,0.25928 29.499939,-16.48813 29.759219,-26.23598 0.25928,-9.74786 -18.704341,-22.64382 -28.452192,-22.9031 z m -0.06099,10.40719 c 6.860884,0.18251 12.294713,5.86171 12.112221,12.72259 -0.182476,6.86089 -5.911868,12.29338 -12.772752,12.11088 -6.860874,-0.1825 -12.293369,-5.91186 -12.110882,-12.77275 0.182496,-6.86088 5.910541,-12.2432 12.771413,-12.06072 z" - style="opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ssssssssss" /> - <path - inkscape:transform-center-y="0.4326845" - inkscape:transform-center-x="-0.56899649" - style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" - d="m 75.791256,881.90961 c -12.084853,-0.32143 -22.153983,9.22592 -22.475426,21.31078 -0.321436,12.08486 9.225928,22.15398 21.310779,22.47542 12.084855,0.32145 22.153988,-9.22592 22.475424,-21.31077 0.32144,-12.08485 -9.225924,-22.15399 -21.310777,-22.47543 z m 0.266633,6.3556 c 8.505744,0.22625 15.242309,7.26703 15.016068,15.77277 -0.226238,8.50574 -7.329218,15.24065 -15.834957,15.01441 -8.505745,-0.22624 -15.240653,-7.32922 -15.014413,-15.83496 0.22624,-8.50574 7.327562,-15.17846 15.833302,-14.95222 z" - id="path3889" - inkscape:connector-curvature="0" /> + rx="6" + ry="6" + x="6" + y="6" + id="rect2419" + style="opacity:0.8;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" /> <path - id="path3873" - d="m 89.886535,933.91821 c -6.873465,-0.0451 -29.669767,13.04416 -28.269045,21.59071 8.448271,51.54748 20.314752,24.86411 27.188216,24.90922 6.873457,0.0451 20.017114,-14.14534 20.062234,-21.0188 0.0451,-6.87346 -12.107945,-25.43602 -18.981405,-25.48113 z m -1.289665,17.07717 c 4.837788,0.0317 8.747453,3.95747 8.715743,8.79521 -0.03176,4.83779 -3.992843,8.74722 -8.830608,8.71549 -4.837779,-0.0317 -8.747217,-3.99284 -8.715488,-8.8306 0.03176,-4.83779 3.992612,-8.71184 8.830389,-8.6801 z" - style="opacity:0.1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="m 14,10 c -2.216,0 -4,1.784 -4,4 l 0,68 c 0,2.216 1.784,4 4,4 l 68,0 c 2.216,0 4,-1.784 4,-4 l 0,-68 c 0,-2.216 -1.784,-4 -4,-4 l -68,0 z m 0,3.0625 68,0 c 0.578769,0 0.9375,0.358731 0.9375,0.9375 l 0,68 c 0,0.578769 -0.358731,0.9375 -0.9375,0.9375 l -68,0 c -0.578769,0 -0.9375,-0.358731 -0.9375,-0.9375 l 0,-68 c 0,-0.578769 0.358731,-0.9375 0.9375,-0.9375 z" inkscape:connector-curvature="0" - sodipodi:nodetypes="ssssssssss" - inkscape:transform-center-x="1.5911461" - inkscape:transform-center-y="0.79011717" /> + id="rect3726" + style="opacity:0.07999998;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" /> <path - sodipodi:nodetypes="ssssssssss" + d="M 12,6 C 8.676,6 6,8.676 6,12 l 0,72 c 0,3.324 2.676,6 6,6 l 72,0 c 3.324,0 6,-2.676 6,-6 L 90,12 C 90,8.676 87.324,6 84,6 L 12,6 z m 2,4 68,0 c 2.216,0 4,1.784 4,4 l 0,68 c 0,2.216 -1.784,4 -4,4 l -68,0 c -2.216,0 -4,-1.784 -4,-4 l 0,-68 c 0,-2.216 1.784,-4 4,-4 z" inkscape:connector-curvature="0" - style="opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" - d="m 88.450012,936.44256 c -9.751089,-0.064 -26.145474,11.53811 -26.20947,21.28921 -0.06399,9.75109 16.135765,27.80218 25.886857,27.86618 9.751092,0.064 29.163801,-17.07565 29.227791,-26.82673 0.064,-9.75109 -19.154087,-22.26466 -28.905178,-22.32866 z m 0.147457,10.40633 c 6.86316,0.0451 12.409641,5.61429 12.364601,12.47744 -0.045,6.86317 -5.664476,12.40931 -12.527653,12.36425 -6.863157,-0.0451 -12.409306,-5.66448 -12.364247,-12.52765 0.04504,-6.86316 5.664147,-12.35912 12.527303,-12.31408 z" - id="path3875" - inkscape:transform-center-x="-0.37047638" - inkscape:transform-center-y="0.96971637" /> + id="rect3629" + style="fill:url(#linearGradient3643);fill-opacity:1;fill-rule:nonzero;stroke:none" /> <path + d="M 12,6 C 8.676,6 6,8.676 6,12 l 0,2 0,68 0,2 c 0,0.334721 0.04135,0.6507 0.09375,0.96875 0.0487,0.295596 0.09704,0.596915 0.1875,0.875 0.00988,0.03038 0.020892,0.0636 0.03125,0.09375 0.098865,0.287771 0.2348802,0.547452 0.375,0.8125 0.1445918,0.273507 0.3156161,0.535615 0.5,0.78125 0.1843839,0.245635 0.3737765,0.473472 0.59375,0.6875 0.439947,0.428056 0.94291,0.814526 1.5,1.09375 0.278545,0.139612 0.5734731,0.246947 0.875,0.34375 -0.2562018,-0.100222 -0.4867109,-0.236272 -0.71875,-0.375 -0.00741,-0.0044 -0.023866,0.0045 -0.03125,0 -0.031933,-0.0193 -0.062293,-0.04251 -0.09375,-0.0625 -0.120395,-0.0767 -0.2310226,-0.163513 -0.34375,-0.25 -0.1061728,-0.0808 -0.2132809,-0.161112 -0.3125,-0.25 C 8.4783201,88.557317 8.3087904,88.373362 8.15625,88.1875 8.0486711,88.057245 7.9378561,87.922215 7.84375,87.78125 7.818661,87.74287 7.805304,87.69538 7.78125,87.65625 7.716487,87.553218 7.6510225,87.451733 7.59375,87.34375 7.4927417,87.149044 7.3880752,86.928049 7.3125,86.71875 7.30454,86.69694 7.288911,86.6782 7.28125,86.65625 7.2494249,86.5643 7.2454455,86.469419 7.21875,86.375 7.1884177,86.268382 7.1483606,86.171969 7.125,86.0625 7.0521214,85.720988 7,85.364295 7,85 L 7,83 7,15 7,13 C 7,10.218152 9.2181517,8 12,8 l 2,0 68,0 2,0 c 2.781848,0 5,2.218152 5,5 l 0,2 0,68 0,2 c 0,0.364295 -0.05212,0.720988 -0.125,1.0625 -0.04415,0.206893 -0.08838,0.397658 -0.15625,0.59375 -0.0077,0.02195 -0.0233,0.04069 -0.03125,0.0625 -0.06274,0.173739 -0.138383,0.367449 -0.21875,0.53125 -0.04158,0.0828 -0.07904,0.169954 -0.125,0.25 -0.0546,0.09721 -0.126774,0.18835 -0.1875,0.28125 -0.09411,0.140965 -0.204921,0.275995 -0.3125,0.40625 -0.143174,0.17445 -0.303141,0.346998 -0.46875,0.5 -0.01117,0.0102 -0.01998,0.02115 -0.03125,0.03125 -0.138386,0.125556 -0.285091,0.234436 -0.4375,0.34375 -0.102571,0.07315 -0.204318,0.153364 -0.3125,0.21875 -0.0074,0.0045 -0.02384,-0.0044 -0.03125,0 -0.232039,0.138728 -0.462548,0.274778 -0.71875,0.375 0.301527,-0.0968 0.596455,-0.204138 0.875,-0.34375 0.55709,-0.279224 1.060053,-0.665694 1.5,-1.09375 0.219973,-0.214028 0.409366,-0.441865 0.59375,-0.6875 0.184384,-0.245635 0.355408,-0.507743 0.5,-0.78125 0.14012,-0.265048 0.276135,-0.524729 0.375,-0.8125 0.01041,-0.03078 0.02133,-0.06274 0.03125,-0.09375 0.09046,-0.278085 0.1388,-0.579404 0.1875,-0.875 C 89.95865,84.6507 90,84.334721 90,84 l 0,-2 0,-68 0,-2 C 90,8.676 87.324,6 84,6 L 12,6 z" inkscape:connector-curvature="0" - id="path3877" - d="m 88.020144,937.20129 c -12.088871,-0.0794 -21.964769,9.66777 -22.044146,21.75661 -0.07933,12.08886 9.667775,21.96476 21.756604,22.04414 12.088866,0.0794 21.964768,-9.66777 22.044148,-21.75659 0.0794,-12.08887 -9.66778,-21.96477 -21.756606,-22.04415 z m 0.393866,6.34899 c 8.508569,0.0559 15.38479,6.9603 15.32896,15.46886 -0.0558,8.50857 -7.022512,15.38438 -15.5311,15.32851 -8.508569,-0.0559 -15.384386,-7.02251 -15.328516,-15.53111 0.05584,-8.50855 7.022096,-15.32216 15.530664,-15.26632 z" - style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" - inkscape:transform-center-x="0.45141933" - inkscape:transform-center-y="0.14907012" /> + id="rect3728" + style="fill:url(#linearGradient3188);fill-opacity:1;fill-rule:nonzero;stroke:none" /> <path - id="path3849-3" - d="m 150.94899,935.04747 c -6.81416,0.90212 -27.59013,17.00676 -25.0255,25.27889 15.46827,49.89224 23.54608,21.82879 30.36023,20.92667 6.81415,-0.90212 17.87781,-16.76782 16.97569,-23.58197 -0.90212,-6.81415 -15.49627,-23.52571 -22.31042,-22.62359 z m 1.07497,17.09204 c 4.79605,-0.63495 9.20919,2.71479 9.84415,7.51084 0.63494,4.79604 -2.74987,9.21384 -7.54592,9.84878 -4.79604,0.63495 -9.21384,-2.74987 -9.84877,-7.54591 -0.63495,-4.79604 2.75451,-9.17877 7.55054,-9.81371 z" - style="opacity:0.1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + d="M 12,90 C 8.676,90 6,87.324 6,84 L 6,82 6,14 6,12 c 0,-0.334721 0.04135,-0.6507 0.09375,-0.96875 0.0487,-0.295596 0.09704,-0.596915 0.1875,-0.875 C 6.29113,10.12587 6.302142,10.09265 6.3125,10.0625 6.411365,9.774729 6.5473802,9.515048 6.6875,9.25 6.8320918,8.976493 7.0031161,8.714385 7.1875,8.46875 7.3718839,8.223115 7.5612765,7.995278 7.78125,7.78125 8.221197,7.353194 8.72416,6.966724 9.28125,6.6875 9.559795,6.547888 9.8547231,6.440553 10.15625,6.34375 9.9000482,6.443972 9.6695391,6.580022 9.4375,6.71875 c -0.00741,0.0044 -0.023866,-0.0045 -0.03125,0 -0.031933,0.0193 -0.062293,0.04251 -0.09375,0.0625 -0.120395,0.0767 -0.2310226,0.163513 -0.34375,0.25 -0.1061728,0.0808 -0.2132809,0.161112 -0.3125,0.25 C 8.4783201,7.442683 8.3087904,7.626638 8.15625,7.8125 8.0486711,7.942755 7.9378561,8.077785 7.84375,8.21875 7.818661,8.25713 7.805304,8.30462 7.78125,8.34375 7.716487,8.446782 7.6510225,8.548267 7.59375,8.65625 7.4927417,8.850956 7.3880752,9.071951 7.3125,9.28125 7.30454,9.30306 7.288911,9.3218 7.28125,9.34375 7.2494249,9.4357 7.2454455,9.530581 7.21875,9.625 7.1884177,9.731618 7.1483606,9.828031 7.125,9.9375 7.0521214,10.279012 7,10.635705 7,11 l 0,2 0,68 0,2 c 0,2.781848 2.2181517,5 5,5 l 2,0 68,0 2,0 c 2.781848,0 5,-2.218152 5,-5 l 0,-2 0,-68 0,-2 C 89,10.635705 88.94788,10.279012 88.875,9.9375 88.83085,9.730607 88.78662,9.539842 88.71875,9.34375 88.71105,9.3218 88.69545,9.30306 88.6875,9.28125 88.62476,9.107511 88.549117,8.913801 88.46875,8.75 88.42717,8.6672 88.38971,8.580046 88.34375,8.5 88.28915,8.40279 88.216976,8.31165 88.15625,8.21875 88.06214,8.077785 87.951329,7.942755 87.84375,7.8125 87.700576,7.63805 87.540609,7.465502 87.375,7.3125 87.36383,7.3023 87.35502,7.29135 87.34375,7.28125 87.205364,7.155694 87.058659,7.046814 86.90625,6.9375 86.803679,6.86435 86.701932,6.784136 86.59375,6.71875 c -0.0074,-0.0045 -0.02384,0.0044 -0.03125,0 -0.232039,-0.138728 -0.462548,-0.274778 -0.71875,-0.375 0.301527,0.0968 0.596455,0.204138 0.875,0.34375 0.55709,0.279224 1.060053,0.665694 1.5,1.09375 0.219973,0.214028 0.409366,0.441865 0.59375,0.6875 0.184384,0.245635 0.355408,0.507743 0.5,0.78125 0.14012,0.265048 0.276135,0.524729 0.375,0.8125 0.01041,0.03078 0.02133,0.06274 0.03125,0.09375 0.09046,0.278085 0.1388,0.579404 0.1875,0.875 C 89.95865,11.3493 90,11.665279 90,12 l 0,2 0,68 0,2 c 0,3.324 -2.676,6 -6,6 l -72,0 z" inkscape:connector-curvature="0" - sodipodi:nodetypes="ssssssssss" - inkscape:transform-center-x="1.2488847" - inkscape:transform-center-y="1.6449717" /> + id="path3615" + style="opacity:0.6;fill:url(#radialGradient3619);fill-opacity:1;fill-rule:nonzero;stroke:none" /> + <rect + width="84" + height="84" + rx="6" + ry="6" + x="6" + y="106" + id="rect2841" + style="fill:url(#linearGradient2843);fill-opacity:1;fill-rule:nonzero;stroke:none" /> + <rect + width="76" + height="76" + rx="4" + ry="4" + x="10" + y="110" + id="rect3634" + style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none" /> <path - sodipodi:nodetypes="ssssssssss" + d="m 14,9 c -2.752703,0 -5,2.247297 -5,5 l 0,68 c 0,2.752703 2.247297,5 5,5 l 68,0 c 2.752703,0 5,-2.247297 5,-5 L 87,14 C 87,11.247297 84.752703,9 82,9 L 14,9 z m 0,2 68,0 c 1.679297,0 3,1.320703 3,3 l 0,68 c 0,1.679297 -1.320703,3 -3,3 l -68,0 c -1.679297,0 -3,-1.320703 -3,-3 l 0,-68 c 0,-1.679297 1.320703,-3 3,-3 z" inkscape:connector-curvature="0" - style="opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" - d="m 149.87389,937.74564 c -9.66696,1.2798 -24.30689,15.02961 -23.02709,24.69656 1.2798,9.66695 19.81163,25.31453 29.47859,24.03469 9.66694,-1.2798 26.53366,-20.93011 25.25385,-30.59707 -1.2798,-9.66694 -22.0384,-19.41398 -31.70535,-18.13418 z m 1.5795,10.28681 c 6.80394,-0.90077 13.0647,3.85137 13.96547,10.65531 0.90077,6.80395 -3.90112,13.07129 -10.70507,13.97205 -6.80393,0.90077 -13.07128,-3.90112 -13.97204,-10.70506 -0.90078,-6.80394 3.90771,-13.02153 10.71164,-13.9223 z" - id="path3851-2" - inkscape:transform-center-x="-0.76139378" - inkscape:transform-center-y="1.4830543" /> + transform="translate(-110,0)" + clip-path="url(#clipPath3649)" + id="rect3647" + style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3657);enable-background:accumulate;font-family:Abandoned Bitplane;-inkscape-font-specification:Abandoned Bitplane" /> <path + d="m 14.089286,10 c -2.216,0 -4,1.784 -4,4 l 0,68 c 0,2.216 1.784,4 4,4 l 68,0 c 2.216,0 4,-1.784 4,-4 l 0,-68 c 0,-2.216 -1.784,-4 -4,-4 l -68,0 z m 0,2 68,0 c 1.140301,0 2,0.859699 2,2 l 0,68 c 0,1.140301 -0.859699,2 -2,2 l -68,0 c -1.140301,0 -2,-0.859699 -2,-2 l 0,-68 c 0,-1.140301 0.859699,-2 2,-2 z" inkscape:connector-curvature="0" - id="path3853" - d="m 149.55262,938.55636 c -11.98455,1.58662 -20.42367,12.6012 -18.83704,24.58576 1.58663,11.98455 12.60121,20.42367 24.58576,18.83704 11.98457,-1.58662 20.42368,-12.6012 18.83705,-24.58576 -1.58663,-11.98456 -12.60121,-20.42367 -24.58577,-18.83704 z m 1.26468,6.23421 c 8.43515,-1.11673 16.1969,4.77472 17.31362,13.20987 1.11673,8.43515 -4.8364,16.20507 -13.27155,17.32179 -8.43515,1.11672 -16.20507,-4.83641 -17.32179,-13.27155 -1.11672,-8.43515 4.84457,-16.14339 13.27972,-17.26011 z" - style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" - inkscape:transform-center-x="0.00048976323" - inkscape:transform-center-y="0.70302153" /> + id="path3709" + style="opacity:0.16000001;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" /> <path - inkscape:transform-center-y="1.533628" - inkscape:transform-center-x="1.7524685" - sodipodi:nodetypes="ssssssssss" + d="m 14,10 c -2.216,0 -4,1.784 -4,4 l 0,68 c 0,2.216 1.784,4 4,4 l 68,0 c 2.216,0 4,-1.784 4,-4 l 0,-68 c 0,-2.216 -1.784,-4 -4,-4 l -68,0 z m 0,1 68,0 c 1.673848,0 3,1.326152 3,3 l 0,68 c 0,1.673848 -1.326152,3 -3,3 l -68,0 c -1.673848,0 -3,-1.326152 -3,-3 l 0,-68 c 0,-1.673848 1.326152,-3 3,-3 z" inkscape:connector-curvature="0" - style="opacity:0.1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" - d="m 181.91988,869.75574 c -6.85819,0.46021 -28.63077,15.1896 -26.60568,23.61008 12.21414,50.78701 22.08731,23.30375 28.9455,22.84353 6.85819,-0.4602 18.9233,-15.57833 18.46309,-22.43651 -0.4602,-6.85819 -13.94472,-24.4773 -20.80291,-24.0171 z m -0.031,17.12579 c 4.82704,-0.32392 9.01467,3.30383 9.33858,8.13086 0.3239,4.82702 -3.33913,9.01703 -8.16616,9.34093 -4.82703,0.32392 -9.01703,-3.33912 -9.34094,-8.16615 -0.32391,-4.82703 3.3415,-8.98174 8.16852,-9.30564 z" - id="path3861" /> + id="path3707" + style="opacity:0.36000001;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" /> + </g> + <g + id="layer5" + style="display:none" + transform="translate(0,-32)"> + <rect + width="66" + height="66" + rx="12" + ry="12" + x="15" + y="15" + clip-path="url(#clipPath3613)" + id="rect3171" + style="opacity:0.1;fill:url(#linearGradient3613);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3794)" /> + </g> + <path + style="opacity:0.3;fill:url(#radialGradient4077);fill-opacity:1;stroke:none" + id="path4075" + d="m 27.526346,61.257488 a 8.0076906,2.5907233 0 0 1 -16.015379,0 8.0076906,2.5907233 0 1 1 16.015379,0 z" + inkscape:connector-curvature="0" /> + <g + id="g4291" + inkscape:transform-center-x="8.7707912" + inkscape:transform-center-y="15.762028" + transform="matrix(3.7722604,0,0,3.7722604,1.82381,3.0800244)"> <path - inkscape:transform-center-y="1.5345569" - inkscape:transform-center-x="-0.24074801" - id="path3863" - d="m 180.67279,872.37886 c -9.72943,0.65287 -25.22672,13.42859 -24.57384,23.15801 0.65287,9.72942 18.13557,26.54101 27.86499,25.88814 9.72942,-0.65288 27.82987,-19.17299 27.17699,-28.9024 -0.65287,-9.72942 -20.73873,-20.79663 -30.46814,-20.14375 z m 0.91192,10.36734 c 6.84791,-0.45953 12.78873,4.687 13.24824,11.5349 0.45952,6.84792 -4.73708,12.79209 -11.58498,13.2516 -6.8479,0.45952 -12.79208,-4.73707 -13.2516,-11.58498 -0.45951,-6.8479 4.74044,-12.74201 11.58834,-13.20152 z" - style="opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" inkscape:connector-curvature="0" - sodipodi:nodetypes="ssssssssss" /> + inkscape:export-ydpi="1637.5708" + inkscape:export-xdpi="1637.5708" + inkscape:export-filename="/home/simon/Desktop/gnome-pie-symbolic.png" + id="path3905" + d="M 5.5028447,11.959141 C 6.3223926,12.42765 6.6069654,13.471827 6.1384561,14.291375 5.6699468,15.110923 4.6257703,15.395496 3.8062225,14.926986 2.9866747,14.458477 2.7021019,13.4143 3.1706112,12.594752 3.6391205,11.775205 4.683297,11.490632 5.5028447,11.959141 z" + inkscape:transform-center-y="3.5807564" + inkscape:transform-center-x="2.0673504" + style="fill:url(#radialGradient4356);fill-opacity:1;stroke:none" /> <path - inkscape:transform-center-y="0.73102307" - inkscape:transform-center-x="0.5515962" - style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" - d="m 180.29985,873.16714 c -12.06201,0.8094 -21.19479,11.25602 -20.38539,23.31802 0.8094,12.062 11.25603,21.19478 23.31803,20.38538 12.062,-0.8094 21.19478,-11.25602 20.38537,-23.31802 -0.8094,-12.062 -11.25601,-21.19478 -23.31801,-20.38538 z m 0.85945,6.30286 c 8.48965,-0.56968 15.85475,5.81069 16.42444,14.30035 0.56969,8.48966 -5.87277,15.85892 -14.36243,16.42861 -8.48966,0.56968 -15.85892,-5.87277 -16.42861,-14.36243 -0.56968,-8.48966 5.87694,-15.79684 14.3666,-16.36653 z" - id="path3865" - inkscape:connector-curvature="0" /> - <path - sodipodi:nodetypes="ssssssssss" + sodipodi:nodetypes="sssss" + style="opacity:0.3;color:#000000;fill:none;stroke:#2b2200;stroke-width:0.34894246;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3871" inkscape:connector-curvature="0" - style="opacity:0.1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" - d="m 119.04536,848.55648 c -6.8736,0 -29.583513,13.23862 -28.126733,21.77578 8.786393,51.49083 20.477503,24.73026 27.351113,24.73026 6.8736,0 19.92385,-14.27641 19.92385,-21.15002 0,-6.87361 -12.27461,-25.35602 -19.14823,-25.35602 z m -1.17755,17.08528 c 4.83789,0 8.77323,3.89998 8.77323,8.73786 0,4.83788 -3.93534,8.77323 -8.77323,8.77323 -4.83788,0 -8.77324,-3.93535 -8.77324,-8.77323 0,-4.83788 3.93536,-8.73786 8.77324,-8.73786 z" - id="path3077" /> + d="m 4.6436742,11.693036 c -0.9747596,0 -1.7666192,0.791858 -1.7666192,1.766618 0,0.97476 0.7918596,1.766618 1.7666192,1.766618 0.9747595,0 1.7666197,-0.791858 1.7666192,-1.766618 0,-0.97476 -0.7918597,-1.766618 -1.7666192,-1.766618 z" /> <path - id="path3075" - d="m 117.62544,851.09021 c -9.7513,0 -26.069186,11.70947 -26.069186,21.46077 0,9.7513 16.317886,27.69569 26.069186,27.69569 9.75131,0 27.30499,-18.72177 27.30499,-28.47307 0,-9.7513 -17.55368,-20.68339 -27.30499,-20.68339 z m 0.21576,10.40513 c 6.86331,0 12.44622,5.53273 12.44622,12.39604 0,6.86331 -5.58291,12.44622 -12.44622,12.44622 -6.8633,0 -12.44621,-5.58291 -12.44621,-12.44622 0,-6.86331 5.58291,-12.39604 12.44621,-12.39604 z" - style="opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" + sodipodi:nodetypes="sssss" + style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient4358);stroke-width:0.34418359;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4762-7" inkscape:connector-curvature="0" - sodipodi:nodetypes="ssssssssss" /> + d="m 6.0714204,13.448876 c 0,0.788594 -0.639283,1.427875 -1.4278751,1.427875 -0.788591,0 -1.4278833,-0.639281 -1.4278833,-1.427875 0,-0.788595 0.6392923,-1.427876 1.4278833,-1.427876 0.7885921,0 1.4278751,0.639281 1.4278751,1.427876 z" /> + </g> + <g + id="g4296" + transform="matrix(4.3679605,0,0,4.3679605,-11.307866,-21.255825)" + inkscape:transform-center-x="19.459783"> <path - style="opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" - d="m 117.20056,851.85176 c -12.08913,0 -21.900844,9.81171 -21.900844,21.90084 0,12.08912 9.811714,21.90084 21.900844,21.90084 12.08913,0 21.90085,-9.81172 21.90085,-21.90084 0,-12.08913 -9.81172,-21.90084 -21.90085,-21.90084 z m 0.43553,6.34626 c 8.50875,0 15.43014,6.85918 15.43014,15.36792 0,8.50876 -6.92139,15.43014 -15.43014,15.43014 -8.50875,0 -15.43014,-6.92138 -15.43014,-15.43014 0,-8.50874 6.92139,-15.36792 15.43014,-15.36792 z" - id="path3065" + style="fill:url(#radialGradient4304);fill-opacity:1;stroke:none" + inkscape:transform-center-x="2.0673504" + inkscape:transform-center-y="3.5807564" + d="M 5.5028447,11.959141 C 6.3223926,12.42765 6.6069654,13.471827 6.1384561,14.291375 5.6699468,15.110923 4.6257703,15.395496 3.8062225,14.926986 2.9866747,14.458477 2.7021019,13.4143 3.1706112,12.594752 3.6391205,11.775205 4.683297,11.490632 5.5028447,11.959141 z" + id="path4298" + inkscape:export-filename="/home/simon/Desktop/gnome-pie-symbolic.png" + inkscape:export-xdpi="1637.5708" + inkscape:export-ydpi="1637.5708" inkscape:connector-curvature="0" /> - <g - id="layer2" - style="display:none" - transform="matrix(2.3378535,0,0,2.3378535,15.409894,807.74843)"> - <rect - width="86" - height="85" - rx="6" - ry="6" - x="5" - y="7" - clip-path="url(#clipPath3625)" - id="rect3745-1" - style="opacity:0.9;fill:url(#ButtonShadow-6);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174-7)" /> - </g> - <g - id="layer1-5" - style="display:none" - transform="matrix(2.3378535,0,0,2.3378535,15.409894,807.74843)"> - <rect - width="84" - height="84" - rx="6" - ry="6" - x="6" - y="6" - id="rect2419-9" - style="opacity:0.8;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" /> - <path - d="m 14,10 c -2.216,0 -4,1.784 -4,4 l 0,68 c 0,2.216 1.784,4 4,4 l 68,0 c 2.216,0 4,-1.784 4,-4 l 0,-68 c 0,-2.216 -1.784,-4 -4,-4 l -68,0 z m 0,3.0625 68,0 c 0.578769,0 0.9375,0.358731 0.9375,0.9375 l 0,68 c 0,0.578769 -0.358731,0.9375 -0.9375,0.9375 l -68,0 c -0.578769,0 -0.9375,-0.358731 -0.9375,-0.9375 l 0,-68 c 0,-0.578769 0.358731,-0.9375 0.9375,-0.9375 z" - inkscape:connector-curvature="0" - id="rect3726" - style="opacity:0.07999998;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" /> - <path - d="M 12,6 C 8.676,6 6,8.676 6,12 l 0,72 c 0,3.324 2.676,6 6,6 l 72,0 c 3.324,0 6,-2.676 6,-6 L 90,12 C 90,8.676 87.324,6 84,6 L 12,6 z m 2,4 68,0 c 2.216,0 4,1.784 4,4 l 0,68 c 0,2.216 -1.784,4 -4,4 l -68,0 c -2.216,0 -4,-1.784 -4,-4 l 0,-68 c 0,-2.216 1.784,-4 4,-4 z" - inkscape:connector-curvature="0" - id="rect3629" - style="fill:url(#linearGradient3643);fill-opacity:1;fill-rule:nonzero;stroke:none" /> - <path - d="M 12,6 C 8.676,6 6,8.676 6,12 l 0,2 0,68 0,2 c 0,0.334721 0.04135,0.6507 0.09375,0.96875 0.0487,0.295596 0.09704,0.596915 0.1875,0.875 0.00988,0.03038 0.020892,0.0636 0.03125,0.09375 0.098865,0.287771 0.2348802,0.547452 0.375,0.8125 0.1445918,0.273507 0.3156161,0.535615 0.5,0.78125 0.1843839,0.245635 0.3737765,0.473472 0.59375,0.6875 0.439947,0.428056 0.94291,0.814526 1.5,1.09375 0.278545,0.139612 0.5734731,0.246947 0.875,0.34375 -0.2562018,-0.100222 -0.4867109,-0.236272 -0.71875,-0.375 -0.00741,-0.0044 -0.023866,0.0045 -0.03125,0 -0.031933,-0.0193 -0.062293,-0.04251 -0.09375,-0.0625 -0.120395,-0.0767 -0.2310226,-0.163513 -0.34375,-0.25 -0.1061728,-0.0808 -0.2132809,-0.161112 -0.3125,-0.25 C 8.4783201,88.557317 8.3087904,88.373362 8.15625,88.1875 8.0486711,88.057245 7.9378561,87.922215 7.84375,87.78125 7.818661,87.74287 7.805304,87.69538 7.78125,87.65625 7.716487,87.553218 7.6510225,87.451733 7.59375,87.34375 7.4927417,87.149044 7.3880752,86.928049 7.3125,86.71875 7.30454,86.69694 7.288911,86.6782 7.28125,86.65625 7.2494249,86.5643 7.2454455,86.469419 7.21875,86.375 7.1884177,86.268382 7.1483606,86.171969 7.125,86.0625 7.0521214,85.720988 7,85.364295 7,85 L 7,83 7,15 7,13 C 7,10.218152 9.2181517,8 12,8 l 2,0 68,0 2,0 c 2.781848,0 5,2.218152 5,5 l 0,2 0,68 0,2 c 0,0.364295 -0.05212,0.720988 -0.125,1.0625 -0.04415,0.206893 -0.08838,0.397658 -0.15625,0.59375 -0.0077,0.02195 -0.0233,0.04069 -0.03125,0.0625 -0.06274,0.173739 -0.138383,0.367449 -0.21875,0.53125 -0.04158,0.0828 -0.07904,0.169954 -0.125,0.25 -0.0546,0.09721 -0.126774,0.18835 -0.1875,0.28125 -0.09411,0.140965 -0.204921,0.275995 -0.3125,0.40625 -0.143174,0.17445 -0.303141,0.346998 -0.46875,0.5 -0.01117,0.0102 -0.01998,0.02115 -0.03125,0.03125 -0.138386,0.125556 -0.285091,0.234436 -0.4375,0.34375 -0.102571,0.07315 -0.204318,0.153364 -0.3125,0.21875 -0.0074,0.0045 -0.02384,-0.0044 -0.03125,0 -0.232039,0.138728 -0.462548,0.274778 -0.71875,0.375 0.301527,-0.0968 0.596455,-0.204138 0.875,-0.34375 0.55709,-0.279224 1.060053,-0.665694 1.5,-1.09375 0.219973,-0.214028 0.409366,-0.441865 0.59375,-0.6875 0.184384,-0.245635 0.355408,-0.507743 0.5,-0.78125 0.14012,-0.265048 0.276135,-0.524729 0.375,-0.8125 0.01041,-0.03078 0.02133,-0.06274 0.03125,-0.09375 0.09046,-0.278085 0.1388,-0.579404 0.1875,-0.875 C 89.95865,84.6507 90,84.334721 90,84 l 0,-2 0,-68 0,-2 C 90,8.676 87.324,6 84,6 L 12,6 z" - inkscape:connector-curvature="0" - id="rect3728-9" - style="fill:url(#linearGradient3188-6);fill-opacity:1;fill-rule:nonzero;stroke:none" /> - <path - d="M 12,90 C 8.676,90 6,87.324 6,84 L 6,82 6,14 6,12 c 0,-0.334721 0.04135,-0.6507 0.09375,-0.96875 0.0487,-0.295596 0.09704,-0.596915 0.1875,-0.875 C 6.29113,10.12587 6.302142,10.09265 6.3125,10.0625 6.411365,9.774729 6.5473802,9.515048 6.6875,9.25 6.8320918,8.976493 7.0031161,8.714385 7.1875,8.46875 7.3718839,8.223115 7.5612765,7.995278 7.78125,7.78125 8.221197,7.353194 8.72416,6.966724 9.28125,6.6875 9.559795,6.547888 9.8547231,6.440553 10.15625,6.34375 9.9000482,6.443972 9.6695391,6.580022 9.4375,6.71875 c -0.00741,0.0044 -0.023866,-0.0045 -0.03125,0 -0.031933,0.0193 -0.062293,0.04251 -0.09375,0.0625 -0.120395,0.0767 -0.2310226,0.163513 -0.34375,0.25 -0.1061728,0.0808 -0.2132809,0.161112 -0.3125,0.25 C 8.4783201,7.442683 8.3087904,7.626638 8.15625,7.8125 8.0486711,7.942755 7.9378561,8.077785 7.84375,8.21875 7.818661,8.25713 7.805304,8.30462 7.78125,8.34375 7.716487,8.446782 7.6510225,8.548267 7.59375,8.65625 7.4927417,8.850956 7.3880752,9.071951 7.3125,9.28125 7.30454,9.30306 7.288911,9.3218 7.28125,9.34375 7.2494249,9.4357 7.2454455,9.530581 7.21875,9.625 7.1884177,9.731618 7.1483606,9.828031 7.125,9.9375 7.0521214,10.279012 7,10.635705 7,11 l 0,2 0,68 0,2 c 0,2.781848 2.2181517,5 5,5 l 2,0 68,0 2,0 c 2.781848,0 5,-2.218152 5,-5 l 0,-2 0,-68 0,-2 C 89,10.635705 88.94788,10.279012 88.875,9.9375 88.83085,9.730607 88.78662,9.539842 88.71875,9.34375 88.71105,9.3218 88.69545,9.30306 88.6875,9.28125 88.62476,9.107511 88.549117,8.913801 88.46875,8.75 88.42717,8.6672 88.38971,8.580046 88.34375,8.5 88.28915,8.40279 88.216976,8.31165 88.15625,8.21875 88.06214,8.077785 87.951329,7.942755 87.84375,7.8125 87.700576,7.63805 87.540609,7.465502 87.375,7.3125 87.36383,7.3023 87.35502,7.29135 87.34375,7.28125 87.205364,7.155694 87.058659,7.046814 86.90625,6.9375 86.803679,6.86435 86.701932,6.784136 86.59375,6.71875 c -0.0074,-0.0045 -0.02384,0.0044 -0.03125,0 -0.232039,-0.138728 -0.462548,-0.274778 -0.71875,-0.375 0.301527,0.0968 0.596455,0.204138 0.875,0.34375 0.55709,0.279224 1.060053,0.665694 1.5,1.09375 0.219973,0.214028 0.409366,0.441865 0.59375,0.6875 0.184384,0.245635 0.355408,0.507743 0.5,0.78125 0.14012,0.265048 0.276135,0.524729 0.375,0.8125 0.01041,0.03078 0.02133,0.06274 0.03125,0.09375 0.09046,0.278085 0.1388,0.579404 0.1875,0.875 C 89.95865,11.3493 90,11.665279 90,12 l 0,2 0,68 0,2 c 0,3.324 -2.676,6 -6,6 l -72,0 z" - inkscape:connector-curvature="0" - id="path3615-1" - style="opacity:0.6;fill:url(#radialGradient3619-2);fill-opacity:1;fill-rule:nonzero;stroke:none" /> - <rect - width="84" - height="84" - rx="6" - ry="6" - x="6" - y="106" - id="rect2841" - style="fill:url(#linearGradient2843);fill-opacity:1;fill-rule:nonzero;stroke:none" /> - <rect - width="76" - height="76" - rx="4" - ry="4" - x="10" - y="110" - id="rect3634" - style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none" /> - <path - d="m 14,9 c -2.752703,0 -5,2.247297 -5,5 l 0,68 c 0,2.752703 2.247297,5 5,5 l 68,0 c 2.752703,0 5,-2.247297 5,-5 L 87,14 C 87,11.247297 84.752703,9 82,9 L 14,9 z m 0,2 68,0 c 1.679297,0 3,1.320703 3,3 l 0,68 c 0,1.679297 -1.320703,3 -3,3 l -68,0 c -1.679297,0 -3,-1.320703 -3,-3 l 0,-68 c 0,-1.679297 1.320703,-3 3,-3 z" - inkscape:connector-curvature="0" - transform="translate(-110,0)" - clip-path="url(#clipPath3649)" - id="rect3647" - style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3657);enable-background:accumulate;font-family:Abandoned Bitplane;-inkscape-font-specification:Abandoned Bitplane" /> - <path - d="m 14.089286,10 c -2.216,0 -4,1.784 -4,4 l 0,68 c 0,2.216 1.784,4 4,4 l 68,0 c 2.216,0 4,-1.784 4,-4 l 0,-68 c 0,-2.216 -1.784,-4 -4,-4 l -68,0 z m 0,2 68,0 c 1.140301,0 2,0.859699 2,2 l 0,68 c 0,1.140301 -0.859699,2 -2,2 l -68,0 c -1.140301,0 -2,-0.859699 -2,-2 l 0,-68 c 0,-1.140301 0.859699,-2 2,-2 z" - inkscape:connector-curvature="0" - id="path3709" - style="opacity:0.16000001;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" /> - <path - d="m 14,10 c -2.216,0 -4,1.784 -4,4 l 0,68 c 0,2.216 1.784,4 4,4 l 68,0 c 2.216,0 4,-1.784 4,-4 l 0,-68 c 0,-2.216 -1.784,-4 -4,-4 l -68,0 z m 0,1 68,0 c 1.673848,0 3,1.326152 3,3 l 0,68 c 0,1.673848 -1.326152,3 -3,3 l -68,0 c -1.673848,0 -3,-1.326152 -3,-3 l 0,-68 c 0,-1.673848 1.326152,-3 3,-3 z" - inkscape:connector-curvature="0" - id="path3707" - style="opacity:0.36000001;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" /> - </g> - <g - id="layer5" - style="display:none" - transform="matrix(2.3378535,0,0,2.3378535,15.409894,807.74843)"> - <rect - width="66" - height="66" - rx="12" - ry="12" - x="15" - y="15" - clip-path="url(#clipPath3613-8)" - id="rect3171-4" - style="opacity:0.1;fill:url(#linearGradient3613-7);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter3794-9)" /> - </g> <path - style="opacity:0.1;fill:#000000;fill-opacity:1;stroke:none;display:inline" - d="m 172.25903,847.18043 -4.30145,6.48111 c 13.49767,6.26007 40.73811,35.36404 40.73811,61.31558 0,6.12517 -5.37494,24.04545 -5.37494,24.04545 0,0 4.68391,0.85374 8.38452,1.33104 5.21603,0.23106 7.66416,-1.02748 8.34471,-4.86723 0.55146,-6.16885 0.90041,-11.4775 0.95035,-17.0913 0.26219,-29.47263 -18.20682,-57.11834 -41.52864,-72.49179 -2.53292,-1.79041 -5.66502,-1.01375 -7.21266,1.27714 z" - id="path3999" + d="m 4.6436742,11.693036 c -0.9747596,0 -1.7666192,0.791858 -1.7666192,1.766618 0,0.97476 0.7918596,1.766618 1.7666192,1.766618 0.9747595,0 1.7666197,-0.791858 1.7666192,-1.766618 0,-0.97476 -0.7918597,-1.766618 -1.7666192,-1.766618 z" inkscape:connector-curvature="0" - sodipodi:nodetypes="ccscccscc" /> + id="path4300" + style="opacity:0.3;color:#000000;fill:none;stroke:#2b2200;stroke-width:0.30135387;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:nodetypes="sssss" /> <path - style="opacity:0.1;fill:#000000;fill-opacity:1;stroke:none;display:inline" - d="m 174.96257,857.47233 c -12.74039,-7.6849 -39.83705,-17.81278 -55.7453,-17.81278 -46.637452,0 -84.703198,38.06573 -84.703198,84.70319 0,46.63746 38.065746,84.70326 84.703198,84.70326 40.93626,0 79.05889,-41.6602 86.83779,-80.36686 -7.91764,-2.4047 -52.42628,-12.66797 -55.21221,-17.44969 -2.4361,-4.0743 26.07507,-52.63261 24.11972,-53.77712 z m 8.84576,80.97604 c -7.92488,31.60452 -30.90104,55.20576 -64.96393,55.20576 -0.19604,0 -0.36362,0 -0.5593,0 -0.19568,0 -0.4254,0 -0.62145,0 -40.188056,0 -72.771417,-32.52129 -72.771417,-72.70935 0,-40.18805 32.583361,-72.77142 72.771417,-72.77142 0.19605,0 0.42577,-0.002 0.62145,0 0.19568,-0.002 0.36326,0 0.5593,0 14.23652,0 22.1995,8.46397 29.19588,10.29177 l -38.42815,67.49291 z" - id="path3923" + d="m 6.0714204,13.448876 c 0,0.788594 -0.639283,1.427875 -1.4278751,1.427875 -0.788591,0 -1.4278833,-0.639281 -1.4278833,-1.427875 0,-0.788595 0.6392923,-1.427876 1.4278833,-1.427876 0.7885921,0 1.4278751,0.639281 1.4278751,1.427876 z" inkscape:connector-curvature="0" - sodipodi:nodetypes="csssccccscssscsccc" /> - <path - style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none;display:inline" - d="m 160.97849,854.38783 c -12.26504,-7.34334 -26.45244,-11.86963 -41.76122,-11.86963 -45.125073,0 -81.844544,36.71946 -81.844544,81.84454 0,45.12508 36.719471,81.84466 81.844544,81.84466 39.59192,0 69.35899,-28.42693 76.88207,-65.83255 l -6.90716,-1.78098 c -7.92488,31.60453 -36.28489,55.06026 -70.34778,55.06026 -40.188058,0 -72.771418,-32.52129 -72.771418,-72.70935 0,-40.18805 32.58336,-72.77142 72.771418,-72.77142 12.418,0 27.50457,3.44108 38.92183,9.18053 0.46752,0.23502 -49.851,66.42262 -49.851,66.42262 l 9.94354,2.35704 c 0,0 44.83688,-64.25324 45.83879,-65.49233 0.9462,-2.80938 -0.53242,-4.66991 -2.71907,-6.25339 z" - id="path3989" - inkscape:connector-curvature="0" - sodipodi:nodetypes="csssccsssscccc" /> - <path - style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none;display:inline" - d="m 178.05836,848.42017 -3.01709,4.78719 c 20.44574,12.88075 33.65442,35.81822 33.65442,61.76976 0,6.12517 -28.57332,1.77979 -24.85383,6.63977 l -31.06661,-24.91262 28.92453,-44.25316 c -2.30707,-0.94076 -3.94679,-8.40069 -8.32474,-1.82263 l -49.02398,72.13834 84.3417,15.10241 c 4.12138,0.44874 7.29897,-1.03001 7.83316,-3.31653 1.05138,-5.22761 1.55362,-10.62447 1.55362,-16.15762 0,-29.8163 -16.13305,-55.67259 -40.02118,-69.97491 z" - id="path3919" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccscccccccsc" /> + id="path4302" + style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient4306);stroke-width:0.29724404;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:nodetypes="sssss" /> + </g> + <g + transform="matrix(5.4320012,0,0,5.4320012,-7.6106202,-56.058075)" + id="g4308"> <path - style="opacity:0.3;fill:#000000;fill-opacity:1;stroke:none;display:inline" - d="m 159.72196,856.44164 c -11.75236,-6.99883 -25.84058,-10.69192 -40.50469,-10.69192 -43.395256,0 -78.61302,35.21776 -78.61302,78.61302 0,43.39526 35.217764,78.61306 78.61302,78.61306 38.07612,0 69.77938,-27.11718 76.99726,-63.07689 l -7.45736,-1.36718 c -8.18744,31.22222 -36.30762,54.37666 -70.0992,54.37666 -40.188062,0 -72.771422,-32.58343 -72.771422,-72.77148 0,-40.18807 32.58336,-72.77143 72.771422,-72.77143 14.46493,0 27.59378,4.12647 38.92227,11.4028 0.2726,0.20007 -51.56013,66.32056 -51.56013,66.32056 l 8.52596,1.34475 c 0,0 45.56903,-66.26973 45.66472,-66.4028 0.79572,-1.10652 0.58358,-2.98105 -0.48883,-3.58915 z" - id="path4002" inkscape:connector-curvature="0" - sodipodi:nodetypes="csssccssscccsc" /> + inkscape:export-ydpi="1637.5708" + inkscape:export-xdpi="1637.5708" + inkscape:export-filename="/home/simon/Desktop/gnome-pie-symbolic.png" + id="path4310" + d="M 5.5028447,11.959141 C 6.3223926,12.42765 6.6069654,13.471827 6.1384561,14.291375 5.6699468,15.110923 4.6257703,15.395496 3.8062225,14.926986 2.9866747,14.458477 2.7021019,13.4143 3.1706112,12.594752 3.6391205,11.775205 4.683297,11.490632 5.5028447,11.959141 z" + inkscape:transform-center-y="-5.3725036" + inkscape:transform-center-x="2.8524709" + style="fill:url(#radialGradient4316);fill-opacity:1;stroke:none" /> <path - style="opacity:0.3;fill:#000000;fill-opacity:1;stroke:none;display:inline" - d="m 176.25616,851.09239 -1.30503,1.92648 c 20.14554,12.93954 33.55813,35.42724 33.55813,61.15037 0,6.39648 -71.14055,-2.9614 -72.69036,2.94873 l -5.20311,4.20384 79.81517,14.51055 c 1.65861,0.10749 2.50628,-0.63865 2.86344,-1.90111 1.00832,-5.02349 1.61575,-10.21703 1.61575,-15.53617 0,-28.73116 -15.62778,-53.59 -38.65399,-67.30269 z" - id="path3913" + sodipodi:nodetypes="sssss" + style="opacity:0.3;color:#000000;fill:none;stroke:#2b2200;stroke-width:0.24232353;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4312" inkscape:connector-curvature="0" - sodipodi:nodetypes="ccsccccsc" /> - <path - style="fill:url(#linearGradient3573);fill-opacity:1;stroke:none;display:inline" - d="m 119.21727,842.70464 c -43.395256,0 -78.61302,35.21775 -78.61302,78.61301 0,43.39527 35.217764,78.61305 78.61302,78.61305 37.0103,0 67.85105,-25.69845 76.18938,-60.15608 l -81.96883,-15.22544 47.2921,-69.72634 c -12.07584,-7.56035 -26.22295,-12.1182 -41.51265,-12.1182 z m -2.17506,12.36678 c 9.80653,0 17.77338,7.9047 17.77338,17.71124 0,9.80652 -7.03469,17.27622 -16.84121,17.27622 -9.80653,0 -18.705554,-7.4697 -18.705554,-17.27622 0,-9.80654 7.966854,-17.71124 17.773384,-17.71124 z M 74.597388,884.528 c 2.862434,-0.0668 5.787585,0.58897 8.513821,1.98863 8.723958,4.4789 12.184839,15.1396 7.70594,23.86356 -4.478898,8.72396 -15.201746,12.1227 -23.925701,7.6438 -8.723957,-4.4789 -12.18484,-15.1396 -7.70594,-23.86357 3.079244,-5.99772 9.114531,-9.48553 15.41188,-9.63242 z m 13.298961,56.80024 c 4.54423,0.003 9.087931,1.68904 12.553221,5.158 6.93059,6.93794 6.93794,18.17586 0,25.10646 -6.937928,6.93058 -18.175856,6.93793 -25.106446,0 -6.930587,-6.93794 -6.937933,-18.17587 0,-25.10646 3.468968,-3.46529 8.008996,-5.16041 12.553225,-5.158 z m 63.574011,0.68359 c 5.6968,-0.19274 11.43815,2.3733 15.03902,7.33307 5.76138,7.93564 3.95837,19.03434 -3.97727,24.79573 -7.93564,5.76139 -19.03434,3.95838 -24.79572,-3.97726 -5.76139,-7.93564 -4.02053,-18.97219 3.91511,-24.73358 2.97587,-2.16052 6.40078,-3.30231 9.81886,-3.41796 z" - id="path3971" - inkscape:connector-curvature="0" /> - <path - style="fill:url(#linearGradient3570);fill-opacity:1;stroke:none;display:inline" - d="m 177.80978,848.85518 -47.2921,69.72633 81.96883,15.22545 c 1.43851,-5.94458 2.42364,-12.07202 2.42364,-18.45697 0,-28.10556 -14.90254,-52.59736 -37.10037,-66.49481 z m 4.22584,27.46794 c 6.91914,0.0815 13.49677,4.2546 16.28191,11.06176 3.71352,9.07622 -0.61835,19.4043 -9.69458,23.11782 -9.07622,3.71352 -19.46645,-0.61835 -23.17996,-9.69457 -3.71352,-9.07622 0.61835,-19.46645 9.69457,-23.17996 2.26906,-0.92838 4.59168,-1.33221 6.89806,-1.30505 z" - id="path2505" - inkscape:connector-curvature="0" /> - <path - style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none;display:inline" - d="m 194.59877,939.58819 c -9.32186,33.0178 -39.3946,57.35955 -75.3815,57.35955 -42.890931,0 -77.807532,-34.42206 -78.61302,-77.12156 -0.0094,0.50207 0,0.98715 0,1.49147 0,43.39526 35.217764,78.61305 78.61302,78.61305 37.01398,0 67.85331,-25.69183 76.18938,-60.15608 l -0.80788,-0.18643 z" - id="path4013" - inkscape:connector-curvature="0" /> + d="m 4.6436742,11.741854 c -0.9478233,0 -1.7178008,0.769976 -1.7178008,1.7178 0,0.947824 0.7699775,1.7178 1.7178008,1.7178 0.9478232,0 1.7178013,-0.769976 1.7178008,-1.7178 0,-0.947824 -0.7699776,-1.7178 -1.7178008,-1.7178 z" /> <path - style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none;display:inline" - d="m 212.16736,931.48554 0.80788,0.18643 c 1.43715,-5.9417 1.88348,-12.30719 1.88347,-18.68847 0,-0.50433 -0.22216,-1.09229 -0.23151,-1.59437 -0.12965,6.87323 -0.67145,13.76199 -2.45984,20.09641 z" - id="path3904" + sodipodi:nodetypes="sssss" + style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient4318);stroke-width:0.23901874;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4314" inkscape:connector-curvature="0" - sodipodi:nodetypes="ccscc" /> - <path - style="opacity:0.75;fill:#ffffff;fill-opacity:1;stroke:none;display:inline" - d="m 160.72992,854.82284 c -12.07692,-7.56143 -26.22295,-12.1182 -41.51265,-12.1182 -43.395256,0 -78.61302,35.21775 -78.61302,78.61301 0,0.50433 -0.0094,1.05154 0,1.55361 0.805488,-42.6995 35.722089,-77.12154 78.61302,-77.12154 14.67425,0 28.26022,4.23973 40.02118,11.24819 l 1.49147,-2.17507 z" - id="path4010" - inkscape:connector-curvature="0" /> + d="m 6.103966,13.448876 c 0,0.806568 -0.6538542,1.46042 -1.4604207,1.46042 -0.8065654,0 -1.460429,-0.653852 -1.460429,-1.46042 0,-0.80657 0.6538636,-1.460422 1.460429,-1.460422 0.8065665,0 1.4604207,0.653852 1.4604207,1.460422 z" /> + </g> + <g + id="g4320" + transform="matrix(6.9981031,0,0,6.9981031,11.533364,-80.629158)" + inkscape:transform-center-x="-16.015621" + inkscape:transform-center-y="-24.685539"> <path - style="opacity:0.75;fill:#ffffff;fill-opacity:1;stroke:none;display:inline" - d="m 177.80978,848.85518 -1.49147,2.17506 c 22.6148,13.47638 38.06194,37.78261 38.59184,65.87337 0.01,-0.50208 0,-1.0493 0,-1.55362 0,-28.10557 -14.90056,-52.59537 -37.10037,-66.49481 z" - id="path3888" + style="fill:url(#radialGradient4328);fill-opacity:1;stroke:none" + inkscape:transform-center-x="2.0673504" + inkscape:transform-center-y="3.5807564" + d="M 5.5028447,11.959141 C 6.3223926,12.42765 6.6069654,13.471827 6.1384561,14.291375 5.6699468,15.110923 4.6257703,15.395496 3.8062225,14.926986 2.9866747,14.458477 2.7021019,13.4143 3.1706112,12.594752 3.6391205,11.775205 4.683297,11.490632 5.5028447,11.959141 z" + id="path4322" + inkscape:export-filename="/home/simon/Desktop/gnome-pie-symbolic.png" + inkscape:export-xdpi="1637.5708" + inkscape:export-ydpi="1637.5708" inkscape:connector-curvature="0" /> <path - style="opacity:0.75;fill:#ffffff;fill-opacity:1;stroke:none;display:inline" - id="path3890" - inkscape:connector-curvature="0" - d="m 117.11796,892.2103 c -9.8578,0 -17.950958,-7.23805 -17.926766,-19.92596 2.25e-4,-0.11811 -0.0022,-0.23653 0,-0.35413 0.182974,10.00215 8.080886,18.28567 17.824136,18.28567 9.74324,0 17.92728,-7.24612 17.89254,-18.28567 0.003,0.1176 -2.3e-4,0.23599 0,0.35413 0.0242,12.42856 -7.93211,19.92596 -17.78991,19.92596 z" - sodipodi:nodetypes="sscscss" /> - <path - sodipodi:nodetypes="sscscss" - d="m 117.04953,853.73487 c 9.8578,0 17.88253,7.71701 17.85834,20.40493 -2.3e-4,0.1181 0.003,0.23652 0,0.35413 -0.18297,-10.00215 -8.08089,-18.08041 -17.82413,-18.08041 -9.74323,0 -17.927291,7.04085 -17.892549,18.08041 -0.0022,-0.11761 2.32e-4,-0.236 0,-0.35413 -0.02418,-12.42857 8.000539,-20.40493 17.858339,-20.40493 z" - inkscape:connector-curvature="0" - id="path3892" - style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none;display:inline" /> - <path - sodipodi:nodetypes="sscscss" - d="m 154.76757,978.57664 c -9.77254,1.29378 -18.74564,-4.81947 -20.38687,-17.40082 -0.0153,-0.11711 -0.0333,-0.23419 -0.0464,-0.35107 1.49411,9.89162 10.41088,17.06693 20.06984,15.78819 9.65896,-1.27874 16.82121,-9.53629 15.33789,-20.4758 0.0175,0.1163 0.0308,0.23398 0.0464,0.35107 1.65515,12.31789 -5.24833,20.79465 -15.02086,22.08843 z" + d="m 4.6436742,11.749809 c -0.9434342,0 -1.7098462,0.76641 -1.7098462,1.709845 0,0.943435 0.766412,1.709845 1.7098462,1.709845 0.9434341,0 1.7098467,-0.76641 1.7098462,-1.709845 0,-0.943435 -0.7664121,-1.709845 -1.7098462,-1.709845 z" inkscape:connector-curvature="0" - id="path3855" - style="opacity:0.75;fill:#ffffff;fill-opacity:1;stroke:none;display:inline" - inkscape:transform-center-x="0.10437309" - inkscape:transform-center-y="3.7717298" /> + id="path4324" + style="opacity:0.3;color:#000000;fill:none;stroke:#2b2200;stroke-width:0.18809408;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:nodetypes="sssss" /> <path - style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none;display:inline" - id="path3857" + d="m 6.1217002,13.448877 c 0,0.816362 -0.661794,1.478154 -1.4781546,1.478154 -0.8163594,0 -1.4781629,-0.661792 -1.4781629,-1.478154 0,-0.816364 0.6618035,-1.478156 1.4781629,-1.478156 0.8163606,0 1.4781546,0.661792 1.4781546,1.478156 z" inkscape:connector-curvature="0" - d="m 149.65005,940.44301 c 9.77254,-1.29378 18.74066,5.30328 20.3819,17.88461 0.0153,0.11712 0.0333,0.2342 0.0464,0.35107 -1.49411,-9.89162 -10.38394,-16.86344 -20.04291,-15.58469 -9.65896,1.27874 -16.84814,9.33279 -15.36482,20.2723 -0.0175,-0.1163 -0.0307,-0.23398 -0.0464,-0.35107 -1.65515,-12.31788 5.25329,-21.27844 15.02583,-22.57222 z" - sodipodi:nodetypes="sscscss" - inkscape:transform-center-x="0.085342765" - inkscape:transform-center-y="-2.9084878" /> - <path - inkscape:transform-center-y="4.0380281" - inkscape:transform-center-x="0.64879679" - style="opacity:0.75;fill:#ffffff;fill-opacity:1;stroke:none;display:inline" - id="path3867" - inkscape:connector-curvature="0" - d="m 182.91954,913.44065 c -9.83568,0.66001 -18.39528,-6.01994 -19.22064,-18.68101 -0.008,-0.11784 -0.0181,-0.23584 -0.0237,-0.35333 0.85223,9.96745 9.28703,17.70361 19.00842,17.05127 9.72137,-0.65233 17.40191,-8.43014 16.62812,-19.4426 0.0101,0.11717 0.0155,0.23548 0.0237,0.35334 0.85625,12.39905 -6.58021,20.41232 -16.41589,21.07233 z" - sodipodi:nodetypes="sscscss" /> - <path - inkscape:transform-center-y="-3.1313222" - inkscape:transform-center-x="0.61420118" - sodipodi:nodetypes="sscscss" - d="m 180.27523,875.05614 c 9.83568,-0.66001 18.35908,6.5024 19.18444,19.16347 0.008,0.11787 0.0181,0.23585 0.0237,0.35334 -0.85222,-9.96745 -9.27328,-17.4988 -18.99466,-16.84647 -9.72138,0.65233 -17.41567,8.22534 -16.64187,19.2378 -0.0101,-0.11717 -0.0155,-0.23548 -0.0237,-0.35333 -0.85626,-12.39907 6.61642,-20.8948 16.4521,-21.55481 z" - inkscape:connector-curvature="0" - id="path3869" - style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none;display:inline" /> + id="path4326" + style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient4330);stroke-width:0.18552889;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:nodetypes="sssss" /> + </g> + <g + transform="matrix(5.2373585,0,0,5.2373585,29.237147,-33.311275)" + id="g4332" + inkscape:transform-center-x="-25.532625"> <path - sodipodi:nodetypes="sscscss" - d="m 87.672668,977.55843 c -9.857587,-0.0647 -17.903062,-7.35571 -17.795601,-20.04319 0.001,-0.1181 -6.94e-4,-0.23653 0.0022,-0.35412 0.117329,10.00313 7.960704,18.33832 17.703732,18.40227 9.743027,0.064 17.974461,-7.12831 18.012161,-18.16786 0.002,0.11761 -0.002,0.23598 -0.003,0.35412 -0.0573,12.42846 -8.062707,19.87348 -17.920297,19.80878 z" inkscape:connector-curvature="0" - id="path3879" - style="opacity:0.75;fill:#ffffff;fill-opacity:1;stroke:none;display:inline" - inkscape:transform-center-x="0.51152745" - inkscape:transform-center-y="3.6815103" /> + inkscape:export-ydpi="1637.5708" + inkscape:export-xdpi="1637.5708" + inkscape:export-filename="/home/simon/Desktop/gnome-pie-symbolic.png" + id="path4334" + d="M 5.5028447,11.959141 C 6.3223926,12.42765 6.6069654,13.471827 6.1384561,14.291375 5.6699468,15.110923 4.6257703,15.395496 3.8062225,14.926986 2.9866747,14.458477 2.7021019,13.4143 3.1706112,12.594752 3.6391205,11.775205 4.683297,11.490632 5.5028447,11.959141 z" + inkscape:transform-center-y="3.5807564" + inkscape:transform-center-x="2.0673504" + style="fill:url(#radialGradient4340);fill-opacity:1;stroke:none" /> <path - style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none;display:inline" - id="path3881" + sodipodi:nodetypes="sssss" + style="opacity:0.3;color:#000000;fill:none;stroke:#2b2200;stroke-width:0.25132933;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4336" inkscape:connector-curvature="0" - d="m 87.856754,939.08338 c 9.857592,0.0646 17.831506,7.8342 17.724046,20.52169 -8.5e-4,0.1181 6.9e-4,0.23653 -0.003,0.35412 -0.11731,-10.00313 -7.962058,-18.13305 -17.705094,-18.197 -9.743026,-0.064 -17.973112,6.92305 -18.010828,17.96259 -0.0014,-0.11762 0.0018,-0.23598 0.0022,-0.35412 0.05738,-12.42846 8.134277,-20.35199 17.991867,-20.28729 z" - sodipodi:nodetypes="sscscss" - inkscape:transform-center-x="0.51762959" - inkscape:transform-center-y="-3.9489544" /> + d="m 4.6436742,11.726799 c -0.9561303,0 -1.7328562,0.776724 -1.7328562,1.732855 0,0.956131 0.7767259,1.732855 1.7328562,1.732855 0.9561302,0 1.7328567,-0.776724 1.7328562,-1.732855 0,-0.956131 -0.776726,-1.732855 -1.7328562,-1.732855 z" /> <path - inkscape:transform-center-y="3.8878274" - inkscape:transform-center-x="-0.52053966" - style="opacity:0.75;fill:#ffffff;fill-opacity:1;stroke:none;display:inline" - id="path3891" + sodipodi:nodetypes="sssss" + style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient4342);stroke-width:0.24790172;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path4338" inkscape:connector-curvature="0" - d="m 74.635586,922.25169 c -9.854317,-0.2621 -17.752153,-7.71279 -17.390611,-20.39557 0.0034,-0.11805 0.0042,-0.23651 0.0093,-0.35401 -0.08305,10.00348 7.591829,18.49408 17.331629,18.75314 9.739791,0.25907 18.11362,-6.76688 18.372416,-17.80347 -8.5e-4,0.11761 -0.0065,0.23591 -0.0093,0.35401 -0.306291,12.42481 -8.459118,19.70801 -18.313435,19.4459 z" - sodipodi:nodetypes="sscscss" /> + d="m 6.1220649,13.448876 c 0,0.816564 -0.6619574,1.478519 -1.4785196,1.478519 -0.816561,0 -1.478528,-0.661955 -1.478528,-1.478519 0,-0.816566 0.661967,-1.478521 1.478528,-1.478521 0.8165622,0 1.4785196,0.661955 1.4785196,1.478521 z" /> + </g> + <g + id="g4344" + transform="matrix(4.3314793,-0.23622939,0.23622939,4.3314793,17.031724,-3.6522405)" + inkscape:transform-center-x="-11.457982" + inkscape:transform-center-y="16.338509"> <path - inkscape:transform-center-y="-3.5900653" - inkscape:transform-center-x="-0.50061725" - sodipodi:nodetypes="sscscss" - d="m 75.590208,883.78805 c 9.854318,0.26211 17.671017,8.18975 17.309477,20.87254 -0.0034,0.11807 -0.0042,0.23651 -0.0093,0.35401 0.08305,-10.00348 -7.597287,-18.28889 -17.337087,-18.54794 -9.739791,-0.25907 -18.10816,6.56169 -18.366964,17.59827 8.5e-4,-0.11763 0.0065,-0.2359 0.0093,-0.35401 0.306293,-12.42482 8.540256,-20.18498 18.394571,-19.92287 z" - inkscape:connector-curvature="0" - id="path3893" - style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none;display:inline" /> + style="fill:url(#radialGradient4352);fill-opacity:1;stroke:none" + inkscape:transform-center-x="2.0673504" + inkscape:transform-center-y="3.5807564" + d="M 5.5028447,11.959141 C 6.3223926,12.42765 6.6069654,13.471827 6.1384561,14.291375 5.6699468,15.110923 4.6257703,15.395496 3.8062225,14.926986 2.9866747,14.458477 2.7021019,13.4143 3.1706112,12.594752 3.6391205,11.775205 4.683297,11.490632 5.5028447,11.959141 z" + id="path4346" + inkscape:export-filename="/home/simon/Desktop/gnome-pie-symbolic.png" + inkscape:export-xdpi="1637.5708" + inkscape:export-ydpi="1637.5708" + inkscape:connector-curvature="0" /> <path + d="m 4.6436742,11.693036 c -0.9747596,0 -1.7666192,0.791858 -1.7666192,1.766618 0,0.97476 0.7918596,1.766618 1.7666192,1.766618 0.9747595,0 1.7666197,-0.791858 1.7666192,-1.766618 0,-0.97476 -0.7918597,-1.766618 -1.7666192,-1.766618 z" inkscape:connector-curvature="0" - id="path4021" - d="m 194.74686,939.71515 c -30.31024,-5.98499 -84.21887,-15.7284 -84.21887,-15.7284 l 3.78966,1.78392 76.36547,16.11954 z" - style="opacity:0.75;fill:#ffffff;fill-opacity:1;stroke:none;display:inline" - sodipodi:nodetypes="ccccc" /> + id="path4348" + style="opacity:0.3;color:#000000;fill:none;stroke:#2b2200;stroke-width:0.30344108;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:nodetypes="sssss" /> <path + d="m 6.0714204,13.448876 c 0,0.788594 -0.639283,1.427875 -1.4278751,1.427875 -0.788591,0 -1.4278833,-0.639281 -1.4278833,-1.427875 0,-0.788595 0.6392923,-1.427876 1.4278833,-1.427876 0.7885921,0 1.4278751,0.639281 1.4278751,1.427876 z" inkscape:connector-curvature="0" - id="path4023" - d="m 110.53066,924.10962 2.95566,0.39105 47.19964,-69.64448 -3.14815,1.26866 z" - style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none;display:inline" - sodipodi:nodetypes="ccccc" /> - <path - sodipodi:nodetypes="ccccc" - style="opacity:0.15;fill:#000000;fill-opacity:1;stroke:none;display:inline" - d="m 134.30889,916.98277 -3.52314,1.58642 81.74635,15.36654 0.48023,-2.29648 z" - id="path4025" - inkscape:connector-curvature="0" /> - <path - sodipodi:nodetypes="ccccc" - style="opacity:0.75;fill:#ffffff;fill-opacity:1;stroke:none;display:inline" - d="m 176.35096,851.02893 -45.81894,67.56644 3.76063,-1.6965 43.83377,-64.88465 z" - id="path4027" - inkscape:connector-curvature="0" /> + id="path4350" + style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient4354);stroke-width:0.29930273;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:nodetypes="sssss" /> </g> </svg> diff --git a/resources/locale/de/LC_MESSAGES/de.po b/resources/locale/de/LC_MESSAGES/de.po index 5012a3b..74e4175 100644 --- a/resources/locale/de/LC_MESSAGES/de.po +++ b/resources/locale/de/LC_MESSAGES/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnomepie 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-29 15:58+0100\n" +"POT-Creation-Date: 2015-04-07 08:55+0200\n" "PO-Revision-Date: 2011-08-25 21:04+0200\n" "Last-Translator: Simon Schneegans <code@simonschneegans.de>\n" "Language-Team: German\n" @@ -25,14 +25,6 @@ msgstr "Tastenkombination" msgid "Simulates the activation of a hotkey." msgstr "Simuliert einen Tastendruck." -#: ../../src/actions/appAction.vala:34 -msgid "Launch application" -msgstr "Programm ausführen" - -#: ../../src/actions/appAction.vala:36 -msgid "Executes the given command." -msgstr "Führt einen gegebenen Befehl aus." - #: ../../src/actions/uriAction.vala:34 msgid "Open URI" msgstr "URI öffnen" @@ -45,6 +37,14 @@ msgstr "Öffnet URLs oder Dateipfade." msgid "Trash" msgstr "Müll" +#: ../../src/actions/appAction.vala:34 +msgid "Launch application" +msgstr "Programm ausführen" + +#: ../../src/actions/appAction.vala:36 +msgid "Executes the given command." +msgstr "Führt einen gegebenen Befehl aus." + #: ../../src/actions/pieAction.vala:34 msgid "Open Pie" msgstr "Pie öffnen" @@ -54,111 +54,176 @@ msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." msgstr "" "Öffnet einen anderen Pie. Auf diese Art können Submenüs erstellt werden." -#: ../../src/gui/triggerSelectWindow.vala:166 -msgid "" -"This hotkey is already assigned to the pie \"%s\"! \n" -"\n" -"Please select another one or cancel your selection." -msgstr "" -"Dieser Hotkey ist schon dem Pie \"%s\" zugeordnet!\n" -" Bitte wähle einen anderen!" - -#: ../../src/gui/preferencesWindow.vala:175 +#: ../../src/gui/preferencesWindow.vala:166 msgid "No Pie selected." msgstr "Kein Pie gewählt." -#: ../../src/gui/preferencesWindow.vala:215 +#: ../../src/gui/preferencesWindow.vala:206 msgid "New Pie" msgstr "Neuer Pie" -#: ../../src/gui/preferencesWindow.vala:228 +#: ../../src/gui/preferencesWindow.vala:219 msgid "" "Do you really want to delete the selected Pie with all contained Slices?" msgstr "Soll dieser Pie wirklich mit allen Slices gelöscht werden?" -#: ../../src/gui/newSliceWindow.vala:291 -msgid "Rename me!" -msgstr "Benenne mich!" +#: ../../src/gui/triggerSelectWindow.vala:226 +msgid "" +"This hotkey is already assigned to the pie \"%s\"! \n" +"\n" +"Please select another one or cancel your selection." +msgstr "" +"Dieser Hotkey ist schon dem Pie \"%s\" zugeordnet!\n" +" Bitte wähle einen anderen!" -#: ../../src/gui/piePreviewRenderer.vala:412 +#: ../../src/gui/piePreview.vala:148 +msgid "Do you really want to delete this Slice?" +msgstr "Soll die ausgewählte Slice wirklich gelöscht werden?" + +#: ../../src/gui/sliceTypeList.vala:60 +msgid "Slice types" +msgstr "Slice-Typen" + +#: ../../src/gui/piePreviewRenderer.vala:419 msgid "Click to edit" msgstr "Editieren durch klicken" -#: ../../src/gui/piePreviewRenderer.vala:412 -#: ../../src/gui/piePreviewRenderer.vala:427 +#: ../../src/gui/piePreviewRenderer.vala:419 +#: ../../src/gui/piePreviewRenderer.vala:434 msgid "Drag to move" msgstr "Verschieben durch ziehen" -#: ../../src/gui/piePreviewRenderer.vala:415 +#: ../../src/gui/piePreviewRenderer.vala:422 msgid "Click to add a new Slice" msgstr "Neue Slice durch Klicken hinzufügen" -#: ../../src/gui/piePreviewRenderer.vala:419 +#: ../../src/gui/piePreviewRenderer.vala:426 msgid "Drop to add as new Slice" msgstr "Als neue Slice hinzuzufügen" -#: ../../src/gui/piePreviewRenderer.vala:422 +#: ../../src/gui/piePreviewRenderer.vala:429 msgid "Drop to move Slice" msgstr "Slice verschieben" -#: ../../src/gui/piePreviewRenderer.vala:427 +#: ../../src/gui/piePreviewRenderer.vala:434 msgid "Click to delete" msgstr "Löschen durch klicken" -#: ../../src/gui/triggerSelectButton.vala:63 -msgid "Press a hotkey ..." -msgstr "Wählen..." - -#: ../../src/gui/piePreview.vala:155 -msgid "Do you really want to delete this Slice?" -msgstr "Soll die ausgewählte Slice wirklich gelöscht werden?" - -#: ../../src/gui/themeList.vala:62 -msgid "Themes" -msgstr "Themen" - -#: ../../src/gui/themeList.vala:99 -msgid "By" -msgstr "Von" - -#: ../../src/gui/sliceTypeList.vala:60 -msgid "Slice types" -msgstr "Slice-Typen" - -#: ../../src/gui/iconSelectWindow.vala:186 +#: ../../src/gui/iconSelectWindow.vala:182 msgid "All icons" msgstr "Alle Symbole" -#: ../../src/gui/iconSelectWindow.vala:187 +#: ../../src/gui/iconSelectWindow.vala:183 #: ../../src/pies/defaultConfig.vala:36 msgid "Applications" msgstr "Anwendungen" -#: ../../src/gui/iconSelectWindow.vala:188 +#: ../../src/gui/iconSelectWindow.vala:184 msgid "Actions" msgstr "Aktionen" -#: ../../src/gui/iconSelectWindow.vala:189 +#: ../../src/gui/iconSelectWindow.vala:185 msgid "Places" msgstr "Orte" -#: ../../src/gui/iconSelectWindow.vala:190 +#: ../../src/gui/iconSelectWindow.vala:186 msgid "File types" msgstr "Dateitypen" -#: ../../src/gui/iconSelectWindow.vala:191 +#: ../../src/gui/iconSelectWindow.vala:187 msgid "Emotes" msgstr "Smilies" -#: ../../src/gui/iconSelectWindow.vala:192 +#: ../../src/gui/iconSelectWindow.vala:188 msgid "Miscellaneous" msgstr "Sonstige" -#: ../../src/gui/iconSelectWindow.vala:267 -#: ../../src/gui/iconSelectWindow.vala:269 +#: ../../src/gui/iconSelectWindow.vala:261 msgid "All supported image formats" msgstr "Alle unterstützten Bildformate" +#: ../../src/gui/newSliceWindow.vala:291 +msgid "Rename me!" +msgstr "Benenne mich!" + +#: ../../src/gui/themeList.vala:62 +msgid "Themes" +msgstr "Themen" + +#: ../../src/gui/themeList.vala:99 +msgid "By" +msgstr "Von" + +#: ../../src/gui/indicator.vala:114 +msgid "_Preferences" +msgstr "Einstellungen" + +#: ../../src/gui/indicator.vala:123 +msgid "_About" +msgstr "Über" + +#: ../../src/gui/indicator.vala:138 +msgid "_Quit" +msgstr "Beenden" + +#: ../../src/gui/newsWindow.vala:64 +msgid "_Close" +msgstr "Schließen" + +#: ../../src/gui/triggerSelectButton.vala:64 +msgid "Press a hotkey ..." +msgstr "Wählen..." + +#: ../../src/utilities/key.vala:65 ../../src/utilities/bindingManager.vala:177 +#: ../../src/utilities/trigger.vala:195 ../../src/utilities/trigger.vala:280 +#: ../../src/utilities/trigger.vala:281 +msgid "Not bound" +msgstr "Nicht zugewiesen" + +#: ../../src/utilities/trigger.vala:182 +msgid "Button %i" +msgstr "Taste %i" + +#: ../../src/utilities/trigger.vala:185 +msgid "LeftButton" +msgstr "MausLinks" + +#: ../../src/utilities/trigger.vala:187 +msgid "RightButton" +msgstr "MausRechts" + +#: ../../src/utilities/trigger.vala:189 +msgid "MiddleButton" +msgstr "Mausrad" + +#: ../../src/utilities/trigger.vala:216 +msgid "Turbo" +msgstr "Turbo" + +#: ../../src/utilities/trigger.vala:220 ../../src/utilities/trigger.vala:222 +msgid "Delayed" +msgstr "Verzögert" + +#: ../../src/utilities/trigger.vala:226 ../../src/utilities/trigger.vala:228 +msgid "Centered" +msgstr "Zentriert" + +#: ../../src/utilities/trigger.vala:232 ../../src/utilities/trigger.vala:234 +msgid "Warp" +msgstr "Warp" + +#: ../../src/utilities/trigger.vala:238 ../../src/utilities/trigger.vala:240 +msgid "Auto-shaped" +msgstr "Dynamische" + +#: ../../src/utilities/trigger.vala:243 ../../src/utilities/trigger.vala:245 +msgid "Quarter pie" +msgstr "Viertel-Pie" + +#: ../../src/utilities/trigger.vala:249 ../../src/utilities/trigger.vala:251 +msgid "Half pie" +msgstr "Halb-Pie" + #: ../../src/actionGroups/windowListGroup.vala:34 msgid "Group: Window List" msgstr "Gruppe: Fensterliste" @@ -167,14 +232,6 @@ msgstr "Gruppe: Fensterliste" msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab." msgstr "Zeigt eine Slice für jedes geöffnete Fenster an." -#: ../../src/actionGroups/menuGroup.vala:35 -msgid "Group: Main menu" -msgstr "Gruppe: Hauptmenü" - -#: ../../src/actionGroups/menuGroup.vala:37 -msgid "Displays your main menu structure." -msgstr "Zeigt das Hauptmenü an." - #: ../../src/actionGroups/clipboardGroup.vala:64 msgid "Group: Clipboard" msgstr "Gruppe: Zwischenablage" @@ -183,6 +240,27 @@ msgstr "Gruppe: Zwischenablage" msgid "Manages your Clipboard." msgstr "Verwaltet die Zwischenablage." +#: ../../src/actionGroups/devicesGroup.vala:35 +msgid "Group: Devices" +msgstr "Gruppe: Laufwerke" + +#: ../../src/actionGroups/devicesGroup.vala:37 +msgid "Shows a Slice for each plugged in devices, like USB-Sticks." +msgstr "" +"Zeigt eine Slice für jedes angeschlossene Gerät, wie z. B. USB Sticks, an. " + +#: ../../src/actionGroups/devicesGroup.vala:85 +msgid "Root" +msgstr "Dateisystem" + +#: ../../src/actionGroups/menuGroup.vala:35 +msgid "Group: Main menu" +msgstr "Gruppe: Hauptmenü" + +#: ../../src/actionGroups/menuGroup.vala:37 +msgid "Displays your main menu structure." +msgstr "Zeigt das Hauptmenü an." + #: ../../src/actionGroups/sessionGroup.vala:35 msgid "Group: Session Control" msgstr "Gruppe: Sitzung" @@ -212,55 +290,6 @@ msgstr "Gruppe: Lesezeichen" msgid "Shows a Slice for each of your directory Bookmarks." msgstr "Zeigt eine Slice für jedes Ordner-Lesezeichen an." -#: ../../src/actionGroups/devicesGroup.vala:35 -msgid "Group: Devices" -msgstr "Gruppe: Laufwerke" - -#: ../../src/actionGroups/devicesGroup.vala:37 -msgid "Shows a Slice for each plugged in devices, like USB-Sticks." -msgstr "" -"Zeigt eine Slice für jedes angeschlossene Gerät, wie z. B. USB Sticks, an. " - -#: ../../src/actionGroups/devicesGroup.vala:85 -msgid "Root" -msgstr "Dateisystem" - -#: ../../src/utilities/bindingManager.vala:161 ../../src/utilities/key.vala:65 -#: ../../src/utilities/trigger.vala:212 ../../src/utilities/trigger.vala:213 -msgid "Not bound" -msgstr "Nicht zugewiesen" - -#: ../../src/utilities/trigger.vala:163 -msgid "Button %i" -msgstr "Taste %i" - -#: ../../src/utilities/trigger.vala:166 -msgid "LeftButton" -msgstr "MausLinks" - -#: ../../src/utilities/trigger.vala:168 -msgid "RightButton" -msgstr "MausRechts" - -#: ../../src/utilities/trigger.vala:170 -msgid "MiddleButton" -msgstr "Mausrad" - -#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190 -#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:196 -msgid "Turbo" -msgstr "Turbo" - -#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:192 -#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:198 -msgid "Delayed" -msgstr "Verzögert" - -#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190 -#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:200 -msgid "Centered" -msgstr "Zentriert" - #: ../../src/pies/defaultConfig.vala:29 msgid "Multimedia" msgstr "Multimedia" @@ -317,52 +346,40 @@ msgstr "Maximieren" msgid "Restore" msgstr "Wiederherstellen" -#: ../ui/icon_select.ui:8 -msgid "Select an icon" -msgstr "Wähle ein Symbol" - -#: ../ui/icon_select.ui:85 -msgid "Icon Theme" -msgstr "Symbolthema" - -#: ../ui/icon_select.ui:105 -msgid "Custom Icon" -msgstr "Benutzerdefiniertes Symbol" - -#: ../ui/trigger_select.ui:8 +#: ../ui/trigger_select.ui:53 msgid "Activation Settings" msgstr "Aktivierungsoptionen" -#: ../ui/trigger_select.ui:86 +#: ../ui/trigger_select.ui:132 msgid "It's possible to bind mouse buttons as well!" msgstr "Es ist auch möglich, Maustasten zu binden!" -#: ../ui/trigger_select.ui:118 +#: ../ui/trigger_select.ui:165 msgid "Turbo mode" msgstr "Turbo-Mode" -#: ../ui/trigger_select.ui:123 ../ui/trigger_select.ui:124 +#: ../ui/trigger_select.ui:171 ../ui/trigger_select.ui:172 msgid "If checked, the Pie will close when you release the chosen hot key." msgstr "" "Falls aktiviert schließt sich der Pie wieder automatisch, wenn der Hotkey " "losgelassen wird." -#: ../ui/trigger_select.ui:137 +#: ../ui/trigger_select.ui:184 msgid "Long press for activation" msgstr "Verzögerte Aktivierung" -#: ../ui/trigger_select.ui:142 ../ui/trigger_select.ui:143 +#: ../ui/trigger_select.ui:190 ../ui/trigger_select.ui:191 msgid "" "If checked, the Pie will only open if you press this hot key a bit longer." msgstr "" "Falls aktiviert, wird sich der Pie erst öffnen, wenn der Hotkey länger " "gedrückt gehalten wird." -#: ../ui/trigger_select.ui:156 +#: ../ui/trigger_select.ui:203 msgid "Open Pie centered on the screen" msgstr "Zentriert auf dem Bildschirm öffnen" -#: ../ui/trigger_select.ui:161 ../ui/trigger_select.ui:162 +#: ../ui/trigger_select.ui:209 ../ui/trigger_select.ui:210 msgid "" "If checked, the Pie will open in the middle of your screen. Else it will pop " "up at your pointer." @@ -370,71 +387,51 @@ msgstr "" "Falls aktiviert, wird sich der Pie nicht an der Maus, sondern in der Mitte " "des Bildschirms öffnen." -#: ../ui/trigger_select.ui:181 -msgid "Activation options" -msgstr "Aktivierungsoptionen" +#: ../ui/trigger_select.ui:222 +msgid "Warp mouse pointer to center of Pie" +msgstr "Bewege den Mauszeiger zur Mitte des Pies" -#: ../ui/settings.ui:9 ../ui/preferences.ui:27 -msgid "General Settings" -msgstr "Allgemeine Einstellungen" - -#: ../ui/settings.ui:74 -msgid "Start Gnome-Pie on login" -msgstr "Beim Anmelden automatisch ausführen" - -#: ../ui/settings.ui:79 ../ui/settings.ui:80 -msgid "If checked, Gnome-Pie will start silently everytime you log in." -msgstr "Wenn aktiviert, startet Gnome-Pie im Hintergrund beim Anmelden." - -#: ../ui/settings.ui:93 -msgid "Display panel icon " -msgstr "Zeige ein Symbol im Panel" - -#: ../ui/settings.ui:98 ../ui/settings.ui:99 +#: ../ui/trigger_select.ui:228 ../ui/trigger_select.ui:229 msgid "" -"If not checked, you can access this menu by launching Gnome-Pie a second " -"time." -msgstr "" -"Falls nicht aktiviert, kann dieses Menü durch ein nochmaliges starten von " -"Gnome-Pie geöffnet werden." - -#: ../ui/settings.ui:118 -msgid "Behavior" -msgstr "Verhalten" - -#: ../ui/settings.ui:175 -msgid "Global scale" -msgstr "Skalierungsfaktor" +"If checked, the mouse pointer will be warped to the center of the Pie. This " +"allows for quick selections even if the Pie is opened at the screen's " +"boundary." +msgstr "Falls aktiviert, wird der Mauszeiger nach dem dem Öffenen des Pies zu " +"dessen Mitte bewegt. Dadurch kann auch an den Seiten des Bildschirms schnell " +"selektiert werden." + +#: ../ui/trigger_select.ui:247 +msgid "Activation options" +msgstr "Aktivierungsoptionen" -#: ../ui/settings.ui:207 -msgid "Display Slice labels" -msgstr "Zeige Namen der Slices" +#: ../ui/trigger_select.ui:438 +msgid "Automatically select the best pie shape" +msgstr "Wähle die Anordnung automatisch" -#: ../ui/settings.ui:212 ../ui/settings.ui:213 +#: ../ui/trigger_select.ui:442 msgid "" -"Displays the name of each Slice next to it. Only available if supported by " -"the theme." -msgstr "" -"Zeigt den Name jeder Slice an. Nur möglich, wenn durch das aktuelle Thema " -"unterstützt." +"If checked, the shape will be automatically selected to minimize mouse " +"travelling." +msgstr "Falls aktiviert, wird je nach Position auf dem Bildschirm eine " +"passende Anordnung gweählt." -#: ../ui/settings.ui:232 -msgid "Appearance" -msgstr "Erscheinungsbild" +#: ../ui/trigger_select.ui:462 +msgid "Pie shape" +msgstr "Anordnung" -#: ../ui/slice_select.ui:9 +#: ../ui/slice_select.ui:8 msgid "Slice Options" msgstr "Slice-Optionen" -#: ../ui/slice_select.ui:139 +#: ../ui/slice_select.ui:141 msgid "There are no options for this Slice type." msgstr "Es gibt keine Otionen für diesen Slice-Typ." -#: ../ui/slice_select.ui:165 +#: ../ui/slice_select.ui:167 msgid "Name of the Slice " msgstr "Name" -#: ../ui/slice_select.ui:204 +#: ../ui/slice_select.ui:205 msgid "URI to open" msgstr "URI" @@ -442,15 +439,15 @@ msgstr "URI" msgid "Command to execute" msgstr "Befehl" -#: ../ui/slice_select.ui:282 +#: ../ui/slice_select.ui:281 msgid "Hotkey to press" msgstr "Tastenkomination" -#: ../ui/slice_select.ui:311 +#: ../ui/slice_select.ui:310 msgid "Pie to open" msgstr "Pie" -#: ../ui/slice_select.ui:340 +#: ../ui/slice_select.ui:339 msgid "Is Quick Action" msgstr "Ist Quick Action" @@ -458,21 +455,41 @@ msgstr "Ist Quick Action" msgid "This Slice will be executed when you click in the middle of the Pie." msgstr "Diese Slice wird aktiviert, falls du in die Mitte des Pies klickst." -#: ../ui/slice_select.ui:388 +#: ../ui/slice_select.ui:387 msgid "Slice options" msgstr "Slice-Optionen" -#: ../ui/preferences.ui:8 +#: ../ui/icon_select.ui:9 +msgid "Select an icon" +msgstr "Wähle ein Symbol" + +#: ../ui/icon_select.ui:103 +msgid "Icon Theme" +msgstr "Symbolthema" + +#: ../ui/icon_select.ui:123 +msgid "Custom Icon" +msgstr "Benutzerdefiniertes Symbol" + +#: ../ui/rename_pie.ui:8 +msgid "Rename a Pie" +msgstr "Pie umbenennen" + +#: ../ui/preferences.ui:7 msgid "Gnome-Pie Settings" msgstr "Gnome-Pie - Einstellungen" -#: ../ui/preferences.ui:261 +#: ../ui/preferences.ui:27 ../ui/settings.ui:8 +msgid "General Settings" +msgstr "Allgemeine Einstellungen" + +#: ../ui/preferences.ui:266 msgid "" "<b><big>This Pie is empty!</big>\n" "\n" "Start adding Slices to it!</b> This can be done by dragging stuff to the " "plus sign below. You can try a lot! For example application launchers or " -"folders. Even URLs from your browser are possible... \n" +"folders. Even URLs from your browser are possible...\n" "\n" "For manual and advanced configuration click on the plus sign." msgstr "" @@ -484,7 +501,7 @@ msgstr "" "\n" "Zur manuellen und fortgeschrittenen Konfiguration klicke auf das Symbol." -#: ../ui/preferences.ui:282 +#: ../ui/preferences.ui:287 msgid "" "<b><big>You have no Pies!</big>\n" "\n" @@ -496,6 +513,54 @@ msgstr "" "Erstelle einen neuen! </b> Klicke dazu einfach auf das kleine Pluszeichen " "unter der leeren Liste auf der linken Seite." -#: ../ui/rename_pie.ui:8 -msgid "Rename a Pie" -msgstr "Pie umbenennen" +#: ../ui/settings.ui:75 +msgid "Start Gnome-Pie on login" +msgstr "Beim Anmelden automatisch ausführen" + +#: ../ui/settings.ui:81 ../ui/settings.ui:82 +msgid "If checked, Gnome-Pie will start silently everytime you log in." +msgstr "Wenn aktiviert, startet Gnome-Pie im Hintergrund beim Anmelden." + +#: ../ui/settings.ui:94 +msgid "Display panel icon " +msgstr "Zeige ein Symbol im Panel" + +#: ../ui/settings.ui:100 ../ui/settings.ui:101 +msgid "" +"If not checked, you can access this menu by launching Gnome-Pie a second " +"time." +msgstr "" +"Falls nicht aktiviert, kann dieses Menü durch ein nochmaliges starten von " +"Gnome-Pie geöffnet werden." + +#: ../ui/settings.ui:119 +msgid "Behavior" +msgstr "Verhalten" + +#: ../ui/settings.ui:178 +msgid "Global scale" +msgstr "Skalierungsfaktor" + +#: ../ui/settings.ui:217 +msgid "Maximum slices per pie" +msgstr "Maximale Zahl von Einträgen pro Pie" + +#: ../ui/settings.ui:256 +msgid "Maximum activation radius" +msgstr "Maximale Aktivierungsentfernung" + +#: ../ui/settings.ui:287 +msgid "Display Slice labels" +msgstr "Zeige Namen der Slices" + +#: ../ui/settings.ui:293 ../ui/settings.ui:294 +msgid "" +"Displays the name of each Slice next to it. Only available if supported by " +"the theme." +msgstr "" +"Zeigt den Name jeder Slice an. Nur möglich, wenn durch das aktuelle Thema " +"unterstützt." + +#: ../ui/settings.ui:312 +msgid "Appearance" +msgstr "Erscheinungsbild" diff --git a/resources/locale/de/LC_MESSAGES/gnomepie.mo b/resources/locale/de/LC_MESSAGES/gnomepie.mo Binary files differindex 1701aa6..b888b32 100644 --- a/resources/locale/de/LC_MESSAGES/gnomepie.mo +++ b/resources/locale/de/LC_MESSAGES/gnomepie.mo diff --git a/resources/locale/es/LC_MESSAGES/es.po b/resources/locale/es/LC_MESSAGES/es.po index b1ba6ce..9f916ea 100644 --- a/resources/locale/es/LC_MESSAGES/es.po +++ b/resources/locale/es/LC_MESSAGES/es.po @@ -2,14 +2,15 @@ # Copyright (C) 2012 Simon Schneegans <code@simonschneegans.de> # This file is distributed under the same license as the gnomepie package. # Eduardo Anabalon <lalo1412@gmail.com>, 2012. +# Gabriel Dubatti <gdubatti@gmail.com>, 2015. # msgid "" msgstr "" "Project-Id-Version: gnomepie 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-29 15:58+0100\n" +"POT-Creation-Date: 2015-04-07 08:55+0200\n" "PO-Revision-Date: 2012-01-22 15:30-0300\n" -"Last-Translator: Eduardo Anabalon <lalo1412@gmail.com>\n" +"Last-Translator: Gabriel Dubatti <gdubatti@gmail.com>\n" "Language-Team: Spanish\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -19,20 +20,12 @@ msgstr "" #: ../../src/actions/keyAction.vala:34 msgid "Press hotkey" -msgstr "Presiona un atajo." +msgstr "Presiona un atajo" #: ../../src/actions/keyAction.vala:36 msgid "Simulates the activation of a hotkey." msgstr "Simula la activación de un atajo." -#: ../../src/actions/appAction.vala:34 -msgid "Launch application" -msgstr "Lanzar una aplicación" - -#: ../../src/actions/appAction.vala:36 -msgid "Executes the given command." -msgstr "Ejecutar un comando dado." - #: ../../src/actions/uriAction.vala:34 msgid "Open URI" msgstr "Abrir URI" @@ -43,7 +36,15 @@ msgstr "Abre un lugar determinado. Puedes usar URI's o ruta de archivos." #: ../../src/actions/actionRegistry.vala:119 msgid "Trash" -msgstr "Borrar" +msgstr "Papelera" + +#: ../../src/actions/appAction.vala:34 +msgid "Launch application" +msgstr "Lanzar una aplicación" + +#: ../../src/actions/appAction.vala:36 +msgid "Executes the given command." +msgstr "Ejecutar un comando dado." #: ../../src/actions/pieAction.vala:34 msgid "Open Pie" @@ -53,114 +54,179 @@ msgstr "Abrir Pastel" msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." msgstr "Abre otro Pastel de Gnome-Pie. De esta manera puedes crear submenús." -#: ../../src/gui/triggerSelectWindow.vala:166 -msgid "" -"This hotkey is already assigned to the pie \"%s\"! \n" -"\n" -"Please select another one or cancel your selection." -msgstr "" -"Este atajo ya está asignado al pastel \"%s\"! \n" -"\n" -"Por favor selecciona otro atajo o cancela tu selección." - -#: ../../src/gui/preferencesWindow.vala:175 +#: ../../src/gui/preferencesWindow.vala:166 msgid "No Pie selected." msgstr "Pastel no seleccionado." -#: ../../src/gui/preferencesWindow.vala:215 +#: ../../src/gui/preferencesWindow.vala:206 msgid "New Pie" msgstr "Nuevo Pastel" -#: ../../src/gui/preferencesWindow.vala:228 +#: ../../src/gui/preferencesWindow.vala:219 msgid "" "Do you really want to delete the selected Pie with all contained Slices?" msgstr "" -"Realmente quieres borrar el Pastel seleccionado incluyendo todas sus " +"¿Realmente quieres borrar el Pastel seleccionado incluyendo todas sus " "Rebanadas?" -#: ../../src/gui/newSliceWindow.vala:291 -msgid "Rename me!" -msgstr "Renombrame!" +#: ../../src/gui/triggerSelectWindow.vala:226 +msgid "" +"This hotkey is already assigned to the pie \"%s\"! \n" +"\n" +"Please select another one or cancel your selection." +msgstr "" +"Este atajo ya está asignado al Pastel \"%s\"! \n" +"\n" +"Por favor selecciona otro atajo o cancela tu selección." -#: ../../src/gui/piePreviewRenderer.vala:412 +#: ../../src/gui/piePreview.vala:148 +msgid "Do you really want to delete this Slice?" +msgstr "¿Realmente quieres borrar esta Rebanada?" + +#: ../../src/gui/sliceTypeList.vala:60 +msgid "Slice types" +msgstr "Tipos de Rebanada" + +#: ../../src/gui/piePreviewRenderer.vala:419 msgid "Click to edit" msgstr "Click para editar" -#: ../../src/gui/piePreviewRenderer.vala:412 -#: ../../src/gui/piePreviewRenderer.vala:427 +#: ../../src/gui/piePreviewRenderer.vala:419 +#: ../../src/gui/piePreviewRenderer.vala:434 msgid "Drag to move" msgstr "Arrastra para mover" -#: ../../src/gui/piePreviewRenderer.vala:415 +#: ../../src/gui/piePreviewRenderer.vala:422 msgid "Click to add a new Slice" msgstr "Click para añadir una nueva Rebanada" -#: ../../src/gui/piePreviewRenderer.vala:419 +#: ../../src/gui/piePreviewRenderer.vala:426 msgid "Drop to add as new Slice" msgstr "Suelta para añadir una nueva Rebanada" -#: ../../src/gui/piePreviewRenderer.vala:422 +#: ../../src/gui/piePreviewRenderer.vala:429 msgid "Drop to move Slice" msgstr "Suelta para mover la Rebanada" -#: ../../src/gui/piePreviewRenderer.vala:427 +#: ../../src/gui/piePreviewRenderer.vala:434 msgid "Click to delete" msgstr "Click para borrar" -#: ../../src/gui/triggerSelectButton.vala:63 -msgid "Press a hotkey ..." -msgstr "Presiona un atajo ..." - -#: ../../src/gui/piePreview.vala:155 -msgid "Do you really want to delete this Slice?" -msgstr "Realmente quieres borrar ésta Rebanada?" - -#: ../../src/gui/themeList.vala:62 -msgid "Themes" -msgstr "Temas" - -#: ../../src/gui/themeList.vala:99 -msgid "By" -msgstr "Por" - -#: ../../src/gui/sliceTypeList.vala:60 -msgid "Slice types" -msgstr "Tipos de Rebanada" - -#: ../../src/gui/iconSelectWindow.vala:186 +#: ../../src/gui/iconSelectWindow.vala:182 msgid "All icons" msgstr "Todos los iconos" -#: ../../src/gui/iconSelectWindow.vala:187 +#: ../../src/gui/iconSelectWindow.vala:183 #: ../../src/pies/defaultConfig.vala:36 msgid "Applications" msgstr "Aplicaciones" -#: ../../src/gui/iconSelectWindow.vala:188 +#: ../../src/gui/iconSelectWindow.vala:184 msgid "Actions" msgstr "Acciones" -#: ../../src/gui/iconSelectWindow.vala:189 +#: ../../src/gui/iconSelectWindow.vala:185 msgid "Places" msgstr "Lugares" -#: ../../src/gui/iconSelectWindow.vala:190 +#: ../../src/gui/iconSelectWindow.vala:186 msgid "File types" msgstr "Tipos de archivo" -#: ../../src/gui/iconSelectWindow.vala:191 +#: ../../src/gui/iconSelectWindow.vala:187 msgid "Emotes" -msgstr "Emotes" +msgstr "Emoticones" -#: ../../src/gui/iconSelectWindow.vala:192 +#: ../../src/gui/iconSelectWindow.vala:188 msgid "Miscellaneous" msgstr "Misceláneos" -#: ../../src/gui/iconSelectWindow.vala:267 -#: ../../src/gui/iconSelectWindow.vala:269 +#: ../../src/gui/iconSelectWindow.vala:261 msgid "All supported image formats" msgstr "Todos los formatos de imágenes soportados" +#: ../../src/gui/newSliceWindow.vala:291 +msgid "Rename me!" +msgstr "Renómbrame!" + +#: ../../src/gui/themeList.vala:62 +msgid "Themes" +msgstr "Temas" + +#: ../../src/gui/themeList.vala:99 +msgid "By" +msgstr "Por" + +#: ../../src/gui/indicator.vala:114 +msgid "_Preferences" +msgstr "_Preferencias" + +#: ../../src/gui/indicator.vala:123 +msgid "_About" +msgstr "_Acerca de" + +#: ../../src/gui/indicator.vala:138 +msgid "_Quit" +msgstr "_Salir" + +#: ../../src/gui/newsWindow.vala:64 +msgid "_Close" +msgstr "_Cerrar" + +#: ../../src/gui/triggerSelectButton.vala:64 +msgid "Press a hotkey ..." +msgstr "Presiona un atajo ..." + +#: ../../src/utilities/key.vala:65 ../../src/utilities/bindingManager.vala:177 +#: ../../src/utilities/trigger.vala:195 ../../src/utilities/trigger.vala:280 +#: ../../src/utilities/trigger.vala:281 +msgid "Not bound" +msgstr "Sin atajo" + +#: ../../src/utilities/trigger.vala:182 +msgid "Button %i" +msgstr "Botón %i" + +#: ../../src/utilities/trigger.vala:185 +msgid "LeftButton" +msgstr "BotónIzquierdo" + +#: ../../src/utilities/trigger.vala:187 +msgid "RightButton" +msgstr "BotónDerecho" + +#: ../../src/utilities/trigger.vala:189 +msgid "MiddleButton" +msgstr "BotónCentral" + +#: ../../src/utilities/trigger.vala:216 +msgid "Turbo" +msgstr "Turbo" + +#: ../../src/utilities/trigger.vala:220 ../../src/utilities/trigger.vala:222 +msgid "Delayed" +msgstr "Retrasado" + +#: ../../src/utilities/trigger.vala:226 ../../src/utilities/trigger.vala:228 +msgid "Centered" +msgstr "Centrado" + +#: ../../src/utilities/trigger.vala:232 ../../src/utilities/trigger.vala:234 +msgid "Warp" +msgstr "Teletransportar" + +#: ../../src/utilities/trigger.vala:238 ../../src/utilities/trigger.vala:240 +msgid "Auto-shaped" +msgstr "Auto-forma" + +#: ../../src/utilities/trigger.vala:243 ../../src/utilities/trigger.vala:245 +msgid "Quarter pie" +msgstr "Cuarto de Pastel" + +#: ../../src/utilities/trigger.vala:249 ../../src/utilities/trigger.vala:251 +msgid "Half pie" +msgstr "Medio Pastel" + #: ../../src/actionGroups/windowListGroup.vala:34 msgid "Group: Window List" msgstr "Grupo: Lista de Ventanas" @@ -168,17 +234,9 @@ msgstr "Grupo: Lista de Ventanas" #: ../../src/actionGroups/windowListGroup.vala:36 msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab." msgstr "" -"Muestra una Rebanada para cada uno de tus Ventanas abiertas. Casi como Alt-" +"Muestra una Rebanada para cada una de tus Ventanas abiertas. Casi como Alt-" "Tab." -#: ../../src/actionGroups/menuGroup.vala:35 -msgid "Group: Main menu" -msgstr "Grupo: Menú Principal" - -#: ../../src/actionGroups/menuGroup.vala:37 -msgid "Displays your main menu structure." -msgstr "Muestra la estructura de tu Menú Principal." - #: ../../src/actionGroups/clipboardGroup.vala:64 msgid "Group: Clipboard" msgstr "Grupo: Portapapeles" @@ -187,13 +245,33 @@ msgstr "Grupo: Portapapeles" msgid "Manages your Clipboard." msgstr "Gestiona tus Portapapeles." +#: ../../src/actionGroups/devicesGroup.vala:35 +msgid "Group: Devices" +msgstr "Grupo: Dispositivos" + +#: ../../src/actionGroups/devicesGroup.vala:37 +msgid "Shows a Slice for each plugged in devices, like USB-Sticks." +msgstr "Muestra una Rebanada por cada dispositivo conectado, como USB-Sticks." + +#: ../../src/actionGroups/devicesGroup.vala:85 +msgid "Root" +msgstr "Root" + +#: ../../src/actionGroups/menuGroup.vala:35 +msgid "Group: Main menu" +msgstr "Grupo: Menú Principal" + +#: ../../src/actionGroups/menuGroup.vala:37 +msgid "Displays your main menu structure." +msgstr "Muestra la estructura de tu Menú Principal." + #: ../../src/actionGroups/sessionGroup.vala:35 msgid "Group: Session Control" msgstr "Grupo: Control de Sesión" #: ../../src/actionGroups/sessionGroup.vala:37 msgid "Shows a Slice for Shutdown, Reboot, and Hibernate." -msgstr "Muestra una Rebanada para Apagar, Reiniciar, e Hibernar." +msgstr "Muestra una Rebanada para Apagar, Reiniciar e Hibernar." #: ../../src/actionGroups/sessionGroup.vala:60 msgid "Shutdown" @@ -215,54 +293,6 @@ msgstr "Grupo: Marcadores" msgid "Shows a Slice for each of your directory Bookmarks." msgstr "Muestra una Rebanada por cada uno de los directorios en los Marcadores." -#: ../../src/actionGroups/devicesGroup.vala:35 -msgid "Group: Devices" -msgstr "Grupo: Dispositivos" - -#: ../../src/actionGroups/devicesGroup.vala:37 -msgid "Shows a Slice for each plugged in devices, like USB-Sticks." -msgstr "Muestra una Rebanada por cada dispositivo conectado, como USB-Sticks." - -#: ../../src/actionGroups/devicesGroup.vala:85 -msgid "Root" -msgstr "Root" - -#: ../../src/utilities/bindingManager.vala:161 ../../src/utilities/key.vala:65 -#: ../../src/utilities/trigger.vala:212 ../../src/utilities/trigger.vala:213 -msgid "Not bound" -msgstr "No encontrado" - -#: ../../src/utilities/trigger.vala:163 -msgid "Button %i" -msgstr "Botón %i" - -#: ../../src/utilities/trigger.vala:166 -msgid "LeftButton" -msgstr "BotónIzquierdo" - -#: ../../src/utilities/trigger.vala:168 -msgid "RightButton" -msgstr "BotónDerecho" - -#: ../../src/utilities/trigger.vala:170 -msgid "MiddleButton" -msgstr "BotónCentral" - -#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190 -#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:196 -msgid "Turbo" -msgstr "Turbo" - -#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:192 -#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:198 -msgid "Delayed" -msgstr "Retrasado" - -#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190 -#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:200 -msgid "Centered" -msgstr "Centrado" - #: ../../src/pies/defaultConfig.vala:29 msgid "Multimedia" msgstr "Multimedia" @@ -319,120 +349,90 @@ msgstr "Maximizar" msgid "Restore" msgstr "Restaurar" -#: ../ui/icon_select.ui:8 -msgid "Select an icon" -msgstr "Selecciona un icono" - -#: ../ui/icon_select.ui:85 -msgid "Icon Theme" -msgstr "Tema de iconos" - -#: ../ui/icon_select.ui:105 -msgid "Custom Icon" -msgstr "Icono personalizado" - -#: ../ui/trigger_select.ui:8 +#: ../ui/trigger_select.ui:53 msgid "Activation Settings" msgstr "Configuración de activación" -#: ../ui/trigger_select.ui:86 +#: ../ui/trigger_select.ui:132 msgid "It's possible to bind mouse buttons as well!" -msgstr "Es posible enlazar los botones del ratón también!" +msgstr "También es posible enlazar los botones del ratón!" -#: ../ui/trigger_select.ui:118 +#: ../ui/trigger_select.ui:165 msgid "Turbo mode" msgstr "Modo Turbo" -#: ../ui/trigger_select.ui:123 ../ui/trigger_select.ui:124 +#: ../ui/trigger_select.ui:171 ../ui/trigger_select.ui:172 msgid "If checked, the Pie will close when you release the chosen hot key." -msgstr "el Pastel cerrará cuando sueltes el atajo seleccionado." +msgstr "El Pastel cerrará cuando sueltes el atajo seleccionado." -#: ../ui/trigger_select.ui:137 +#: ../ui/trigger_select.ui:184 msgid "Long press for activation" -msgstr "Larga pulsación para la activación" +msgstr "Pulsación larga para activar" -#: ../ui/trigger_select.ui:142 ../ui/trigger_select.ui:143 +#: ../ui/trigger_select.ui:190 ../ui/trigger_select.ui:191 msgid "" "If checked, the Pie will only open if you press this hot key a bit longer." -msgstr "el Pastel solo se abrirá si presionas el atajo un poco más." +msgstr "El Pastel sólo se abrirá si presionas el atajo un poco más." -#: ../ui/trigger_select.ui:156 +#: ../ui/trigger_select.ui:203 msgid "Open Pie centered on the screen" msgstr "Abrir el Pastel en el centro de la pantalla" -#: ../ui/trigger_select.ui:161 ../ui/trigger_select.ui:162 +#: ../ui/trigger_select.ui:209 ../ui/trigger_select.ui:210 msgid "" "If checked, the Pie will open in the middle of your screen. Else it will pop " "up at your pointer." msgstr "" -"el Pastel abrirá en el centro de la pantalla. De lo contrario abrirá encima " +"El Pastel abrirá en el centro de la pantalla. De lo contrario abrirá encima " "del puntero." -#: ../ui/trigger_select.ui:181 -msgid "Activation options" -msgstr "Opciones de activación" - -#: ../ui/settings.ui:9 ../ui/preferences.ui:27 -msgid "General Settings" -msgstr "Configuraciones Generales" - -#: ../ui/settings.ui:74 -msgid "Start Gnome-Pie on login" -msgstr "Arrancar Gnome-Pie al inicio" - -#: ../ui/settings.ui:79 ../ui/settings.ui:80 -msgid "If checked, Gnome-Pie will start silently everytime you log in." -msgstr "Gnome-Pie se iniciará en silencio cada vez que inicies sesión." - -#: ../ui/settings.ui:93 -msgid "Display panel icon " -msgstr "Mostrar panel de íconos" +#: ../ui/trigger_select.ui:222 +msgid "Warp mouse pointer to center of Pie" +msgstr "Teletransportar el mouse al centro del Pastel" -#: ../ui/settings.ui:98 ../ui/settings.ui:99 +#: ../ui/trigger_select.ui:228 ../ui/trigger_select.ui:229 msgid "" -"If not checked, you can access this menu by launching Gnome-Pie a second " -"time." -msgstr "Si no esta activado, puedes acceder a este menú lanzando Gnome-Pie " -"por segunda vez." - -#: ../ui/settings.ui:118 -msgid "Behavior" -msgstr "Comportamiento" +"If checked, the mouse pointer will be warped to the center of the Pie. This " +"allows for quick selections even if the Pie is opened at the screen's " +"boundary." +msgstr "" +"El puntero será teletransportado al centro del Pastel. Esto permite " +"acelerar la selección cuando el pastel es abierto cerca de un borde o en el " +"centro de la pantalla." -#: ../ui/settings.ui:175 -msgid "Global scale" -msgstr "Escala Global" +#: ../ui/trigger_select.ui:247 +msgid "Activation options" +msgstr "Opciones de activación" -#: ../ui/settings.ui:207 -#, fuzzy -msgid "Display Slice labels" -msgstr "Mostrar las etiquetas de las Rebanadas" +#: ../ui/trigger_select.ui:438 +msgid "Automatically select the best pie shape" +msgstr "Seleccionar automáticamente la mejor forma de Pastel" -#: ../ui/settings.ui:212 ../ui/settings.ui:213 +#: ../ui/trigger_select.ui:442 msgid "" -"Displays the name of each Slice next to it. Only available if supported by " -"the theme." +"If checked, the shape will be automatically selected to minimize mouse " +"travelling." msgstr "" -"Mostrar el nombre de cada Rebanada. Solo si es soportado por el theme." +"La forma del Pastel se ajustará según la posición del puntero para " +"minimizar la distancia al centro" -#: ../ui/settings.ui:232 -#, fuzzy -msgid "Appearance" -msgstr "Apariencia" +#: ../ui/trigger_select.ui:462 +msgid "Pie shape" +msgstr "Forma del Pastel" -#: ../ui/slice_select.ui:9 +#: ../ui/slice_select.ui:8 msgid "Slice Options" msgstr "Opciones de Rebanadas" -#: ../ui/slice_select.ui:139 +#: ../ui/slice_select.ui:141 msgid "There are no options for this Slice type." msgstr "No hay opciones para este tipo de Rebanada." -#: ../ui/slice_select.ui:165 +#: ../ui/slice_select.ui:167 msgid "Name of the Slice " msgstr "Nombre de la Rebanada " -#: ../ui/slice_select.ui:204 +#: ../ui/slice_select.ui:205 msgid "URI to open" msgstr "URI a abrir" @@ -440,49 +440,69 @@ msgstr "URI a abrir" msgid "Command to execute" msgstr "Comando a ejecutar" -#: ../ui/slice_select.ui:282 +#: ../ui/slice_select.ui:281 msgid "Hotkey to press" msgstr "Atajo a presionar" -#: ../ui/slice_select.ui:311 +#: ../ui/slice_select.ui:310 msgid "Pie to open" msgstr "Pastel a abrir" -#: ../ui/slice_select.ui:340 +#: ../ui/slice_select.ui:339 msgid "Is Quick Action" msgstr "Es una Acción Rápida" #: ../ui/slice_select.ui:354 ../ui/slice_select.ui:355 msgid "This Slice will be executed when you click in the middle of the Pie." -msgstr "Esta Rebanada se ejecutará cuando hagas click en el medio del Pastel." +msgstr "Esta Rebanada se ejecutará cuando hagas click en el centro del Pastel." -#: ../ui/slice_select.ui:388 +#: ../ui/slice_select.ui:387 msgid "Slice options" msgstr "Opciones de Rebanadas" -#: ../ui/preferences.ui:8 +#: ../ui/icon_select.ui:9 +msgid "Select an icon" +msgstr "Selecciona un icono" + +#: ../ui/icon_select.ui:103 +msgid "Icon Theme" +msgstr "Tema de iconos" + +#: ../ui/icon_select.ui:123 +msgid "Custom Icon" +msgstr "Icono personalizado" + +#: ../ui/rename_pie.ui:8 +msgid "Rename a Pie" +msgstr "Renombrar un Pastel" + +#: ../ui/preferences.ui:7 msgid "Gnome-Pie Settings" msgstr "Configuraciones de Gnome-Pie" -#: ../ui/preferences.ui:261 +#: ../ui/preferences.ui:27 ../ui/settings.ui:8 +msgid "General Settings" +msgstr "Configuraciones Generales" + +#: ../ui/preferences.ui:266 msgid "" "<b><big>This Pie is empty!</big>\n" "\n" "Start adding Slices to it!</b> This can be done by dragging stuff to the " "plus sign below. You can try a lot! For example application launchers or " -"folders. Even URLs from your browser are possible... \n" +"folders. Even URLs from your browser are possible...\n" "\n" "For manual and advanced configuration click on the plus sign." msgstr "" "<b><big>Un Pastel vacío!</big>\n" "\n" -"Empieza añadiendo Rebanadas!</b> Puedes hacerlo añadiendo cosas al signo " +"Empieza añadiendo Rebanadas!</b> Puedes hacerlo arrastrando cosas al signo " "más. Puedes intentar muchas cosas! Por ejemplo lanzadores de aplicaciones o " -"directorios. Incluso puedes añadir URLs desde tu navegador... \n" +"directorios. Incluso puedes añadir URLs desde tu navegador...\n" "\n" "Para configuración manual y avanzada, click en el signo más." -#: ../ui/preferences.ui:282 +#: ../ui/preferences.ui:287 msgid "" "<b><big>You have no Pies!</big>\n" "\n" @@ -494,12 +514,53 @@ msgstr "" "Empieza por crear uno! </b> Puedes hacerlo haciendo click en el pequeño " "signo más en la esquina inferior izquierda." -#: ../ui/rename_pie.ui:8 -msgid "Rename a Pie" -msgstr "Renombrar un Pastel" +#: ../ui/settings.ui:75 +msgid "Start Gnome-Pie on login" +msgstr "Arrancar Gnome-Pie al inicio" + +#: ../ui/settings.ui:81 ../ui/settings.ui:82 +msgid "If checked, Gnome-Pie will start silently everytime you log in." +msgstr "Gnome-Pie se iniciará en silencio cada vez que inicies sesión." + +#: ../ui/settings.ui:94 +msgid "Display panel icon " +msgstr "Mostrar panel de íconos " + +#: ../ui/settings.ui:100 ../ui/settings.ui:101 +msgid "" +"If not checked, you can access this menu by launching Gnome-Pie a second " +"time." +msgstr "Si no esta activado, puedes acceder a este menú lanzando Gnome-Pie " +"por segunda vez." + +#: ../ui/settings.ui:119 +msgid "Behavior" +msgstr "Comportamiento" + +#: ../ui/settings.ui:178 +msgid "Global scale" +msgstr "Escala Global" + +#: ../ui/settings.ui:217 +msgid "Maximum slices per pie" +msgstr "Máximo de Rebanadas por Pastel" + +#: ../ui/settings.ui:256 +msgid "Maximum activation radius" +msgstr "Radio máximo de activación" + +#: ../ui/settings.ui:287 +msgid "Display Slice labels" +msgstr "Mostrar etiquetas en las Rebanadas" + +#: ../ui/settings.ui:293 ../ui/settings.ui:294 +msgid "" +"Displays the name of each Slice next to it. Only available if supported by " +"the theme." +msgstr "" +"Mostrar el nombre de cada Rebanada. Sólo si es soportado por el Tema." -#~ msgid "Suspend" -#~ msgstr "Suspender" +#: ../ui/settings.ui:312 +msgid "Appearance" +msgstr "Apariencia" -#~ msgid "Hibernate" -#~ msgstr "Hibernar" diff --git a/resources/locale/es/LC_MESSAGES/gnomepie.mo b/resources/locale/es/LC_MESSAGES/gnomepie.mo Binary files differindex 9b22914..63ef92f 100644 --- a/resources/locale/es/LC_MESSAGES/gnomepie.mo +++ b/resources/locale/es/LC_MESSAGES/gnomepie.mo diff --git a/resources/locale/gnomepie.pot b/resources/locale/gnomepie.pot index 9684268..b87c651 100644 --- a/resources/locale/gnomepie.pot +++ b/resources/locale/gnomepie.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnomepie 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-29 16:07-0300\n" +"POT-Creation-Date: 2015-04-07 08:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -25,22 +25,6 @@ msgstr "" msgid "Simulates the activation of a hotkey." msgstr "" -#: ../../src/actions/pieAction.vala:34 -msgid "Open Pie" -msgstr "" - -#: ../../src/actions/pieAction.vala:36 -msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." -msgstr "" - -#: ../../src/actions/appAction.vala:34 -msgid "Launch application" -msgstr "" - -#: ../../src/actions/appAction.vala:36 -msgid "Executes the given command." -msgstr "" - #: ../../src/actions/uriAction.vala:34 msgid "Open URI" msgstr "" @@ -53,199 +37,188 @@ msgstr "" msgid "Trash" msgstr "" -#: ../../src/utilities/trigger.vala:163 -msgid "Button %i" -msgstr "" - -#: ../../src/utilities/trigger.vala:166 -msgid "LeftButton" -msgstr "" - -#: ../../src/utilities/trigger.vala:168 -msgid "RightButton" +#: ../../src/actions/appAction.vala:34 +msgid "Launch application" msgstr "" -#: ../../src/utilities/trigger.vala:170 -msgid "MiddleButton" +#: ../../src/actions/appAction.vala:36 +msgid "Executes the given command." msgstr "" -#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190 -#: ../../src/utilities/trigger.vala:192 ../../src/utilities/trigger.vala:196 -msgid "Turbo" +#: ../../src/actions/pieAction.vala:34 +msgid "Open Pie" msgstr "" -#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:192 -#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:198 -msgid "Delayed" +#: ../../src/actions/pieAction.vala:36 +msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." msgstr "" -#: ../../src/utilities/trigger.vala:188 ../../src/utilities/trigger.vala:190 -#: ../../src/utilities/trigger.vala:194 ../../src/utilities/trigger.vala:200 -msgid "Centered" +#: ../../src/gui/preferencesWindow.vala:166 +msgid "No Pie selected." msgstr "" -#: ../../src/utilities/trigger.vala:212 ../../src/utilities/trigger.vala:213 -#: ../../src/utilities/key.vala:65 ../../src/utilities/bindingManager.vala:161 -msgid "Not bound" +#: ../../src/gui/preferencesWindow.vala:206 +msgid "New Pie" msgstr "" -#: ../../src/pies/defaultConfig.vala:29 -msgid "Multimedia" +#: ../../src/gui/preferencesWindow.vala:219 +msgid "" +"Do you really want to delete the selected Pie with all contained Slices?" msgstr "" -#: ../../src/pies/defaultConfig.vala:30 -msgid "Next Track" +#: ../../src/gui/triggerSelectWindow.vala:226 +msgid "" +"This hotkey is already assigned to the pie \"%s\"! \n" +"\n" +"Please select another one or cancel your selection." msgstr "" -#: ../../src/pies/defaultConfig.vala:31 -msgid "Stop" +#: ../../src/gui/piePreview.vala:148 +msgid "Do you really want to delete this Slice?" msgstr "" -#: ../../src/pies/defaultConfig.vala:32 -msgid "Previous Track" +#: ../../src/gui/sliceTypeList.vala:60 +msgid "Slice types" msgstr "" -#: ../../src/pies/defaultConfig.vala:33 -msgid "Play/Pause" +#: ../../src/gui/piePreviewRenderer.vala:419 +msgid "Click to edit" msgstr "" -#: ../../src/pies/defaultConfig.vala:36 -#: ../../src/gui/iconSelectWindow.vala:187 -msgid "Applications" +#: ../../src/gui/piePreviewRenderer.vala:419 +#: ../../src/gui/piePreviewRenderer.vala:434 +msgid "Drag to move" msgstr "" -#: ../../src/pies/defaultConfig.vala:45 -msgid "Bookmarks" +#: ../../src/gui/piePreviewRenderer.vala:422 +msgid "Click to add a new Slice" msgstr "" -#: ../../src/pies/defaultConfig.vala:50 -msgid "Session" +#: ../../src/gui/piePreviewRenderer.vala:426 +msgid "Drop to add as new Slice" msgstr "" -#: ../../src/pies/defaultConfig.vala:54 -msgid "Main Menu" +#: ../../src/gui/piePreviewRenderer.vala:429 +msgid "Drop to move Slice" msgstr "" -#: ../../src/pies/defaultConfig.vala:58 -msgid "Window" +#: ../../src/gui/piePreviewRenderer.vala:434 +msgid "Click to delete" msgstr "" -#: ../../src/pies/defaultConfig.vala:59 -msgid "Scale" +#: ../../src/gui/iconSelectWindow.vala:182 +msgid "All icons" msgstr "" -#: ../../src/pies/defaultConfig.vala:60 -msgid "Minimize" +#: ../../src/gui/iconSelectWindow.vala:183 +#: ../../src/pies/defaultConfig.vala:36 +msgid "Applications" msgstr "" -#: ../../src/pies/defaultConfig.vala:61 -msgid "Close" +#: ../../src/gui/iconSelectWindow.vala:184 +msgid "Actions" msgstr "" -#: ../../src/pies/defaultConfig.vala:62 -msgid "Maximize" +#: ../../src/gui/iconSelectWindow.vala:185 +msgid "Places" msgstr "" -#: ../../src/pies/defaultConfig.vala:63 -msgid "Restore" +#: ../../src/gui/iconSelectWindow.vala:186 +msgid "File types" msgstr "" -#: ../../src/gui/piePreview.vala:155 -msgid "Do you really want to delete this Slice?" +#: ../../src/gui/iconSelectWindow.vala:187 +msgid "Emotes" msgstr "" -#: ../../src/gui/themeList.vala:62 -msgid "Themes" +#: ../../src/gui/iconSelectWindow.vala:188 +msgid "Miscellaneous" msgstr "" -#: ../../src/gui/themeList.vala:99 -msgid "By" +#: ../../src/gui/iconSelectWindow.vala:261 +msgid "All supported image formats" msgstr "" #: ../../src/gui/newSliceWindow.vala:291 msgid "Rename me!" msgstr "" -#: ../../src/gui/triggerSelectWindow.vala:166 -msgid "" -"This hotkey is already assigned to the pie \"%s\"! \n" -"\n" -"Please select another one or cancel your selection." +#: ../../src/gui/themeList.vala:62 +msgid "Themes" msgstr "" -#: ../../src/gui/piePreviewRenderer.vala:412 -msgid "Click to edit" +#: ../../src/gui/themeList.vala:99 +msgid "By" msgstr "" -#: ../../src/gui/piePreviewRenderer.vala:412 -#: ../../src/gui/piePreviewRenderer.vala:427 -msgid "Drag to move" +#: ../../src/gui/indicator.vala:114 +msgid "_Preferences" msgstr "" -#: ../../src/gui/piePreviewRenderer.vala:415 -msgid "Click to add a new Slice" +#: ../../src/gui/indicator.vala:123 +msgid "_About" msgstr "" -#: ../../src/gui/piePreviewRenderer.vala:419 -msgid "Drop to add as new Slice" +#: ../../src/gui/indicator.vala:138 +msgid "_Quit" msgstr "" -#: ../../src/gui/piePreviewRenderer.vala:422 -msgid "Drop to move Slice" +#: ../../src/gui/newsWindow.vala:64 +msgid "_Close" msgstr "" -#: ../../src/gui/piePreviewRenderer.vala:427 -msgid "Click to delete" +#: ../../src/gui/triggerSelectButton.vala:64 +msgid "Press a hotkey ..." msgstr "" -#: ../../src/gui/preferencesWindow.vala:175 -msgid "No Pie selected." +#: ../../src/utilities/key.vala:65 ../../src/utilities/bindingManager.vala:177 +#: ../../src/utilities/trigger.vala:195 ../../src/utilities/trigger.vala:280 +#: ../../src/utilities/trigger.vala:281 +msgid "Not bound" msgstr "" -#: ../../src/gui/preferencesWindow.vala:215 -msgid "New Pie" +#: ../../src/utilities/trigger.vala:182 +msgid "Button %i" msgstr "" -#: ../../src/gui/preferencesWindow.vala:228 -msgid "" -"Do you really want to delete the selected Pie with all contained Slices?" +#: ../../src/utilities/trigger.vala:185 +msgid "LeftButton" msgstr "" -#: ../../src/gui/triggerSelectButton.vala:63 -msgid "Press a hotkey ..." +#: ../../src/utilities/trigger.vala:187 +msgid "RightButton" msgstr "" -#: ../../src/gui/sliceTypeList.vala:60 -msgid "Slice types" +#: ../../src/utilities/trigger.vala:189 +msgid "MiddleButton" msgstr "" -#: ../../src/gui/iconSelectWindow.vala:186 -msgid "All icons" +#: ../../src/utilities/trigger.vala:216 +msgid "Turbo" msgstr "" -#: ../../src/gui/iconSelectWindow.vala:188 -msgid "Actions" +#: ../../src/utilities/trigger.vala:220 ../../src/utilities/trigger.vala:222 +msgid "Delayed" msgstr "" -#: ../../src/gui/iconSelectWindow.vala:189 -msgid "Places" +#: ../../src/utilities/trigger.vala:226 ../../src/utilities/trigger.vala:228 +msgid "Centered" msgstr "" -#: ../../src/gui/iconSelectWindow.vala:190 -msgid "File types" +#: ../../src/utilities/trigger.vala:232 ../../src/utilities/trigger.vala:234 +msgid "Warp" msgstr "" -#: ../../src/gui/iconSelectWindow.vala:191 -msgid "Emotes" +#: ../../src/utilities/trigger.vala:238 ../../src/utilities/trigger.vala:240 +msgid "Auto-shaped" msgstr "" -#: ../../src/gui/iconSelectWindow.vala:192 -msgid "Miscellaneous" +#: ../../src/utilities/trigger.vala:243 ../../src/utilities/trigger.vala:245 +msgid "Quarter pie" msgstr "" -#: ../../src/gui/iconSelectWindow.vala:267 -#: ../../src/gui/iconSelectWindow.vala:269 -msgid "All supported image formats" +#: ../../src/utilities/trigger.vala:249 ../../src/utilities/trigger.vala:251 +msgid "Half pie" msgstr "" #: ../../src/actionGroups/windowListGroup.vala:34 @@ -256,6 +229,14 @@ msgstr "" msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab." msgstr "" +#: ../../src/actionGroups/clipboardGroup.vala:64 +msgid "Group: Clipboard" +msgstr "" + +#: ../../src/actionGroups/clipboardGroup.vala:66 +msgid "Manages your Clipboard." +msgstr "" + #: ../../src/actionGroups/devicesGroup.vala:35 msgid "Group: Devices" msgstr "" @@ -268,12 +249,12 @@ msgstr "" msgid "Root" msgstr "" -#: ../../src/actionGroups/bookmarkGroup.vala:36 -msgid "Group: Bookmarks" +#: ../../src/actionGroups/menuGroup.vala:35 +msgid "Group: Main menu" msgstr "" -#: ../../src/actionGroups/bookmarkGroup.vala:38 -msgid "Shows a Slice for each of your directory Bookmarks." +#: ../../src/actionGroups/menuGroup.vala:37 +msgid "Displays your main menu structure." msgstr "" #: ../../src/actionGroups/sessionGroup.vala:35 @@ -296,78 +277,147 @@ msgstr "" msgid "Reboot" msgstr "" -#: ../../src/actionGroups/menuGroup.vala:35 -msgid "Group: Main menu" +#: ../../src/actionGroups/bookmarkGroup.vala:36 +msgid "Group: Bookmarks" msgstr "" -#: ../../src/actionGroups/menuGroup.vala:37 -msgid "Displays your main menu structure." +#: ../../src/actionGroups/bookmarkGroup.vala:38 +msgid "Shows a Slice for each of your directory Bookmarks." msgstr "" -#: ../../src/actionGroups/clipboardGroup.vala:64 -msgid "Group: Clipboard" +#: ../../src/pies/defaultConfig.vala:29 +msgid "Multimedia" msgstr "" -#: ../../src/actionGroups/clipboardGroup.vala:66 -msgid "Manages your Clipboard." +#: ../../src/pies/defaultConfig.vala:30 +msgid "Next Track" msgstr "" -#: ../ui/icon_select.ui:8 -msgid "Select an icon" +#: ../../src/pies/defaultConfig.vala:31 +msgid "Stop" msgstr "" -#: ../ui/icon_select.ui:85 -msgid "Icon Theme" +#: ../../src/pies/defaultConfig.vala:32 +msgid "Previous Track" msgstr "" -#: ../ui/icon_select.ui:105 -msgid "Custom Icon" +#: ../../src/pies/defaultConfig.vala:33 +msgid "Play/Pause" msgstr "" -#: ../ui/rename_pie.ui:8 -msgid "Rename a Pie" +#: ../../src/pies/defaultConfig.vala:45 +msgid "Bookmarks" msgstr "" -#: ../ui/preferences.ui:8 -msgid "Gnome-Pie Settings" +#: ../../src/pies/defaultConfig.vala:50 +msgid "Session" msgstr "" -#: ../ui/preferences.ui:27 ../ui/settings.ui:9 -msgid "General Settings" +#: ../../src/pies/defaultConfig.vala:54 +msgid "Main Menu" +msgstr "" + +#: ../../src/pies/defaultConfig.vala:58 +msgid "Window" +msgstr "" + +#: ../../src/pies/defaultConfig.vala:59 +msgid "Scale" +msgstr "" + +#: ../../src/pies/defaultConfig.vala:60 +msgid "Minimize" +msgstr "" + +#: ../../src/pies/defaultConfig.vala:61 +msgid "Close" +msgstr "" + +#: ../../src/pies/defaultConfig.vala:62 +msgid "Maximize" +msgstr "" + +#: ../../src/pies/defaultConfig.vala:63 +msgid "Restore" +msgstr "" + +#: ../ui/trigger_select.ui:53 +msgid "Activation Settings" +msgstr "" + +#: ../ui/trigger_select.ui:132 +msgid "It's possible to bind mouse buttons as well!" +msgstr "" + +#: ../ui/trigger_select.ui:165 +msgid "Turbo mode" +msgstr "" + +#: ../ui/trigger_select.ui:171 ../ui/trigger_select.ui:172 +msgid "If checked, the Pie will close when you release the chosen hot key." msgstr "" -#: ../ui/preferences.ui:261 +#: ../ui/trigger_select.ui:184 +msgid "Long press for activation" +msgstr "" + +#: ../ui/trigger_select.ui:190 ../ui/trigger_select.ui:191 msgid "" -"<b><big>This Pie is empty!</big>\n" -"\n" -"Start adding Slices to it!</b> This can be done by dragging stuff to the " -"plus sign below. You can try a lot! For example application launchers or " -"folders. Even URLs from your browser are possible... \n" -"\n" -"For manual and advanced configuration click on the plus sign." +"If checked, the Pie will only open if you press this hot key a bit longer." msgstr "" -#: ../ui/preferences.ui:282 +#: ../ui/trigger_select.ui:203 +msgid "Open Pie centered on the screen" +msgstr "" + +#: ../ui/trigger_select.ui:209 ../ui/trigger_select.ui:210 msgid "" -"<b><big>You have no Pies!</big>\n" -"\n" -"Start by creating one! </b> This can be done by clicking on the tiny little " -"plus sign in the lower left corner." +"If checked, the Pie will open in the middle of your screen. Else it will pop " +"up at your pointer." +msgstr "" + +#: ../ui/trigger_select.ui:222 +msgid "Warp mouse pointer to center of Pie" +msgstr "" + +#: ../ui/trigger_select.ui:228 ../ui/trigger_select.ui:229 +msgid "" +"If checked, the mouse pointer will be warped to the center of the Pie. This " +"allows for quick selections even if the Pie is opened at the screen's " +"boundary." +msgstr "" + +#: ../ui/trigger_select.ui:247 +msgid "Activation options" +msgstr "" + +#: ../ui/trigger_select.ui:438 +msgid "Automatically select the best pie shape" msgstr "" -#: ../ui/slice_select.ui:9 +#: ../ui/trigger_select.ui:442 +msgid "" +"If checked, the shape will be automatically selected to minimize mouse " +"travelling." +msgstr "" + +#: ../ui/trigger_select.ui:462 +msgid "Pie shape" +msgstr "" + +#: ../ui/slice_select.ui:8 msgid "Slice Options" msgstr "" -#: ../ui/slice_select.ui:139 +#: ../ui/slice_select.ui:141 msgid "There are no options for this Slice type." msgstr "" -#: ../ui/slice_select.ui:165 +#: ../ui/slice_select.ui:167 msgid "Name of the Slice " msgstr "" -#: ../ui/slice_select.ui:204 +#: ../ui/slice_select.ui:205 msgid "URI to open" msgstr "" @@ -375,15 +425,15 @@ msgstr "" msgid "Command to execute" msgstr "" -#: ../ui/slice_select.ui:282 +#: ../ui/slice_select.ui:281 msgid "Hotkey to press" msgstr "" -#: ../ui/slice_select.ui:311 +#: ../ui/slice_select.ui:310 msgid "Pie to open" msgstr "" -#: ../ui/slice_select.ui:340 +#: ../ui/slice_select.ui:339 msgid "Is Quick Action" msgstr "" @@ -391,85 +441,97 @@ msgstr "" msgid "This Slice will be executed when you click in the middle of the Pie." msgstr "" -#: ../ui/slice_select.ui:388 +#: ../ui/slice_select.ui:387 msgid "Slice options" msgstr "" -#: ../ui/settings.ui:74 -msgid "Start Gnome-Pie on login" +#: ../ui/icon_select.ui:9 +msgid "Select an icon" msgstr "" -#: ../ui/settings.ui:79 ../ui/settings.ui:80 -msgid "If checked, Gnome-Pie will start silently everytime you log in." +#: ../ui/icon_select.ui:103 +msgid "Icon Theme" msgstr "" -#: ../ui/settings.ui:93 -msgid "Display panel icon " +#: ../ui/icon_select.ui:123 +msgid "Custom Icon" msgstr "" -#: ../ui/settings.ui:98 ../ui/settings.ui:99 -msgid "" -"If not checked, you can access this menu by launching Gnome-Pie a second " -"time." +#: ../ui/rename_pie.ui:8 +msgid "Rename a Pie" msgstr "" -#: ../ui/settings.ui:118 -msgid "Behavior" +#: ../ui/preferences.ui:7 +msgid "Gnome-Pie Settings" msgstr "" -#: ../ui/settings.ui:175 -msgid "Global scale" +#: ../ui/preferences.ui:27 ../ui/settings.ui:8 +msgid "General Settings" msgstr "" -#: ../ui/settings.ui:207 -msgid "Display Slice labels" +#: ../ui/preferences.ui:266 +msgid "" +"<b><big>This Pie is empty!</big>\n" +"\n" +"Start adding Slices to it!</b> This can be done by dragging stuff to the " +"plus sign below. You can try a lot! For example application launchers or " +"folders. Even URLs from your browser are possible...\n" +"\n" +"For manual and advanced configuration click on the plus sign." msgstr "" -#: ../ui/settings.ui:212 ../ui/settings.ui:213 +#: ../ui/preferences.ui:287 msgid "" -"Displays the name of each Slice next to it. Only available if supported by " -"the theme." +"<b><big>You have no Pies!</big>\n" +"\n" +"Start by creating one! </b> This can be done by clicking on the tiny little " +"plus sign in the lower left corner." msgstr "" -#: ../ui/settings.ui:232 -msgid "Appearance" +#: ../ui/settings.ui:75 +msgid "Start Gnome-Pie on login" msgstr "" -#: ../ui/trigger_select.ui:8 -msgid "Activation Settings" +#: ../ui/settings.ui:81 ../ui/settings.ui:82 +msgid "If checked, Gnome-Pie will start silently everytime you log in." msgstr "" -#: ../ui/trigger_select.ui:86 -msgid "It's possible to bind mouse buttons as well!" +#: ../ui/settings.ui:94 +msgid "Display panel icon " msgstr "" -#: ../ui/trigger_select.ui:118 -msgid "Turbo mode" +#: ../ui/settings.ui:100 ../ui/settings.ui:101 +msgid "" +"If not checked, you can access this menu by launching Gnome-Pie a second " +"time." msgstr "" -#: ../ui/trigger_select.ui:123 ../ui/trigger_select.ui:124 -msgid "If checked, the Pie will close when you release the chosen hot key." +#: ../ui/settings.ui:119 +msgid "Behavior" msgstr "" -#: ../ui/trigger_select.ui:137 -msgid "Long press for activation" +#: ../ui/settings.ui:178 +msgid "Global scale" msgstr "" -#: ../ui/trigger_select.ui:142 ../ui/trigger_select.ui:143 -msgid "" -"If checked, the Pie will only open if you press this hot key a bit longer." +#: ../ui/settings.ui:217 +msgid "Maximum slices per pie" msgstr "" -#: ../ui/trigger_select.ui:156 -msgid "Open Pie centered on the screen" +#: ../ui/settings.ui:256 +msgid "Maximum activation radius" msgstr "" -#: ../ui/trigger_select.ui:161 ../ui/trigger_select.ui:162 +#: ../ui/settings.ui:287 +msgid "Display Slice labels" +msgstr "" + +#: ../ui/settings.ui:293 ../ui/settings.ui:294 msgid "" -"If checked, the Pie will open in the middle of your screen. Else it will pop " -"up at your pointer." +"Displays the name of each Slice next to it. Only available if supported by " +"the theme." msgstr "" -#: ../ui/trigger_select.ui:181 -msgid "Activation options" +#: ../ui/settings.ui:312 +msgid "Appearance" msgstr "" diff --git a/resources/themes/adwaita/arrow.svg b/resources/themes/adwaita/arrow.svg index 4b81a6d..d6e0e84 100644 --- a/resources/themes/adwaita/arrow.svg +++ b/resources/themes/adwaita/arrow.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="arrow.svg"> <defs id="defs4"> @@ -76,8 +76,8 @@ inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="11.2" - inkscape:cx="77.449971" - inkscape:cy="47.388963" + inkscape:cx="93.12865" + inkscape:cy="42.239723" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -86,13 +86,17 @@ inkscape:guide-bbox="true" inkscape:window-width="1174" inkscape:window-height="737" - inkscape:window-x="552" - inkscape:window-y="163" + inkscape:window-x="225" + inkscape:window-y="142" inkscape:window-maximized="0"> <sodipodi:guide orientation="0,1" position="111.25,50" id="guide2994" /> + <sodipodi:guide + orientation="1,0" + position="89.714173,50" + id="guide2995" /> </sodipodi:namedview> <metadata id="metadata7"> @@ -112,10 +116,14 @@ id="layer1" transform="translate(0,-952.36218)"> <path - style="fill:#ffffff;fill-opacity:1;stroke:none" - d="m 81.857481,996.8239 5.535712,5.5357 -5.535712,5.5357 c 0.621411,-3.8458 0.51189,-7.5089 0,-11.0714 z" - id="rect2998" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cccc" /> + sodipodi:type="arc" + style="fill:#efefef;fill-opacity:1;stroke:none" + id="path3765" + sodipodi:cx="83.125" + sodipodi:cy="50" + sodipodi:rx="16.696428" + sodipodi:ry="16.696428" + d="m 99.821428,50 a 16.696428,16.696428 0 1 1 -33.392856,0 16.696428,16.696428 0 1 1 33.392856,0 z" + transform="matrix(0.47058823,0,0,0.47058823,44.007354,978.83277)" /> </g> </svg> diff --git a/resources/themes/adwaita/arrow_bg.svg b/resources/themes/adwaita/arrow_bg.svg new file mode 100644 index 0000000..128deb7 --- /dev/null +++ b/resources/themes/adwaita/arrow_bg.svg @@ -0,0 +1,129 @@ +<?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_bg.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" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#1d1d1d" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="1" + inkscape:pageshadow="2" + inkscape:zoom="11.2" + inkscape:cx="93.12865" + inkscape:cy="42.239723" + 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="225" + inkscape:window-y="142" + inkscape:window-maximized="0"> + <sodipodi:guide + orientation="0,1" + position="111.25,50" + id="guide2994" /> + <sodipodi:guide + orientation="1,0" + position="89.714173,50" + id="guide2995" /> + </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></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Ebene 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-952.36218)"> + <path + sodipodi:type="arc" + style="fill:#efefef;fill-opacity:1;stroke:#a1a1a1;stroke-opacity:1;stroke-width:1.42587502;stroke-miterlimit:4;stroke-dasharray:none" + id="path3765" + sodipodi:cx="83.125" + sodipodi:cy="50" + sodipodi:rx="16.696428" + sodipodi:ry="16.696428" + d="m 99.821428,50 a 16.696428,16.696428 0 1 1 -33.392856,0 16.696428,16.696428 0 1 1 33.392856,0 z" + transform="matrix(0.47058823,0,0,0.47058823,44.007354,978.83277)" /> + </g> +</svg> diff --git a/resources/themes/adwaita/icon.svg b/resources/themes/adwaita/icon.svg new file mode 100644 index 0000000..577fc54 --- /dev/null +++ b/resources/themes/adwaita/icon.svg @@ -0,0 +1,245 @@ +<?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="icon.svg"> + <defs + id="defs4"> + <linearGradient + id="linearGradient3784"> + <stop + style="stop-color:#edeeed;stop-opacity:1" + offset="0" + id="stop3786" /> + <stop + style="stop-color:#f8f8f8;stop-opacity:1" + offset="1" + id="stop3788" /> + </linearGradient> + <linearGradient + id="linearGradient3800"> + <stop + id="stop3810" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + style="stop-color:#000000;stop-opacity:0.63106796" + offset="0.5776158" + id="stop3780" /> + <stop + id="stop3813" + offset="0.75491738" + style="stop-color:#000000;stop-opacity:0.27843137;" /> + <stop + id="stop3811" + offset="0.79946876" + style="stop-color:#000000;stop-opacity:0.19215686;" /> + <stop + id="stop3782" + offset="0.86143982" + style="stop-color:#000000;stop-opacity:0.10980392;" /> + <stop + style="stop-color:#000000;stop-opacity:0" + offset="1" + id="stop3804" /> + </linearGradient> + <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> + <linearGradient + id="linearGradient3767"> + <stop + style="stop-color:#ffffff;stop-opacity:0" + offset="0" + id="stop3769" /> + <stop + id="stop4739" + offset="0.3680203" + style="stop-color:#ffffff;stop-opacity:0;" /> + <stop + style="stop-color:#ffffff;stop-opacity:0.66666667;" + offset="0.59831607" + 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> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3767" + id="radialGradient3775" + cx="50.002552" + cy="49.744911" + fx="50.002552" + fy="49.744911" + r="49.750011" + gradientUnits="userSpaceOnUse" /> + <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" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3800" + id="radialGradient3808" + cx="50" + cy="50" + fx="50" + fy="50" + r="49.47143" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.194041,0,0,1.1819698,-9.7020495,-9.098491)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3784" + id="linearGradient3809" + x1="52.98814" + y1="97.627907" + x2="53.845432" + y2="2.1650128" + gradientUnits="userSpaceOnUse" /> + <filter + inkscape:collect="always" + id="filter3806"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="3.9697952" + id="feGaussianBlur3808" /> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#1d1d1d" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:zoom="2.8" + inkscape:cx="60.809331" + inkscape:cy="44.929803" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:showpageshadow="false" + showguides="true" + inkscape:guide-bbox="true" + 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> + <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 + transform="matrix(0.81275299,0,0,0.80831217,10.329173,964.74428)" + 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="path3792" + style="fill:#000000;fill-opacity:0.43646414;stroke:none;filter:url(#filter3806)" + sodipodi:type="arc" /> + <path + transform="matrix(0.78754387,0,0,0.78995914,10.622807,962.78534)" + d="M 98.57143,50 C 98.57143,76.82526 76.82526,98.57143 50,98.57143 23.17474,98.57143 1.4285698,76.82526 1.4285698,50 1.4285698,23.17474 23.17474,1.4285698 50,1.4285698 76.82526,1.4285698 98.57143,23.17474 98.57143,50 z" + sodipodi:ry="48.57143" + sodipodi:rx="48.57143" + sodipodi:cy="50" + sodipodi:cx="50" + id="path3782" + style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#000000;stroke-width:0.88747953999999984;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.32596686" + sodipodi:type="arc" /> + </g> +</svg> diff --git a/resources/themes/adwaita/icon_active.svg b/resources/themes/adwaita/icon_active.svg deleted file mode 100644 index 8393747..0000000 --- a/resources/themes/adwaita/icon_active.svg +++ /dev/null @@ -1,152 +0,0 @@ -<?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.1 r9760" - sodipodi:docname="icon_active.svg"> - <defs - id="defs4"> - <linearGradient - inkscape:collect="always" - id="linearGradient3785"> - <stop - style="stop-color:#f8fafa;stop-opacity:1" - offset="0" - id="stop3787" /> - <stop - id="stop3797" - offset="0.61673242" - style="stop-color:#e4e6e6;stop-opacity:1" /> - <stop - style="stop-color:#d2d6d6;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> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#000000" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="5.6" - inkscape:cx="56.854505" - 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="328" - 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 - style="fill:#000000;fill-opacity:0.29136694;stroke:none;filter:url(#filter3921)" - id="rect3883" - width="79.766541" - height="79.766541" - x="10.207148" - y="962.45947" - ry="9.8949661" - rx="10.6689" - transform="matrix(0.69218766,0,0,0.69218766,16.668448,309.78347)" /> - <rect - rx="7.384881" - ry="6.8491735" - y="973.88806" - x="21.635719" - height="56.909401" - width="56.909401" - id="rect3799" - style="fill:#000000;fill-opacity:0.34892087;stroke:none" /> - <rect - style="fill:url(#linearGradient3791);fill-opacity:1;stroke:url(#linearGradient3793);stroke-width:1.14377474999999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="rect3000" - width="54.012722" - height="54.012722" - x="23.084059" - y="975.33636" - ry="6.3134527" - rx="6.3134527" /> - </g> -</svg> diff --git a/resources/themes/adwaita/icon_highlight.svg b/resources/themes/adwaita/icon_highlight.svg new file mode 100644 index 0000000..16019c8 --- /dev/null +++ b/resources/themes/adwaita/icon_highlight.svg @@ -0,0 +1,248 @@ +<?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="icon_highlight.svg"> + <defs + id="defs4"> + <linearGradient + inkscape:collect="always" + id="linearGradient3794"> + <stop + style="stop-color:#f8f8f8;stop-opacity:1" + offset="0" + id="stop3796" /> + <stop + style="stop-color:#d9d9d9;stop-opacity:1" + offset="1" + id="stop3798" /> + </linearGradient> + <linearGradient + id="linearGradient3784"> + <stop + style="stop-color:#edeeed;stop-opacity:1" + offset="0" + id="stop3786" /> + <stop + style="stop-color:#f8f8f8;stop-opacity:1" + offset="1" + id="stop3788" /> + </linearGradient> + <linearGradient + id="linearGradient3800"> + <stop + id="stop3810" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + style="stop-color:#000000;stop-opacity:0.63106796" + offset="0.5776158" + id="stop3780" /> + <stop + id="stop3813" + offset="0.75491738" + style="stop-color:#000000;stop-opacity:0.27843137;" /> + <stop + id="stop3811" + offset="0.79946876" + style="stop-color:#000000;stop-opacity:0.19215686;" /> + <stop + id="stop3782" + offset="0.86143982" + style="stop-color:#000000;stop-opacity:0.10980392;" /> + <stop + style="stop-color:#000000;stop-opacity:0" + offset="1" + id="stop3804" /> + </linearGradient> + <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> + <linearGradient + id="linearGradient3767"> + <stop + style="stop-color:#ffffff;stop-opacity:0" + offset="0" + id="stop3769" /> + <stop + id="stop4739" + offset="0.3680203" + style="stop-color:#ffffff;stop-opacity:0;" /> + <stop + style="stop-color:#ffffff;stop-opacity:0.66666667;" + offset="0.59831607" + 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> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3767" + id="radialGradient3775" + cx="50.002552" + cy="49.744911" + fx="50.002552" + fy="49.744911" + r="49.750011" + gradientUnits="userSpaceOnUse" /> + <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" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3800" + id="radialGradient3808" + cx="50" + cy="50" + fx="50" + fy="50" + r="49.47143" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.194041,0,0,1.1819698,-9.7020495,-9.098491)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3794" + id="linearGradient3807" + x1="35.535618" + y1="3.2004027" + x2="35.887642" + y2="97.42083" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3784" + id="linearGradient3809" + x1="52.98814" + y1="97.627907" + x2="53.845432" + y2="2.1650128" + gradientUnits="userSpaceOnUse" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#1d1d1d" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:zoom="2.8" + inkscape:cx="25.913098" + inkscape:cy="22.489584" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:showpageshadow="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:window-width="958" + inkscape:window-height="1100" + inkscape:window-x="529" + inkscape:window-y="133" + 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></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Ebene 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-952.36218)"> + <path + transform="matrix(0.78754387,0,0,0.78995914,10.622807,962.78534)" + 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="fill:url(#linearGradient3809);fill-opacity:1;stroke:url(#linearGradient3807);stroke-width:1.50654160999999998;stroke-miterlimit:4;stroke-dasharray:none;opacity:0.67156863" + sodipodi:type="arc" /> + </g> +</svg> diff --git a/resources/themes/adwaita/icon_inactive.svg b/resources/themes/adwaita/icon_inactive.svg deleted file mode 100644 index 1120dc9..0000000 --- a/resources/themes/adwaita/icon_inactive.svg +++ /dev/null @@ -1,152 +0,0 @@ -<?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.1 r9760" - sodipodi:docname="icon_inactive.svg"> - <defs - id="defs4"> - <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> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#000000" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:zoom="5.6" - inkscape:cx="56.854505" - 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 - style="fill:#000000;fill-opacity:0.29136694;stroke:none;filter:url(#filter3921)" - id="rect3883" - width="79.766541" - height="79.766541" - x="10.207148" - y="962.45947" - ry="9.2462864" - rx="9.9694843" - transform="matrix(0.74074858,0,0,0.74074858,13.878869,260.75164)" /> - <rect - rx="7.384881" - ry="6.8491735" - y="973.88806" - x="21.635719" - height="56.909401" - width="56.909401" - id="rect3799" - style="fill:#000000;fill-opacity:0.34892087;stroke:none" /> - <rect - style="fill:url(#linearGradient3791);fill-opacity:1;stroke:url(#linearGradient3793);stroke-width:1.14377475;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - id="rect3000" - width="54.012722" - height="54.012722" - x="23.084059" - y="975.33636" - ry="6.3134527" - rx="6.3134527" /> - </g> -</svg> diff --git a/resources/themes/adwaita/preview.png b/resources/themes/adwaita/preview.png Binary files differindex d8dd27a..f104653 100644 --- a/resources/themes/adwaita/preview.png +++ b/resources/themes/adwaita/preview.png diff --git a/resources/themes/adwaita/ring.svg b/resources/themes/adwaita/ring.svg index acc7c61..7973fb3 100644 --- a/resources/themes/adwaita/ring.svg +++ b/resources/themes/adwaita/ring.svg @@ -14,30 +14,18 @@ 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"> <linearGradient - inkscape:collect="always" - id="linearGradient3794"> - <stop - style="stop-color:#878786;stop-opacity:1" - offset="0" - id="stop3796" /> - <stop - style="stop-color:#e3e3e0;stop-opacity:1" - offset="1" - id="stop3798" /> - </linearGradient> - <linearGradient id="linearGradient3784"> <stop - style="stop-color:#e3e3e0;stop-opacity:1;" + style="stop-color:#edeeed;stop-opacity:1" offset="0" id="stop3786" /> <stop - style="stop-color:#aeaea2;stop-opacity:1" + style="stop-color:#f8f8f8;stop-opacity:1" offset="1" id="stop3788" /> </linearGradient> @@ -179,15 +167,6 @@ gradientTransform="matrix(1.194041,0,0,1.1819698,-9.7020495,-9.098491)" /> <linearGradient inkscape:collect="always" - xlink:href="#linearGradient3794" - id="linearGradient3807" - x1="35.535618" - y1="3.2004027" - x2="35.887642" - y2="97.42083" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" xlink:href="#linearGradient3784" id="linearGradient3809" x1="52.98814" @@ -195,6 +174,14 @@ x2="53.845432" y2="2.1650128" gradientUnits="userSpaceOnUse" /> + <filter + inkscape:collect="always" + id="filter3801"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="2.3351737" + id="feGaussianBlur3803" /> + </filter> </defs> <sodipodi:namedview id="base" @@ -204,19 +191,19 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="5.6" - inkscape:cx="73.450679" - inkscape:cy="52.126988" + inkscape:cx="51.295153" + inkscape:cy="27.155314" 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-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> @@ -235,24 +222,24 @@ id="layer1" transform="translate(0,-952.36218)"> <path - sodipodi:type="arc" - style="opacity:0.5964912;fill:none;stroke:url(#radialGradient3808);stroke-width:26.50491905;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - id="path3012" - sodipodi:cx="50" - sodipodi:cy="50" - sodipodi:rx="48.57143" - sodipodi:ry="48.57143" + transform="matrix(0.8695154,0,0,0.86476442,6.5242291,960.94215)" 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.7492844,0,0,0.7492844,14.429816,967.14914)" /> + sodipodi:ry="48.57143" + sodipodi:rx="48.57143" + sodipodi:cy="50" + sodipodi:cx="50" + id="path3792" + style="fill:#000000;fill-opacity:0.43529412;stroke:none;filter:url(#filter3801)" + sodipodi:type="arc" /> <path - transform="matrix(0.70847877,0,0,0.70847877,14.576061,966.93823)" - 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.86318078,0,0,0.86318078,6.8409607,959.07906)" + d="M 98.57143,50 C 98.57143,76.82526 76.82526,98.57143 50,98.57143 23.17474,98.57143 1.4285698,76.82526 1.4285698,50 1.4285698,23.17474 23.17474,1.4285698 50,1.4285698 76.82526,1.4285698 98.57143,23.17474 98.57143,50 z" sodipodi:ry="48.57143" sodipodi:rx="48.57143" sodipodi:cy="50" sodipodi:cx="50" id="path3782" - style="fill:url(#linearGradient3809);fill-opacity:1;stroke:url(#linearGradient3807);stroke-width:0.34789082;stroke-miterlimit:4;stroke-dasharray:none" + style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#000000;stroke-width:0.46340235;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.32549021000000000" sodipodi:type="arc" /> </g> </svg> diff --git a/resources/themes/adwaita/theme.xml b/resources/themes/adwaita/theme.xml index d7e2d04..6805ad0 100644 --- a/resources/themes/adwaita/theme.xml +++ b/resources/themes/adwaita/theme.xml @@ -1,31 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> <theme name="Adwaita" description="Made for the default theme of Gnome3" author="Simon Schneegans" email="code@simonschneegans.de"> - <pie radius="150" 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"> - <center radius="100" activeRadius="55"> - <center_layer file="ring.svg" + <pie radius="110" maxZoom="1.1" zoomRange="0.1" transitionTime="0.2" springiness="1.5" + fadeInTime="0.3" fadeOutTime="0.3" fadeInZoom="0.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" inactive_scale="0.8" 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="10.0" active_colorize="true" active_alpha="1.0" - inactive_scale="1.0" inactive_rotationMode="turn_to_mouse" inactive_rotationSpeed="5.0" inactive_colorize="false" inactive_alpha="0.0" /> </center> - <slices radius="30"> + <slices radius="25"> <activeSlice> - <slice_layer type="file" file="icon_active.svg" scale="1.8" /> + <slice_layer type="file" file="icon.svg" scale="1.7" /> + <slice_layer type="file" colorize="true" file="icon_highlight.svg" scale="1.7" /> <slice_layer type="icon" scale="0.9" file="caption_mask.svg" visibility="with_caption" /> <slice_layer type="icon" scale="0.9" visibility="without_caption" /> - <slice_layer type="caption" y="22" font="sans 9" width="60" color="#000" height="20" visibility="with_caption" /> + <slice_layer type="caption" y="22" font="sans 8" width="50" color="#333" height="20" visibility="with_caption" /> </activeSlice> <inactiveSlice> - <slice_layer type="file" file="icon_inactive.svg" scale="1.8" /> + <slice_layer type="file" file="icon.svg" scale="1.7" /> <slice_layer type="icon" scale="0.9" file="caption_mask.svg" visibility="with_caption" /> <slice_layer type="icon" scale="0.9" visibility="without_caption" /> - <slice_layer type="caption" y="22" font="sans 9" width="60" color="#000" height="20" visibility="with_caption" /> + <slice_layer type="caption" y="22" font="sans 8" width="50" color="#333" height="20" visibility="with_caption" /> </inactiveSlice> </slices> - <caption position="0" font="sans 10" width="100" height="100" color="#000"/> + <caption position="0" font="sans 10" width="80" height="80" color="#333"/> </pie> </theme> diff --git a/resources/themes/bright/gloss.svg b/resources/themes/bright/gloss.svg index 60a795f..7828bc9 100644 --- a/resources/themes/bright/gloss.svg +++ b/resources/themes/bright/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/bright/preview.png b/resources/themes/bright/preview.png Binary files differindex babbafa..5e17ca5 100644 --- a/resources/themes/bright/preview.png +++ b/resources/themes/bright/preview.png 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 Binary files differindex 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> diff --git a/resources/themes/simple/preview.png b/resources/themes/simple/preview.png Binary files differnew file mode 100644 index 0000000..c75ff2e --- /dev/null +++ b/resources/themes/simple/preview.png diff --git a/resources/themes/simple/slice_caption.svg b/resources/themes/simple/slice_caption.svg new file mode 100644 index 0000000..d2aa2cb --- /dev/null +++ b/resources/themes/simple/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/simple/theme.xml b/resources/themes/simple/theme.xml new file mode 100644 index 0000000..88aba34 --- /dev/null +++ b/resources/themes/simple/theme.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<theme name="Simple" description="Only icons" 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.2" wobble="0.1" fadeOutZoom="0.8" fadeInRotation="0.0" fadeOutRotation="0.0"> + <slices radius="35" minGap="0"> + <activeSlice> + <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" 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> +</theme> + 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 Binary files differindex 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" diff --git a/resources/ui/settings.ui b/resources/ui/settings.ui index d993748..b2d2776 100644 --- a/resources/ui/settings.ui +++ b/resources/ui/settings.ui @@ -1,16 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.8"/> <object class="GtkDialog" id="window"> <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">General Settings</property> - <property name="resizable">True</property> <property name="modal">True</property> <property name="window_position">center-on-parent</property> <property name="destroy_with_parent">True</property> <property name="type_hint">dialog</property> - <property name="has_resize_grip">False</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="width_request">550</property> @@ -24,10 +23,10 @@ <child> <object class="GtkButton" id="close-button"> <property name="label">gtk-close</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -46,10 +45,10 @@ </child> <child> <object class="GtkBox" id="vbox4"> - <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">6</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkFrame" id="frame2"> @@ -67,20 +66,20 @@ <property name="right_padding">6</property> <child> <object class="GtkBox" id="vbox5"> - <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="autostart-checkbox"> <property name="label" translatable="yes">Start Gnome-Pie on login</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">If checked, Gnome-Pie will start silently everytime you log in.</property> <property name="tooltip_text" translatable="yes">If checked, Gnome-Pie will start silently everytime you log in.</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -93,13 +92,13 @@ <child> <object class="GtkCheckButton" id="indicator-checkbox"> <property name="label" translatable="yes">Display panel icon </property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">If not checked, you can access this menu by launching Gnome-Pie a second time.</property> <property name="tooltip_text" translatable="yes">If not checked, you can access this menu by launching Gnome-Pie a second time.</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -146,9 +145,9 @@ <property name="right_padding">6</property> <child> <object class="GtkBox" id="vbox1"> - <property name="orientation">vertical</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkScrolledWindow" id="theme-scrolledwindow"> @@ -170,16 +169,17 @@ <object class="GtkBox" id="hbox1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="homogeneous">True</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Global scale</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -190,7 +190,6 @@ <property name="fill_level">2</property> <property name="round_digits">2</property> <property name="digits">2</property> - <property name="value_pos">right</property> </object> <packing> <property name="expand">True</property> @@ -209,16 +208,56 @@ <object class="GtkBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> + <property name="homogeneous">True</property> <child> <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Maximum slices per pie</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScale" id="range-slices"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="fill_level">2000</property> + <property name="round_digits">0</property> + <property name="digits">0</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="hbox3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="label" translatable="yes">Maximum activation radius</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -229,7 +268,6 @@ <property name="fill_level">2000</property> <property name="round_digits">0</property> <property name="digits">0</property> - <property name="value_pos">right</property> </object> <packing> <property name="expand">True</property> @@ -241,26 +279,26 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> <object class="GtkCheckButton" id="captions-checkbox"> <property name="label" translatable="yes">Display Slice labels</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="has_tooltip">True</property> <property name="tooltip_markup" translatable="yes">Displays the name of each Slice next to it. Only available if supported by the theme.</property> <property name="tooltip_text" translatable="yes">Displays the name of each Slice next to it. Only available if supported by the theme.</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> </object> @@ -268,7 +306,7 @@ </object> </child> <child type="label"> - <object class="GtkLabel" id="label4"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Appearance</property> diff --git a/resources/ui/shapes/shape1.svg b/resources/ui/shapes/shape1.svg new file mode 100644 index 0000000..84ccfc6 --- /dev/null +++ b/resources/ui/shapes/shape1.svg @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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" + viewBox="0 0 48 48" + id="svg2" + version="1.1" + inkscape:version="0.91 r" + sodipodi:docname="shape1.svg"> + <metadata + id="metadata93"> + <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></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1231" + inkscape:window-height="1000" + id="namedview91" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:zoom="8.028154" + inkscape:cx="1.248967" + inkscape:cy="15.798592" + inkscape:window-x="49" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + inkscape:snap-global="true" /> + <defs + id="defs4"> + <linearGradient + id="linearGradient3764" + x1="1" + x2="47" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,-1,1,0,-1.5e-6,47.999998)"> + <stop + stop-color="#efefef" + stop-opacity="1" + id="stop7" /> + <stop + offset="1" + stop-color="#f9f9f9" + stop-opacity="1" + id="stop9" /> + </linearGradient> + <clipPath + id="clipPath-084505435"> + <g + transform="translate(0,-1004.3622)" + id="g12"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path14" /> + </g> + </clipPath> + <clipPath + id="clipPath-096389266"> + <g + transform="translate(0,-1004.3622)" + id="g17"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path19" /> + </g> + </clipPath> + </defs> + <g + id="g33" /> + <circle + style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.38769698;stroke-opacity:1" + id="path3507" + cx="24.199833" + cy="24.138927" + r="4.5928373" /> + <circle + transform="matrix(-0.02030675,-0.9997938,0.9997938,-0.02030675,0,0)" + r="3.3096831" + cy="23.980618" + cx="-11.038768" + id="circle4359" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-0.039595386" + inkscape:transform-center-y="-13.45149" /> + <circle + transform="matrix(-0.72579795,-0.68790794,0.68790794,-0.72579795,0,0)" + r="3.3096831" + cy="-0.58865309" + cx="-20.552629" + id="circle4361" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="9.545328" + inkscape:transform-center-y="-9.4779143" /> + <circle + inkscape:transform-center-y="0.17490642" + inkscape:transform-center-x="13.450411" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4363" + cx="-9.6689577" + cy="-24.505499" + r="3.3096831" + transform="matrix(-0.99934287,0.03624683,-0.03624683,-0.99934287,0,0)" /> +</svg> diff --git a/resources/ui/shapes/shape2.svg b/resources/ui/shapes/shape2.svg new file mode 100644 index 0000000..bc252b1 --- /dev/null +++ b/resources/ui/shapes/shape2.svg @@ -0,0 +1,146 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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" + viewBox="0 0 48 48" + id="svg2" + version="1.1" + inkscape:version="0.91 r" + sodipodi:docname="shape2.svg"> + <metadata + id="metadata93"> + <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></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1231" + inkscape:window-height="1000" + id="namedview91" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:zoom="8.028154" + inkscape:cx="1.248967" + inkscape:cy="15.798592" + inkscape:window-x="49" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + inkscape:snap-global="true" /> + <defs + id="defs4"> + <linearGradient + id="linearGradient3764" + x1="1" + x2="47" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,-1,1,0,-1.5e-6,47.999998)"> + <stop + stop-color="#efefef" + stop-opacity="1" + id="stop7" /> + <stop + offset="1" + stop-color="#f9f9f9" + stop-opacity="1" + id="stop9" /> + </linearGradient> + <clipPath + id="clipPath-084505435"> + <g + transform="translate(0,-1004.3622)" + id="g12"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path14" /> + </g> + </clipPath> + <clipPath + id="clipPath-096389266"> + <g + transform="translate(0,-1004.3622)" + id="g17"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path19" /> + </g> + </clipPath> + </defs> + <g + id="g33" /> + <circle + style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.38769698;stroke-opacity:1" + id="path3507" + cx="24.199833" + cy="24.138927" + r="4.5928373" /> + <circle + transform="matrix(-0.02030675,-0.9997938,0.9997938,-0.02030675,0,0)" + r="3.3096831" + cy="23.980618" + cx="-11.038768" + id="circle4359" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-0.039595386" + inkscape:transform-center-y="-13.45149" /> + <circle + transform="matrix(-0.72579795,-0.68790794,0.68790794,-0.72579795,0,0)" + r="3.3096831" + cy="-0.58865309" + cx="-20.552629" + id="circle4361" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="9.545328" + inkscape:transform-center-y="-9.4779143" /> + <circle + inkscape:transform-center-y="0.17490642" + inkscape:transform-center-x="13.450411" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4363" + cx="-9.6689577" + cy="-24.505499" + r="3.3096831" + transform="matrix(-0.99934287,0.03624683,-0.03624683,-0.99934287,0,0)" /> + <circle + inkscape:transform-center-y="9.5897459" + inkscape:transform-center-x="9.4329694" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4365" + cx="14.553385" + cy="-33.570721" + r="3.3096831" + transform="matrix(-0.68449089,0.72902141,-0.72902141,-0.68449089,0,0)" /> + <circle + transform="matrix(0.04094088,0.99916157,-0.99916157,0.04094088,0,0)" + r="3.3096831" + cy="-22.64629" + cx="38.409817" + id="circle4367" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-0.23808869" + inkscape:transform-center-y="13.44944" /> +</svg> diff --git a/resources/ui/shapes/shape3.svg b/resources/ui/shapes/shape3.svg new file mode 100644 index 0000000..b0a9816 --- /dev/null +++ b/resources/ui/shapes/shape3.svg @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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" + viewBox="0 0 48 48" + id="svg2" + version="1.1" + inkscape:version="0.91 r" + sodipodi:docname="shape3.svg"> + <metadata + id="metadata93"> + <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></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1231" + inkscape:window-height="1000" + id="namedview91" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:zoom="8.028154" + inkscape:cx="1.248967" + inkscape:cy="15.798592" + inkscape:window-x="49" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + inkscape:snap-global="true" /> + <defs + id="defs4"> + <linearGradient + id="linearGradient3764" + x1="1" + x2="47" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,-1,1,0,-1.5e-6,47.999998)"> + <stop + stop-color="#efefef" + stop-opacity="1" + id="stop7" /> + <stop + offset="1" + stop-color="#f9f9f9" + stop-opacity="1" + id="stop9" /> + </linearGradient> + <clipPath + id="clipPath-084505435"> + <g + transform="translate(0,-1004.3622)" + id="g12"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path14" /> + </g> + </clipPath> + <clipPath + id="clipPath-096389266"> + <g + transform="translate(0,-1004.3622)" + id="g17"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path19" /> + </g> + </clipPath> + </defs> + <g + id="g33" /> + <circle + style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.38769698;stroke-opacity:1" + id="path3507" + cx="24.199833" + cy="24.138927" + r="4.5928373" /> + <circle + inkscape:transform-center-y="0.17490642" + inkscape:transform-center-x="13.450411" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4363" + cx="-9.6689577" + cy="-24.505499" + r="3.3096831" + transform="matrix(-0.99934287,0.03624683,-0.03624683,-0.99934287,0,0)" /> + <circle + inkscape:transform-center-y="9.5897459" + inkscape:transform-center-x="9.4329694" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4365" + cx="14.553385" + cy="-33.570721" + r="3.3096831" + transform="matrix(-0.68449089,0.72902141,-0.72902141,-0.68449089,0,0)" /> + <circle + transform="matrix(0.04094088,0.99916157,-0.99916157,0.04094088,0,0)" + r="3.3096831" + cy="-22.64629" + cx="38.409817" + id="circle4367" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-0.23808869" + inkscape:transform-center-y="13.44944" /> +</svg> diff --git a/resources/ui/shapes/shape4.svg b/resources/ui/shapes/shape4.svg new file mode 100644 index 0000000..5d02413 --- /dev/null +++ b/resources/ui/shapes/shape4.svg @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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" + viewBox="0 0 48 48" + id="svg2" + version="1.1" + inkscape:version="0.91 r" + sodipodi:docname="shape4.svg"> + <metadata + id="metadata93"> + <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></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1231" + inkscape:window-height="1000" + id="namedview91" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:zoom="8.028154" + inkscape:cx="1.248967" + inkscape:cy="15.798592" + inkscape:window-x="49" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + inkscape:snap-global="true" /> + <defs + id="defs4"> + <linearGradient + id="linearGradient3764" + x1="1" + x2="47" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,-1,1,0,-1.5e-6,47.999998)"> + <stop + stop-color="#efefef" + stop-opacity="1" + id="stop7" /> + <stop + offset="1" + stop-color="#f9f9f9" + stop-opacity="1" + id="stop9" /> + </linearGradient> + <clipPath + id="clipPath-084505435"> + <g + transform="translate(0,-1004.3622)" + id="g12"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path14" /> + </g> + </clipPath> + <clipPath + id="clipPath-096389266"> + <g + transform="translate(0,-1004.3622)" + id="g17"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path19" /> + </g> + </clipPath> + </defs> + <g + id="g33" /> + <circle + style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.38769698;stroke-opacity:1" + id="path3507" + cx="24.199833" + cy="24.138927" + r="4.5928373" /> + <circle + r="3.3096831" + cy="24.138927" + cx="37.449177" + id="circle4321" + style="fill:#333333;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-13.447913" + inkscape:transform-center-y="0.31274215" /> + <circle + inkscape:transform-center-y="-9.3929803" + inkscape:transform-center-x="-9.6289189" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4357" + cx="13.043242" + cy="34.155338" + r="3.3096831" + transform="matrix(0.69939401,-0.71473633,0.71473633,0.69939401,0,0)" /> + <circle + transform="matrix(-0.02030675,-0.9997938,0.9997938,-0.02030675,0,0)" + r="3.3096831" + cy="23.980618" + cx="-11.038768" + id="circle4359" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-0.039595386" + inkscape:transform-center-y="-13.45149" /> + <circle + transform="matrix(-0.72579795,-0.68790794,0.68790794,-0.72579795,0,0)" + r="3.3096831" + cy="-0.58865309" + cx="-20.552629" + id="circle4361" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="9.545328" + inkscape:transform-center-y="-9.4779143" /> + <circle + inkscape:transform-center-y="0.17490642" + inkscape:transform-center-x="13.450411" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4363" + cx="-9.6689577" + cy="-24.505499" + r="3.3096831" + transform="matrix(-0.99934287,0.03624683,-0.03624683,-0.99934287,0,0)" /> +</svg> diff --git a/resources/ui/shapes/shape5.svg b/resources/ui/shapes/shape5.svg new file mode 100644 index 0000000..7d749b5 --- /dev/null +++ b/resources/ui/shapes/shape5.svg @@ -0,0 +1,176 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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" + viewBox="0 0 48 48" + id="svg2" + version="1.1" + inkscape:version="0.91 r" + sodipodi:docname="shape5.svg"> + <metadata + id="metadata93"> + <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> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1231" + inkscape:window-height="1000" + id="namedview91" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:zoom="6.718875" + inkscape:cx="-1.0390948" + inkscape:cy="8.5728422" + inkscape:window-x="49" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + inkscape:snap-global="true" /> + <defs + id="defs4"> + <linearGradient + id="linearGradient3764" + x1="1" + x2="47" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,-1,1,0,-1.5e-6,47.999998)"> + <stop + stop-color="#efefef" + stop-opacity="1" + id="stop7" /> + <stop + offset="1" + stop-color="#f9f9f9" + stop-opacity="1" + id="stop9" /> + </linearGradient> + <clipPath + id="clipPath-084505435"> + <g + transform="translate(0,-1004.3622)" + id="g12"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path14" /> + </g> + </clipPath> + <clipPath + id="clipPath-096389266"> + <g + transform="translate(0,-1004.3622)" + id="g17"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path19" /> + </g> + </clipPath> + </defs> + <g + id="g33" /> + <g + id="g3366" + transform="translate(0.12087836,0.08392367)"> + <circle + r="4.5928373" + cy="24.055004" + cx="24.078955" + id="path3507" + style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.38769698;stroke-opacity:1" /> + <circle + inkscape:transform-center-y="0.31274215" + inkscape:transform-center-x="-13.447913" + style="fill:#333333;stroke:#333333;stroke-opacity:1" + id="circle4321" + cx="37.328297" + cy="24.055004" + r="3.3096831" /> + <circle + transform="matrix(0.69939401,-0.71473633,0.71473633,0.69939401,0,0)" + r="3.3096831" + cy="34.010246" + cx="13.018683" + id="circle4357" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-9.6289189" + inkscape:transform-center-y="-9.3929803" /> + <circle + inkscape:transform-center-y="-13.45149" + inkscape:transform-center-x="-0.039595386" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4359" + cx="-10.952407" + cy="23.861467" + r="3.3096831" + transform="matrix(-0.02030675,-0.9997938,0.9997938,-0.02030675,0,0)" /> + <circle + inkscape:transform-center-y="-9.4779143" + inkscape:transform-center-x="9.545328" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4361" + cx="-20.407164" + cy="-0.61089462" + r="3.3096831" + transform="matrix(-0.72579795,-0.68790794,0.68790794,-0.72579795,0,0)" /> + <circle + transform="matrix(-0.99934287,0.03624683,-0.03624683,-0.99934287,0,0)" + r="3.3096831" + cy="-24.41725" + cx="-9.5512009" + id="circle4363" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="13.450411" + inkscape:transform-center-y="0.17490642" /> + <circle + transform="matrix(-0.68449089,0.72902141,-0.72902141,-0.68449089,0,0)" + r="3.3096831" + cy="-33.425152" + cx="14.574943" + id="circle4365" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="9.4329694" + inkscape:transform-center-y="9.5897459" /> + <circle + inkscape:transform-center-y="13.44944" + inkscape:transform-center-x="-0.23808869" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4367" + cx="38.321014" + cy="-22.528948" + r="3.3096831" + transform="matrix(0.04094088,0.99916157,-0.99916157,0.04094088,0,0)" /> + <circle + transform="matrix(0.71796327,0.69608099,-0.69608099,0.71796327,0,0)" + r="3.3096831" + cy="0.79657805" + cx="47.311657" + id="circle4369" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-9.4374107" + inkscape:transform-center-y="9.5853718" /> + </g> +</svg> diff --git a/resources/ui/shapes/shape6.svg b/resources/ui/shapes/shape6.svg new file mode 100644 index 0000000..242bad9 --- /dev/null +++ b/resources/ui/shapes/shape6.svg @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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" + viewBox="0 0 48 48" + id="svg2" + version="1.1" + inkscape:version="0.91 r" + sodipodi:docname="shape6.svg"> + <metadata + id="metadata93"> + <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></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1231" + inkscape:window-height="1000" + id="namedview91" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:zoom="8.028154" + inkscape:cx="1.248967" + inkscape:cy="15.798592" + inkscape:window-x="49" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + inkscape:snap-global="true" /> + <defs + id="defs4"> + <linearGradient + id="linearGradient3764" + x1="1" + x2="47" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,-1,1,0,-1.5e-6,47.999998)"> + <stop + stop-color="#efefef" + stop-opacity="1" + id="stop7" /> + <stop + offset="1" + stop-color="#f9f9f9" + stop-opacity="1" + id="stop9" /> + </linearGradient> + <clipPath + id="clipPath-084505435"> + <g + transform="translate(0,-1004.3622)" + id="g12"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path14" /> + </g> + </clipPath> + <clipPath + id="clipPath-096389266"> + <g + transform="translate(0,-1004.3622)" + id="g17"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path19" /> + </g> + </clipPath> + </defs> + <g + id="g33" /> + <circle + style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.38769698;stroke-opacity:1" + id="path3507" + cx="24.199833" + cy="24.138927" + r="4.5928373" /> + <circle + r="3.3096831" + cy="24.138927" + cx="37.449177" + id="circle4321" + style="fill:#333333;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-13.447913" + inkscape:transform-center-y="0.31274215" /> + <circle + inkscape:transform-center-y="0.17490642" + inkscape:transform-center-x="13.450411" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4363" + cx="-9.6689577" + cy="-24.505499" + r="3.3096831" + transform="matrix(-0.99934287,0.03624683,-0.03624683,-0.99934287,0,0)" /> + <circle + inkscape:transform-center-y="9.5897459" + inkscape:transform-center-x="9.4329694" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4365" + cx="14.553385" + cy="-33.570721" + r="3.3096831" + transform="matrix(-0.68449089,0.72902141,-0.72902141,-0.68449089,0,0)" /> + <circle + transform="matrix(0.04094088,0.99916157,-0.99916157,0.04094088,0,0)" + r="3.3096831" + cy="-22.64629" + cx="38.409817" + id="circle4367" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-0.23808869" + inkscape:transform-center-y="13.44944" /> + <circle + inkscape:transform-center-y="9.5853718" + inkscape:transform-center-x="-9.4374107" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4369" + cx="47.45686" + cy="0.77269101" + r="3.3096831" + transform="matrix(0.71796327,0.69608099,-0.69608099,0.71796327,0,0)" /> +</svg> diff --git a/resources/ui/shapes/shape7.svg b/resources/ui/shapes/shape7.svg new file mode 100644 index 0000000..28cecd9 --- /dev/null +++ b/resources/ui/shapes/shape7.svg @@ -0,0 +1,127 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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" + viewBox="0 0 48 48" + id="svg2" + version="1.1" + inkscape:version="0.91 r" + sodipodi:docname="shape7.svg"> + <metadata + id="metadata93"> + <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></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1231" + inkscape:window-height="1000" + id="namedview91" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:zoom="8.028154" + inkscape:cx="1.248967" + inkscape:cy="15.798592" + inkscape:window-x="49" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + inkscape:snap-global="true" /> + <defs + id="defs4"> + <linearGradient + id="linearGradient3764" + x1="1" + x2="47" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,-1,1,0,-1.5e-6,47.999998)"> + <stop + stop-color="#efefef" + stop-opacity="1" + id="stop7" /> + <stop + offset="1" + stop-color="#f9f9f9" + stop-opacity="1" + id="stop9" /> + </linearGradient> + <clipPath + id="clipPath-084505435"> + <g + transform="translate(0,-1004.3622)" + id="g12"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path14" /> + </g> + </clipPath> + <clipPath + id="clipPath-096389266"> + <g + transform="translate(0,-1004.3622)" + id="g17"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path19" /> + </g> + </clipPath> + </defs> + <g + id="g33" /> + <circle + style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.38769698;stroke-opacity:1" + id="path3507" + cx="24.199833" + cy="24.138927" + r="4.5928373" /> + <circle + r="3.3096831" + cy="24.138927" + cx="37.449177" + id="circle4321" + style="fill:#333333;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-13.447913" + inkscape:transform-center-y="0.31274215" /> + <circle + inkscape:transform-center-y="-9.3929803" + inkscape:transform-center-x="-9.6289189" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4357" + cx="13.043242" + cy="34.155338" + r="3.3096831" + transform="matrix(0.69939401,-0.71473633,0.71473633,0.69939401,0,0)" /> + <circle + transform="matrix(-0.02030675,-0.9997938,0.9997938,-0.02030675,0,0)" + r="3.3096831" + cy="23.980618" + cx="-11.038768" + id="circle4359" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-0.039595386" + inkscape:transform-center-y="-13.45149" /> +</svg> diff --git a/resources/ui/shapes/shape8.svg b/resources/ui/shapes/shape8.svg new file mode 100644 index 0000000..4a14471 --- /dev/null +++ b/resources/ui/shapes/shape8.svg @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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" + viewBox="0 0 48 48" + id="svg2" + version="1.1" + inkscape:version="0.91 r" + sodipodi:docname="shape8.svg"> + <metadata + id="metadata93"> + <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></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1231" + inkscape:window-height="1000" + id="namedview91" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:zoom="8.028154" + inkscape:cx="1.248967" + inkscape:cy="15.798592" + inkscape:window-x="49" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + inkscape:snap-global="true" /> + <defs + id="defs4"> + <linearGradient + id="linearGradient3764" + x1="1" + x2="47" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,-1,1,0,-1.5e-6,47.999998)"> + <stop + stop-color="#efefef" + stop-opacity="1" + id="stop7" /> + <stop + offset="1" + stop-color="#f9f9f9" + stop-opacity="1" + id="stop9" /> + </linearGradient> + <clipPath + id="clipPath-084505435"> + <g + transform="translate(0,-1004.3622)" + id="g12"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path14" /> + </g> + </clipPath> + <clipPath + id="clipPath-096389266"> + <g + transform="translate(0,-1004.3622)" + id="g17"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path19" /> + </g> + </clipPath> + </defs> + <g + id="g33" /> + <circle + style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.38769698;stroke-opacity:1" + id="path3507" + cx="24.199833" + cy="24.138927" + r="4.5928373" /> + <circle + r="3.3096831" + cy="24.138927" + cx="37.449177" + id="circle4321" + style="fill:#333333;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-13.447913" + inkscape:transform-center-y="0.31274215" /> + <circle + inkscape:transform-center-y="-9.3929803" + inkscape:transform-center-x="-9.6289189" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4357" + cx="13.043242" + cy="34.155338" + r="3.3096831" + transform="matrix(0.69939401,-0.71473633,0.71473633,0.69939401,0,0)" /> + <circle + transform="matrix(-0.02030675,-0.9997938,0.9997938,-0.02030675,0,0)" + r="3.3096831" + cy="23.980618" + cx="-11.038768" + id="circle4359" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-0.039595386" + inkscape:transform-center-y="-13.45149" /> + <circle + transform="matrix(0.04094088,0.99916157,-0.99916157,0.04094088,0,0)" + r="3.3096831" + cy="-22.64629" + cx="38.409817" + id="circle4367" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-0.23808869" + inkscape:transform-center-y="13.44944" /> + <circle + inkscape:transform-center-y="9.5853718" + inkscape:transform-center-x="-9.4374107" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4369" + cx="47.45686" + cy="0.77269101" + r="3.3096831" + transform="matrix(0.71796327,0.69608099,-0.69608099,0.71796327,0,0)" /> +</svg> diff --git a/resources/ui/shapes/shape9.svg b/resources/ui/shapes/shape9.svg new file mode 100644 index 0000000..d51f33c --- /dev/null +++ b/resources/ui/shapes/shape9.svg @@ -0,0 +1,127 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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" + viewBox="0 0 48 48" + id="svg2" + version="1.1" + inkscape:version="0.91 r" + sodipodi:docname="shape9.svg"> + <metadata + id="metadata93"> + <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></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1231" + inkscape:window-height="1000" + id="namedview91" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:zoom="4.7509621" + inkscape:cx="-23.653533" + inkscape:cy="22.480903" + inkscape:window-x="49" + inkscape:window-y="24" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" + inkscape:snap-global="true" /> + <defs + id="defs4"> + <linearGradient + id="linearGradient3764" + x1="1" + x2="47" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0,-1,1,0,-1.5e-6,47.999998)"> + <stop + stop-color="#efefef" + stop-opacity="1" + id="stop7" /> + <stop + offset="1" + stop-color="#f9f9f9" + stop-opacity="1" + id="stop9" /> + </linearGradient> + <clipPath + id="clipPath-084505435"> + <g + transform="translate(0,-1004.3622)" + id="g12"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path14" /> + </g> + </clipPath> + <clipPath + id="clipPath-096389266"> + <g + transform="translate(0,-1004.3622)" + id="g17"> + <path + d="m -24 13 c 0 1.105 -0.672 2 -1.5 2 -0.828 0 -1.5 -0.895 -1.5 -2 0 -1.105 0.672 -2 1.5 -2 0.828 0 1.5 0.895 1.5 2 z" + transform="matrix(15.333333,0,0,11.5,414.99999,878.8622)" + fill="#1890d0" + id="path19" /> + </g> + </clipPath> + </defs> + <g + id="g33" /> + <circle + style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:1.38769698;stroke-opacity:1" + id="path3507" + cx="24.199833" + cy="24.138927" + r="4.5928373" /> + <circle + r="3.3096831" + cy="24.138927" + cx="37.449177" + id="circle4321" + style="fill:#333333;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-13.447913" + inkscape:transform-center-y="0.31274215" /> + <circle + transform="matrix(0.04094088,0.99916157,-0.99916157,0.04094088,0,0)" + r="3.3096831" + cy="-22.64629" + cx="38.409817" + id="circle4367" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + inkscape:transform-center-x="-0.23808869" + inkscape:transform-center-y="13.44944" /> + <circle + inkscape:transform-center-y="9.5853718" + inkscape:transform-center-x="-9.4374107" + style="fill:#333333;fill-opacity:1;stroke:#333333;stroke-opacity:1" + id="circle4369" + cx="47.45686" + cy="0.77269101" + r="3.3096831" + transform="matrix(0.71796327,0.69608099,-0.69608099,0.71796327,0,0)" /> +</svg> diff --git a/resources/ui/trigger_select.ui b/resources/ui/trigger_select.ui index d98d889..ab12270 100644 --- a/resources/ui/trigger_select.ui +++ b/resources/ui/trigger_select.ui @@ -2,6 +2,51 @@ <!-- Generated with glade 3.18.3 --> <interface> <requires lib="gtk+" version="3.8"/> + <object class="GtkImage" id="shape1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">shapes/shape1.svg</property> + </object> + <object class="GtkImage" id="shape2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">shapes/shape2.svg</property> + </object> + <object class="GtkImage" id="shape3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">shapes/shape3.svg</property> + </object> + <object class="GtkImage" id="shape4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">shapes/shape4.svg</property> + </object> + <object class="GtkImage" id="shape5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">shapes/shape5.svg</property> + </object> + <object class="GtkImage" id="shape6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">shapes/shape6.svg</property> + </object> + <object class="GtkImage" id="shape7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">shapes/shape7.svg</property> + </object> + <object class="GtkImage" id="shape8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">shapes/shape8.svg</property> + </object> + <object class="GtkImage" id="shape9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixbuf">shapes/shape9.svg</property> + </object> <object class="GtkDialog" id="window"> <property name="can_focus">False</property> <property name="border_width">5</property> @@ -172,6 +217,25 @@ <property name="position">2</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="warp-check"> + <property name="label" translatable="yes">Warp mouse pointer to center of Pie</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="has_tooltip">True</property> + <property name="tooltip_markup" translatable="yes">If checked, the mouse pointer will be warped to the center of the Pie. This allows for quick selections even if the Pie is opened at the screen's boundary.</property> + <property name="tooltip_text" translatable="yes">If checked, the mouse pointer will be warped to the center of the Pie. This allows for quick selections even if the Pie is opened at the screen's boundary.</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> </object> </child> </object> @@ -193,6 +257,221 @@ <property name="position">2</property> </packing> </child> + <child> + <object class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="bottom_padding">6</property> + <property name="left_padding">6</property> + <property name="right_padding">6</property> + <child> + <object class="GtkBox" id="shape"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="row_spacing">5</property> + <property name="column_spacing">20</property> + <child> + <object class="GtkRadioButton" id="rshape1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="image">shape1</property> + <property name="xalign">0</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rshape2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="image">shape2</property> + <property name="xalign">0</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">rshape1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rshape3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="image">shape3</property> + <property name="xalign">0</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">rshape1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rshape4"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="image">shape4</property> + <property name="xalign">0</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">rshape1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rshape5"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="image">shape5</property> + <property name="xalign">0</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">rshape1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rshape6"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="image">shape6</property> + <property name="xalign">0</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">rshape1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rshape7"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="image">shape7</property> + <property name="xalign">0</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">rshape1</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rshape8"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="image">shape8</property> + <property name="xalign">0</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">rshape1</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rshape9"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="image">shape9</property> + <property name="xalign">0</property> + <property name="always_show_image">True</property> + <property name="draw_indicator">True</property> + <property name="group">rshape1</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rshape0"> + <property name="label" translatable="yes">Automatically select the best pie shape</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, the shape will be automatically selected to minimize mouse travelling.</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">rshape1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Pie shape</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> </object> <packing> <property name="expand">True</property> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ee08045..af412a6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,69 +33,69 @@ add_executable(gnome-pie ${VALA_C}) # install executable install( - TARGETS - gnome-pie - RUNTIME DESTINATION - ${CMAKE_INSTALL_PREFIX}/bin + TARGETS + gnome-pie + RUNTIME DESTINATION + ${CMAKE_INSTALL_PREFIX}/bin ) # install credits install( - FILES - ${CMAKE_SOURCE_DIR}/README.md - DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/doc/gnome-pie + FILES + ${CMAKE_SOURCE_DIR}/README.md + DESTINATION + ${CMAKE_INSTALL_PREFIX}/share/doc/gnome-pie ) # install locales install( - DIRECTORY - ${CMAKE_SOURCE_DIR}/resources/locale - DESTINATION - ${CMAKE_INSTALL_PREFIX}/share - PATTERN *.po EXCLUDE - PATTERN *.pot EXCLUDE - PATTERN *.sh EXCLUDE + DIRECTORY + ${CMAKE_SOURCE_DIR}/resources/locale + DESTINATION + ${CMAKE_INSTALL_PREFIX}/share + PATTERN *.po EXCLUDE + PATTERN *.pot EXCLUDE + PATTERN *.sh EXCLUDE ) # install themes install( - DIRECTORY - ${CMAKE_SOURCE_DIR}/resources/themes - DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/gnome-pie + DIRECTORY + ${CMAKE_SOURCE_DIR}/resources/themes + DESTINATION + ${CMAKE_INSTALL_PREFIX}/share/gnome-pie ) # install UI files install( - DIRECTORY - ${CMAKE_SOURCE_DIR}/resources/ui - DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/gnome-pie + DIRECTORY + ${CMAKE_SOURCE_DIR}/resources/ui + DESTINATION + ${CMAKE_INSTALL_PREFIX}/share/gnome-pie ) # install icons install( - FILES - ${CMAKE_SOURCE_DIR}/resources/gnome-pie.svg - ${CMAKE_SOURCE_DIR}/resources/gnome-pie-symbolic.svg - DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps + FILES + ${CMAKE_SOURCE_DIR}/resources/gnome-pie.svg + ${CMAKE_SOURCE_DIR}/resources/gnome-pie-symbolic.svg + DESTINATION + ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps ) # desktop file install( - FILES - ${CMAKE_SOURCE_DIR}/resources/gnome-pie.desktop - DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/applications + FILES + ${CMAKE_SOURCE_DIR}/resources/gnome-pie.desktop + DESTINATION + ${CMAKE_INSTALL_PREFIX}/share/applications ) # install manpage install( - FILES - ${CMAKE_SOURCE_DIR}/resources/gnome-pie.1 - DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/man/man1 + FILES + ${CMAKE_SOURCE_DIR}/resources/gnome-pie.1 + DESTINATION + ${CMAKE_INSTALL_PREFIX}/share/man/man1 ) diff --git a/src/actionGroups/actionGroup.vala b/src/actionGroups/actionGroup.vala index c54be2f..8bbcde4 100644 --- a/src/actionGroups/actionGroup.vala +++ b/src/actionGroups/actionGroup.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// // A base class storing a set of Actions. Derived classes may define // how these Actions are created. This base class serves for custom // actions, defined by the user. @@ -28,67 +28,67 @@ public class ActionGroup : GLib.Object { ///////////////////////////////////////////////////////////////////// /// A list of all stored actions. ///////////////////////////////////////////////////////////////////// - + public Gee.ArrayList<Action?> actions { get; private set; } - + ///////////////////////////////////////////////////////////////////// /// The ID of the pie to which this group is attached. ///////////////////////////////////////////////////////////////////// - + public string parent_id { get; construct set; } - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members. ///////////////////////////////////////////////////////////////////// - + public ActionGroup(string parent_id) { GLib.Object(parent_id : parent_id); } - + construct { this.actions = new Gee.ArrayList<Action?>(); } - + ///////////////////////////////////////////////////////////////////// /// This one is called, when the ActionGroup is deleted. ///////////////////////////////////////////////////////////////////// - + public virtual void on_remove() {} - + ///////////////////////////////////////////////////////////////////// /// Adds a new Action to the group. ///////////////////////////////////////////////////////////////////// - + public void add_action(Action new_action) { this.actions.add(new_action); } - + ///////////////////////////////////////////////////////////////////// /// Removes all Actions from the group. ///////////////////////////////////////////////////////////////////// - + public void delete_all() { actions.clear(); } - + ///////////////////////////////////////////////////////////////////// /// Makes all contained Slices no Quick Actions. ///////////////////////////////////////////////////////////////////// - + public void disable_quickactions() { foreach (var action in actions) action.is_quickaction = false; } - + ///////////////////////////////////////////////////////////////////// /// Returns true, if one o the contained Slices is a Quick Action ///////////////////////////////////////////////////////////////////// - + public bool has_quickaction() { foreach (var action in actions) if (action.is_quickaction) return true; - + return false; } } diff --git a/src/actionGroups/bookmarkGroup.vala b/src/actionGroups/bookmarkGroup.vala index 0a560c5..791d609 100644 --- a/src/actionGroups/bookmarkGroup.vala +++ b/src/actionGroups/bookmarkGroup.vala @@ -1,36 +1,36 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A group of Actions, which represent the users gtk-bookmarks, his home -/// directory, desktop and trash. It stay up-to-date, even if the +/// directory, desktop and trash. It stay up-to-date, even if the /// bookmarks change. ///////////////////////////////////////////////////////////////////////// public class BookmarkGroup : ActionGroup { - + ///////////////////////////////////////////////////////////////////// /// Used to register this type of ActionGroup. It sets the display - /// name for this ActionGroup, it's icon name and the string used in + /// name for this ActionGroup, it's icon name and the string used in /// the pies.conf file for this kind of ActionGroups. ///////////////////////////////////////////////////////////////////// - + public static GroupRegistry.TypeDescription register() { var description = new GroupRegistry.TypeDescription(); description.name = _("Group: Bookmarks"); @@ -41,34 +41,34 @@ public class BookmarkGroup : ActionGroup { } ///////////////////////////////////////////////////////////////////// - /// Two members needed to avoid useless, frequent changes of the + /// Two members needed to avoid useless, frequent changes of the /// stored Actions. ///////////////////////////////////////////////////////////////////// private bool changing = false; private bool changed_again = false; - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members. ///////////////////////////////////////////////////////////////////// - + public BookmarkGroup(string parent_id) { GLib.Object(parent_id : parent_id); } - + ///////////////////////////////////////////////////////////////////// /// Construct block loads the bookmarks of the user and adds a file /// monitor in order to update the BookmarkGroup when the bookmarks /// of the user change. ///////////////////////////////////////////////////////////////////// - + construct { this.load(); - + // add monitor var bookmark_file = GLib.File.new_for_path( GLib.Environment.get_home_dir()).get_child(".gtk-bookmarks"); - + if (bookmark_file.query_exists()) { try { var monitor = bookmark_file.monitor(GLib.FileMonitorFlags.NONE); @@ -78,31 +78,31 @@ public class BookmarkGroup : ActionGroup { } } } - + ///////////////////////////////////////////////////////////////////// /// Adds Actions for each gtk-bookmark of the user and for his home /// folder, desktop and trash. ///////////////////////////////////////////////////////////////////// - + private void load() { // add home folder this.add_action(ActionRegistry.new_for_uri("file://" + GLib.Environment.get_home_dir())); - + // add .gtk-bookmarks var bookmark_file = GLib.File.new_for_path( GLib.Environment.get_home_dir()).get_child(".gtk-bookmarks"); - + if (!bookmark_file.query_exists()) { warning("Failed to find file \".gtk-bookmarks\"!"); return; } - + try { var dis = new DataInputStream(bookmark_file.read()); string line; while ((line = dis.read_line(null)) != null) { var parts = line.split(" "); - + string uri = parts[0]; string name = parts[1]; @@ -111,19 +111,19 @@ public class BookmarkGroup : ActionGroup { } catch (Error e) { error ("%s", e.message); } - + // add trash this.add_action(ActionRegistry.new_for_uri("trash://")); - + // add desktop this.add_action(ActionRegistry.new_for_uri("file://" + GLib.Environment.get_user_special_dir(GLib.UserDirectory.DESKTOP))); } - + ///////////////////////////////////////////////////////////////////// /// Reloads all Bookmarks. Is called when the user's gtk-bookmarks /// file changes. ///////////////////////////////////////////////////////////////////// - + private void reload() { // avoid too frequent changes... if (!this.changing) { @@ -138,13 +138,13 @@ public class BookmarkGroup : ActionGroup { message("Bookmarks changed..."); this.delete_all(); this.load(); - + this.changing = false; return false; }); } else { this.changed_again = true; - } + } } } diff --git a/src/actionGroups/clipboardGroup.vala b/src/actionGroups/clipboardGroup.vala index c104d62..ad18740 100644 --- a/src/actionGroups/clipboardGroup.vala +++ b/src/actionGroups/clipboardGroup.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// This Group keeps a history of the last used Clipboard entries. /// Experimental. Not enabled. ///////////////////////////////////////////////////////////////////////// @@ -25,40 +25,40 @@ namespace GnomePie { public class ClipboardGroup : ActionGroup { ///////////////////////////////////////////////////////////////////// - /// + /// ///////////////////////////////////////////////////////////////////// private class ClipboardItem : GLib.Object { - + public string name { get; private set; } public string icon { get; private set; } - + private Gtk.SelectionData contents; - + public ClipboardItem(Gtk.SelectionData contents) { this.contents = contents.copy(); this.name = this.contents.get_text() ?? ""; this.icon = "edit-paste"; } - + public void paste() { debug(name); } } - + public ClipboardGroup(string parent_id) { GLib.Object(parent_id : parent_id); } - + ///////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////// - + ///////////////////////////////////////////////////////////////////// /// Used to register this type of ActionGroup. It sets the display - /// name for this ActionGroup, it's icon name and the string used in + /// name for this ActionGroup, it's icon name and the string used in /// the pies.conf file for this kind of ActionGroups. ///////////////////////////////////////////////////////////////////// - + public static GroupRegistry.TypeDescription register() { var description = new GroupRegistry.TypeDescription(); description.name = _("Group: Clipboard"); @@ -67,45 +67,45 @@ public class ClipboardGroup : ActionGroup { description.id = "clipboard"; return description; } - + ///////////////////////////////////////////////////////////////////// /// The clipboard to be monitored. ///////////////////////////////////////////////////////////////////// - + private Gtk.Clipboard clipboard; - - + + ///////////////////////////////////////////////////////////////////// /// The maximum remembered items of the clipboard. ///////////////////////////////////////////////////////////////////// - + private static const int max_items = 6; - + private Gee.ArrayList<ClipboardItem?> items; - + construct { this.items = new Gee.ArrayList<ClipboardItem?>(); this.clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD); this.clipboard.owner_change.connect(this.on_change); } - + private void on_change() { if (this.clipboard.wait_is_text_available()) { this.clipboard.request_contents(Gdk.Atom.intern("text/plain", false), this.add_item); } } - + private void add_item(Gtk.Clipboard c, Gtk.SelectionData contents) { var new_item = new ClipboardItem(contents); - + if (this.items.size == ClipboardGroup.max_items) this.items.remove_at(0); - + this.items.add(new_item); - + // update slices this.delete_all(); - + for (int i=0; i<this.items.size; ++i) { var action = new SigAction(items[i].name, items[i].icon, i.to_string()); action.activated.connect(() => { diff --git a/src/actionGroups/devicesGroup.vala b/src/actionGroups/devicesGroup.vala index d3892fe..1078296 100644 --- a/src/actionGroups/devicesGroup.vala +++ b/src/actionGroups/devicesGroup.vala @@ -1,35 +1,35 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { ///////////////////////////////////////////////////////////////////// -/// An ActionGroup which contains all currently plugged-in devices, +/// An ActionGroup which contains all currently plugged-in devices, /// such as CD-ROM's or USB-sticks. ///////////////////////////////////////////////////////////////////// public class DevicesGroup : ActionGroup { - + ///////////////////////////////////////////////////////////////////// /// Used to register this type of ActionGroup. It sets the display - /// name for this ActionGroup, it's icon name and the string used in + /// name for this ActionGroup, it's icon name and the string used in /// the pies.conf file for this kind of ActionGroups. ///////////////////////////////////////////////////////////////////// - + public static GroupRegistry.TypeDescription register() { var description = new GroupRegistry.TypeDescription(); description.name = _("Group: Devices"); @@ -40,63 +40,63 @@ public class DevicesGroup : ActionGroup { } ///////////////////////////////////////////////////////////////////// - /// Two members needed to avoid useless, frequent changes of the + /// Two members needed to avoid useless, frequent changes of the /// stored Actions. ///////////////////////////////////////////////////////////////////// private bool changing = false; private bool changed_again = false; - + ///////////////////////////////////////////////////////////////////// /// The VolumeMonitor used to check for added or removed devices. ///////////////////////////////////////////////////////////////////// - + private GLib.VolumeMonitor monitor; - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members. ///////////////////////////////////////////////////////////////////// - + public DevicesGroup(string parent_id) { GLib.Object(parent_id : parent_id); } - + ///////////////////////////////////////////////////////////////////// /// Construct block loads all currently plugged-in devices and /// connects signal handlers to the VolumeMonitor. ///////////////////////////////////////////////////////////////////// - + construct { this.monitor = GLib.VolumeMonitor.get(); - + this.load(); // add monitor this.monitor.mount_added.connect(this.reload); this.monitor.mount_removed.connect(this.reload); } - + ///////////////////////////////////////////////////////////////////// /// Loads all currently plugged-in devices. ///////////////////////////////////////////////////////////////////// - + private void load() { // add root device this.add_action(new UriAction(_("Root"), "harddrive", "file:///")); - + // add all other devices foreach(var mount in this.monitor.get_mounts()) { // get icon var icon = mount.get_icon(); - + this.add_action(new UriAction(mount.get_name(), Icon.get_icon_name(icon), mount.get_root().get_uri())); } } - + ///////////////////////////////////////////////////////////////////// /// Reloads all devices. Is called when the VolumeMonitor changes. ///////////////////////////////////////////////////////////////////// - + private void reload() { // avoid too frequent changes... if (!this.changing) { @@ -111,13 +111,13 @@ public class DevicesGroup : ActionGroup { message("Devices changed..."); this.delete_all(); this.load(); - + this.changing = false; return false; }); } else { this.changed_again = true; - } + } } } diff --git a/src/actionGroups/groupRegistry.vala b/src/actionGroups/groupRegistry.vala index 7510a03..ca0dc4d 100644 --- a/src/actionGroups/groupRegistry.vala +++ b/src/actionGroups/groupRegistry.vala @@ -1,83 +1,83 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A which has knowledge on all possible acion group types. ///////////////////////////////////////////////////////////////////////// public class GroupRegistry : GLib.Object { - + ///////////////////////////////////////////////////////////////////// /// A list containing all available ActionGroup types. ///////////////////////////////////////////////////////////////////// - + public static Gee.ArrayList<string> types { get; private set; } - + ///////////////////////////////////////////////////////////////////// - /// A map associating a displayable name for each ActionGroup, + /// A map associating a displayable name for each ActionGroup, /// an icon name and a name for the pies.conf file with it's type. ///////////////////////////////////////////////////////////////////// - + public static Gee.HashMap<string, TypeDescription?> descriptions { get; private set; } - + public class TypeDescription { public string name { get; set; default=""; } public string icon { get; set; default=""; } public string description { get; set; default=""; } public string id { get; set; default=""; } } - + ///////////////////////////////////////////////////////////////////// /// Registers all ActionGroup types. ///////////////////////////////////////////////////////////////////// - + public static void init() { types = new Gee.ArrayList<string>(); descriptions = new Gee.HashMap<string, TypeDescription?>(); - + TypeDescription type_description; - + type_description = BookmarkGroup.register(); types.add(typeof(BookmarkGroup).name()); descriptions.set(typeof(BookmarkGroup).name(), type_description); - + type_description = DevicesGroup.register(); types.add(typeof(DevicesGroup).name()); descriptions.set(typeof(DevicesGroup).name(), type_description); - + type_description = MenuGroup.register(); types.add(typeof(MenuGroup).name()); descriptions.set(typeof(MenuGroup).name(), type_description); - + type_description = SessionGroup.register(); types.add(typeof(SessionGroup).name()); descriptions.set(typeof(SessionGroup).name(), type_description); - + type_description = WindowListGroup.register(); types.add(typeof(WindowListGroup).name()); descriptions.set(typeof(WindowListGroup).name(), type_description); } - + ///////////////////////////////////////////////////////////////////// /// Creates a Group for a given type name. ///////////////////////////////////////////////////////////////////// - + public static ActionGroup? create_group(string type_id, string parent_id) { switch (type_id) { case "bookmarks": return new BookmarkGroup(parent_id); @@ -86,7 +86,7 @@ public class GroupRegistry : GLib.Object { case "session": return new SessionGroup(parent_id); case "window_list": return new WindowListGroup(parent_id); } - + return null; } } diff --git a/src/actionGroups/menuGroup.vala b/src/actionGroups/menuGroup.vala index 26a2662..7a1e344 100644 --- a/src/actionGroups/menuGroup.vala +++ b/src/actionGroups/menuGroup.vala @@ -1,35 +1,35 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// An ActionGroup which displays the user's main menu. It's a bit ugly, /// but it supports both, an older version and libgnome-menus-3 at the /// same time. ///////////////////////////////////////////////////////////////////////// - + public class MenuGroup : ActionGroup { ///////////////////////////////////////////////////////////////////// /// Used to register this type of ActionGroup. It sets the display - /// name for this ActionGroup, it's icon name and the string used in + /// name for this ActionGroup, it's icon name and the string used in /// the pies.conf file for this kind of ActionGroups. ///////////////////////////////////////////////////////////////////// - + public static GroupRegistry.TypeDescription register() { var description = new GroupRegistry.TypeDescription(); description.name = _("Group: Main menu"); @@ -38,50 +38,50 @@ public class MenuGroup : ActionGroup { description.id = "menu"; return description; } - + ///////////////////////////////////////////////////////////////////// /// True, if this MenuGroup is the top most menu. ///////////////////////////////////////////////////////////////////// - + public bool is_toplevel {get; construct set; default = true;} - + ///////////////////////////////////////////////////////////////////// /// The menu tree displayed by the MenuGroup. Only set for the /// toplevel MenuGroup. ///////////////////////////////////////////////////////////////////// - + private GMenu.Tree menu = null; - + ///////////////////////////////////////////////////////////////////// /// A list of all sub menus of this MenuGroup. ///////////////////////////////////////////////////////////////////// - + private Gee.ArrayList<MenuGroup?> childs; - + ///////////////////////////////////////////////////////////////////// - /// Two members needed to avoid useless, frequent changes of the + /// Two members needed to avoid useless, frequent changes of the /// stored Actions. ///////////////////////////////////////////////////////////////////// - + private bool changing = false; private bool changed_again = false; - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members. Used for the toplevel menu. ///////////////////////////////////////////////////////////////////// - + public MenuGroup(string parent_id) { GLib.Object(parent_id : parent_id, is_toplevel : true); } - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members. Used for sub menus. ///////////////////////////////////////////////////////////////////// - + public MenuGroup.sub_menu(string parent_id) { GLib.Object(parent_id : parent_id, is_toplevel : false); } - + construct { this.childs = new Gee.ArrayList<MenuGroup?>(); @@ -89,16 +89,16 @@ public class MenuGroup : ActionGroup { #if HAVE_GMENU_3 this.menu = new GMenu.Tree("applications.menu", GMenu.TreeFlags.INCLUDE_EXCLUDED); this.menu.changed.connect(this.reload); - #endif - - this.load_toplevel(); - } + #endif + + this.load_toplevel(); + } } - + ///////////////////////////////////////////////////////////////////// /// Starts to load the menu. ///////////////////////////////////////////////////////////////////// - + private void load_toplevel() { #if HAVE_GMENU_3 try { @@ -113,13 +113,13 @@ public class MenuGroup : ActionGroup { this.menu.add_monitor(this.reload); var dir = this.menu.get_root_directory(); this.load_contents(dir, this.parent_id); - #endif + #endif } ///////////////////////////////////////////////////////////////////// /// Parses the main menu recursively. ///////////////////////////////////////////////////////////////////// - + private void load_contents(GMenu.TreeDirectory dir, string parent_id) { #if HAVE_GMENU_3 var item = dir.iter(); @@ -128,35 +128,35 @@ public class MenuGroup : ActionGroup { var type = item.next(); if (type == GMenu.TreeItemType.INVALID) break; - + if (type == GMenu.TreeItemType.DIRECTORY && !item.get_directory().get_is_nodisplay()) { - // create a MenuGroup for sub menus - + // create a MenuGroup for sub menus + // get icon var icon = item.get_directory().get_icon(); - + var sub_menu = PieManager.create_dynamic_pie(item.get_directory().get_name(), Icon.get_icon_name(icon)); var group = new MenuGroup.sub_menu(sub_menu.id); group.add_action(new PieAction(parent_id, true)); group.load_contents(item.get_directory(), sub_menu.id); childs.add(group); - + sub_menu.add_group(group); - - this.add_action(new PieAction(sub_menu.id)); + + this.add_action(new PieAction(sub_menu.id)); } else if (type == GMenu.TreeItemType.ENTRY ) { // create an AppAction for entries if (!item.get_entry().get_is_excluded()) { - this.add_action(ActionRegistry.new_for_app_info(item.get_entry().get_app_info())); - } + this.add_action(ActionRegistry.new_for_app_info(item.get_entry().get_app_info())); + } } } #else foreach (var item in dir.get_contents()) { switch(item.get_type()) { case GMenu.TreeItemType.DIRECTORY: - // create a MenuGroup for sub menus + // create a MenuGroup for sub menus if (!((GMenu.TreeDirectory)item).get_is_nodisplay()) { var sub_menu = PieManager.create_dynamic_pie( ((GMenu.TreeDirectory)item).get_name(), @@ -165,30 +165,30 @@ public class MenuGroup : ActionGroup { group.add_action(new PieAction(parent_id, true)); group.load_contents((GMenu.TreeDirectory)item, sub_menu.id); childs.add(group); - + sub_menu.add_group(group); - - this.add_action(new PieAction(sub_menu.id)); - } + + this.add_action(new PieAction(sub_menu.id)); + } break; - + case GMenu.TreeItemType.ENTRY: // create an AppAction for entries if (!((GMenu.TreeEntry)item).get_is_nodisplay() && !((GMenu.TreeEntry)item).get_is_excluded()) { - this.add_action(new AppAction(((GMenu.TreeEntry)item).get_name(), - ((GMenu.TreeEntry)item).get_icon(), - ((GMenu.TreeEntry)item).get_exec())); - } + this.add_action(new AppAction(((GMenu.TreeEntry)item).get_name(), + ((GMenu.TreeEntry)item).get_icon(), + ((GMenu.TreeEntry)item).get_exec())); + } break; } } #endif } - + ///////////////////////////////////////////////////////////////////// /// Reloads the menu. ///////////////////////////////////////////////////////////////////// - + private void reload() { // avoid too frequent changes... if (!this.changing) { @@ -204,46 +204,46 @@ public class MenuGroup : ActionGroup { #if !HAVE_GMENU_3 this.menu.remove_monitor(this.reload); #endif - + this.clear(); this.load_toplevel(); - + this.changing = false; return false; }); } else { this.changed_again = true; - } + } } - + ///////////////////////////////////////////////////////////////////// /// Deletes all generated Pies, when the toplevel menu is deleted. ///////////////////////////////////////////////////////////////////// - + public override void on_remove() { if (this.is_toplevel) this.clear(); } - + ///////////////////////////////////////////////////////////////////// /// Clears this ActionGroup recursively. ///////////////////////////////////////////////////////////////////// - + private void clear() { foreach (var child in childs) child.clear(); if (!this.is_toplevel) PieManager.remove_pie(this.parent_id); - + this.delete_all(); - + this.childs.clear(); - + #if !HAVE_GMENU_3 this.menu = null; #endif - + } } diff --git a/src/actionGroups/sessionGroup.vala b/src/actionGroups/sessionGroup.vala index 26f8ebc..7b989a6 100644 --- a/src/actionGroups/sessionGroup.vala +++ b/src/actionGroups/sessionGroup.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -23,13 +23,13 @@ namespace GnomePie { ///////////////////////////////////////////////////////////////////// public class SessionGroup : ActionGroup { - + ///////////////////////////////////////////////////////////////////// /// Used to register this type of ActionGroup. It sets the display - /// name for this ActionGroup, it's icon name and the string used in + /// name for this ActionGroup, it's icon name and the string used in /// the pies.conf file for this kind of ActionGroups. ///////////////////////////////////////////////////////////////////// - + public static GroupRegistry.TypeDescription register() { var description = new GroupRegistry.TypeDescription(); description.name = _("Group: Session Control"); @@ -38,38 +38,38 @@ public class SessionGroup : ActionGroup { description.id = "session"; return description; } - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members. ///////////////////////////////////////////////////////////////////// - + public SessionGroup(string parent_id) { GLib.Object(parent_id : parent_id); } - + ///////////////////////////////////////////////////////////////////// /// Construct block adds the three Actions. ///////////////////////////////////////////////////////////////////// - + construct { -// string iface = GLib.Bus.get_proxy_sync(GLib.BusType.SESSION, "org.gnome.SessionManager", "/org/gnome/SessionManager"); -// iface = GLib.Bus.get_proxy_sync(GLib.BusType.SESSION, "org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer"); -// iface = GLib.Bus.get_proxy_sync(GLib.BusType.SESSION, "org.kde.ksmserver", "/KSMServer"); -// iface = GLib.Bus.get_proxy_sync(GLib.BusType.SESSION, "org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager"); - - this.add_action(new AppAction(_("Shutdown"), "gnome-shutdown", +// string iface = GLib.Bus.get_proxy_sync(GLib.BusType.SESSION, "org.gnome.SessionManager", "/org/gnome/SessionManager"); +// iface = GLib.Bus.get_proxy_sync(GLib.BusType.SESSION, "org.freedesktop.Hal", "/org/freedesktop/Hal/devices/computer"); +// iface = GLib.Bus.get_proxy_sync(GLib.BusType.SESSION, "org.kde.ksmserver", "/KSMServer"); +// iface = GLib.Bus.get_proxy_sync(GLib.BusType.SESSION, "org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager"); + + this.add_action(new AppAction(_("Shutdown"), "gnome-shutdown", "dbus-send --print-reply --dest=org.gnome.SessionManager /org/gnome/SessionManager org.gnome.SessionManager.RequestShutdown")); - - this.add_action(new AppAction(_("Logout"), "gnome-session-logout", + + this.add_action(new AppAction(_("Logout"), "gnome-session-logout", "dbus-send --print-reply --dest=org.gnome.SessionManager /org/gnome/SessionManager org.gnome.SessionManager.Logout uint32:1")); - - this.add_action(new AppAction(_("Reboot"), "gnome-session-reboot", + + this.add_action(new AppAction(_("Reboot"), "gnome-session-reboot", "dbus-send --print-reply --dest=org.gnome.SessionManager /org/gnome/SessionManager org.gnome.SessionManager.RequestReboot")); } - + // TODO: check for available interfaces --- these may work too: // dbus-send --print-reply --dest=org.freedesktop.Hal /org/freedesktop/Hal/devices/computer org.freedesktop.Hal.Device.SystemPowerManagement.Shutdown - // dbus-send --print-reply --dest=org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.logout 0 2 2 + // dbus-send --print-reply --dest=org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.logout 0 2 2 // dbus-send --print-reply --dest="org.freedesktop.ConsoleKit" /org/freedesktop/ConsoleKit/Manager org.freedesktop.ConsoleKit.Manager.Stop } diff --git a/src/actionGroups/windowListGroup.vala b/src/actionGroups/windowListGroup.vala index 774666f..a2dc19c 100644 --- a/src/actionGroups/windowListGroup.vala +++ b/src/actionGroups/windowListGroup.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -22,13 +22,13 @@ namespace GnomePie { ///////////////////////////////////////////////////////////////////// public class WindowListGroup : ActionGroup { - + ///////////////////////////////////////////////////////////////////// /// Used to register this type of ActionGroup. It sets the display - /// name for this ActionGroup, it's icon name and the string used in + /// name for this ActionGroup, it's icon name and the string used in /// the pies.conf file for this kind of ActionGroups. ///////////////////////////////////////////////////////////////////// - + public static GroupRegistry.TypeDescription register() { var description = new GroupRegistry.TypeDescription(); description.name = _("Group: Window List"); @@ -39,86 +39,86 @@ public class WindowListGroup : ActionGroup { } ///////////////////////////////////////////////////////////////////// - /// Two members needed to avoid useless, frequent changes of the + /// Two members needed to avoid useless, frequent changes of the /// stored Actions. ///////////////////////////////////////////////////////////////////// private bool changing = false; private bool changed_again = false; - + private Wnck.Screen screen; - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members. ///////////////////////////////////////////////////////////////////// - + public WindowListGroup(string parent_id) { GLib.Object(parent_id : parent_id); } - + ///////////////////////////////////////////////////////////////////// /// Loads all windows. ///////////////////////////////////////////////////////////////////// - + construct { this.screen = Wnck.Screen.get_default(); - + this.screen.window_opened.connect(reload); this.screen.window_closed.connect(reload); - + this.load(); } - + ///////////////////////////////////////////////////////////////////// /// Loads all currently opened windows and creates actions for them. ///////////////////////////////////////////////////////////////////// - + private void load() { unowned GLib.List<Wnck.Window?> windows = this.screen.get_windows(); - + var matcher = Bamf.Matcher.get_default(); foreach (var window in windows) { if (window.get_window_type() == Wnck.WindowType.NORMAL - && !window.is_skip_pager() && !window.is_skip_tasklist()) { + && !window.is_skip_pager() && !window.is_skip_tasklist()) { var application = window.get_application(); var bamf_app = matcher.get_application_for_xid((uint32)window.get_xid()); - + string name = window.get_name(); - + if (name.length > 30) name = name.substring(0, 30) + "..."; - + var action = new SigAction( name, (bamf_app == null) ? application.get_icon_name().down() : bamf_app.get_icon(), - "%lu".printf(window.get_xid()) + "%lu".printf(window.get_xid()) ); action.activated.connect(() => { Wnck.Screen.get_default().force_update(); - + var xid = (X.Window)uint64.parse(action.real_command); var win = Wnck.Window.get(xid); - var time = Gtk.get_current_event_time(); - - if (win.get_workspace() != null - && win.get_workspace() != win.get_screen().get_active_workspace()) - win.get_workspace().activate(time); - - if (win.is_minimized()) - win.unminimize(time); - - win.activate_transient(time); + var time = Gtk.get_current_event_time(); + + if (win.get_workspace() != null + && win.get_workspace() != win.get_screen().get_active_workspace()) + win.get_workspace().activate(time); + + if (win.is_minimized()) + win.unminimize(time); + + win.activate_transient(time); }); this.add_action(action); } } } - + ///////////////////////////////////////////////////////////////////// /// Reloads all running applications. ///////////////////////////////////////////////////////////////////// - + private void reload() { // avoid too frequent changes... if (!this.changing) { @@ -132,13 +132,13 @@ public class WindowListGroup : ActionGroup { // reload this.delete_all(); this.load(); - + this.changing = false; return false; }); } else { this.changed_again = true; - } + } } } diff --git a/src/actions/action.vala b/src/actions/action.vala index ff0e9cd..91fc448 100644 --- a/src/actions/action.vala +++ b/src/actions/action.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A base class for actions, which are executed when the user /// activates a pie's slice. ///////////////////////////////////////////////////////////////////////// @@ -30,33 +30,33 @@ public abstract class Action : GLib.Object { ///////////////////////////////////////////////////////////////////// public abstract string real_command { get; construct set; } - + ///////////////////////////////////////////////////////////////////// /// The command displayed to the user. It should be a bit more /// beautiful than the real_command. ///////////////////////////////////////////////////////////////////// - - public abstract string display_command { get; } - + + public abstract string display_command { get; } + ///////////////////////////////////////////////////////////////////// /// The name of the Action. - ///////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////////// public virtual string name { get; set; } - + ///////////////////////////////////////////////////////////////////// /// The name of the icon of this Action. It should be in the users /// current icon theme. ///////////////////////////////////////////////////////////////////// - + public virtual string icon { get; set; } - + ///////////////////////////////////////////////////////////////////// /// True, if this Action is the quickAction of the associated Pie. /// The quickAction of a Pie gets executed when the users clicks on /// the center of a Pie. ///////////////////////////////////////////////////////////////////// - + public virtual bool is_quickaction { get; set; } ///////////////////////////////////////////////////////////////////// diff --git a/src/actions/actionRegistry.vala b/src/actions/actionRegistry.vala index 24cc1fe..9a22cc7 100644 --- a/src/actions/actionRegistry.vala +++ b/src/actions/actionRegistry.vala @@ -1,46 +1,46 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A which has knowledge on all possible acion types. ///////////////////////////////////////////////////////////////////////// public class ActionRegistry : GLib.Object { - + ///////////////////////////////////////////////////////////////////// /// A list containing all available Action types. ///////////////////////////////////////////////////////////////////// - + public static Gee.ArrayList<string> types { get; private set; } - + ///////////////////////////////////////////////////////////////////// - /// A map associating a displayable name for each Action, + /// A map associating a displayable name for each Action, /// whether it has a custom icon and a name for the pies.conf /// file with it's type. ///////////////////////////////////////////////////////////////////// - + public static Gee.HashMap<string, TypeDescription?> descriptions { get; private set; } - + ///////////////////////////////////////////////////////////////////// /// A helper class storing information on a Action type. ///////////////////////////////////////////////////////////////////// - + public class TypeDescription { public string name { get; set; default=""; } public string icon { get; set; default=""; } @@ -48,38 +48,38 @@ public class ActionRegistry : GLib.Object { public string id { get; set; default=""; } public bool icon_name_editable { get; set; default=false; } } - + ///////////////////////////////////////////////////////////////////// /// Registers all Action types. ///////////////////////////////////////////////////////////////////// - + public static void init() { types = new Gee.ArrayList<string>(); descriptions = new Gee.HashMap<string, TypeDescription?>(); - + TypeDescription type_description; - + types.add(typeof(AppAction).name()); type_description = AppAction.register(); descriptions.set(typeof(AppAction).name(), type_description); - + types.add(typeof(KeyAction).name()); type_description = KeyAction.register(); descriptions.set(typeof(KeyAction).name(), type_description); - + types.add(typeof(PieAction).name()); type_description = PieAction.register(); descriptions.set(typeof(PieAction).name(), type_description); - + types.add(typeof(UriAction).name()); type_description = UriAction.register(); descriptions.set(typeof(UriAction).name(), type_description); } - + ///////////////////////////////////////////////////////////////////// /// Creates a new Action from the given type name. ///////////////////////////////////////////////////////////////////// - + public static Action? create_action(string type_id, string name, string icon, string command, bool quickaction) { switch (type_id) { case "app": return new AppAction(name, icon, command, quickaction); @@ -87,131 +87,131 @@ public class ActionRegistry : GLib.Object { case "uri": return new UriAction(name, icon, command, quickaction); case "pie": return new PieAction(command, quickaction); } - + return null; } - + ///////////////////////////////////////////////////////////////////// - /// A helper method which creates an Action, appropriate for the + /// A helper method which creates an Action, appropriate for the /// given URI. This can result in an UriAction or in an AppAction, - /// depending on the Type of the URI. + /// depending on the Type of the URI. ///////////////////////////////////////////////////////////////////// public static Action? new_for_uri(string uri, string? name = null) { var file = GLib.File.new_for_uri(uri); var scheme = file.get_uri_scheme(); - + string final_icon = ""; string final_name = file.get_basename(); switch (scheme) { case "application": var file_name = uri.split("//")[1]; - + var desktop_file = GLib.File.new_for_path("/usr/share/applications/" + file_name); if (desktop_file.query_exists()) return new_for_desktop_file(desktop_file.get_path()); break; - + case "trash": final_icon = "user-trash"; final_name = _("Trash"); break; - + case "http": case "https": final_icon = "www"; final_name = get_domain_name(uri); break; - + case "ftp": case "sftp": final_icon = "folder-remote"; final_name = get_domain_name(uri); break; - + default: try { var info = file.query_info("*", GLib.FileQueryInfoFlags.NONE); - + if (info.get_content_type() == "application/x-desktop") return new_for_desktop_file(file.get_parse_name()); - + // search for an appropriate icon - var icon = info.get_icon(); + var icon = info.get_icon(); final_icon = Icon.get_icon_name(icon); - + } catch (GLib.Error e) { warning(e.message); } break; } - + if (!Gtk.IconTheme.get_default().has_icon(final_icon)) final_icon = "stock_unknown"; - + if (name != null) final_name = name; - + return new UriAction(final_name, final_icon, uri); } - + ///////////////////////////////////////////////////////////////////// /// A helper method which creates an AppAction for given AppInfo. ///////////////////////////////////////////////////////////////////// - - public static Action? new_for_app_info(GLib.AppInfo info) { + + public static Action? new_for_app_info(GLib.AppInfo info) { // get icon - var icon = info.get_icon(); - + var icon = info.get_icon(); + return new AppAction(info.get_display_name(), Icon.get_icon_name(icon), info.get_commandline()); } - + ///////////////////////////////////////////////////////////////////// /// A helper method which creates an AppAction for given *.desktop /// file. ///////////////////////////////////////////////////////////////////// - + public static Action? new_for_desktop_file(string file_name) { // check whether its a desktop file to open one of Gnome-Pie's pies if (file_name.has_prefix(Paths.launchers)) { string id = file_name.substring((long)file_name.length - 11, 3); return new PieAction(id); } - + var info = new DesktopAppInfo.from_filename(file_name); return new_for_app_info(info); } - + ///////////////////////////////////////////////////////////////////// /// A helper method which creates an AppAction for given mime type. ///////////////////////////////////////////////////////////////////// - + public static Action? default_for_mime_type(string type) { var info = AppInfo.get_default_for_type(type, false); return new_for_app_info(info); } - + ///////////////////////////////////////////////////////////////////// /// A helper method which creates an AppAction for given uri scheme. ///////////////////////////////////////////////////////////////////// - + public static Action? default_for_uri(string uri) { var info = AppInfo.get_default_for_uri_scheme(uri); return new_for_app_info(info); } - + ///////////////////////////////////////////////////////////////////// /// Returns for example www.google.com when http://www.google.de/?q=h /// is given. ///////////////////////////////////////////////////////////////////// - + private static string get_domain_name(string url) { int domain_end = url.index_of_char('/', 7); int domain_begin = url.index_of_char('/', 0) + 2; - + if (domain_begin < domain_end) return url.substring(domain_begin, domain_end-domain_begin); - + return url; } } diff --git a/src/actions/appAction.vala b/src/actions/appAction.vala index 2371f7c..859baf8 100644 --- a/src/actions/appAction.vala +++ b/src/actions/appAction.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// This type of Action launches an application or a custom command. ///////////////////////////////////////////////////////////////////////// @@ -38,17 +38,17 @@ public class AppAction : Action { description.id = "app"; return description; } - + ///////////////////////////////////////////////////////////////////// /// Stores the command line. ///////////////////////////////////////////////////////////////////// public override string real_command { get; construct set; } - + ///////////////////////////////////////////////////////////////////// /// Simply returns the real_command. No beautification. ///////////////////////////////////////////////////////////////////// - + public override string display_command { get {return real_command;} } ///////////////////////////////////////////////////////////////////// @@ -67,10 +67,10 @@ public class AppAction : Action { try{ var item = GLib.AppInfo.create_from_commandline(this.real_command, null, GLib.AppInfoCreateFlags.NONE); item.launch(null, null); - } catch (Error e) { - warning(e.message); + } catch (Error e) { + warning(e.message); } - } + } } } diff --git a/src/actions/keyAction.vala b/src/actions/keyAction.vala index 3816686..68a2ec1 100644 --- a/src/actions/keyAction.vala +++ b/src/actions/keyAction.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// This type of Action "presses" a key stroke. ///////////////////////////////////////////////////////////////////////// @@ -37,24 +37,24 @@ public class KeyAction : Action { description.icon_name_editable = true; description.id = "key"; return description; - } - + } + ///////////////////////////////////////////////////////////////////// /// Stores the accelerator of this action. ///////////////////////////////////////////////////////////////////// - + public override string real_command { get; construct set; } - + ///////////////////////////////////////////////////////////////////// /// Returns a human readable form of the accelerator. ///////////////////////////////////////////////////////////////////// - + public override string display_command { get {return key.label;} } - + ///////////////////////////////////////////////////////////////////// /// The simulated key which gets 'pressed' on execution. ///////////////////////////////////////////////////////////////////// - + public Key key { get; set; } ///////////////////////////////////////////////////////////////////// @@ -64,11 +64,11 @@ public class KeyAction : Action { public KeyAction(string name, string icon, string command, bool is_quickaction = false) { GLib.Object(name : name, icon : icon, real_command : command, is_quickaction : is_quickaction); } - + construct { this.key = new Key.from_string(real_command); } - + ///////////////////////////////////////////////////////////////////// /// Presses the desired key. ///////////////////////////////////////////////////////////////////// diff --git a/src/actions/pieAction.vala b/src/actions/pieAction.vala index c65c1d6..8069ff3 100644 --- a/src/actions/pieAction.vala +++ b/src/actions/pieAction.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// This Action opens another pie. ///////////////////////////////////////////////////////////////////////// @@ -38,23 +38,23 @@ public class PieAction : Action { description.id = "pie"; return description; } - + ///////////////////////////////////////////////////////////////////// /// Stores the ID of the referenced Pie. ///////////////////////////////////////////////////////////////////// public override string real_command { get; construct set; } - + ///////////////////////////////////////////////////////////////////// /// Returns the name of the referenced Pie. ///////////////////////////////////////////////////////////////////// - + public override string display_command { get {return name;} } - + ///////////////////////////////////////////////////////////////////// /// Returns the name of the referenced Pie. ///////////////////////////////////////////////////////////////////// - + public override string name { get { var referee = PieManager.all_pies[real_command]; @@ -66,13 +66,13 @@ public class PieAction : Action { } protected set {} } - + private string owned_name; - + ///////////////////////////////////////////////////////////////////// /// Returns the icon of the referenced Pie. ///////////////////////////////////////////////////////////////////// - + public override string icon { get { var referee = PieManager.all_pies[real_command]; @@ -90,14 +90,14 @@ public class PieAction : Action { public PieAction(string id, bool is_quickaction = false) { GLib.Object(name : "", icon : "", real_command : id, is_quickaction : is_quickaction); } - + ///////////////////////////////////////////////////////////////////// /// Opens the desired Pie. ///////////////////////////////////////////////////////////////////// public override void activate() { PieManager.open_pie(real_command); - } + } } } diff --git a/src/actions/sigAction.vala b/src/actions/sigAction.vala index 1edbc08..4eebbca 100644 --- a/src/actions/sigAction.vala +++ b/src/actions/sigAction.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// This type of Action can't be selected by the user, therefore there is /// no register() method for this class. But it may be useful for /// ActionGroups: It emits a signal on activation. @@ -30,19 +30,19 @@ public class SigAction : Action { ///////////////////////////////////////////////////////////////////// public signal void activated(); - + ///////////////////////////////////////////////////////////////////// /// This may store something useful. ///////////////////////////////////////////////////////////////////// public override string real_command { get; construct set; } - + ///////////////////////////////////////////////////////////////////// /// Only for inheritance... Greetings to Liskov. ///////////////////////////////////////////////////////////////////// - + public override string display_command { get {return real_command;} } - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members. ///////////////////////////////////////////////////////////////////// @@ -57,7 +57,7 @@ public class SigAction : Action { public override void activate() { this.activated(); - } + } } } diff --git a/src/actions/uriAction.vala b/src/actions/uriAction.vala index f407f6c..dfc1029 100644 --- a/src/actions/uriAction.vala +++ b/src/actions/uriAction.vala @@ -1,34 +1,34 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// This type of Action opens the default application for an URI. ///////////////////////////////////////////////////////////////////////// public class UriAction : Action { - + ///////////////////////////////////////////////////////////////////// /// Used to register this type of Action. It sets the display name /// for this Action, whether it has a custom Icon/Name and the string /// used in the pies.conf file for this kind of Actions. ///////////////////////////////////////////////////////////////////// - + public static ActionRegistry.TypeDescription register() { var description = new ActionRegistry.TypeDescription(); description.name = _("Open URI"); @@ -38,17 +38,17 @@ public class UriAction : Action { description.id = "uri"; return description; } - + ///////////////////////////////////////////////////////////////////// /// The URI of this Action. ///////////////////////////////////////////////////////////////////// - + public override string real_command { get; construct set; } - + ///////////////////////////////////////////////////////////////////// /// Returns only the real URI. An URI can't be beautified. ///////////////////////////////////////////////////////////////////// - + public override string display_command { get {return real_command;} } ///////////////////////////////////////////////////////////////////// @@ -56,8 +56,8 @@ public class UriAction : Action { ///////////////////////////////////////////////////////////////////// public UriAction(string name, string icon, string command, bool is_quickaction = false) { - GLib.Object(name : name, icon : icon, - real_command : command.has_prefix("www") ? "http://" + command : command, + GLib.Object(name : name, icon : icon, + real_command : command.has_prefix("www") ? "http://" + command : command, is_quickaction : is_quickaction); } @@ -68,10 +68,10 @@ public class UriAction : Action { public override void activate() { try{ GLib.AppInfo.launch_default_for_uri(real_command, null); - } catch (Error e) { - warning(e.message); + } catch (Error e) { + warning(e.message); } - } + } } } diff --git a/src/deamon.vala b/src/deamon.vala index 2e79d10..daa6d9d 100644 --- a/src/deamon.vala +++ b/src/deamon.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -36,7 +36,7 @@ public class Deamon : GLib.Object { ///////////////////////////////////////////////////////////////////// public static int main(string[] args) { - version = "0.5.7"; + version = "0.6.0"; Logger.init(); Gtk.init(ref args); @@ -133,9 +133,9 @@ public class Deamon : GLib.Object { private static void sig_handler(int sig) { stdout.printf("\n"); - message("Caught signal (%d), bye!".printf(sig)); - Gtk.main_quit(); - } + message("Caught signal (%d), bye!".printf(sig)); + Gtk.main_quit(); + } ///////////////////////////////////////////////////////////////////// /// Handles command line parameters. diff --git a/src/gui/aboutWindow.vala b/src/gui/aboutWindow.vala index 39258cb..cf1ce8a 100644 --- a/src/gui/aboutWindow.vala +++ b/src/gui/aboutWindow.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -29,38 +29,40 @@ public class AboutWindow: Gtk.AboutDialog { ///////////////////////////////////////////////////////////////////// public AboutWindow () { - string[] devs = { - "Simon Schneegans <code@simonschneegans.de>", + string[] devs = { + "Simon Schneegans <code@simonschneegans.de>", + "Gabriel Dubatti <gdubatti@gmail.com>", "Francesco Piccinno <stack.box@gmail.com>" }; string[] artists = { - "Simon Schneegans <code@simonschneegans.de>" + "Simon Schneegans <code@simonschneegans.de>" }; - string[] translators = { - "Simon Schneegans <code@simonschneegans.de> (DE, EN)", - "Riccardo Traverso <gr3yfox.fw@gmail.com> (IT)", - "Magnun Leno <magnun@codecommunity.org> (PT-BR)", - "Kim Boram <Boramism@gmail.com> (KO)", + string[] translators = { + "Simon Schneegans <code@simonschneegans.de> (DE, EN)", + "Riccardo Traverso <gr3yfox.fw@gmail.com> (IT)", + "Magnun Leno <magnun@codecommunity.org> (PT-BR)", + "Kim Boram <Boramism@gmail.com> (KO)", "Eduardo Anabalon <lalo1412@gmail.com> (ES)", + "Gabriel Dubatti <gdubatti@gmail.com> (ES)", "Grégoire Bellon-Gervais <greggbg@gmail.com> (FR)", "Alex Maxime <cad.maxime@gmail.com> (FR)", "Eugene Roskin <pams@imail.ru> (RU)", "Ting Zhou <tzhou@haverford.edu> (ZH-CN)", "Martin Dinov <martindinov@yahoo.com> (BG)" - }; + }; - // sort translators - GLib.List<string> translator_list = new GLib.List<string>(); - foreach (var translator in translators) - translator_list.append(translator); + // sort translators + GLib.List<string> translator_list = new GLib.List<string>(); + foreach (var translator in translators) + translator_list.append(translator); - translator_list.sort((a, b) => { - return a.ascii_casecmp(b); - }); + translator_list.sort((a, b) => { + return a.ascii_casecmp(b); + }); - string translator_string = ""; - foreach (var translator in translator_list) - translator_string += translator + "\n"; + string translator_string = ""; + foreach (var translator in translator_list) + translator_string += translator + "\n"; GLib.Object ( artists : artists, diff --git a/src/gui/iconSelectWindow.vala b/src/gui/iconSelectWindow.vala index 2560811..ce610ea 100644 --- a/src/gui/iconSelectWindow.vala +++ b/src/gui/iconSelectWindow.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/indicator.vala b/src/gui/indicator.vala index 1277fb8..b46ee59 100644 --- a/src/gui/indicator.vala +++ b/src/gui/indicator.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/newSliceWindow.vala b/src/gui/newSliceWindow.vala index 92c7701..a17c819 100644 --- a/src/gui/newSliceWindow.vala +++ b/src/gui/newSliceWindow.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/newsWindow.vala b/src/gui/newsWindow.vala index 373135f..cc1a77d 100644 --- a/src/gui/newsWindow.vala +++ b/src/gui/newsWindow.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/pieComboList.vala b/src/gui/pieComboList.vala index 3be3bff..f0fd22f 100644 --- a/src/gui/pieComboList.vala +++ b/src/gui/pieComboList.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A drop-down list, containing one entry for each existing Pie. ///////////////////////////////////////////////////////////////////////// @@ -26,19 +26,19 @@ class PieComboList : Gtk.ComboBox { ///////////////////////////////////////////////////////////////////// /// This signal gets emitted when the user selects a new Pie. ///////////////////////////////////////////////////////////////////// - + public signal void on_select(string id); - + ///////////////////////////////////////////////////////////////////// /// The currently selected row. ///////////////////////////////////////////////////////////////////// - + public string current_id { get; private set; default=""; } - + ///////////////////////////////////////////////////////////////////// /// Stores the data internally. ///////////////////////////////////////////////////////////////////// - + private Gtk.ListStore data; private enum DataPos {ICON, NAME, ID} @@ -48,25 +48,25 @@ class PieComboList : Gtk.ComboBox { public PieComboList() { GLib.Object(); - - this.data = new Gtk.ListStore(3, typeof(Gdk.Pixbuf), + + this.data = new Gtk.ListStore(3, typeof(Gdk.Pixbuf), typeof(string), typeof(string)); - + this.data.set_sort_column_id(1, Gtk.SortType.ASCENDING); - + base.set_model(this.data); - + var icon_render = new Gtk.CellRendererPixbuf(); icon_render.xpad = 4; this.pack_start(icon_render, false); - + var name_render = new Gtk.CellRendererText(); this.pack_start(name_render, true); - + this.add_attribute(icon_render, "pixbuf", DataPos.ICON); this.add_attribute(name_render, "text", DataPos.NAME); - + this.changed.connect(() => { Gtk.TreeIter active; if (this.get_active_iter(out active)) { @@ -76,36 +76,36 @@ class PieComboList : Gtk.ComboBox { this.current_id = id; } }); - + reload(); } - + ///////////////////////////////////////////////////////////////////// /// Loads all existing Pies to the list. ///////////////////////////////////////////////////////////////////// - + public void reload() { Gtk.TreeIter active; string id = ""; if (this.get_active_iter(out active)) this.data.get(active, DataPos.ID, out id); - + data.clear(); foreach (var pie in PieManager.all_pies.entries) { this.load_pie(pie.value); } - + select_first(); select(id); } - + ///////////////////////////////////////////////////////////////////// /// Selects the first Pie. ///////////////////////////////////////////////////////////////////// - + public void select_first() { Gtk.TreeIter active; - + if(this.data.get_iter_first(out active) ) { this.set_active_iter(active); string id = ""; @@ -117,37 +117,37 @@ class PieComboList : Gtk.ComboBox { this.current_id = ""; } } - + ///////////////////////////////////////////////////////////////////// /// Selects the Pie with the given ID. ///////////////////////////////////////////////////////////////////// - + public void select(string id) { this.data.foreach((model, path, iter) => { string pie_id; this.data.get(iter, DataPos.ID, out pie_id); - + if (id == pie_id) { this.set_active_iter(iter); return true; } - + return false; }); } - + ///////////////////////////////////////////////////////////////////// /// Loads one given pie to the list. ///////////////////////////////////////////////////////////////////// - + private void load_pie(Pie pie) { if (pie.id.length == 3) { Gtk.TreeIter last; this.data.append(out last); var icon = new Icon(pie.icon, 24); - this.data.set(last, DataPos.ICON, icon.to_pixbuf(), + this.data.set(last, DataPos.ICON, icon.to_pixbuf(), DataPos.NAME, pie.name, - DataPos.ID, pie.id); + DataPos.ID, pie.id); } } } diff --git a/src/gui/pieList.vala b/src/gui/pieList.vala index f9fb54b..29c0a1e 100644 --- a/src/gui/pieList.vala +++ b/src/gui/pieList.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A list, containing one entry for each existing Pie. ///////////////////////////////////////////////////////////////////////// @@ -26,22 +26,22 @@ class PieList : Gtk.TreeView { ///////////////////////////////////////////////////////////////////// /// This signal gets emitted when the user selects a new Pie. ///////////////////////////////////////////////////////////////////// - + public signal void on_select(string id); - + ///////////////////////////////////////////////////////////////////// /// Stores the data internally. ///////////////////////////////////////////////////////////////////// - + private Gtk.ListStore data; private enum DataPos {ICON, ICON_NAME, NAME, ID} - + ///////////////////////////////////////////////////////////////////// /// Stores where a drag startet. ///////////////////////////////////////////////////////////////////// - + private Gtk.TreeIter? drag_start = null; - + ///////////////////////////////////////////////////////////////////// /// Rembers the time when a last drag move event was reported. Used /// to avoid frequent changes of selected Pie when a Pie is dragged @@ -49,45 +49,45 @@ class PieList : Gtk.TreeView { ///////////////////////////////////////////////////////////////////// private uint last_hover = 0; - + ///////////////////////////////////////////////////////////////////// /// C'tor, constructs the Widget. ///////////////////////////////////////////////////////////////////// public PieList() { GLib.Object(); - - this.data = new Gtk.ListStore(4, typeof(Gdk.Pixbuf), + + this.data = new Gtk.ListStore(4, typeof(Gdk.Pixbuf), typeof(string), typeof(string), typeof(string)); - + this.data.set_sort_column_id(DataPos.NAME, Gtk.SortType.ASCENDING); - + this.set_model(this.data); this.set_headers_visible(false); this.set_grid_lines(Gtk.TreeViewGridLines.NONE); this.width_request = 170; this.set_enable_search(false); - + this.set_events(Gdk.EventMask.POINTER_MOTION_MASK); - + var main_column = new Gtk.TreeViewColumn(); var icon_render = new Gtk.CellRendererPixbuf(); icon_render.xpad = 4; icon_render.ypad = 4; main_column.pack_start(icon_render, false); - + var name_render = new Gtk.CellRendererText(); name_render.ellipsize = Pango.EllipsizeMode.END; name_render.ellipsize_set = true; main_column.pack_start(name_render, true); - + base.append_column(main_column); - + main_column.add_attribute(icon_render, "pixbuf", DataPos.ICON); main_column.add_attribute(name_render, "text", DataPos.NAME); - + // setup drag'n'drop Gtk.TargetEntry uri_source = {"text/uri-list", 0, 0}; Gtk.TargetEntry[] entries = { uri_source }; @@ -100,7 +100,7 @@ class PieList : Gtk.TreeView { this.drag_leave.connect(() => { this.last_hover = 0; }); - + this.get_selection().changed.connect(() => { Gtk.TreeIter active; if (this.get_selection().get_selected(null, out active)) { @@ -109,35 +109,35 @@ class PieList : Gtk.TreeView { this.on_select(id); } }); - + reload_all(); } - + ///////////////////////////////////////////////////////////////////// /// Loads all existing Pies to the list. ///////////////////////////////////////////////////////////////////// - + public void reload_all() { Gtk.TreeIter active; string id = ""; if (this.get_selection().get_selected(null, out active)) this.data.get(active, DataPos.ID, out id); - + data.clear(); foreach (var pie in PieManager.all_pies.entries) { this.load_pie(pie.value); } - + select(id); } - + ///////////////////////////////////////////////////////////////////// /// Selects the first Pie. ///////////////////////////////////////////////////////////////////// - + public void select_first() { Gtk.TreeIter active; - + if(this.data.get_iter_first(out active) ) { this.get_selection().select_iter(active); string id = ""; @@ -147,45 +147,45 @@ class PieList : Gtk.TreeView { this.on_select(""); } } - + ///////////////////////////////////////////////////////////////////// /// Selects the Pie with the given ID. ///////////////////////////////////////////////////////////////////// - + public void select(string id) { this.data.foreach((model, path, iter) => { string pie_id; this.data.get(iter, DataPos.ID, out pie_id); - + if (id == pie_id) { this.get_selection().select_iter(iter); return true; } - + return false; }); } - + ///////////////////////////////////////////////////////////////////// /// Loads one given pie to the list. ///////////////////////////////////////////////////////////////////// - + private void load_pie(Pie pie) { if (pie.id.length == 3) { Gtk.TreeIter last; this.data.append(out last); var icon = new Icon(pie.icon, 24); - this.data.set(last, DataPos.ICON, icon.to_pixbuf(), + this.data.set(last, DataPos.ICON, icon.to_pixbuf(), DataPos.ICON_NAME, pie.icon, DataPos.NAME, pie.name, - DataPos.ID, pie.id); + DataPos.ID, pie.id); } } - + ///////////////////////////////////////////////////////////////////// /// Called when a drag which started on this Widget was successfull. ///////////////////////////////////////////////////////////////////// - + private void on_dnd_source(Gdk.DragContext context, Gtk.SelectionData selection_data, uint info, uint time_) { if (this.drag_start != null) { string id = ""; @@ -193,72 +193,72 @@ class PieList : Gtk.TreeView { selection_data.set_uris({"file://" + Paths.launchers + "/" + id + ".desktop"}); } } - + ///////////////////////////////////////////////////////////////////// /// Called when a drag operation is started on this Widget. ///////////////////////////////////////////////////////////////////// - + private void on_start_drag(Gdk.DragContext ctx) { if (this.get_selection().get_selected(null, out this.drag_start)) { string icon_name = ""; this.data.get(this.drag_start, DataPos.ICON_NAME, out icon_name); - + var icon = new Icon(icon_name, 48); var pixbuf = icon.to_pixbuf(); Gtk.drag_set_icon_pixbuf(ctx, pixbuf, icon.size()/2, icon.size()/2); } } - + ///////////////////////////////////////////////////////////////////// /// Called when something is dragged over this Widget. ///////////////////////////////////////////////////////////////////// - + private bool on_drag_move(Gdk.DragContext context, int x, int y, uint time) { - + Gtk.TreeViewDropPosition position; Gtk.TreePath path; - + if (!this.get_dest_row_at_pos(x, y, out path, out position)) return false; - + if (position == Gtk.TreeViewDropPosition.BEFORE) this.set_drag_dest_row(path, Gtk.TreeViewDropPosition.INTO_OR_BEFORE); else if (position == Gtk.TreeViewDropPosition.AFTER) this.set_drag_dest_row(path, Gtk.TreeViewDropPosition.INTO_OR_AFTER); Gdk.drag_status(context, context.get_suggested_action(), time); - + // avoid too frequent selection... this.last_hover = time; - + GLib.Timeout.add(150, () => { if (this.last_hover == time) - this.get_selection().select_path(path); + this.get_selection().select_path(path); return false; }); - + return true; } - + ///////////////////////////////////////////////////////////////////// /// Called when the user finishes a drag operation on this widget. /// Only used for external drags. ///////////////////////////////////////////////////////////////////// - - private void on_dnd_received(Gdk.DragContext context, int x, int y, + + private void on_dnd_received(Gdk.DragContext context, int x, int y, Gtk.SelectionData selection_data, uint info, uint time_) { - + Gtk.TreeIter active; if (this.get_selection().get_selected(null, out active)) { string id = ""; this.data.get(active, DataPos.ID, out id); - + var pie = PieManager.all_pies[id]; - + foreach (var uri in selection_data.get_uris()) { pie.add_action(ActionRegistry.new_for_uri(uri), 0); } - + this.on_select(id); } } diff --git a/src/gui/piePreview.vala b/src/gui/piePreview.vala index 0420d5e..ce1ba96 100644 --- a/src/gui/piePreview.vala +++ b/src/gui/piePreview.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/piePreviewAddSign.vala b/src/gui/piePreviewAddSign.vala index ee8c14b..fb5e9fa 100644 --- a/src/gui/piePreviewAddSign.vala +++ b/src/gui/piePreviewAddSign.vala @@ -1,25 +1,25 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// using GLib.Math; namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A liitle plus-sign displayed on the preview widget to indicate where /// the user may add a new Slice. ///////////////////////////////////////////////////////////////////////// @@ -31,57 +31,57 @@ public class PiePreviewAddSign : GLib.Object { ///////////////////////////////////////////////////////////////////// public signal void on_clicked(int position); - + ///////////////////////////////////////////////////////////////////// /// The image used to display this oject. ///////////////////////////////////////////////////////////////////// - + public Image icon { get; private set; } - + ///////////////////////////////////////////////////////////////////// /// True, when the add sign is currently visible. ///////////////////////////////////////////////////////////////////// - + public bool visible { get; private set; default=false; } - + ///////////////////////////////////////////////////////////////////// /// The position of the sign in its parent Pie. May be 2.5 for /// example. ///////////////////////////////////////////////////////////////////// - + private double position = 0; - + ///////////////////////////////////////////////////////////////////// /// The parent renderer. ///////////////////////////////////////////////////////////////////// - private unowned PiePreviewRenderer parent; - + private unowned PiePreviewRenderer parent; + ///////////////////////////////////////////////////////////////////// /// Some values used for displaying this sign. ///////////////////////////////////////////////////////////////////// - + private double time = 0; - private double max_size = 0; - private double angle = 0; - private AnimatedValue size; - private AnimatedValue alpha; - private AnimatedValue activity; - private AnimatedValue clicked; - + private double max_size = 0; + private double angle = 0; + private AnimatedValue size; + private AnimatedValue alpha; + private AnimatedValue activity; + private AnimatedValue clicked; + ///////////////////////////////////////////////////////////////////// /// C'tor, sets everything up. ///////////////////////////////////////////////////////////////////// public PiePreviewAddSign(PiePreviewRenderer parent) { this.parent = parent; - + this.size = new AnimatedValue.cubic(AnimatedValue.Direction.OUT, 0, 0, 0, 2.0); this.alpha = new AnimatedValue.cubic(AnimatedValue.Direction.OUT, 0, 0, 0, 0.0); this.activity = new AnimatedValue.cubic(AnimatedValue.Direction.OUT, -3, -3, 0, 0.0); this.clicked = new AnimatedValue.cubic(AnimatedValue.Direction.OUT, 1, 1, 0, 0.0); } - + ///////////////////////////////////////////////////////////////////// /// Loads the desired icon for this sign. ///////////////////////////////////////////////////////////////////// @@ -89,41 +89,41 @@ public class PiePreviewAddSign : GLib.Object { public void load() { this.icon = new Icon("add", 36); } - + ///////////////////////////////////////////////////////////////////// /// Updates the position where this object should be displayed. ///////////////////////////////////////////////////////////////////// public void set_position(int position) { double new_position = position; - + if (!this.parent.drag_n_drop_mode) new_position += 0.5; this.position = new_position; this.angle = 2.0 * PI * new_position/parent.slice_count(); } - + ///////////////////////////////////////////////////////////////////// /// Makes this object visible. ///////////////////////////////////////////////////////////////////// - + public void show() { this.visible = true; - this.size.reset_target(this.max_size, 0.3); - this.alpha.reset_target(1.0, 0.3); + this.size.reset_target(this.max_size, 0.3); + this.alpha.reset_target(1.0, 0.3); } - + ///////////////////////////////////////////////////////////////////// /// Makes this object invisible. ///////////////////////////////////////////////////////////////////// - + public void hide() { this.visible = false; - this.size.reset_target(0.0, 0.3); - this.alpha.reset_target(0.0, 0.3); + this.size.reset_target(0.0, 0.3); + this.alpha.reset_target(0.0, 0.3); } - + ///////////////////////////////////////////////////////////////////// /// Updates the size of this object. All transitions will be smooth. ///////////////////////////////////////////////////////////////////// @@ -132,7 +132,7 @@ public class PiePreviewAddSign : GLib.Object { this.max_size = size; this.size.reset_target(size, 0.5); } - + ///////////////////////////////////////////////////////////////////// /// Draws the sign to the given context. ///////////////////////////////////////////////////////////////////// @@ -140,75 +140,75 @@ public class PiePreviewAddSign : GLib.Object { public void draw(double frame_time, Cairo.Context ctx) { this.time += frame_time; - + this.size.update(frame_time); this.alpha.update(frame_time); this.activity.update(frame_time); this.clicked.update(frame_time); - + if (this.parent.slice_count() == 0) { ctx.save(); - - double scale = this.clicked.val + + double scale = this.clicked.val + GLib.Math.sin(this.time*10)*0.02*this.alpha.val + this.alpha.val*0.08 - 0.1; ctx.scale(scale, scale); - + // paint the image icon.paint_on(ctx); - + ctx.restore(); - + } else if (this.alpha.val*this.activity.val > 0) { ctx.save(); - + // distance from the center double radius = 120; - + // transform the context ctx.translate(cos(this.angle)*radius, sin(this.angle)*radius); - double scale = this.size.val*this.clicked.val + double scale = this.size.val*this.clicked.val + this.activity.val*0.07 + GLib.Math.sin(this.time*10)*0.03*this.activity.val - 0.1; ctx.scale(scale, scale); - + // paint the image icon.paint_on(ctx, this.alpha.val*this.activity.val); - + ctx.restore(); } } - + ///////////////////////////////////////////////////////////////////// /// Called when the mouse moves to another position. ///////////////////////////////////////////////////////////////////// - + public void on_mouse_move(double angle) { double direction = 2.0 * PI * position/parent.slice_count(); double diff = fabs(angle-direction); - + if (diff > PI) - diff = 2 * PI - diff; - - if (diff < 0.5*PI/parent.slice_count()) this.activity.reset_target(1.0, 1.0); + diff = 2 * PI - diff; + + if (diff < 0.5*PI/parent.slice_count()) this.activity.reset_target(1.0, 1.0); else this.activity.reset_target(-3.0, 1.5); } - + ///////////////////////////////////////////////////////////////////// /// Called when a button of the mouse is pressed. ///////////////////////////////////////////////////////////////////// - + public void on_button_press(double x, double y) { if (this.activity.end == 1.0) { this.clicked.reset_target(0.9, 0.1); } } - + ///////////////////////////////////////////////////////////////////// /// Called when a button of the mouse is released. ///////////////////////////////////////////////////////////////////// - + public void on_button_release(double x, double y) { if (this.clicked.end == 0.9) { this.clicked.reset_target(1.0, 0.1); diff --git a/src/gui/piePreviewCenter.vala b/src/gui/piePreviewCenter.vala index 20527bc..2a163b6 100644 --- a/src/gui/piePreviewCenter.vala +++ b/src/gui/piePreviewCenter.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// using GLib.Math; diff --git a/src/gui/piePreviewDeleteSign.vala b/src/gui/piePreviewDeleteSign.vala index 500d876..6ba4dcb 100644 --- a/src/gui/piePreviewDeleteSign.vala +++ b/src/gui/piePreviewDeleteSign.vala @@ -1,25 +1,25 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// using GLib.Math; namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// The delete sign, displayed in the upper right corner of each /// Slice. ///////////////////////////////////////////////////////////////////////// @@ -31,17 +31,17 @@ public class PiePreviewDeleteSign : GLib.Object { ///////////////////////////////////////////////////////////////////// public signal void on_clicked(); - + ///////////////////////////////////////////////////////////////////// /// The image used to display this oject. ///////////////////////////////////////////////////////////////////// - + public Image icon { get; private set; } - + ///////////////////////////////////////////////////////////////////// /// Some constants determining the look and behaviour of this Slice. ///////////////////////////////////////////////////////////////////// - + private static const int radius = 18; private static const double globale_scale = 0.8; private static const double click_cancel_treshold = 5; @@ -51,24 +51,24 @@ public class PiePreviewDeleteSign : GLib.Object { ///////////////////////////////////////////////////////////////////// private bool visible = false; - + ///////////////////////////////////////////////////////////////////// /// Some AnimatedValues for smooth transitions. ///////////////////////////////////////////////////////////////////// - + private AnimatedValue size; - private AnimatedValue alpha; - private AnimatedValue activity; - private AnimatedValue clicked; - + private AnimatedValue alpha; + private AnimatedValue activity; + private AnimatedValue clicked; + ///////////////////////////////////////////////////////////////////// /// Storing the position where a mouse click was executed. Useful for /// canceling the click when the mouse moves some pixels. ///////////////////////////////////////////////////////////////////// - + private double clicked_x = 0.0; private double clicked_y = 0.0; - + ///////////////////////////////////////////////////////////////////// /// C'tor, sets everything up. ///////////////////////////////////////////////////////////////////// @@ -79,7 +79,7 @@ public class PiePreviewDeleteSign : GLib.Object { this.activity = new AnimatedValue.cubic(AnimatedValue.Direction.OUT, -3, -3, 0, 0.0); this.clicked = new AnimatedValue.cubic(AnimatedValue.Direction.OUT, 1, 1, 0, 0.0); } - + ///////////////////////////////////////////////////////////////////// /// Loads an Action. All members are initialized accordingly. ///////////////////////////////////////////////////////////////////// @@ -87,26 +87,26 @@ public class PiePreviewDeleteSign : GLib.Object { public void load() { this.icon = new Icon("stock_delete", PiePreviewDeleteSign.radius*2); } - + ///////////////////////////////////////////////////////////////////// /// Makes this object visible. ///////////////////////////////////////////////////////////////////// - + public void show() { if (!this.visible) { this.visible = true; - this.alpha.reset_target(1.0, 0.3); + this.alpha.reset_target(1.0, 0.3); } } - + ///////////////////////////////////////////////////////////////////// /// Makes this object invisible. ///////////////////////////////////////////////////////////////////// - + public void hide() { if (this.visible) { this.visible = false; - this.alpha.reset_target(0.0, 0.3); + this.alpha.reset_target(0.0, 0.3); } } @@ -117,7 +117,7 @@ public class PiePreviewDeleteSign : GLib.Object { public void set_size(double size) { this.size.reset_target(size, 0.2); } - + ///////////////////////////////////////////////////////////////////// /// Draws the sign to the given context. ///////////////////////////////////////////////////////////////////// @@ -127,46 +127,46 @@ public class PiePreviewDeleteSign : GLib.Object { this.alpha.update(frame_time); this.activity.update(frame_time); this.clicked.update(frame_time); - + if (this.alpha.val > 0) { ctx.save(); - + // transform the context - double scale = (this.size.val*this.clicked.val + double scale = (this.size.val*this.clicked.val + this.activity.val*0.2 - 0.2)*PiePreviewDeleteSign.globale_scale; ctx.scale(scale, scale); - + // paint the image icon.paint_on(ctx, this.alpha.val); - + ctx.restore(); } } - + ///////////////////////////////////////////////////////////////////// /// Called when the mouse moves to another position. ///////////////////////////////////////////////////////////////////// - + public bool on_mouse_move(double x, double y) { if (this.clicked.end == 0.9) { double dist = GLib.Math.pow(x-this.clicked_x, 2) + GLib.Math.pow(y-this.clicked_y, 2); if (dist > PiePreviewDeleteSign.click_cancel_treshold*PiePreviewDeleteSign.click_cancel_treshold) this.clicked.reset_target(1.0, 0.1); } - - if (GLib.Math.fabs(x) <= PiePreviewDeleteSign.radius*PiePreviewDeleteSign.globale_scale && GLib.Math.fabs(y) <= PiePreviewDeleteSign.radius*PiePreviewDeleteSign.globale_scale) { - this.activity.reset_target(1.0, 0.2); - return true; - } - + + if (GLib.Math.fabs(x) <= PiePreviewDeleteSign.radius*PiePreviewDeleteSign.globale_scale && GLib.Math.fabs(y) <= PiePreviewDeleteSign.radius*PiePreviewDeleteSign.globale_scale) { + this.activity.reset_target(1.0, 0.2); + return true; + } + this.activity.reset_target(0.0, 0.2); return false; } - + ///////////////////////////////////////////////////////////////////// /// Called when a button of the mouse is pressed. ///////////////////////////////////////////////////////////////////// - + public bool on_button_press(double x, double y) { if (this.activity.end == 1.0) { this.clicked.reset_target(0.9, 0.1); @@ -176,16 +176,16 @@ public class PiePreviewDeleteSign : GLib.Object { } return false; } - + ///////////////////////////////////////////////////////////////////// /// Called when a button of the mouse is released. ///////////////////////////////////////////////////////////////////// - + public bool on_button_release(double x, double y) { if (this.clicked.end == 0.9) { this.clicked.reset_target(1.0, 0.1); this.on_clicked(); - + return true; } return false; diff --git a/src/gui/piePreviewRenderer.vala b/src/gui/piePreviewRenderer.vala index 626ab73..53dd2fb 100644 --- a/src/gui/piePreviewRenderer.vala +++ b/src/gui/piePreviewRenderer.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// using GLib.Math; diff --git a/src/gui/piePreviewSliceRenderer.vala b/src/gui/piePreviewSliceRenderer.vala index 6a12a47..5b4d939 100644 --- a/src/gui/piePreviewSliceRenderer.vala +++ b/src/gui/piePreviewSliceRenderer.vala @@ -1,25 +1,25 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// using GLib.Math; namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// Displays the preview of a Slice. ///////////////////////////////////////////////////////////////////////// @@ -30,17 +30,17 @@ public class PiePreviewSliceRenderer : GLib.Object { ///////////////////////////////////////////////////////////////////// public signal void on_clicked(int position); - + ///////////////////////////////////////////////////////////////////// /// Called when the user clicked on the delete sign. ///////////////////////////////////////////////////////////////////// - + public signal void on_remove(int position); - + ///////////////////////////////////////////////////////////////////// /// The image used to display this oject. ///////////////////////////////////////////////////////////////////// - + public Icon icon { get; private set; } public ActionGroup action_group { get; private set; } public string name { get; private set; default=""; } @@ -50,47 +50,47 @@ public class PiePreviewSliceRenderer : GLib.Object { /// The parent renderer. ///////////////////////////////////////////////////////////////////// - private unowned PiePreviewRenderer parent; - + private unowned PiePreviewRenderer parent; + ///////////////////////////////////////////////////////////////////// /// The delete sign, displayed in the upper right corner of each /// Slice. ///////////////////////////////////////////////////////////////////// - + private PiePreviewDeleteSign delete_sign = null; - + ///////////////////////////////////////////////////////////////////// /// Some AnimatedValues for smooth transitions. ///////////////////////////////////////////////////////////////////// - - private AnimatedValue angle; - private AnimatedValue size; - private AnimatedValue activity; - private AnimatedValue clicked; - + + private AnimatedValue angle; + private AnimatedValue size; + private AnimatedValue activity; + private AnimatedValue clicked; + ///////////////////////////////////////////////////////////////////// /// Some constants determining the look and behaviour of this Slice. ///////////////////////////////////////////////////////////////////// - + private static const double pie_radius = 126; private static const double radius = 24; private static const double delete_x = 13; private static const double delete_y = -13; private static const double click_cancel_treshold = 5; - + ///////////////////////////////////////////////////////////////////// /// Storing the position where a mouse click was executed. Useful for /// canceling the click when the mouse moves some pixels. ///////////////////////////////////////////////////////////////////// - + private double clicked_x = 0.0; private double clicked_y = 0.0; - + ///////////////////////////////////////////////////////////////////// /// The index of this slice in a pie. Clockwise assigned, starting /// from the right-most slice. ///////////////////////////////////////////////////////////////////// - + private int position; ///////////////////////////////////////////////////////////////////// @@ -103,21 +103,21 @@ public class PiePreviewSliceRenderer : GLib.Object { this.delete_sign.on_clicked.connect(() => { this.on_remove(this.position); }); - + this.parent = parent; this.angle = new AnimatedValue.cubic(AnimatedValue.Direction.OUT, 0, 0, 0, 0.5); this.size = new AnimatedValue.cubic(AnimatedValue.Direction.OUT, 0, 0, 0, 1.0); this.activity = new AnimatedValue.cubic(AnimatedValue.Direction.OUT, 0, 0, 0, 0.0); this.clicked = new AnimatedValue.cubic(AnimatedValue.Direction.OUT, 1, 1, 0, 1.0); } - + ///////////////////////////////////////////////////////////////////// /// Loads an Action. All members are initialized accordingly. ///////////////////////////////////////////////////////////////////// public void load(ActionGroup group) { this.action_group = group; - + // if it's a custom ActionGroup if (group.get_type().depth() == 2 && group.actions.size > 0) { this.icon = new Icon(group.actions[0].icon, (int)(PiePreviewSliceRenderer.radius*2)); @@ -127,23 +127,23 @@ public class PiePreviewSliceRenderer : GLib.Object { this.name = GroupRegistry.descriptions[group.get_type().name()].name; } } - + ///////////////////////////////////////////////////////////////////// /// Updates the position where this object should be displayed. ///////////////////////////////////////////////////////////////////// public void set_position(int position, bool smoothly = true) { double direction = 2.0 * PI * position/parent.slice_count(); - + if (direction != this.angle.end) { this.position = position; this.angle.reset_target(direction, smoothly ? 0.5 : 0.0); - + if (!smoothly) this.angle.update(1.0); } } - + ///////////////////////////////////////////////////////////////////// /// Updates the size of this object. All transitions will be smooth. ///////////////////////////////////////////////////////////////////// @@ -152,15 +152,15 @@ public class PiePreviewSliceRenderer : GLib.Object { this.size.reset_target(size, 0.5); this.delete_sign.set_size(size); } - + ///////////////////////////////////////////////////////////////////// /// Notifies that all quick actions should be disabled. ///////////////////////////////////////////////////////////////////// - + public void disable_quickactions() { this.action_group.disable_quickactions(); } - + ///////////////////////////////////////////////////////////////////// /// Draws the slice to the given context. ///////////////////////////////////////////////////////////////////// @@ -172,100 +172,100 @@ public class PiePreviewSliceRenderer : GLib.Object { this.clicked.update(frame_time); ctx.save(); - + // transform the context ctx.translate(cos(this.angle.val)*PiePreviewSliceRenderer.pie_radius, sin(this.angle.val)*PiePreviewSliceRenderer.pie_radius); - - double scale = this.size.val*this.clicked.val + + double scale = this.size.val*this.clicked.val + this.activity.val*0.1 - 0.1; - ctx.save(); - + ctx.save(); + ctx.scale(scale, scale); - + // paint the image icon.paint_on(ctx); - + ctx.restore(); - + ctx.translate(PiePreviewSliceRenderer.delete_x*this.size.val, PiePreviewSliceRenderer.delete_y*this.size.val); this.delete_sign.draw(frame_time, ctx); - + ctx.restore(); } - + ///////////////////////////////////////////////////////////////////// /// Called when the mouse moves to another position. ///////////////////////////////////////////////////////////////////// - + public bool on_mouse_move(double angle, double x, double y) { double direction = 2.0 * PI * position/parent.slice_count(); double diff = fabs(angle-direction); - + if (diff > PI) - diff = 2 * PI - diff; - - bool active = diff < 0.5*PI/parent.slice_count(); - - if (active) { - this.activity.reset_target(1.0, 0.3); - this.delete_sign.show(); + diff = 2 * PI - diff; + + bool active = diff < 0.5*PI/parent.slice_count(); + + if (active) { + this.activity.reset_target(1.0, 0.3); + this.delete_sign.show(); } else { this.activity.reset_target(0.0, 0.3); this.delete_sign.hide(); - } - + } + if (this.clicked.end == 0.9) { double dist = GLib.Math.pow(x-this.clicked_x, 2) + GLib.Math.pow(y-this.clicked_y, 2); if (dist > PiePreviewSliceRenderer.click_cancel_treshold*PiePreviewSliceRenderer.click_cancel_treshold) this.clicked.reset_target(1.0, 0.1); } - + double own_x = cos(this.angle.val)*PiePreviewSliceRenderer.pie_radius; double own_y = sin(this.angle.val)*PiePreviewSliceRenderer.pie_radius; - this.delete_hovered = this.delete_sign.on_mouse_move(x - own_x - PiePreviewSliceRenderer.delete_x*this.size.val, + this.delete_hovered = this.delete_sign.on_mouse_move(x - own_x - PiePreviewSliceRenderer.delete_x*this.size.val, y - own_y - PiePreviewSliceRenderer.delete_y*this.size.val); - + return active; } - + ///////////////////////////////////////////////////////////////////// /// Called when the mouse leaves the area of this widget. ///////////////////////////////////////////////////////////////////// - + public void on_mouse_leave() { this.activity.reset_target(0.0, 0.3); this.delete_sign.hide(); } - + ///////////////////////////////////////////////////////////////////// /// Called when a button of the mouse is pressed. ///////////////////////////////////////////////////////////////////// - + public void on_button_press(double x, double y) { bool delete_pressed = false; if (this.activity.end == 1.0) { double own_x = cos(this.angle.val)*PiePreviewSliceRenderer.pie_radius; double own_y = sin(this.angle.val)*PiePreviewSliceRenderer.pie_radius; - delete_pressed = this.delete_sign.on_button_press(x - own_x - PiePreviewSliceRenderer.delete_x*this.size.val, + delete_pressed = this.delete_sign.on_button_press(x - own_x - PiePreviewSliceRenderer.delete_x*this.size.val, y - own_y - PiePreviewSliceRenderer.delete_y*this.size.val); } - + if (!delete_pressed && this.activity.end == 1.0) { this.clicked.reset_target(0.9, 0.1); this.clicked_x = x; this.clicked_y = y; } } - + ///////////////////////////////////////////////////////////////////// /// Called when a button of the mouse is released. ///////////////////////////////////////////////////////////////////// - + public void on_button_release(double x, double y) { bool deleted = false; if (this.activity.end == 1.0) deleted = this.delete_sign.on_button_release(x, y); - + if (!deleted && this.clicked.end == 0.9) { this.clicked.reset_target(1.0, 0.1); this.on_clicked(this.position); diff --git a/src/gui/preferencesWindow.vala b/src/gui/preferencesWindow.vala index 8cdc853..29b5250 100644 --- a/src/gui/preferencesWindow.vala +++ b/src/gui/preferencesWindow.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/renameWindow.vala b/src/gui/renameWindow.vala index 389b460..de65069 100644 --- a/src/gui/renameWindow.vala +++ b/src/gui/renameWindow.vala @@ -1,106 +1,106 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A window which allows selection of a new name for a Pie. ///////////////////////////////////////////////////////////////////////// public class RenameWindow : GLib.Object { - + ///////////////////////////////////////////////////////////////////// /// Gets emitted when the user selects a new name. ///////////////////////////////////////////////////////////////////// - + public signal void on_ok(string new_name); - + ///////////////////////////////////////////////////////////////////// /// Some Widgets used by this dialog. ///////////////////////////////////////////////////////////////////// - + private Gtk.Dialog window = null; private Gtk.Entry entry = null; - + ///////////////////////////////////////////////////////////////////// /// C'tor, constructs the Widget. ///////////////////////////////////////////////////////////////////// - + public RenameWindow() { try { - + Gtk.Builder builder = new Gtk.Builder(); builder.add_from_file (Paths.ui_files + "/rename_pie.ui"); window = builder.get_object("window") as Gtk.Dialog; entry = builder.get_object("name-entry") as Gtk.Entry; - + entry.activate.connect(this.on_ok_button_clicked); - + (builder.get_object("ok-button") as Gtk.Button).clicked.connect(on_ok_button_clicked); (builder.get_object("cancel-button") as Gtk.Button).clicked.connect(on_cancel_button_clicked); - + this.window.delete_event.connect(this.window.hide_on_delete); - + } catch (GLib.Error e) { error("Could not load UI: %s\n", e.message); } } - + ///////////////////////////////////////////////////////////////////// /// Sets the parent window, in order to make this window stay in /// front. ///////////////////////////////////////////////////////////////////// - + public void set_parent(Gtk.Window parent) { this.window.set_transient_for(parent); } - + ///////////////////////////////////////////////////////////////////// /// Displays the window on the screen. ///////////////////////////////////////////////////////////////////// - + public void show() { this.window.show_all(); this.entry.is_focus = true; - } - + } + ///////////////////////////////////////////////////////////////////// /// Make the text entry display the name of the Pie with given ID. ///////////////////////////////////////////////////////////////////// - + public void set_pie(string id) { entry.text = PieManager.get_name_of(id); } - + ///////////////////////////////////////////////////////////////////// /// Called when the ok button is pressed. ///////////////////////////////////////////////////////////////////// - + private void on_ok_button_clicked() { this.on_ok(entry.text); this.window.hide(); } - + ///////////////////////////////////////////////////////////////////// /// Called when the cancel button is pressed. ///////////////////////////////////////////////////////////////////// - + private void on_cancel_button_clicked() { this.window.hide(); } diff --git a/src/gui/settingsWindow.vala b/src/gui/settingsWindow.vala index b03ae2f..6bb10c1 100644 --- a/src/gui/settingsWindow.vala +++ b/src/gui/settingsWindow.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -99,13 +99,21 @@ public class SettingsWindow : GLib.Object { }); var range_slider = (builder.get_object("range-hscale") as Gtk.Scale); - range_slider.set_range(100, 2000); + range_slider.set_range(0, 2000); range_slider.set_increments(10, 100); range_slider.set_value(Config.global.activation_range); range_slider.value_changed.connect(() => { Config.global.activation_range = (int)range_slider.get_value(); }); + var range_slices = (builder.get_object("range-slices") as Gtk.Scale); + range_slices.set_range(12, 96); + range_slices.set_increments(4, 12); + range_slices.set_value(Config.global.max_visible_slices); + range_slices.value_changed.connect(() => { + Config.global.max_visible_slices = (int)range_slices.get_value(); + }); + this.window.delete_event.connect(this.window.hide_on_delete); } catch (GLib.Error e) { diff --git a/src/gui/sliceTypeList.vala b/src/gui/sliceTypeList.vala index a339e5e..e164dea 100644 --- a/src/gui/sliceTypeList.vala +++ b/src/gui/sliceTypeList.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A list displaying all available Action types and ActionGroup types. ///////////////////////////////////////////////////////////////////////// @@ -26,13 +26,13 @@ class SliceTypeList : Gtk.TreeView { ///////////////////////////////////////////////////////////////////// /// This signal gets emitted when the user selects a new Type. ///////////////////////////////////////////////////////////////////// - + public signal void on_select(string id, string icon_name); - + ///////////////////////////////////////////////////////////////////// /// The listore which staroes all types internally. ///////////////////////////////////////////////////////////////////// - + private Gtk.ListStore data; private enum DataPos {ICON, ICON_NAME, NAME, ID} @@ -42,33 +42,33 @@ class SliceTypeList : Gtk.TreeView { public SliceTypeList() { GLib.Object(); - - this.data = new Gtk.ListStore(4, typeof(Gdk.Pixbuf), + + this.data = new Gtk.ListStore(4, typeof(Gdk.Pixbuf), typeof(string), typeof(string), typeof(string)); - + this.data.set_sort_column_id(2, Gtk.SortType.ASCENDING); - + base.set_model(this.data); base.set_headers_visible(true); base.set_grid_lines(Gtk.TreeViewGridLines.NONE); this.set_fixed_height_mode(true); - + var main_column = new Gtk.TreeViewColumn(); main_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED); main_column.title = _("Slice types"); var icon_render = new Gtk.CellRendererPixbuf(); main_column.pack_start(icon_render, false); - + var name_render = new Gtk.CellRendererText(); main_column.pack_start(name_render, true); - + base.append_column(main_column); - + main_column.add_attribute(icon_render, "pixbuf", DataPos.ICON); main_column.add_attribute(name_render, "markup", DataPos.NAME); - + this.get_selection().changed.connect(() => { Gtk.TreeIter active; if (this.get_selection().get_selected(null, out active)) { @@ -79,59 +79,59 @@ class SliceTypeList : Gtk.TreeView { this.on_select(id, icon); } }); - + reload_all(); } - + ///////////////////////////////////////////////////////////////////// /// Loads a registered actions and action groups. ///////////////////////////////////////////////////////////////////// - + public void reload_all() { Gtk.TreeIter active; string current_id = ""; if (this.get_selection().get_selected(null, out active)) this.data.get(active, DataPos.ID, out current_id); - + data.clear(); - + foreach (var action_type in ActionRegistry.types) { var description = ActionRegistry.descriptions[action_type]; - + Gtk.TreeIter current; data.append(out current); var icon = new Icon(description.icon, 36); - data.set(current, DataPos.ICON, icon.to_pixbuf()); - data.set(current, DataPos.ICON_NAME, description.icon); + data.set(current, DataPos.ICON, icon.to_pixbuf()); + data.set(current, DataPos.ICON_NAME, description.icon); data.set(current, DataPos.NAME, "<b>" + GLib.Markup.escape_text(description.name) + "</b>\n" - + "<small>" + GLib.Markup.escape_text(description.description) + "</small>"); - data.set(current, DataPos.ID, description.id); + + "<small>" + GLib.Markup.escape_text(description.description) + "</small>"); + data.set(current, DataPos.ID, description.id); } - + foreach (var group_type in GroupRegistry.types) { var description = GroupRegistry.descriptions[group_type]; - + Gtk.TreeIter current; data.append(out current); var icon = new Icon(description.icon, 36); - data.set(current, DataPos.ICON, icon.to_pixbuf()); + data.set(current, DataPos.ICON, icon.to_pixbuf()); data.set(current, DataPos.ICON_NAME, description.icon); data.set(current, DataPos.NAME, "<b>" + GLib.Markup.escape_text(description.name) + "</b>\n" - + "<small>" + GLib.Markup.escape_text(description.description) + "</small>"); - data.set(current, DataPos.ID, description.id); + + "<small>" + GLib.Markup.escape_text(description.description) + "</small>"); + data.set(current, DataPos.ID, description.id); } - + select_first(); select(current_id); } - + ///////////////////////////////////////////////////////////////////// /// Selects the first type in the list. ///////////////////////////////////////////////////////////////////// - + public void select_first() { Gtk.TreeIter active; - + if(this.data.get_iter_first(out active) ) { this.get_selection().select_iter(active); string id = ""; @@ -143,16 +143,16 @@ class SliceTypeList : Gtk.TreeView { this.on_select("", "stock_unknown"); } } - + ///////////////////////////////////////////////////////////////////// /// Select the given slice type. ///////////////////////////////////////////////////////////////////// - + public void select(string id) { this.data.foreach((model, path, iter) => { string pie_id; this.data.get(iter, DataPos.ID, out pie_id); - + if (id == pie_id) { this.get_selection().select_iter(iter); string icon = ""; @@ -160,10 +160,10 @@ class SliceTypeList : Gtk.TreeView { this.on_select(pie_id, icon); this.scroll_to_cell(path, null, true, 0.5f, 0.5f); this.has_focus = true; - + return true; } - + return false; }); } diff --git a/src/gui/themeList.vala b/src/gui/themeList.vala index 1c038a9..4173819 100644 --- a/src/gui/themeList.vala +++ b/src/gui/themeList.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A widget displaying all available themes of Gnome-Pie. ///////////////////////////////////////////////////////////////////////// @@ -26,7 +26,7 @@ class ThemeList : Gtk.TreeView { ///////////////////////////////////////////////////////////////////// /// This signal gets emitted, when a new theme is selected by the /// user. This new theme is applied automatically, with this signal - /// actions may be triggered which should be executed AFTER the + /// actions may be triggered which should be executed AFTER the /// change to a new theme. ///////////////////////////////////////////////////////////////////// @@ -37,11 +37,11 @@ class ThemeList : Gtk.TreeView { ///////////////////////////////////////////////////////////////////// private Gtk.TreeIter active { private get; private set; } - + ///////////////////////////////////////////////////////////////////// /// The positions in the data list store. ///////////////////////////////////////////////////////////////////// - + private enum DataPos {ICON, NAME} ///////////////////////////////////////////////////////////////////// @@ -50,57 +50,57 @@ class ThemeList : Gtk.TreeView { public ThemeList() { GLib.Object(); - - var data = new Gtk.ListStore(2, typeof(Gdk.Pixbuf), + + var data = new Gtk.ListStore(2, typeof(Gdk.Pixbuf), typeof(string)); this.set_model(data); this.set_headers_visible(true); this.set_grid_lines(Gtk.TreeViewGridLines.NONE); this.set_fixed_height_mode(true); - + var main_column = new Gtk.TreeViewColumn(); main_column.title = _("Themes"); main_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED); var icon_render = new Gtk.CellRendererPixbuf(); main_column.pack_start(icon_render, false); - + var theme_render = new Gtk.CellRendererText(); main_column.pack_start(theme_render, true); - + this.append_column(main_column); - + main_column.add_attribute(icon_render, "pixbuf", DataPos.ICON); main_column.add_attribute(theme_render, "markup", DataPos.NAME); - + this.get_selection().changed.connect(() => { Gtk.TreeIter active; if (this.get_selection().get_selected(null, out active)) { Timeout.add(10, () => { int index = int.parse(data.get_path(active).to_string()); Config.global.theme = Config.global.themes[index]; - + this.on_select_new(); - + Config.global.theme.load(); Config.global.theme.load_images(); return false; - }); + }); } }); - + // load all themes into the list var themes = Config.global.themes; foreach(var theme in themes) { Gtk.TreeIter current; data.append(out current); - data.set(current, DataPos.ICON, theme.preview_icon.to_pixbuf()); + data.set(current, DataPos.ICON, theme.preview_icon.to_pixbuf()); data.set(current, DataPos.NAME, "<b>"+GLib.Markup.escape_text(theme.name)+"</b><small> - " +GLib.Markup.escape_text(theme.description)+"\n" +"<i>"+GLib.Markup.escape_text(_("By")+" "+theme.author) - +"</i></small>"); + +"</i></small>"); if(theme == Config.global.theme) get_selection().select_iter(current); - } + } } } diff --git a/src/gui/triggerSelectButton.vala b/src/gui/triggerSelectButton.vala index 7132220..92cd8a3 100644 --- a/src/gui/triggerSelectButton.vala +++ b/src/gui/triggerSelectButton.vala @@ -1,64 +1,64 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// This window allows the selection of a hotkey. It is returned in form /// of a Trigger. Therefore it can be either a keyboard driven hotkey or /// a mouse based hotkey. ///////////////////////////////////////////////////////////////////////// public class TriggerSelectButton : Gtk.ToggleButton { - + ///////////////////////////////////////////////////////////////////// /// This signal is emitted when the user selects a new hot key. ///////////////////////////////////////////////////////////////////// - + public signal void on_select(Trigger trigger); - + ///////////////////////////////////////////////////////////////////// /// The currently contained Trigger. ///////////////////////////////////////////////////////////////////// - + private Trigger trigger = null; - + ///////////////////////////////////////////////////////////////////// /// True, if mouse buttons can be bound as well. ///////////////////////////////////////////////////////////////////// - + private bool enable_mouse = false; - + ///////////////////////////////////////////////////////////////////// /// These modifiers are ignored. ///////////////////////////////////////////////////////////////////// - + private Gdk.ModifierType lock_modifiers = Gdk.ModifierType.MOD2_MASK |Gdk.ModifierType.SUPER_MASK |Gdk.ModifierType.LOCK_MASK |Gdk.ModifierType.MOD5_MASK; - + ///////////////////////////////////////////////////////////////////// /// C'tor, constructs a new TriggerSelectWindow. ///////////////////////////////////////////////////////////////////// - + public TriggerSelectButton(bool enable_mouse) { this.enable_mouse = enable_mouse; - + this.toggled.connect(() => { if (this.active) { this.set_label(_("Press a hotkey ...")); @@ -66,49 +66,49 @@ public class TriggerSelectButton : Gtk.ToggleButton { FocusGrabber.grab(this.get_window(), true, true, true); } }); - + this.button_press_event.connect(this.on_button_press); this.key_press_event.connect(this.on_key_press); this.set_trigger(new Trigger()); } - + ///////////////////////////////////////////////////////////////////// /// Makes the button display the given Trigger. ///////////////////////////////////////////////////////////////////// - + public void set_trigger(Trigger trigger) { this.trigger = trigger; this.set_label(trigger.label); } - + ///////////////////////////////////////////////////////////////////// /// Can be called to cancel the selection process. ///////////////////////////////////////////////////////////////////// - + private void cancel() { this.set_label(trigger.label); this.set_active(false); Gtk.grab_remove(this); FocusGrabber.ungrab(true, true); } - + ///////////////////////////////////////////////////////////////////// /// Makes the button display the given Trigger. ///////////////////////////////////////////////////////////////////// - + private void update_trigger(Trigger trigger) { if (this.trigger.name != trigger.name) { this.set_trigger(trigger); this.on_select(this.trigger); } - + this.cancel(); } - + ///////////////////////////////////////////////////////////////////// /// Called when the user presses a keyboard key. ///////////////////////////////////////////////////////////////////// - + private bool on_key_press(Gdk.EventKey event) { if (this.active) { if (Gdk.keyval_name(event.keyval) == "Escape") { @@ -117,44 +117,45 @@ public class TriggerSelectButton : Gtk.ToggleButton { this.update_trigger(new Trigger()); } else if (event.is_modifier == 0) { Gdk.ModifierType state = event.state & ~ this.lock_modifiers; - this.update_trigger(new Trigger.from_values(event.keyval, state, false, false, false, false)); + this.update_trigger(new Trigger.from_values(event.keyval, state, false, false, false, + false, false, 5)); } - + return true; } return false; } - + ///////////////////////////////////////////////////////////////////// /// Called when the user presses a button of the mouse. ///////////////////////////////////////////////////////////////////// - + private bool on_button_press(Gdk.EventButton event) { if (this.active) { Gtk.Allocation rect; this.get_allocation(out rect); if (event.x < 0 || event.x > rect.width || event.y < 0 || event.y > rect.height) { - + this.cancel(); return true; } } - + if (this.active && this.enable_mouse) { Gdk.ModifierType state = event.state & ~ this.lock_modifiers; var new_trigger = new Trigger.from_values((int)event.button, state, true, - false, false, false); - + false, false, false, false, 5); + if (new_trigger.key_code != 1) this.update_trigger(new_trigger); else this.cancel(); - + return true; } else if (this.active) { this.cancel(); return true; } - + return false; } } diff --git a/src/gui/triggerSelectWindow.vala b/src/gui/triggerSelectWindow.vala index 611c179..56781b4 100644 --- a/src/gui/triggerSelectWindow.vala +++ b/src/gui/triggerSelectWindow.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -39,6 +39,8 @@ public class TriggerSelectWindow : GLib.Object { private Gtk.CheckButton turbo; private Gtk.CheckButton delayed; private Gtk.CheckButton centered; + private Gtk.CheckButton warp; + private Gtk.RadioButton rshape[10]; private TriggerSelectButton button; ///////////////////////////////////////////////////////////////////// @@ -56,6 +58,13 @@ public class TriggerSelectWindow : GLib.Object { private Trigger original_trigger = null; ///////////////////////////////////////////////////////////////////// + /// Radioboxes call toggled() twice per selection change. + /// This flag is used to discard one of the two notifications. + ///////////////////////////////////////////////////////////////////// + + private static int notify_toggle= 0; + + ///////////////////////////////////////////////////////////////////// /// C'tor, constructs a new TriggerSelectWindow. ///////////////////////////////////////////////////////////////////// @@ -76,7 +85,9 @@ public class TriggerSelectWindow : GLib.Object { trigger.with_mouse, this.turbo.active, this.delayed.active, - this.centered.active); + this.centered.active, + this.warp.active, + this.get_radio_shape()); }); (builder.get_object("trigger-box") as Gtk.Box).pack_start(this.button, true, true); @@ -93,6 +104,14 @@ public class TriggerSelectWindow : GLib.Object { this.centered = builder.get_object("center-check") as Gtk.CheckButton; this.centered.toggled.connect(this.on_check_toggled); + this.warp = builder.get_object("warp-check") as Gtk.CheckButton; + this.warp.toggled.connect(this.on_check_toggled); + + for (int i= 0; i < 10; i++) { + this.rshape[i] = builder.get_object("rshape%d".printf(i)) as Gtk.RadioButton; + this.rshape[i].toggled.connect(this.on_radio_toggled); + } + this.window.delete_event.connect(this.window.hide_on_delete); } catch (GLib.Error e) { @@ -128,6 +147,8 @@ public class TriggerSelectWindow : GLib.Object { this.turbo.active = trigger.turbo; this.delayed.active = trigger.delayed; this.centered.active = trigger.centered; + this.warp.active = trigger.warp; + this.set_radio_shape( trigger.shape ); this.original_trigger = trigger; this.trigger = trigger; @@ -135,14 +156,53 @@ public class TriggerSelectWindow : GLib.Object { } ///////////////////////////////////////////////////////////////////// - /// Called when one of the three checkoxes is toggled. + /// Called when one of the checkboxes is toggled. ///////////////////////////////////////////////////////////////////// private void on_check_toggled() { if (this.trigger != null) this.trigger = new Trigger.from_values(this.trigger.key_sym, this.trigger.modifiers, this.trigger.with_mouse, this.turbo.active, - this.delayed.active, this.centered.active); + this.delayed.active, this.centered.active, + this.warp.active, + this.get_radio_shape()); + } + + ///////////////////////////////////////////////////////////////////// + /// Returns the current selected radio-button shape: 0= automatic + /// 5= full pie; 1,3,7,8= quarters; 2,4,6,8=halves + /// 1 | 4 | 7 + /// 2 | 5 | 8 + /// 3 | 6 | 9 + ///////////////////////////////////////////////////////////////////// + + private int get_radio_shape() { + int rs; + for (rs= 0; rs < 10; rs++) + if (this.rshape[rs].active) + break; + return rs; + } + + ///////////////////////////////////////////////////////////////////// + /// Sets the current selected radio-button shape: 0= automatic + /// 5= full pie; 1,3,7,8= quarters; 2,4,6,8=halves + ///////////////////////////////////////////////////////////////////// + + private void set_radio_shape(int rs) { + if (rs < 0 || rs > 9) + rs= 5; //replace invalid value with default= full pie + this.rshape[rs].active= true; + } + + ///////////////////////////////////////////////////////////////////// + /// Called twice when one of the radioboxes is toggled. + ///////////////////////////////////////////////////////////////////// + + private void on_radio_toggled() { + notify_toggle= 1 - notify_toggle; + if (notify_toggle == 1) + on_check_toggled(); //just call once } ///////////////////////////////////////////////////////////////////// diff --git a/src/images/icon.vala b/src/images/icon.vala index 6dfb53b..9cfccf8 100644 --- a/src/images/icon.vala +++ b/src/images/icon.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A class representing a square-shaped icon, loaded from the users /// icon theme. ///////////////////////////////////////////////////////////////////////// @@ -30,34 +30,34 @@ public class Icon : Image { ///////////////////////////////////////////////////////////////////// private static Gee.HashMap<string, Cairo.ImageSurface?> cache { private get; private set; } - + ///////////////////////////////////////////////////////////////////// /// Initializes the cache. ///////////////////////////////////////////////////////////////////// - + public static void init() { clear_cache(); - + Gtk.IconTheme.get_default().changed.connect(() => { clear_cache(); }); } - + ///////////////////////////////////////////////////////////////////// /// Clears the cache. ///////////////////////////////////////////////////////////////////// - + public static void clear_cache() { cache = new Gee.HashMap<string, Cairo.ImageSurface?>(); } - + ///////////////////////////////////////////////////////////////////// /// Loads an icon from the current icon theme of the user. ///////////////////////////////////////////////////////////////////// - + public Icon(string icon_name, int size) { var cached = Icon.cache.get("%s@%u".printf(icon_name, size)); - + if (cached == null) { this.load_file_at_size(Icon.get_icon_file(icon_name, size), size, size); Icon.cache.set("%s@%u".printf(icon_name, size), this.surface); @@ -65,56 +65,56 @@ public class Icon : Image { this.surface = cached; } } - + ///////////////////////////////////////////////////////////////////// /// Returns the size of the icon in pixels. Greetings to Liskov. ///////////////////////////////////////////////////////////////////// - + public int size() { return base.width(); } - + ///////////////////////////////////////////////////////////////////// /// Returns the icon name for a given GLib.Icon. ///////////////////////////////////////////////////////////////////// - + public static string get_icon_name(GLib.Icon? icon) { if (icon != null) { var icon_names = icon.to_string().split(" "); - + foreach (var icon_name in icon_names) { if (Gtk.IconTheme.get_default().has_icon(icon_name)) { return icon_name; } } } - + return ""; } - + ///////////////////////////////////////////////////////////////////// /// Returns the filename for a given system icon. ///////////////////////////////////////////////////////////////////// - + public static string get_icon_file(string icon_name, int size) { string result = ""; - + if (icon_name.contains("/")) { var file = GLib.File.new_for_path(icon_name); if(file.query_exists()) return icon_name; - + warning("Icon \"" + icon_name + "\" not found! Using default icon..."); } - - + + var icon_theme = Gtk.IconTheme.get_default(); var file = icon_theme.lookup_icon(icon_name, size, 0); if (file != null) result = file.get_filename(); - + if (result == "") { warning("Icon \"" + icon_name + "\" not found! Using default icon..."); - + string[] default_icons = {"application-default-icon", "stock_unknown"}; foreach (var icon in default_icons) { file = icon_theme.lookup_icon(icon, size, 0); @@ -123,11 +123,11 @@ public class Icon : Image { break; } } - + if (result == "") warning("No default icon found! Will be ugly..."); } - + return result; } } diff --git a/src/images/image.vala b/src/images/image.vala index e65e34a..a903493 100644 --- a/src/images/image.vala +++ b/src/images/image.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -163,10 +163,10 @@ public class Image : GLib.Object { ///////////////////////////////////////////////////////////////////// public Gdk.Pixbuf to_pixbuf() { - if (this.surface == null || this.surface.get_data().length <= 0) + if (this.surface == null || this.surface.get_data() == null) return new Gdk.Pixbuf(Gdk.Colorspace.RGB, true, 8, 1, 1); - var pixbuf = new Gdk.Pixbuf.from_data(this.surface.get_data(), Gdk.Colorspace.RGB, true, 8, + var pixbuf = new Gdk.Pixbuf.with_unowned_data(this.surface.get_data(), Gdk.Colorspace.RGB, true, 8, width(), height(), this.surface.get_stride(), null); pixbuf = pixbuf.copy(); @@ -180,7 +180,7 @@ public class Image : GLib.Object { *(p + i + 2) = tmp; } - return pixbuf; + return pixbuf; } ///////////////////////////////////////////////////////////////////// diff --git a/src/images/renderedText.vala b/src/images/renderedText.vala index 544af1f..2f4b82f 100644 --- a/src/images/renderedText.vala +++ b/src/images/renderedText.vala @@ -1,149 +1,149 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A class representing string, rendered on an Image. ///////////////////////////////////////////////////////////////////////// public class RenderedText : Image { - + ///////////////////////////////////////////////////////////////////// /// C'tor, creates a new image representation of a string. ///////////////////////////////////////////////////////////////////// - + public RenderedText(string text, int width, int height, string font, Color color, double scale) { - + this.render_text(text, width, height, font, color, scale); } - + ///////////////////////////////////////////////////////////////////// /// C'tor, creates a new image representation of a string. This /// string may contain markup information. ///////////////////////////////////////////////////////////////////// - + public RenderedText.with_markup(string text, int width, int height, string font, Color color, double scale) { this.render_markup(text, width, height, font, color, scale); } - + ///////////////////////////////////////////////////////////////////// /// Creates a new transparent image, with text written onto. ///////////////////////////////////////////////////////////////////// - - public void render_text(string text, int width, int height, string font, + + public void render_text(string text, int width, int height, string font, Color color, double scale) { - + this.surface = new Cairo.ImageSurface(Cairo.Format.ARGB32, width, height); if (text != "") { var ctx = this.context(); - + // set the color ctx.set_source_rgb(color.r, color.g, color.g); - - var layout = Pango.cairo_create_layout(ctx); + + var layout = Pango.cairo_create_layout(ctx); layout.set_width(Pango.units_from_double(width)); - + var font_description = Pango.FontDescription.from_string(font); font_description.set_size((int)(font_description.get_size() * scale)); - + layout.set_font_description(font_description); layout.set_text(text, -1); - + // add newlines at the end of each line, in order to allow ellipsizing string broken_string = ""; - + for (int i=0; i<layout.get_line_count(); ++i) { - + string next_line = ""; - if (i == layout.get_line_count() -1) + if (i == layout.get_line_count() -1) next_line = text.substring(layout.get_line(i).start_index, -1); - else + else next_line = text.substring(layout.get_line(i).start_index, layout.get_line(i).length); - + if (broken_string == "") { broken_string = next_line; } else if (next_line != "") { // test whether the addition of a line would cause the height to become too large string broken_string_tmp = broken_string + "\n" + next_line; - - var layout_tmp = Pango.cairo_create_layout(ctx); + + var layout_tmp = Pango.cairo_create_layout(ctx); layout_tmp.set_width(Pango.units_from_double(width)); - + layout_tmp.set_font_description(font_description); - + layout_tmp.set_text(broken_string_tmp, -1); Pango.Rectangle extents; layout_tmp.get_pixel_extents(null, out extents); - + if (extents.height > height) broken_string = broken_string + next_line; else broken_string = broken_string_tmp; } } - + layout.set_text(broken_string, -1); - + layout.set_ellipsize(Pango.EllipsizeMode.END); layout.set_alignment(Pango.Alignment.CENTER); - + Pango.Rectangle extents; layout.get_pixel_extents(null, out extents); ctx.move_to(0, (int)(0.5*(height - extents.height))); - + Pango.cairo_update_layout(ctx, layout); Pango.cairo_show_layout(ctx, layout); } } - + ///////////////////////////////////////////////////////////////////// /// Creates a new transparent image, with text written onto. ///////////////////////////////////////////////////////////////////// - - public void render_markup(string text, int width, int height, string font, + + public void render_markup(string text, int width, int height, string font, Color color, double scale) { - + this.surface = new Cairo.ImageSurface(Cairo.Format.ARGB32, width, height); var ctx = this.context(); - - // set the color + + // set the color ctx.set_source_rgb(color.r, color.g, color.g); - - var layout = Pango.cairo_create_layout(ctx); + + var layout = Pango.cairo_create_layout(ctx); layout.set_width(Pango.units_from_double(width)); - + var font_description = Pango.FontDescription.from_string(font); font_description.set_size((int)(font_description.get_size() * scale)); - + layout.set_font_description(font_description); layout.set_markup(text, -1); - + layout.set_ellipsize(Pango.EllipsizeMode.END); layout.set_alignment(Pango.Alignment.CENTER); - + Pango.Rectangle extents; layout.get_pixel_extents(null, out extents); ctx.move_to(0, (int)(0.5*(height - extents.height))); - + Pango.cairo_update_layout(ctx, layout); Pango.cairo_show_layout(ctx, layout); } diff --git a/src/images/themedIcon.vala b/src/images/themedIcon.vala index f816e0f..b7b6f74 100644 --- a/src/images/themedIcon.vala +++ b/src/images/themedIcon.vala @@ -1,96 +1,96 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A class representing a square-shaped icon, themed according to the /// current theme of Gnome-Pie. ///////////////////////////////////////////////////////////////////////// public class ThemedIcon : Image { - + ///////////////////////////////////////////////////////////////////// /// Paint a slice icon according to the current theme. ///////////////////////////////////////////////////////////////////// - + public ThemedIcon(string caption, string icon_name, bool active) { - + // get layers for the desired slice type var layers = active ? Config.global.theme.active_slice_layers : Config.global.theme.inactive_slice_layers; - + // get max size int size = 1; foreach (var layer in layers) { - if (layer.image != null && layer.image.width() > size) + if (layer.image != null && layer.image.width() > size) size = layer.image.width(); } - + this.surface = new Cairo.ImageSurface(Cairo.Format.ARGB32, size, size); - + // get size of icon layer int icon_size = size; foreach (var layer in layers) { if (layer.image != null && layer.layer_type == SliceLayer.Type.ICON) icon_size = layer.image.width(); } - + Image icon; if (icon_name.contains("/")) icon = new Image.from_file_at_size(icon_name, icon_size, icon_size); else icon = new Icon(icon_name, icon_size); - + var color = new Color.from_icon(icon); var ctx = this.context(); - + ctx.translate(size/2, size/2); ctx.set_operator(Cairo.Operator.OVER); - + // now render all layers on top of each other foreach (var layer in layers) { - - if (layer.visibility == SliceLayer.Visibility.ANY || + + if (layer.visibility == SliceLayer.Visibility.ANY || (Config.global.show_captions == (layer.visibility == SliceLayer.Visibility.WITH_CAPTION))) { - + if (layer.colorize) { ctx.push_group(); } - + if (layer.layer_type == SliceLayer.Type.ICON) { ctx.push_group(); - + layer.image.paint_on(ctx); - + ctx.set_operator(Cairo.Operator.IN); - + if (layer.image.width() != icon_size) { if (icon_name.contains("/")) icon = new Image.from_file_at_size(icon_name, layer.image.width(), layer.image.width()); else icon = new Icon(icon_name,layer.image.width()); } - + icon.paint_on(ctx); ctx.pop_group_to_source(); ctx.paint(); ctx.set_operator(Cairo.Operator.OVER); - + } else if (layer.layer_type == SliceLayer.Type.CAPTION) { Image text = new RenderedText(caption, layer.width, layer.height, layer.font, layer.color, Config.global.global_scale); ctx.translate(0, layer.position); @@ -99,13 +99,13 @@ public class ThemedIcon : Image { } else if (layer.layer_type == SliceLayer.Type.FILE) { layer.image.paint_on(ctx); } - + // colorize the whole layer if neccasary if (layer.colorize) { ctx.set_operator(Cairo.Operator.ATOP); ctx.set_source_rgb(color.r, color.g, color.b); ctx.paint(); - + ctx.set_operator(Cairo.Operator.OVER); ctx.pop_group_to_source(); ctx.paint(); @@ -113,11 +113,11 @@ public class ThemedIcon : Image { } } } - + ///////////////////////////////////////////////////////////////////// /// Returns the size of the icon in pixels. Greetings to Liskov. ///////////////////////////////////////////////////////////////////// - + public int size() { return base.width(); } diff --git a/src/pies/defaultConfig.vala b/src/pies/defaultConfig.vala index 87fd30d..6ca45e4 100644 --- a/src/pies/defaultConfig.vala +++ b/src/pies/defaultConfig.vala @@ -1,37 +1,37 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A helper class which creates a user-specific default configuration. ///////////////////////////////////////////////////////////////////////// namespace Pies { public void create_default_config() { - + // add a pie with playback controls var multimedia = PieManager.create_persistent_pie(_("Multimedia"), "stock_media-play", new Trigger.from_string("<Control><Alt>m")); multimedia.add_action(new KeyAction(_("Next Track"), "stock_media-next", "XF86AudioNext", true)); multimedia.add_action(new KeyAction(_("Stop"), "stock_media-stop", "XF86AudioStop")); multimedia.add_action(new KeyAction(_("Previous Track"), "stock_media-prev", "XF86AudioPrev")); multimedia.add_action(new KeyAction(_("Play/Pause"), "stock_media-play", "XF86AudioPlay")); - + // add a pie with the users default applications var apps = PieManager.create_persistent_pie(_("Applications"), "applications-accessories", new Trigger.from_string("<Control><Alt>a")); apps.add_action(ActionRegistry.default_for_mime_type("text/plain")); @@ -40,20 +40,20 @@ namespace Pies { apps.add_action(ActionRegistry.default_for_mime_type("image/jpg")); apps.add_action(ActionRegistry.default_for_uri("http")); apps.add_action(ActionRegistry.default_for_uri("mailto")); - + // add a pie with the users bookmarks and devices var bookmarks = PieManager.create_persistent_pie(_("Bookmarks"), "user-bookmarks", new Trigger.from_string("<Control><Alt>b")); bookmarks.add_group(new BookmarkGroup(bookmarks.id)); bookmarks.add_group(new DevicesGroup(bookmarks.id)); - + // add a pie with session controls var session = PieManager.create_persistent_pie(_("Session"), "gnome-session-halt", new Trigger.from_string("<Control><Alt>q")); session.add_group(new SessionGroup(session.id)); - + // add a pie with a main menu var menu = PieManager.create_persistent_pie(_("Main Menu"), "alacarte", new Trigger.from_string("<Control><Alt>space")); menu.add_group(new MenuGroup(menu.id)); - + // add a pie with window controls var window = PieManager.create_persistent_pie(_("Window"), "gnome-window-manager", new Trigger.from_string("<Control><Alt>w")); window.add_action(new KeyAction(_("Scale"), "top", "<Control><Alt>s")); @@ -61,7 +61,7 @@ namespace Pies { window.add_action(new KeyAction(_("Close"), "window-close", "<Alt>F4")); window.add_action(new KeyAction(_("Maximize"), "window_fullscreen", "<Alt>F10")); window.add_action(new KeyAction(_("Restore"), "window_nofullscreen", "<Alt>F5")); - + // save the configuration to file Pies.save(); } diff --git a/src/pies/load.vala b/src/pies/load.vala index cb08a8a..7402094 100644 --- a/src/pies/load.vala +++ b/src/pies/load.vala @@ -1,25 +1,25 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// using GLib.Math; namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A helper method which loads pies according to the configuration file. ///////////////////////////////////////////////////////////////////////// @@ -28,7 +28,7 @@ namespace Pies { ///////////////////////////////////////////////////////////////////// /// Loads all Pies from the pies.conf file. ///////////////////////////////////////////////////////////////////// - + public void load() { // check whether the config file exists if (!GLib.File.new_for_path(Paths.pie_config).query_exists()) { @@ -36,13 +36,13 @@ namespace Pies { Pies.create_default_config(); return; } - + message("Loading Pies from \"" + Paths.pie_config + "\"."); - + // load the settings file Xml.Parser.init(); Xml.Doc* piesXML = Xml.Parser.parse_file(Paths.pie_config); - + if (piesXML != null) { // begin parsing at the root element Xml.Node* root = piesXML->get_root_element(); @@ -57,36 +57,36 @@ namespace Pies { default: warning("Invalid child element <" + node_name + "> in <pies> element pies.conf!"); break; - } + } } } } else { warning("Error loading pies: pies.conf is empty! The cake is a lie..."); } - + delete piesXML; - + } else { warning("Error loading pies: pies.conf not found! The cake is a lie..."); } } - + ///////////////////////////////////////////////////////////////////// /// Parses a <pie> element from the pies.conf file. ///////////////////////////////////////////////////////////////////// - + private static void parse_pie(Xml.Node* node) { string hotkey = ""; string name = ""; string icon = ""; string id = ""; int quickaction = -1; - + // parse all attributes of this node for (Xml.Attr* attribute = node->properties; attribute != null; attribute = attribute->next) { string attr_name = attribute->name.down(); string attr_content = attribute->children->content; - + switch (attr_name) { case "hotkey": hotkey = attr_content; @@ -108,15 +108,15 @@ namespace Pies { break; } } - + if (name == "") { warning("Invalid <pie> element in pies.conf: No name specified!"); return; } - + // add a new Pie with the loaded properties var pie = PieManager.create_persistent_pie(name, icon, new Trigger.from_string(hotkey), id); - + // and parse all child elements for (Xml.Node* slice = node->children; slice != null; slice = slice->next) { if (slice->type == Xml.ElementType.ELEMENT_NODE) { @@ -131,22 +131,22 @@ namespace Pies { default: warning("Invalid child element <" + node_name + "> in <pie> element in pies.conf!"); break; - } + } } } } - + ///////////////////////////////////////////////////////////////////// /// Parses a <slice> element from the pies.conf file. ///////////////////////////////////////////////////////////////////// - + private static void parse_slice(Xml.Node* slice, Pie pie) { string name=""; string icon=""; string command=""; string type=""; bool quickaction = false; - + // parse all attributes of this node for (Xml.Attr* attribute = slice->properties; attribute != null; attribute = attribute->next) { string attr_name = attribute->name.down(); @@ -173,20 +173,20 @@ namespace Pies { break; } } - + // create a new Action according to the loaded type Action action = ActionRegistry.create_action(type, name, icon, command, quickaction); - + if (action != null) pie.add_action(action); } - + ///////////////////////////////////////////////////////////////////// /// Parses a <group> element from the pies.conf file. ///////////////////////////////////////////////////////////////////// - + private static void parse_group(Xml.Node* slice, Pie pie) { string type=""; - + // parse all attributes of this node for (Xml.Attr* attribute = slice->properties; attribute != null; attribute = attribute->next) { string attr_name = attribute->name.down(); @@ -201,7 +201,7 @@ namespace Pies { break; } } - + ActionGroup group = GroupRegistry.create_group(type, pie.id); if (group != null) pie.add_group(group); diff --git a/src/pies/pie.vala b/src/pies/pie.vala index fa205c7..1699ada 100644 --- a/src/pies/pie.vala +++ b/src/pies/pie.vala @@ -1,109 +1,109 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// -/// This class stores information on a pie. A pie consists of a name, an +///////////////////////////////////////////////////////////////////////// +/// This class stores information on a pie. A pie consists of a name, an /// icon name and an unique ID. Furthermore it has an arbitrary amount /// of ActionGroups storing Actions. ///////////////////////////////////////////////////////////////////////// public class Pie : GLib.Object { - + ///////////////////////////////////////////////////////////////////// /// The name of this Pie. It has not to be unique. ///////////////////////////////////////////////////////////////////// - + public string name { get; set; } - + ///////////////////////////////////////////////////////////////////// /// The name of the icon to be used for this Pie. It should exist in /// the users current icon theme, else a standard icon will be used. ///////////////////////////////////////////////////////////////////// - + public string icon { get; set; } - + ///////////////////////////////////////////////////////////////////// /// The ID of this Pie. It has to be unique among all Pies. This ID - /// consists of three digits when the Pie was created by the user, - /// of four digits when it was created dynamically by another class, + /// consists of three digits when the Pie was created by the user, + /// of four digits when it was created dynamically by another class, /// for example by an ActionGroup. ///////////////////////////////////////////////////////////////////// - + public string id { get; construct; } - + ///////////////////////////////////////////////////////////////////// /// Stores all ActionGroups of this Pie. ///////////////////////////////////////////////////////////////////// - + public Gee.ArrayList<ActionGroup?> action_groups { get; private set; } - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all given members. ///////////////////////////////////////////////////////////////////// - + public Pie(string id, string name, string icon) { GLib.Object(id: id, name: name, icon:icon); - + this.action_groups = new Gee.ArrayList<ActionGroup?>(); } - + ///////////////////////////////////////////////////////////////////// /// Should be called when this Pie is deleted, in order to clean up /// stuff created by contained ActionGroups. ///////////////////////////////////////////////////////////////////// - + public virtual void on_remove() { foreach (var action_group in action_groups) action_group.on_remove(); } - + ///////////////////////////////////////////////////////////////////// /// Adds an Action to this Pie. ///////////////////////////////////////////////////////////////////// - + public void add_action(Action action, int at_position = -1) { var group = new ActionGroup(this.id); group.add_action(action); this.add_group(group, at_position); } - + ///////////////////////////////////////////////////////////////////// /// Adds an ActionGroup to this Pie. ///////////////////////////////////////////////////////////////////// - - public void add_group(ActionGroup group, int at_position = -1) { + + public void add_group(ActionGroup group, int at_position = -1) { if (group.has_quickaction()) { foreach (var action_group in action_groups) action_group.disable_quickactions(); } - - if (at_position < 0 || at_position >= this.action_groups.size) + + if (at_position < 0 || at_position >= this.action_groups.size) this.action_groups.add(group); else this.action_groups.insert(at_position, group); } - + public void remove_group(int index) { if (this.action_groups.size > index) this.action_groups.remove_at(index); } - + public void move_group(int from, int to) { if (this.action_groups.size > from && this.action_groups.size > to) { var tmp = this.action_groups[from]; @@ -111,7 +111,7 @@ public class Pie : GLib.Object { this.add_group(tmp, to); } } - + public void update_group(ActionGroup group, int index) { if (this.action_groups.size > index) this.action_groups.set(index, group); diff --git a/src/pies/pieManager.vala b/src/pies/pieManager.vala index 83a8309..55cb353 100644 --- a/src/pies/pieManager.vala +++ b/src/pies/pieManager.vala @@ -1,24 +1,24 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// -/// A static class which stores all Pies. It can be used to add, delete +///////////////////////////////////////////////////////////////////////// +/// A static class which stores all Pies. It can be used to add, delete /// and open Pies. ///////////////////////////////////////////////////////////////////////// @@ -30,196 +30,227 @@ public class PieManager : GLib.Object { ///////////////////////////////////////////////////////////////////// public static Gee.HashMap<string, Pie?> all_pies { get; private set; } - + ///////////////////////////////////////////////////////////////////// /// Stores all PieWindows which are currently opened. Should be /// rarely more than two... ///////////////////////////////////////////////////////////////////// - + public static Gee.HashSet<PieWindow?> opened_windows { get; private set; } - + ///////////////////////////////////////////////////////////////////// /// Stores all global hotkeys. ///////////////////////////////////////////////////////////////////// - + private static BindingManager bindings; - + ///////////////////////////////////////////////////////////////////// /// True, if any pie has the current focus. If it is closing this /// will be false already. ///////////////////////////////////////////////////////////////////// - + private static bool a_pie_is_active = false; - + ///////////////////////////////////////////////////////////////////// /// Storing the position of the last Pie. Used for subpies, which are /// opened at their parents location. ///////////////////////////////////////////////////////////////////// - + private static int last_x = 0; private static int last_y = 0; - + ///////////////////////////////////////////////////////////////////// /// Initializes all Pies. They are loaded from the pies.conf file. ///////////////////////////////////////////////////////////////////// - + public static void init() { all_pies = new Gee.HashMap<string, Pie?>(); opened_windows = new Gee.HashSet<PieWindow?>(); bindings = new BindingManager(); - + // load all Pies from th pies.conf file Pies.load(); - + // open the according pie if it's hotkey is pressed bindings.on_press.connect((id) => { open_pie(id); }); } - + ///////////////////////////////////////////////////////////////////// /// Opens the Pie with the given ID, if it exists. ///////////////////////////////////////////////////////////////////// - + public static void open_pie(string id) { if (!a_pie_is_active) { Pie? pie = all_pies[id]; - + if (pie != null) { - + a_pie_is_active = true; - + + //change WM_CLASS so launchers can track windows properly + Gdk.set_program_class("gnome-pie-" + id); + var window = new PieWindow(); window.load_pie(pie); - + window.open(); - + opened_windows.add(window); - + window.on_closed.connect(() => { opened_windows.remove(window); if (opened_windows.size == 0) { Icon.clear_cache(); } }); - + window.on_closing.connect(() => { window.get_center_pos(out last_x, out last_y); a_pie_is_active = false; }); - - + + + //restore default WM_CLASS after window open + Gdk.set_program_class("gnome-pie"); + } else { warning("Failed to open pie with ID \"" + id + "\": ID does not exist!"); } } } - + ///////////////////////////////////////////////////////////////////// /// Returns the hotkey which the Pie with the given ID is bound to. ///////////////////////////////////////////////////////////////////// - + public static string get_accelerator_of(string id) { return bindings.get_accelerator_of(id); } - + ///////////////////////////////////////////////////////////////////// /// Returns a human-readable version of the hotkey which the Pie /// with the given ID is bound to. ///////////////////////////////////////////////////////////////////// - + public static string get_accelerator_label_of(string id) { return bindings.get_accelerator_label_of(id); } - + ///////////////////////////////////////////////////////////////////// /// Bind the Pie with the given ID to the given trigger. ///////////////////////////////////////////////////////////////////// - + public static void bind_trigger(Trigger trigger, string id) { bindings.unbind(id); bindings.bind(trigger, id); } - + ///////////////////////////////////////////////////////////////////// /// Returns true if the pie with the given id is in turbo mode. ///////////////////////////////////////////////////////////////////// - + public static bool get_is_turbo(string id) { return bindings.get_is_turbo(id); } - + ///////////////////////////////////////////////////////////////////// /// Returns true if the pie with the given id opens in the middle of /// the screen. ///////////////////////////////////////////////////////////////////// - + public static bool get_is_centered(string id) { return bindings.get_is_centered(id); } - + + ///////////////////////////////////////////////////////////////////// + /// Returns true if the mouse pointer will be warped to the center of + /// the pie. + ///////////////////////////////////////////////////////////////////// + + public static bool get_is_warp(string id) { + return bindings.get_is_warp(id); + } + + ///////////////////////////////////////////////////////////////////// + /// Returns true if the pie with the given id is auto shaped + ///////////////////////////////////////////////////////////////////// + + public static bool get_is_auto_shape(string id) { + return bindings.get_is_auto_shape(id); + } + + ///////////////////////////////////////////////////////////////////// + /// Returns the prefered pie shape number + ///////////////////////////////////////////////////////////////////// + + public static int get_shape_number(string id) { + return bindings.get_shape_number(id); + } + ///////////////////////////////////////////////////////////////////// /// Returns the name of the Pie with the given ID. ///////////////////////////////////////////////////////////////////// - + public static string get_name_of(string id) { Pie? pie = all_pies[id]; if (pie == null) return ""; else return pie.name; } - + ///////////////////////////////////////////////////////////////////// /// Returns the name ID of the Pie bound to the given Trigger. /// Returns "" if there is nothing bound to this trigger. ///////////////////////////////////////////////////////////////////// - + public static string get_assigned_id(Trigger trigger) { return bindings.get_assigned_id(trigger); } - + ///////////////////////////////////////////////////////////////////// /// Creates a new Pie which is displayed in the configuration dialog /// and gets saved. ///////////////////////////////////////////////////////////////////// - + public static Pie create_persistent_pie(string name, string icon_name, Trigger? hotkey, string? desired_id = null) { Pie pie = create_pie(name, icon_name, 100, 999, desired_id); if (hotkey != null) bindings.bind(hotkey, pie.id); - + create_launcher(pie.id); - + return pie; } - + ///////////////////////////////////////////////////////////////////// /// Creates a new Pie which is not displayed in the configuration /// dialog and is not saved. ///////////////////////////////////////////////////////////////////// - + public static Pie create_dynamic_pie(string name, string icon_name, string? desired_id = null) { return create_pie(name, icon_name, 1000, 9999, desired_id); } - + ///////////////////////////////////////////////////////////////////// /// Adds a new Pie. Can't be accesd from outer scope. Use /// create_persistent_pie or create_dynamic_pie instead. ///////////////////////////////////////////////////////////////////// - + private static Pie create_pie(string name, string icon_name, int min_id, int max_id, string? desired_id = null) { var random = new GLib.Rand(); - + string final_id; - - if (desired_id == null) + + if (desired_id == null) final_id = random.int_range(min_id, max_id).to_string(); else { final_id = desired_id; final_id.canon("0123456789", '_'); final_id = final_id.replace("_", ""); - + int id = int.parse(final_id); - + if (id < min_id || id > max_id) { final_id = random.int_range(min_id, max_id).to_string(); warning("The ID for pie \"" + name + "\" should be in range %u - %u! Using \"" + final_id + "\" instead of \"" + desired_id + "\"...", min_id, max_id); @@ -237,21 +268,21 @@ public class PieManager : GLib.Object { Pie pie = new Pie(final_id, name, icon_name); all_pies.set(final_id, pie); - + return pie; } - + ///////////////////////////////////////////////////////////////////// /// Removes the Pie with the given ID if it exists. Additionally it /// unbinds it's global hotkey. ///////////////////////////////////////////////////////////////////// - + public static void remove_pie(string id) { if (all_pies.has_key(id)) { all_pies[id].on_remove(); all_pies.unset(id); bindings.unbind(id); - + if (id.length == 3) remove_launcher(id); } @@ -259,27 +290,28 @@ public class PieManager : GLib.Object { warning("Failed to remove pie with ID \"" + id + "\": ID does not exist!"); } } - + ///////////////////////////////////////////////////////////////////// /// Creates a desktop file for which opens the Pie with given ID. ///////////////////////////////////////////////////////////////////// - + public static void create_launcher(string id) { if (all_pies.has_key(id)) { Pie? pie = all_pies[id]; - - string launcher_entry = - "#!/usr/bin/env xdg-open\n" + + + string launcher_entry = + "#!/usr/bin/env xdg-open\n" + "[Desktop Entry]\n" + "Name=%s\n".printf(pie.name) + "Exec=%s -o %s\n".printf(Paths.executable, pie.id) + "Encoding=UTF-8\n" + "Type=Application\n" + - "Icon=%s\n".printf(pie.icon); + "Icon=%s\n".printf(pie.icon) + + "StartupWMClass=gnome-pie-%s\n".printf(pie.id); // create the launcher file string launcher = Paths.launchers + "/%s.desktop".printf(pie.id); - + try { FileUtils.set_contents(launcher, launcher_entry); FileUtils.chmod(launcher, 0755); @@ -288,11 +320,11 @@ public class PieManager : GLib.Object { } } } - + ///////////////////////////////////////////////////////////////////// /// Deletes the desktop file for the Pie with the given ID. ///////////////////////////////////////////////////////////////////// - + private static void remove_launcher(string id) { string launcher = Paths.launchers + "/%s.desktop".printf(id); if (FileUtils.test(launcher, FileTest.EXISTS)) { diff --git a/src/pies/save.vala b/src/pies/save.vala index 60fc0b2..9760cce 100644 --- a/src/pies/save.vala +++ b/src/pies/save.vala @@ -1,25 +1,25 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// using GLib.Math; namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A helper method which saves pies in a configuration file. ///////////////////////////////////////////////////////////////////////// @@ -28,23 +28,23 @@ namespace Pies { ///////////////////////////////////////////////////////////////////// /// Saves all Pies of the PieManager to the pies.conf file. ///////////////////////////////////////////////////////////////////// - + public void save() { message("Saving Pies to \"" + Paths.pie_config + "\"."); - + // initializes the XML-Writer var writer = new Xml.TextWriter.filename(Paths.pie_config); writer.set_indent(true); writer.start_document("1.0"); writer.start_element("pies"); - + // iterate through all Pies foreach (var pie_entry in PieManager.all_pies.entries) { var pie = pie_entry.value; - + // if it's no dynamically created Pie if (pie.id.length == 3) { - int slice_count = 0; + int slice_count = 0; // write all attributes of the Pie writer.start_element("pie"); @@ -52,7 +52,7 @@ namespace Pies { writer.write_attribute("id", pie.id); writer.write_attribute("icon", pie.icon); writer.write_attribute("hotkey", PieManager.get_accelerator_of(pie.id)); - + // and all of it's Actions foreach (var group in pie.action_groups) { // if it's a custom ActionGroup @@ -67,14 +67,14 @@ namespace Pies { writer.write_attribute("command", action.real_command); writer.write_attribute("quickAction", action.is_quickaction ? "true" : "false"); writer.end_element(); - + ++ slice_count; } } else { writer.start_element("group"); writer.write_attribute("type", GroupRegistry.descriptions[group.get_type().name()].id); writer.end_element(); - + slice_count += group.actions.size; } } diff --git a/src/renderers/centerRenderer.vala b/src/renderers/centerRenderer.vala index fab633e..e94714f 100644 --- a/src/renderers/centerRenderer.vala +++ b/src/renderers/centerRenderer.vala @@ -1,25 +1,25 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// using GLib.Math; namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// Renders the center of a Pie. ///////////////////////////////////////////////////////////////////////// @@ -30,26 +30,26 @@ public class CenterRenderer : GLib.Object { ///////////////////////////////////////////////////////////////////// private unowned PieRenderer parent; - + ///////////////////////////////////////////////////////////////////// /// The caption drawn in the center. Changes when the active slice /// changes. ///////////////////////////////////////////////////////////////////// - + private unowned Image? caption; - + ///////////////////////////////////////////////////////////////////// /// The color of the currently active slice. Used to colorize layers. ///////////////////////////////////////////////////////////////////// - + private Color color; - + ///////////////////////////////////////////////////////////////////// /// Two AnimatedValues: alpha is for global transparency (when /// fading in/out), activity is 1.0 if there is an active slice and /// 0.0 if there is no active slice. ///////////////////////////////////////////////////////////////////// - + private AnimatedValue activity; private AnimatedValue alpha; @@ -64,22 +64,22 @@ public class CenterRenderer : GLib.Object { this.color = new Color(); this.caption = null; } - + ///////////////////////////////////////////////////////////////////// /// Initiates the fade-out animation by resetting the targets of the /// AnimatedValues to 0.0. ///////////////////////////////////////////////////////////////////// - + public void fade_out() { this.activity.reset_target(0.0, Config.global.theme.fade_out_time); this.alpha.reset_target(0.0, Config.global.theme.fade_out_time); } - + ///////////////////////////////////////////////////////////////////// /// Should be called if the active slice of the PieRenderer changes. /// The members activity, caption and color are set accordingly. ///////////////////////////////////////////////////////////////////// - + public void set_active_slice(SliceRenderer? active_slice) { if (active_slice == null) { this.activity.reset_target(0.0, Config.global.theme.transition_time); @@ -89,104 +89,136 @@ public class CenterRenderer : GLib.Object { this.color = active_slice.color; } } - + ///////////////////////////////////////////////////////////////////// /// Draws all center layers and the caption. ///////////////////////////////////////////////////////////////////// - - public void draw(double frame_time, Cairo.Context ctx, double angle, double distance) { + + public void draw(double frame_time, Cairo.Context ctx, double angle, int slice_track) { // get all center_layers - var layers = Config.global.theme.center_layers; - + var layers = Config.global.theme.center_layers; + // update the AnimatedValues this.activity.update(frame_time); this.alpha.update(frame_time); - - // draw each layer - foreach (var layer in layers) { - ctx.save(); + + // draw each layer + foreach (var layer in layers) { + ctx.save(); // calculate all values needed for animation/drawing - double active_speed = (layer.active_rotation_mode == CenterLayer.RotationMode.TO_MOUSE) ? + double active_speed = (layer.active_rotation_mode == CenterLayer.RotationMode.TO_MOUSE) ? 0.0 : layer.active_rotation_speed; - double inactive_speed = (layer.inactive_rotation_mode == CenterLayer.RotationMode.TO_MOUSE) ? + double inactive_speed = (layer.inactive_rotation_mode == CenterLayer.RotationMode.TO_MOUSE) ? 0.0 : layer.inactive_rotation_speed; - double max_scale = layer.active_scale*this.activity.val - + layer.inactive_scale*(1.0-this.activity.val); - double max_alpha = layer.active_alpha*this.activity.val + double max_scale = layer.active_scale*this.activity.val + + layer.inactive_scale*(1.0-this.activity.val); + double max_alpha = layer.active_alpha*this.activity.val + layer.inactive_alpha*(1.0-this.activity.val); - double colorize = ((layer.active_colorize == true) ? this.activity.val : 0.0) + double colorize = ((layer.active_colorize == true) ? this.activity.val : 0.0) + ((layer.inactive_colorize == true) ? 1.0 - this.activity.val : 0.0); - double max_rotation_speed = active_speed*this.activity.val + double max_rotation_speed = active_speed*this.activity.val + inactive_speed*(1.0-this.activity.val); - CenterLayer.RotationMode rotation_mode = ((this.activity.val > 0.5) ? + CenterLayer.RotationMode rotation_mode = ((this.activity.val > 0.5) ? layer.active_rotation_mode : layer.inactive_rotation_mode); - - if (rotation_mode == CenterLayer.RotationMode.TO_MOUSE) { - double diff = angle-layer.rotation; - max_rotation_speed = layer.active_rotation_speed*this.activity.val - + layer.inactive_rotation_speed*(1.0-this.activity.val); - double smoothy = fabs(diff) < 0.9 ? fabs(diff) + 0.1 : 1.0; - double step = max_rotation_speed*frame_time*smoothy; - + + if (rotation_mode == CenterLayer.RotationMode.TO_MOUSE) { + double diff = angle-layer.rotation; + max_rotation_speed = layer.active_rotation_speed*this.activity.val + + layer.inactive_rotation_speed*(1.0-this.activity.val); + double smoothy = fabs(diff) < 0.9 ? fabs(diff) + 0.1 : 1.0; + double step = max_rotation_speed*frame_time*smoothy; + if (fabs(diff) <= step || fabs(diff) >= 2.0*PI - step) - layer.rotation = angle; - else { - if ((diff > 0 && diff < PI) || diff < -PI) layer.rotation += step; - else layer.rotation -= step; + layer.rotation = angle; + else { + if ((diff > 0 && diff < PI) || diff < -PI) layer.rotation += step; + else layer.rotation -= step; } - - } else if (rotation_mode == CenterLayer.RotationMode.TO_ACTIVE) { - max_rotation_speed *= this.activity.val; - - double slice_angle = parent.slice_count() > 0 ? 2*PI/parent.slice_count() : 0; - double direction = (int)((angle+0.5*slice_angle) / (slice_angle))*slice_angle; - double diff = direction-layer.rotation; - double step = max_rotation_speed*frame_time; - + + } else if (rotation_mode == CenterLayer.RotationMode.TO_ACTIVE) { + max_rotation_speed *= this.activity.val; + + double slice_angle = parent.total_slice_count > 0 ? 2*PI/parent.total_slice_count : 0; + double direction = (int)((angle+0.5*slice_angle) / (slice_angle))*slice_angle; + double diff = direction-layer.rotation; + double step = max_rotation_speed*frame_time; + if (fabs(diff) <= step || fabs(diff) >= 2.0*PI - step) - layer.rotation = direction; - else { - if ((diff > 0 && diff < PI) || diff < -PI) layer.rotation += step; - else layer.rotation -= step; + layer.rotation = direction; + else { + if ((diff > 0 && diff < PI) || diff < -PI) layer.rotation += step; + else layer.rotation -= step; } - - } else layer.rotation += max_rotation_speed*frame_time; - - layer.rotation = fmod(layer.rotation+2*PI, 2*PI); - - if (colorize > 0.0) ctx.push_group(); - - // transform the context - ctx.rotate(layer.rotation); - ctx.scale(max_scale, max_scale); - - // paint the layer - layer.image.paint_on(ctx, this.alpha.val*max_alpha); - + + } else layer.rotation += max_rotation_speed*frame_time; + + layer.rotation = fmod(layer.rotation+2*PI, 2*PI); + + if (colorize > 0.0) ctx.push_group(); + + // transform the context + ctx.rotate(layer.rotation); + ctx.scale(max_scale, max_scale); + + // paint the layer + layer.image.paint_on(ctx, this.alpha.val*max_alpha); + // colorize it, if necessary if (colorize > 0.0) { ctx.set_operator(Cairo.Operator.ATOP); ctx.set_source_rgb(this.color.r, this.color.g, this.color.b); ctx.paint_with_alpha(colorize); - + ctx.set_operator(Cairo.Operator.OVER); ctx.pop_group_to_source(); - ctx.paint(); - } - + ctx.paint(); + } + ctx.restore(); } - + // draw caption if (Config.global.theme.caption && caption != null && this.activity.val > 0) { - ctx.save(); + ctx.save(); ctx.identity_matrix(); - int pos = this.parent.size/2; - ctx.translate(pos, (int)(Config.global.theme.caption_position) + pos); + ctx.translate(this.parent.center_x, (int)(Config.global.theme.caption_position) + this.parent.center_y); caption.paint_on(ctx, this.activity.val*this.alpha.val); ctx.restore(); } + + //scroll pie + if (this.alpha.val > 0.1 + && this.parent.original_visible_slice_count < this.parent.slice_count() + && this.parent.original_visible_slice_count > 0) { + int np= (this.parent.slice_count()+this.parent.original_visible_slice_count -1)/this.parent.original_visible_slice_count; + int cp= this.parent.first_slice_idx / this.parent.original_visible_slice_count; + int r= 8; //circle radious + int dy= 20; //distance between circles + double a= 0.8 * this.alpha.val; + int dx= (int)Config.global.theme.center_radius + r + 10; + if (this.parent.center_x + dx > this.parent.size_w) + dx= -dx; //no right side, put scroll in the left size + ctx.save(); + ctx.identity_matrix(); + ctx.translate(this.parent.center_x + dx, this.parent.center_y - (np-1)*dy/2); + for (int i=0; i<np; i++) { + ctx.arc( 0, 0, r, 0, 2*PI ); + if (i == cp){ + ctx.set_source_rgba(0.3,0.3,0.3, a); //light gray stroke + ctx.stroke_preserve(); + ctx.set_source_rgba(1,1,1, a); //white fill + ctx.fill(); //current + } else { + ctx.set_source_rgba(1,1,1, a); //white stroke + ctx.stroke_preserve(); + ctx.set_source_rgba(0.3,0.3,0.3, a/4); //light gray fill + ctx.fill(); //current + } + ctx.translate(0, dy); + } + ctx.restore(); + } } } diff --git a/src/renderers/pieRenderer.vala b/src/renderers/pieRenderer.vala index 8085758..2edee09 100644 --- a/src/renderers/pieRenderer.vala +++ b/src/renderers/pieRenderer.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// using GLib.Math; @@ -49,13 +49,89 @@ public class PieRenderer : GLib.Object { /// The width and height of the Pie in pixels. ///////////////////////////////////////////////////////////////////// - public int size { get; private set; } + public int size_w { get; private set; } + public int size_h { get; private set; } + + ///////////////////////////////////////////////////////////////////// + /// Center position relative to window top-left corner + ///////////////////////////////////////////////////////////////////// + + public int center_x { get; private set; } + public int center_y { get; private set; } + + //////////////////////////////////////////////////////////////////// + /// Possible show pie modes. + /// FULL_PIE: Show the pie as a complete circle. + /// HPIE_LEFT: Eat half pie so it can be shown at the left of the screen. + /// HPIE_RIGHT: Eat half pie so it can be shown at the right of the screen. + /// HPIE_TOP: Eat half pie so it can be shown at the top of the screen. + /// HPIE_BOTTOM: Eat half pie so it can be shown at the bottom of the screen. + /// CPIE_TOP_LEFT: Eat 3/4 pie so it can be shown at the top-left corner. + /// CPIE_TOP_RIGHT: Eat 3/4 pie so it can be shown at the top-right corner. + /// CPIE_BOT_LEFT: Eat 3/4 pie so it can be shown at the bottom-left corner. + /// CPIE_BOT_RIGHT: Eat 3/4 pie so it can be shown at the bottom-right corner. ///////////////////////////////////////////////////////////////////// - /// True if the pie should close when it's trigger is released. + + public enum ShowPieMode { + FULL_PIE, + HPIE_LEFT, HPIE_RIGHT, HPIE_TOP, HPIE_BOTTOM, + CPIE_TOP_LEFT, CPIE_TOP_RIGHT, CPIE_BOT_LEFT, CPIE_BOT_RIGHT} + ///////////////////////////////////////////////////////////////////// + /// Show pie mode: full, half-circle, corner + ///////////////////////////////////////////////////////////////////// + + public ShowPieMode pie_show_mode { get; private set; default= ShowPieMode.FULL_PIE; } + + ///////////////////////////////////////////////////////////////////// + /// Number of visible slices + ///////////////////////////////////////////////////////////////////// + + public int visible_slice_count { get; private set; } - public bool turbo_mode { get; private set; default=false; } + public int original_visible_slice_count { get; private set; } + + ///////////////////////////////////////////////////////////////////// + /// Number of slices in full pie (visible or not) + ///////////////////////////////////////////////////////////////////// + + public int total_slice_count { get; private set; } + + ///////////////////////////////////////////////////////////////////// + /// Maximun number of visible slices in a full pie + ///////////////////////////////////////////////////////////////////// + + public int max_visible_slices { get; private set; } + + ///////////////////////////////////////////////////////////////////// + /// The index of the first visible slice + ///////////////////////////////////////////////////////////////////// + + public int first_slice_idx { get; private set; } + + ///////////////////////////////////////////////////////////////////// + /// Angular position of the first visible slice + ///////////////////////////////////////////////////////////////////// + + public double first_slice_angle { get; private set; } + + ///////////////////////////////////////////////////////////////////// + /// Index of the slice where to go when up/down/left/right key is pressed + /// or -1 if that side of the pie was eaten + ///////////////////////////////////////////////////////////////////// + + public int up_slice_idx { get; private set; } + public int down_slice_idx { get; private set; } + public int left_slice_idx { get; private set; } + public int right_slice_idx { get; private set; } + + + ///////////////////////////////////////////////////////////////////// + /// The ID of the currently loaded Pie. + ///////////////////////////////////////////////////////////////////// + + public string id { get; private set; } ///////////////////////////////////////////////////////////////////// /// True if the pie is currently navigated with the keyboard. This is @@ -77,6 +153,11 @@ public class PieRenderer : GLib.Object { private CenterRenderer center; ///////////////////////////////////////////////////////////////////// + /// Maximum distance from the center that activates the slices + ///////////////////////////////////////////////////////////////////// + private int activation_range; + + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes members. ///////////////////////////////////////////////////////////////////// @@ -85,7 +166,35 @@ public class PieRenderer : GLib.Object { this.center = new CenterRenderer(this); this.quickaction = -1; this.active_slice = -2; - this.size = 0; + this.size_w = 0; + this.size_h = 0; + this.activation_range= 300; + + this.max_visible_slices= Config.global.max_visible_slices; + + set_show_mode(ShowPieMode.FULL_PIE); + } + + + private void get_mouse_and_screen(out int mousex, out int mousey, out int screenx, out int screeny) { + // get the mouse position and screen resolution + double x = 0.0; + double y = 0.0; + + var display = Gdk.Display.get_default(); + var manager = display.get_device_manager(); + GLib.List<weak Gdk.Device?> list = manager.list_devices(Gdk.DeviceType.MASTER); + + foreach(var device in list) { + if (device.input_source != Gdk.InputSource.KEYBOARD) { + Gdk.Screen screen; + device.get_position( out screen, out x, out y ); + } + } + mousex= (int) x; + mousey= (int) y; + screenx= Gdk.Screen.width(); + screeny= Gdk.Screen.height(); } ///////////////////////////////////////////////////////////////////// @@ -95,6 +204,8 @@ public class PieRenderer : GLib.Object { public void load_pie(Pie pie) { this.slices.clear(); + this.id = pie.id; + int count = 0; foreach (var group in pie.action_groups) { foreach (var action in group.actions) { @@ -110,18 +221,200 @@ public class PieRenderer : GLib.Object { } } - this.turbo_mode = PieManager.get_is_turbo(pie.id); - this.set_highlighted_slice(this.quickaction); - this.size = (int)fmax(2*Config.global.theme.radius + 2*Config.global.theme.slice_radius*Config.global.theme.max_zoom, - 2*Config.global.theme.center_radius); + ShowPieMode showpie= ShowPieMode.FULL_PIE; + //set full pie to determine the number of visible slices + set_show_mode(showpie); + + int sz0= (int)fmax(2*Config.global.theme.radius + 2*Config.global.theme.visible_slice_radius*Config.global.theme.max_zoom, + 2*Config.global.theme.center_radius); + + int sz= sz0; // increase size if there are many slices - if (slices.size > 0) { - this.size = (int)fmax(this.size, - (((Config.global.theme.slice_radius + Config.global.theme.slice_gap)/tan(PI/slices.size)) - + Config.global.theme.slice_radius)*2*Config.global.theme.max_zoom); + if (this.total_slice_count > 0) { + sz = (int)fmax(sz0, + (((Config.global.theme.slice_radius + Config.global.theme.slice_gap)/tan(PI/this.total_slice_count)) + + Config.global.theme.visible_slice_radius)*2*Config.global.theme.max_zoom); + } + + + + + // get mouse position and screen resolution + int mouse_x, mouse_y, screen_x, screen_y; + get_mouse_and_screen( out mouse_x, out mouse_y, out screen_x, out screen_y ); + + //reduce the window size if needed to get closer to the actual mouse position + int reduce_szx= 1; + int reduce_szy= 1; + + if (PieManager.get_is_auto_shape(pie.id) && !PieManager.get_is_centered(pie.id)) { + //set the best show mode that put the mouse near the center + if (mouse_x < sz/2) { + if (mouse_y < sz/2) + showpie= ShowPieMode.CPIE_TOP_LEFT; //show 1/4 pie + else if (screen_y > 0 && screen_y-mouse_y < sz/2) + showpie= ShowPieMode.CPIE_BOT_LEFT; //show 1/4 pie + else + showpie= ShowPieMode.HPIE_LEFT; //show 1/2 pie + + } else if (mouse_y < sz/2) { + if (screen_x > 0 && screen_x-mouse_x < sz/2) + showpie= ShowPieMode.CPIE_TOP_RIGHT; //show 1/4 pie + else + showpie= ShowPieMode.HPIE_TOP; //show 1/2 pie + + } else if (screen_x > 0 && screen_x-mouse_x < sz/2) { + if (screen_y > 0 && screen_y-mouse_y < sz/2) + showpie= ShowPieMode.CPIE_BOT_RIGHT; //show 1/4 pie + else + showpie= ShowPieMode.HPIE_RIGHT; //show 1/2 pie + + } else if (screen_y > 0 && screen_y-mouse_y < sz/2) + showpie= ShowPieMode.HPIE_BOTTOM; //show 1/2 pie + + + } else { + //if the pie is centered in the screen, don't reduce the size + if (PieManager.get_is_centered(pie.id)) { + reduce_szx= 0; + reduce_szy= 0; + } + + //select the configured shape + //convert from radio-buttum number to ShowPieMode enum + switch( PieManager.get_shape_number(pie.id) ) { + case 1: + showpie= ShowPieMode.CPIE_BOT_RIGHT; + if (screen_x-mouse_x > sz/2) + reduce_szx= 0; //keep full width + if (screen_y-mouse_y > sz/2) + reduce_szy= 0; //keep full height + break; + case 2: + showpie= ShowPieMode.HPIE_RIGHT; + if (screen_x-mouse_x > sz/2) + reduce_szx= 0; //keep full width + break; + case 3: + showpie= ShowPieMode.CPIE_TOP_RIGHT; + if (screen_x-mouse_x > sz/2) + reduce_szx= 0; //keep full width + if (mouse_y > sz/2) + reduce_szy= 0; //keep full height + break; + case 4: + showpie= ShowPieMode.HPIE_BOTTOM; + if (screen_y-mouse_y > sz/2) + reduce_szy= 0; //keep full height + break; + case 6: + showpie= ShowPieMode.HPIE_TOP; + if (mouse_y > sz/2) + reduce_szy= 0; //keep full height + break; + case 7: + showpie= ShowPieMode.CPIE_BOT_LEFT; + if (mouse_x > sz/2) + reduce_szx= 0; //keep full width + if (screen_y-mouse_y > sz/2) + reduce_szy= 0; //keep full height + break; + case 8: + showpie= ShowPieMode.HPIE_LEFT; + if (mouse_x > sz/2) + reduce_szx= 0; //keep full width + break; + case 9: + showpie= ShowPieMode.CPIE_TOP_LEFT; + if (mouse_x > sz/2) + reduce_szx= 0; //keep full width + if (mouse_y > sz/2) + reduce_szy= 0; //keep full height + break; + } + } + //set the new show pie mode + set_show_mode(showpie); + + //recalc size + sz = sz0; + if (this.total_slice_count > 0) { + sz = (int)fmax(sz0, + (((Config.global.theme.slice_radius + Config.global.theme.slice_gap)/tan(PI/this.total_slice_count)) + + Config.global.theme.visible_slice_radius)*2*Config.global.theme.max_zoom); + } + //activation_range = normal pie radius + "outer" activation_range + this.activation_range= (int)((double)Config.global.activation_range + sz/(2*Config.global.theme.max_zoom)); + + int szx = 1; //full width + int szy = 1; //full height + switch(this.pie_show_mode) { + //half pie + case ShowPieMode.HPIE_LEFT: + szx = 0; //half width, center to the left + break; + case ShowPieMode.HPIE_RIGHT: + szx = 2; //half width, center to the right + break; + case ShowPieMode.HPIE_TOP: + szy = 0; //half height, center to the top + break; + case ShowPieMode.HPIE_BOTTOM: + szy = 2; //half height, center to the bottom + break; + + //cuarter pie + case ShowPieMode.CPIE_TOP_LEFT: + szx = 0; //half width, center to the left + szy = 0; //half height, center to the top + break; + case ShowPieMode.CPIE_TOP_RIGHT: + szx = 2; //half width, center to the right + szy = 0; //half height, center to the top + break; + case ShowPieMode.CPIE_BOT_LEFT: + szx = 0; //half width, center to the left + szy = 2; //half height, center to the bottom + break; + case ShowPieMode.CPIE_BOT_RIGHT: + szx = 2; //half width, center to the right + szy = 2; //half height, center to the bottom + break; + } + if (reduce_szx == 0) + szx = 1; //don't reduce width + if (reduce_szy == 0) + szy = 1; //don't reduce height + + int rc = (int)Config.global.theme.center_radius; + if (szx == 1 ) { + //full width + this.size_w = sz; + this.center_x = sz/2; //center position + } else { + //half width + this.size_w = sz/2 + rc; + if (szx == 0) { + this.center_x = rc; //center to the left + } else { + this.center_x = this.size_w-rc; //center to the right + } + } + if (szy == 1) { + //full heigth + this.size_h = sz; + this.center_y = sz/2; //center position + } else { + //half heigth + this.size_h = sz/2 + rc; + if (szy == 0) { + this.center_y = rc; //center to the top + } else { + this.center_y = this.size_h-rc; //center to the bottom + } } } @@ -130,12 +423,16 @@ public class PieRenderer : GLib.Object { ///////////////////////////////////////////////////////////////////// public void activate() { - if (this.active_slice >= 0 && this.active_slice < this.slices.size) { + if (this.active_slice >= this.first_slice_idx + && this.active_slice < this.first_slice_idx+this.visible_slice_count) { slices[active_slice].activate(); } - foreach (var slice in this.slices) - slice.fade_out(); + //foreach (var slice in this.slices) + // slice.fade_out(); + for (int i= 0; i < this.visible_slice_count; ++i) { + this.slices[ i+this.first_slice_idx ].fade_out(); + } center.fade_out(); } @@ -145,29 +442,23 @@ public class PieRenderer : GLib.Object { ///////////////////////////////////////////////////////////////////// public void cancel() { - foreach (var slice in this.slices) - slice.fade_out(); + //foreach (var slice in this.slices) + // slice.fade_out(); + for (int i= 0; i < this.visible_slice_count; ++i) { + this.slices[ i+this.first_slice_idx ].fade_out(); + } center.fade_out(); } + ///////////////////////////////////////////////////////////////////// /// Called when the up-key is pressed. Selects the next slice towards /// the top. ///////////////////////////////////////////////////////////////////// public void select_up() { - int bottom = this.slice_count()/4; - int top = this.slice_count()*3/4; - - if (this.active_slice == -1 || this.active_slice == bottom) - this.set_highlighted_slice(top); - else if (this.active_slice > bottom && this.active_slice < top) - this.set_highlighted_slice(this.active_slice+1); - else if (this.active_slice != top) - this.set_highlighted_slice((this.active_slice-1+this.slice_count())%this.slice_count()); - - this.key_board_control = true; + move_active_slice(this.up_slice_idx, this.down_slice_idx); } ///////////////////////////////////////////////////////////////////// @@ -176,17 +467,7 @@ public class PieRenderer : GLib.Object { ///////////////////////////////////////////////////////////////////// public void select_down() { - int bottom = this.slice_count()/4; - int top = this.slice_count()*3/4; - - if (this.active_slice == -1 || this.active_slice == top) - this.set_highlighted_slice(bottom); - else if (this.active_slice > bottom && this.active_slice < top) - this.set_highlighted_slice(this.active_slice-1); - else if (this.active_slice != bottom) - this.set_highlighted_slice((this.active_slice+1)%this.slice_count()); - - this.key_board_control = true; + move_active_slice(this.down_slice_idx, this.up_slice_idx); } ///////////////////////////////////////////////////////////////////// @@ -195,17 +476,7 @@ public class PieRenderer : GLib.Object { ///////////////////////////////////////////////////////////////////// public void select_left() { - int left = this.slice_count()/2; - int right = 0; - - if (this.active_slice == -1 || this.active_slice == right) - this.set_highlighted_slice(left); - else if (this.active_slice > left) - this.set_highlighted_slice(this.active_slice-1); - else if (this.active_slice < left) - this.set_highlighted_slice(this.active_slice+1); - - this.key_board_control = true; + move_active_slice(this.left_slice_idx, this.right_slice_idx); } ///////////////////////////////////////////////////////////////////// @@ -214,17 +485,79 @@ public class PieRenderer : GLib.Object { ///////////////////////////////////////////////////////////////////// public void select_right() { - int left = this.slice_count()/2; - int right = 0; + move_active_slice(this.right_slice_idx, this.left_slice_idx); + } - if (this.active_slice == -1 || this.active_slice == left) - this.set_highlighted_slice(right); - else if (this.active_slice > left) - this.set_highlighted_slice((this.active_slice+1)%this.slice_count()); - else if (this.active_slice < left && this.active_slice != right) - this.set_highlighted_slice((this.active_slice-1+this.slice_count())%this.slice_count()); + ///////////////////////////////////////////////////////////////////// + /// Called when the page_up-key is pressed. Selects the next + /// group of slices. + ///////////////////////////////////////////////////////////////////// - this.key_board_control = true; + public void select_nextpage() { + if (this.first_slice_idx+this.visible_slice_count < slices.size) { + //advance one page + this.first_slice_idx += this.visible_slice_count; + if (this.first_slice_idx+this.visible_slice_count >= slices.size) { + this.visible_slice_count= slices.size - this.first_slice_idx; + } + this.reset_sclice_anim(); + this.set_highlighted_slice(-1); + calc_key_navigation_pos(); + this.key_board_control = true; + + } else if (this.first_slice_idx > 0) { + //go to first page + this.first_slice_idx= 0; + this.reset_sclice_anim(); + //recover the original value + this.visible_slice_count= this.original_visible_slice_count; + this.reset_sclice_anim(); + this.set_highlighted_slice(-1); + calc_key_navigation_pos(); + this.key_board_control = true; + } + } + + ///////////////////////////////////////////////////////////////////// + /// Called when the page_down-key is pressed. Selects the previous + /// group of slices. + ///////////////////////////////////////////////////////////////////// + + public void select_prevpage() { + if (this.first_slice_idx > 0) { + //go back one page + //recover the original value + this.visible_slice_count= this.original_visible_slice_count; + this.first_slice_idx -= this.visible_slice_count; + if (this.first_slice_idx < 0) { + this.first_slice_idx= 0; + } + this.reset_sclice_anim(); + this.set_highlighted_slice(-1); + calc_key_navigation_pos(); + this.key_board_control = true; + + } else if (this.visible_slice_count < slices.size) { + //go to last page + int n= slices.size % this.original_visible_slice_count; + if (n == 0) + //all pages have the same number of slices + this.visible_slice_count= this.original_visible_slice_count; + else + //last page has less slices than previous + this.visible_slice_count= n; + this.first_slice_idx= slices.size - this.visible_slice_count; + this.reset_sclice_anim(); + this.set_highlighted_slice(-1); + calc_key_navigation_pos(); + this.key_board_control = true; + } + } + + private void reset_sclice_anim() { + //reset animation values in all the new visible slices + for (int i= 0; i < this.visible_slice_count; ++i) + this.slices[ i+this.first_slice_idx ].reset_anim(); } ///////////////////////////////////////////////////////////////////// @@ -240,41 +573,58 @@ public class PieRenderer : GLib.Object { ///////////////////////////////////////////////////////////////////// public void draw(double frame_time, Cairo.Context ctx, int mouse_x, int mouse_y) { - if (this.size > 0) { - double distance = sqrt(mouse_x*mouse_x + mouse_y*mouse_y); - double angle = 0.0; - - if (this.key_board_control) { - angle = 2.0*PI*this.active_slice/(double)slice_count(); - } else { - - if (distance > 0) { - angle = acos(mouse_x/distance); - if (mouse_y < 0) - angle = 2*PI - angle; - } - - int next_active_slice = this.active_slice; - - if (distance < Config.global.theme.active_radius - && this.quickaction >= 0 && this.quickaction < this.slices.size) { + if (this.size_w > 0) { + double distance = sqrt(mouse_x*mouse_x + mouse_y*mouse_y); + double angle = 0.0; + int slice_track= 0; + + if (this.key_board_control) { + int n= this.active_slice - this.first_slice_idx; + angle = 2.0*PI*n/(double)this.total_slice_count + this.first_slice_angle; + slice_track= 1; + } else { + + if (distance > 0) { + angle = acos(mouse_x/distance); + if (mouse_y < 0) + angle = 2*PI - angle; + } - next_active_slice = this.quickaction; - angle = 2.0*PI*quickaction/(double)slice_count(); - } else if (distance > Config.global.theme.active_radius && this.slice_count() > 0 && distance < Config.global.activation_range) { - next_active_slice = (int)(angle*slices.size/(2*PI) + 0.5) % this.slice_count(); - } else { - next_active_slice = -1; - } + int next_active_slice = this.active_slice; + + if (distance < Config.global.theme.active_radius + && this.quickaction >= this.first_slice_idx + && this.quickaction < this.first_slice_idx+this.visible_slice_count) { + + next_active_slice = this.quickaction; + int n= this.quickaction - this.first_slice_idx; + angle = 2.0*PI*n/(double)this.total_slice_count + this.first_slice_angle; + + } else if (distance > Config.global.theme.active_radius && this.total_slice_count > 0 + && distance < this.activation_range) { + double a= angle-this.first_slice_angle; + if (a < 0) + a= a + 2*PI; + next_active_slice = (int)(a*this.total_slice_count/(2*PI) + 0.5) % this.total_slice_count; + if (next_active_slice >= this.visible_slice_count) + next_active_slice = -1; + else { + next_active_slice = next_active_slice + this.first_slice_idx; + slice_track= 1; + } + } else { + next_active_slice = -1; + } - this.set_highlighted_slice(next_active_slice); - } + this.set_highlighted_slice(next_active_slice); + } - center.draw(frame_time, ctx, angle, distance); + center.draw(frame_time, ctx, angle, slice_track); - foreach (var slice in this.slices) - slice.draw(frame_time, ctx, angle, distance); - } + for (int i= 0; i < this.visible_slice_count; ++i) { + this.slices[ i+this.first_slice_idx ].draw(frame_time, ctx, angle, slice_track); + } + } } ///////////////////////////////////////////////////////////////////// @@ -291,21 +641,215 @@ public class PieRenderer : GLib.Object { public void set_highlighted_slice(int index) { if (index != this.active_slice) { - if (index >= 0 && index < this.slice_count()) + if (index >= this.first_slice_idx && index < this.first_slice_idx+this.visible_slice_count) this.active_slice = index; - else if (this.quickaction >= 0) - this.active_slice = this.quickaction; else this.active_slice = -1; - SliceRenderer? active = (this.active_slice >= 0 && this.active_slice < this.slice_count()) ? + SliceRenderer? active = (this.active_slice >= 0 && this.active_slice < slices.size) ? this.slices[this.active_slice] : null; center.set_active_slice(active); - foreach (var slice in this.slices) - slice.set_active_slice(active); + for (int i= 0; i < this.visible_slice_count; ++i) { + this.slices[ i+this.first_slice_idx ].set_active_slice(active); + } + } + } + + private void set_show_mode(ShowPieMode show_mode) { + //The index of the first visible slice + this.first_slice_idx= 0; + //Angular position of the first visible slice + this.first_slice_angle= 0; + + int mult= 1; + switch(show_mode) { + //half pie + case ShowPieMode.HPIE_LEFT: + mult= 2; + this.first_slice_angle= -PI/2; + break; + case ShowPieMode.HPIE_RIGHT: + mult= 2; + this.first_slice_angle= PI/2; + break; + case ShowPieMode.HPIE_TOP: + mult= 2; + break; + case ShowPieMode.HPIE_BOTTOM: + this.first_slice_angle= PI; + mult= 2; + break; + + //cuarter pie + case ShowPieMode.CPIE_TOP_LEFT: + mult= 4; + break; + case ShowPieMode.CPIE_TOP_RIGHT: + this.first_slice_angle= PI/2; + mult= 4; + break; + case ShowPieMode.CPIE_BOT_LEFT: + this.first_slice_angle= -PI/2; + mult= 4; + break; + case ShowPieMode.CPIE_BOT_RIGHT: + this.first_slice_angle= PI; + mult= 4; + break; + + default: //ShowPieMode.FULL_PIE or invalid values + show_mode= ShowPieMode.FULL_PIE; + break; + } + this.pie_show_mode= show_mode; + //limit the number of visible slices + int maxview= this.max_visible_slices / mult; + //Number of visible slices + this.visible_slice_count= (int)fmin(slices.size, maxview); + //Number of slices in full pie (visible or not) + this.total_slice_count= this.visible_slice_count*mult; + if (mult > 1 && slices.size > 1) { + this.total_slice_count -= mult; } + + //keep a copy of the original value since page up/down change it + original_visible_slice_count= visible_slice_count; + + calc_key_navigation_pos(); + } + + private void calc_key_navigation_pos() { + //calc slices index for keyboard navigation + + int a= this.first_slice_idx; + int b= this.first_slice_idx + this.visible_slice_count/4; + int c= this.first_slice_idx + this.visible_slice_count/2; + int d= this.first_slice_idx + (this.visible_slice_count*3)/4; + int e= this.first_slice_idx + this.visible_slice_count -1; + switch(this.pie_show_mode) { + //half pie + case ShowPieMode.HPIE_LEFT: + this.up_slice_idx= a; + this.right_slice_idx= c; + this.down_slice_idx= e; + this.left_slice_idx= -1; //no left slice, go up instead + break; + case ShowPieMode.HPIE_RIGHT: + this.down_slice_idx= a; + this.left_slice_idx= c; + this.up_slice_idx= e; + this.right_slice_idx= -1; //no right slice, go down instead + break; + case ShowPieMode.HPIE_TOP: + this.right_slice_idx= a; + this.down_slice_idx= c; + this.left_slice_idx= e; + this.up_slice_idx= -1; //no up slice, go left instead + break; + case ShowPieMode.HPIE_BOTTOM: + this.left_slice_idx= a; + this.up_slice_idx= c; + this.right_slice_idx= e; + this.down_slice_idx= -1; //no down slice, go right instead + break; + + //cuarter pie + case ShowPieMode.CPIE_TOP_LEFT: + this.right_slice_idx= a; + this.down_slice_idx= e; + this.up_slice_idx= -1; //no up slice, go right instead + this.left_slice_idx= -1; //no left slice, go down instead + break; + case ShowPieMode.CPIE_TOP_RIGHT: + this.down_slice_idx= a; + this.left_slice_idx= e; + this.up_slice_idx= -1; //no up slice, go left instead + this.right_slice_idx= -1; //no righ slice, go down instead + break; + case ShowPieMode.CPIE_BOT_LEFT: + this.up_slice_idx= a; + this.right_slice_idx= e; + this.down_slice_idx= -1; //no down slice, go right instead + this.left_slice_idx= -1; //no left slice, go up instead + break; + case ShowPieMode.CPIE_BOT_RIGHT: + this.left_slice_idx= a; + this.up_slice_idx= e; + this.down_slice_idx= -1; //no down slice, go left instead + this.right_slice_idx= -1; //no right slice, go up instead + break; + + default: //ShowPieMode.FULL_PIE or invalid values + this.right_slice_idx= a; + this.down_slice_idx= b; + this.left_slice_idx= c; + this.up_slice_idx= d; + break; + } + } + + + ///////////////////////////////////////////////////////////////////// + /// keyboard navigation helper + /// move current position one slice towards the given extreme + ///////////////////////////////////////////////////////////////////// + + private void move_active_slice(int extreme, int other_extreme ) { + int pos= this.active_slice; + + if (pos < 0 || pos == extreme) { + //no actual position or allready at the extreme + pos= extreme; //go to the extreme pos + + } else if (extreme == -1) { + //the extreme was eaten, just go away from the other_extreme + if (pos > other_extreme || other_extreme == 0) { + if (pos < this.visible_slice_count+this.first_slice_idx-1) + pos++; + } else if (pos > this.first_slice_idx) + pos--; + + } else if (other_extreme == -1) { + //the other_extreme was eaten, just get closer to the extreme + if (pos < extreme) + pos++; + else if (pos > extreme) + pos--; + + } else if (pos == other_extreme) { + //both extremes are present + //jump quickly form one extreme to the other + pos= extreme; //go to the extreme pos + + } else { + //both extremes are present + //add or substract 1 to position in a circular manner + if (extreme > other_extreme) { + if (pos > other_extreme && pos < extreme) + //other_extreme < pos < extreme + pos= pos+1; + else + pos= pos-1; + } else { + if (pos > extreme && pos < other_extreme) + //extreme < pos < other_extreme + pos= pos-1; + else + pos= pos+1; + } + + if (pos < this.first_slice_idx) + pos= this.visible_slice_count-1+this.first_slice_idx; + + if (pos >= this.visible_slice_count+this.first_slice_idx) + pos= this.first_slice_idx; + } + + this.set_highlighted_slice(pos); + + this.key_board_control = true; } } diff --git a/src/renderers/pieWindow.vala b/src/renderers/pieWindow.vala index da346dd..4d5d35a 100644..100755 --- a/src/renderers/pieWindow.vala +++ b/src/renderers/pieWindow.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// using GLib.Math; @@ -45,6 +45,31 @@ public class PieWindow : Gtk.Window { public Image background { get; private set; default=null; } ///////////////////////////////////////////////////////////////////// + /// The background image position and size. + ///////////////////////////////////////////////////////////////////// + + private int back_x; + private int back_y; + private int back_sz_x; + private int back_sz_y; + + ///////////////////////////////////////////////////////////////////// + /// Some panels moves the window after it was realized. + /// This value set the maximum allowed panel height or width. + /// (how many pixels the window could be moved in every direction + /// from the screen borders towards the center) + ///////////////////////////////////////////////////////////////////// + + private int panel_sz = 64; + + ///////////////////////////////////////////////////////////////////// + /// This value set the maximum allowed mouse movement in pixels + /// from the capture to the show point in every direction. + ///////////////////////////////////////////////////////////////////// + + private int mouse_move = 30; + + ///////////////////////////////////////////////////////////////////// /// The owned renderer. ///////////////////////////////////////////////////////////////////// @@ -97,11 +122,12 @@ public class PieWindow : Gtk.Window { this.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK | Gdk.EventMask.KEY_RELEASE_MASK | Gdk.EventMask.KEY_PRESS_MASK | - Gdk.EventMask.POINTER_MOTION_MASK); + Gdk.EventMask.POINTER_MOTION_MASK | + Gdk.EventMask.SCROLL_MASK ); // activate on left click this.button_release_event.connect ((e) => { - if (e.button == 1 || this.renderer.turbo_mode) this.activate_slice(); + if (e.button == 1 || PieManager.get_is_turbo(this.renderer.id)) this.activate_slice(); return true; }); @@ -124,7 +150,7 @@ public class PieWindow : Gtk.Window { // activate on key release if turbo_mode is enabled this.key_release_event.connect((e) => { last_key = 0; - if (this.renderer.turbo_mode) + if (PieManager.get_is_turbo(this.renderer.id)) this.activate_slice(); else this.handle_key_release(e.keyval); @@ -142,6 +168,15 @@ public class PieWindow : Gtk.Window { FocusGrabber.grab(this.get_window(), true, true, false); }); + this.scroll_event.connect((e) => { + if (e.direction == Gdk.ScrollDirection.UP) + this.renderer.select_prevpage(); + + else if (e.direction == Gdk.ScrollDirection.DOWN) + this.renderer.select_nextpage(); + return true; + }); + // draw the pie on expose this.draw.connect(this.draw_window); } @@ -153,7 +188,7 @@ public class PieWindow : Gtk.Window { public void load_pie(Pie pie) { this.renderer.load_pie(pie); this.set_window_position(pie); - this.set_size_request(renderer.size, renderer.size); + this.set_size_request(renderer.size_w, renderer.size_h); } ///////////////////////////////////////////////////////////////////// @@ -162,13 +197,56 @@ public class PieWindow : Gtk.Window { public void open() { this.realize(); - // capture the background image if there is no compositing if (!this.has_compositing) { - int x, y, width, height; - this.get_position(out x, out y); - this.get_size(out width, out height); - this.background = new Image.capture_screen(x, y, width+1, height+1); + this.get_position(out this.back_x, out this.back_y); + this.get_size(out this.back_sz_x, out this.back_sz_y); + this.back_sz_x++; + this.back_sz_y++; + + int screenx= Gdk.Screen.width(); + int screeny= Gdk.Screen.height(); + + //allow some window movement from the screen borders + //(some panels moves the window after it was realized) + int dx = this.panel_sz - this.back_x; + if (dx > 0) + this.back_sz_x += dx; + dx = this.panel_sz - (screenx - this.back_x - this.back_sz_x +1); + if (dx > 0) { + this.back_sz_x += dx; + this.back_x -= dx; + } + + int dy = this.panel_sz - this.back_y; + if (dy > 0) + this.back_sz_y += dy; + dy = this.panel_sz - (screeny - this.back_y - this.back_sz_y +1); + if (dy > 0) { + this.back_sz_y += dy; + this.back_y -= dy; + } + + //also tolerate some mouse movement + this.back_x -= this.mouse_move; + this.back_sz_x += this.mouse_move*2; + this.back_y -= this.mouse_move; + this.back_sz_y += this.mouse_move*2; + + //make sure we don't go outside the screen + if (this.back_x < 0) { + this.back_sz_x += this.back_x; + this.back_x = 0; + } + if (this.back_y < 0) { + this.back_sz_y += this.back_y; + this.back_y = 0; + } + if (this.back_x + this.back_sz_x > screenx) + this.back_sz_x = screenx - this.back_x; + if (this.back_y + this.back_sz_y > screeny) + this.back_sz_y = screeny - this.back_y; + this.background = new Image.capture_screen(this.back_x, this.back_y, this.back_sz_x, this.back_sz_y); } // capture the input focus @@ -179,11 +257,20 @@ public class PieWindow : Gtk.Window { this.timer.start(); this.queue_draw(); + bool warp_pointer = PieManager.get_is_warp(this.renderer.id); + // the main draw loop GLib.Timeout.add((uint)(1000.0/Config.global.refresh_rate), () => { if (this.closed) return false; + if (warp_pointer) { + warp_pointer = false; + int x, y; + this.get_center_pos(out x, out y); + this.set_mouse_position(x, y); + } + this.queue_draw(); return this.visible; }); @@ -194,12 +281,46 @@ public class PieWindow : Gtk.Window { ///////////////////////////////////////////////////////////////////// public void get_center_pos(out int out_x, out int out_y) { - int x=0, y=0, width=0, height=0; + int x=0, y=0; //width=0, height=0; this.get_position(out x, out y); - this.get_size(out width, out height); + out_x = x + renderer.center_x; + out_y = y + renderer.center_y; + } - out_x = x + width/2; - out_y = y + height/2; + ///////////////////////////////////////////////////////////////////// + /// Gets the absolute position of the mouse pointer. + ///////////////////////////////////////////////////////////////////// + + private void get_mouse_position(out int mx, out int my) { + // get the mouse position + mx = 0; + my = 0; + Gdk.ModifierType mask; + + var display = Gdk.Display.get_default(); + var manager = display.get_device_manager(); + GLib.List<weak Gdk.Device?> list = manager.list_devices(Gdk.DeviceType.MASTER); + + foreach(var device in list) { + if (device.input_source != Gdk.InputSource.KEYBOARD) { + this.get_window().get_device_position(device, out mx, out my, out mask); + } + } + } + + ///////////////////////////////////////////////////////////////////// + /// Sets the absolute position of the mouse pointer. + ///////////////////////////////////////////////////////////////////// + + private void set_mouse_position(int mx, int my) { + var display = Gdk.Display.get_default(); + var manager = display.get_device_manager(); + GLib.List<weak Gdk.Device?> list = manager.list_devices(Gdk.DeviceType.MASTER); + foreach(var device in list) { + if (device.input_source != Gdk.InputSource.KEYBOARD) { + device.warp(Gdk.Screen.get_default(), mx, my); + } + } } ///////////////////////////////////////////////////////////////////// @@ -213,35 +334,34 @@ public class PieWindow : Gtk.Window { ctx.paint(); ctx.set_operator (Cairo.Operator.OVER); } else { + //correct the background position if the window was moved + //since the background image was captured + int x, y; + this.get_position(out x, out y); + int dx = this.back_x - x; + int dy = this.back_y - y; + ctx.save(); + ctx.translate(dx, dy); ctx.set_operator (Cairo.Operator.OVER); ctx.set_source_surface(background.surface, -1, -1); ctx.paint(); + ctx.restore(); } // align the context to the center of the PieWindow - ctx.translate(this.width_request*0.5, this.height_request*0.5); + ctx.translate(this.renderer.center_x, this.renderer.center_y); // get the mouse position - double mouse_x = 0.0, mouse_y = 0.0; - Gdk.ModifierType mask; - - var display = Gdk.Display.get_default(); - var manager = display.get_device_manager(); - GLib.List<weak Gdk.Device?> list = manager.list_devices(Gdk.DeviceType.MASTER); - - foreach(var device in list) { - if (device.input_source != Gdk.InputSource.KEYBOARD) { - this.get_window().get_device_position_double(device, out mouse_x, out mouse_y, out mask); - } - } + int mouse_x, mouse_y; + get_mouse_position( out mouse_x, out mouse_y ); // store the frame time double frame_time = this.timer.elapsed(); this.timer.reset(); // render the Pie - this.renderer.draw(frame_time, ctx, (int)(mouse_x - this.width_request*0.5), - (int)(mouse_y - this.height_request*0.5)); + this.renderer.draw(frame_time, ctx, mouse_x - (int)this.renderer.center_x, + mouse_y - (int)this.renderer.center_y); return true; } @@ -309,11 +429,15 @@ public class PieWindow : Gtk.Window { private void handle_key_press(uint key) { if (Gdk.keyval_name(key) == "Escape") this.cancel(); else if (Gdk.keyval_name(key) == "Return") this.activate_slice(); - else if (!this.renderer.turbo_mode) { + else if (!PieManager.get_is_turbo(this.renderer.id)) { if (Gdk.keyval_name(key) == "Up") this.renderer.select_up(); else if (Gdk.keyval_name(key) == "Down") this.renderer.select_down(); else if (Gdk.keyval_name(key) == "Left") this.renderer.select_left(); else if (Gdk.keyval_name(key) == "Right") this.renderer.select_right(); + else if (Gdk.keyval_name(key) == "Page_Down") this.renderer.select_nextpage(); + else if (Gdk.keyval_name(key) == "Page_Up") this.renderer.select_prevpage(); + else if (Gdk.keyval_name(key) == "Tab") this.renderer.select_nextpage(); + else if (Gdk.keyval_name(key) == "ISO_Left_Tab") this.renderer.select_prevpage(); else if (Gdk.keyval_name(key) == "Alt_L") this.renderer.show_hotkeys = true; else { int index = -1; @@ -342,7 +466,7 @@ public class PieWindow : Gtk.Window { ///////////////////////////////////////////////////////////////////// private void handle_key_release(uint key) { - if (!this.renderer.turbo_mode) { + if (!PieManager.get_is_turbo(this.renderer.id)) { if (Gdk.keyval_name(key) == "Alt_L") this.renderer.show_hotkeys = false; } } diff --git a/src/renderers/sliceRenderer.vala b/src/renderers/sliceRenderer.vala index 2ecf7c4..862e2a5 100644 --- a/src/renderers/sliceRenderer.vala +++ b/src/renderers/sliceRenderer.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// using GLib.Math; @@ -94,7 +94,14 @@ public class SliceRenderer : GLib.Object { public SliceRenderer(PieRenderer parent) { this.parent = parent; + this.reset_anim(); + } + ///////////////////////////////////////////////////////////////////// + /// Put all AnimatedValues in their initial values + ///////////////////////////////////////////////////////////////////// + + public void reset_anim() { this.fade = new AnimatedValue.linear(0.0, 0.0, Config.global.theme.transition_time); this.wobble = new AnimatedValue.linear(0.0, 0.0, Config.global.theme.transition_time); this.alpha = new AnimatedValue.linear(0.0, 1.0, Config.global.theme.fade_in_time); @@ -147,7 +154,7 @@ public class SliceRenderer : GLib.Object { } ///////////////////////////////////////////////////////////////////// - /// Activaes the Action of this slice. + /// Activates the Action of this slice. ///////////////////////////////////////////////////////////////////// public void activate() { @@ -189,7 +196,7 @@ public class SliceRenderer : GLib.Object { /// Draws all layers of the slice. ///////////////////////////////////////////////////////////////////// - public void draw(double frame_time, Cairo.Context ctx, double angle, double distance) { + public void draw(double frame_time, Cairo.Context ctx, double angle, int slice_track) { // update the AnimatedValues this.scale.update(frame_time); @@ -199,16 +206,23 @@ public class SliceRenderer : GLib.Object { this.fade_rotation.update(frame_time); this.wobble.update(frame_time); - double direction = 2.0 * PI * position/parent.slice_count() + this.fade_rotation.val; - double max_scale = 1.0/Config.global.theme.max_zoom; + double direction = 2.0 * PI * (position-parent.first_slice_idx)/parent.total_slice_count + + parent.first_slice_angle + this.fade_rotation.val; + double max_scale = 1.0/Config.global.theme.max_zoom; double diff = fabs(angle-direction); - if (diff > PI) - diff = 2 * PI - diff; + if (diff > 2 * PI) { + diff = diff - 2 * PI; + } + + if (diff > PI) { + diff = 2 * PI - diff; + } + - active = ((parent.active_slice >= 0) && (diff < PI/parent.slice_count())); + active = ((parent.active_slice >= 0) && (diff < PI/parent.total_slice_count)); - if (parent.active_slice >= 0) { + if (slice_track != 0) { double wobble = Config.global.theme.wobble*diff/PI*(1-diff/PI); if ((direction < angle && direction > angle - PI) || direction > PI+angle) { this.wobble.reset_target(-wobble, Config.global.theme.transition_time*0.5); @@ -228,7 +242,7 @@ public class SliceRenderer : GLib.Object { - max_scale = (parent.active_slice >= 0 ? max_scale : 1.0/Config.global.theme.max_zoom); + max_scale = (slice_track != 0 ? max_scale : 1.0/Config.global.theme.max_zoom); if (fabs(this.scale.end - max_scale) > Config.global.theme.max_zoom*0.005) this.scale.reset_target(max_scale, Config.global.theme.transition_time); @@ -240,9 +254,9 @@ public class SliceRenderer : GLib.Object { // increase radius if there are many slices in a pie if (atan((Config.global.theme.slice_radius+Config.global.theme.slice_gap) - /(radius/Config.global.theme.max_zoom)) > PI/parent.slice_count()) { + /(radius/Config.global.theme.max_zoom)) > PI/parent.total_slice_count) { radius = (Config.global.theme.slice_radius+Config.global.theme.slice_gap) - /tan(PI/parent.slice_count())*Config.global.theme.max_zoom; + /tan(PI/parent.total_slice_count)*Config.global.theme.max_zoom; } // transform the context diff --git a/src/themes/centerLayer.vala b/src/themes/centerLayer.vala index 3469fd0..59f37ed 100644 --- a/src/themes/centerLayer.vala +++ b/src/themes/centerLayer.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// This class representing a layer of the center of a pie. Each theme /// may have plenty of them. ///////////////////////////////////////////////////////////////////////// @@ -32,77 +32,77 @@ public class CenterLayer : GLib.Object { ///////////////////////////////////////////////////////////////////// public enum RotationMode {AUTO, TO_MOUSE, TO_ACTIVE} - + ///////////////////////////////////////////////////////////////////// /// Information on the contained image. ///////////////////////////////////////////////////////////////////// - + public Image image {get; private set;} public string image_file; - + ///////////////////////////////////////////////////////////////////// /// Properties for the active state of this layer. ///////////////////////////////////////////////////////////////////// - + public double active_scale {get; private set;} public double active_rotation_speed {get; private set;} public double active_alpha {get; private set;} public bool active_colorize {get; private set;} public RotationMode active_rotation_mode {get; private set;} - + ///////////////////////////////////////////////////////////////////// /// Properties for the inactive state of this layer. ///////////////////////////////////////////////////////////////////// - + public double inactive_scale {get; private set;} public double inactive_rotation_speed {get; private set;} public double inactive_alpha {get; private set;} public bool inactive_colorize {get; private set;} public RotationMode inactive_rotation_mode {get; private set;} - + ///////////////////////////////////////////////////////////////////// /// The current rotation of this layer. TODO: Remove this. ///////////////////////////////////////////////////////////////////// - + public double rotation {get; set;} - + ///////////////////////////////////////////////////////////////////// /// Helper variable for image loading. ///////////////////////////////////////////////////////////////////// - + private int center_radius; - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members of the layer. ///////////////////////////////////////////////////////////////////// - - public CenterLayer(string image_file, int center_radius, double active_scale, double active_rotation_speed, + + public CenterLayer(string image_file, int center_radius, double active_scale, double active_rotation_speed, double active_alpha, bool active_colorize, RotationMode active_rotation_mode, - double inactive_scale, double inactive_rotation_speed, + double inactive_scale, double inactive_rotation_speed, double inactive_alpha, bool inactive_colorize, RotationMode inactive_rotation_mode) { - + this.image_file = image_file; this.center_radius = center_radius; - + this.active_scale = active_scale; this.active_rotation_speed = active_rotation_speed; this.active_alpha = active_alpha; this.active_colorize = active_colorize; this.active_rotation_mode = active_rotation_mode; - + this.inactive_scale = inactive_scale; this.inactive_rotation_speed = inactive_rotation_speed; this.inactive_alpha = inactive_alpha; this.inactive_colorize = inactive_colorize; this.inactive_rotation_mode = inactive_rotation_mode; - + this.rotation = 0.0; } - + ///////////////////////////////////////////////////////////////////// /// Loads the contained image. ///////////////////////////////////////////////////////////////////// - + public void load_image() { this.image = new Image.from_file_at_size(image_file, 2*center_radius, 2*center_radius); } diff --git a/src/themes/sliceLayer.vala b/src/themes/sliceLayer.vala index 3c650c0..17ac3bb 100644 --- a/src/themes/sliceLayer.vala +++ b/src/themes/sliceLayer.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// This class representing a layer of a slice of a pie. Each theme may /// have plenty of them. ///////////////////////////////////////////////////////////////////////// @@ -26,35 +26,35 @@ public class SliceLayer : GLib.Object { public enum Type { FILE, ICON, CAPTION } public enum Visibility { ANY, WITH_CAPTION, WITHOUT_CAPTION } - + public Type layer_type { get; private set; } public Visibility visibility { get; private set; } - + ///////////////////////////////////////////////////////////////////// /// Information on the contained image. ///////////////////////////////////////////////////////////////////// - + public Image image {get; set;} - - + + ///////////////////////////////////////////////////////////////////// /// Properties of this layer. ///////////////////////////////////////////////////////////////////// - + public string icon_file {get; private set; default="";} public bool colorize {get; private set; default=false;} public int icon_size {get; private set; default=1;} - + public string font {get; private set; default="";} public int width {get; private set; default=0;} public int height {get; private set; default=0;} public int position {get; private set; default=0;} public Color color {get; private set; default=new Color();} - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members of the layer. ///////////////////////////////////////////////////////////////////// - + public SliceLayer.file(string icon_file, int icon_size, bool colorize, Visibility visibility) { this.layer_type = Type.FILE; this.icon_file = icon_file; @@ -62,7 +62,7 @@ public class SliceLayer : GLib.Object { this.icon_size = icon_size; this.visibility = visibility; } - + public SliceLayer.icon(string icon_file, int icon_size, bool colorize, Visibility visibility) { this.layer_type = Type.ICON; this.icon_file = icon_file; @@ -70,7 +70,7 @@ public class SliceLayer : GLib.Object { this.icon_size = icon_size; this.visibility = visibility; } - + public SliceLayer.caption(string font, int width, int height, int position, Color color, bool colorize, Visibility visibility) { this.layer_type = Type.CAPTION; this.font = font; @@ -81,15 +81,15 @@ public class SliceLayer : GLib.Object { this.visibility = visibility; this.colorize = colorize; } - + ///////////////////////////////////////////////////////////////////// /// Loads the contained image. ///////////////////////////////////////////////////////////////////// - + public void load_image() { this.image = null; - - if (this.icon_file == "" && this.layer_type == Type.ICON) + + if (this.icon_file == "" && this.layer_type == Type.ICON) this.image = new Image.empty(this.icon_size, this.icon_size, new Color.from_rgb(1, 1, 1)); else if (this.icon_file != "") this.image = new Image.from_file_at_size(this.icon_file, this.icon_size, this.icon_size); diff --git a/src/themes/theme.vala b/src/themes/theme.vala index 1956046..e068b9e 100644 --- a/src/themes/theme.vala +++ b/src/themes/theme.vala @@ -1,34 +1,34 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http:www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// using GLib.Math; namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A theme of Gnome-Pie. Can be loaded from XML-Files. ///////////////////////////////////////////////////////////////////////// public class Theme : GLib.Object { - + ///////////////////////////////////////////////////////////////////// /// Properties of a theme. ///////////////////////////////////////////////////////////////////// - + public string directory {get; private set; default="";} public string name {get; private set; default="";} public string description {get; private set; default="";} @@ -49,6 +49,7 @@ public class Theme : GLib.Object { public double center_radius {get; private set; default=90.0;} public double active_radius {get; private set; default=45.0;} public double slice_radius {get; private set; default=32.0;} + public double visible_slice_radius {get; private set; default=0.0;} public double slice_gap {get; private set; default=14.0;} public bool has_slice_captions {get; private set; default=false;} public bool caption {get; private set; default=false;} @@ -58,39 +59,39 @@ public class Theme : GLib.Object { public double caption_position {get; private set; default=0.0;} public Color caption_color {get; private set; default=new Color();} public Icon preview_icon {get; private set; default=new Icon("gnome-pie", 36);} - + public Gee.ArrayList<CenterLayer?> center_layers {get; private set;} public Gee.ArrayList<SliceLayer?> active_slice_layers {get; private set;} public Gee.ArrayList<SliceLayer?> inactive_slice_layers {get; private set;} - + ///////////////////////////////////////////////////////////////////// /// C'tor, creates a theme object for a given theme directory. This /// directory should contain a theme.xml file. ///////////////////////////////////////////////////////////////////// - + public Theme(string dir) { this.center_layers = new Gee.ArrayList<CenterLayer?>(); this.active_slice_layers = new Gee.ArrayList<SliceLayer?>(); this.inactive_slice_layers = new Gee.ArrayList<SliceLayer?>(); - + this.directory = dir; } - + ///////////////////////////////////////////////////////////////////// - /// Loads the theme from its directory. Images have to be loaded + /// Loads the theme from its directory. Images have to be loaded /// explicitly. ///////////////////////////////////////////////////////////////////// - + public bool load() { this.center_layers.clear(); this.active_slice_layers.clear(); this.inactive_slice_layers.clear(); - + this.preview_icon = new Icon(this.directory + "/preview.png", 36); - + Xml.Parser.init(); string path = this.directory + "/theme.xml"; - + Xml.Doc* themeXML = Xml.Parser.parse_file(path); if (themeXML == null) { warning("Failed to add theme: \"" + path + "\" not found!"); @@ -103,21 +104,21 @@ public class Theme : GLib.Object { warning("Failed to add theme: \"theme.xml\" is empty!"); return false; } - + this.parse_root(root); - + delete themeXML; Xml.Parser.cleanup(); - + this.radius *= max_zoom; - + return true; } - + ///////////////////////////////////////////////////////////////////// /// Loads all images of the theme. ///////////////////////////////////////////////////////////////////// - + public void load_images() { foreach (var layer in this.center_layers) layer.load_image(); @@ -126,17 +127,17 @@ public class Theme : GLib.Object { foreach (var layer in this.inactive_slice_layers) layer.load_image(); } - + ///////////////////////////////////////////////////////////////////// /// The following methods parse specific parts of the theme file. /// Nothing special here, just some boring code. ///////////////////////////////////////////////////////////////////// - + private void parse_root(Xml.Node* root) { for (Xml.Attr* attribute = root->properties; attribute != null; attribute = attribute->next) { string attr_name = attribute->name.down(); string attr_content = attribute->children->content; - + switch (attr_name) { case "name": name = attr_content; @@ -161,16 +162,16 @@ public class Theme : GLib.Object { } } } - + ///////////////////////////////////////////////////////////////////// /// Parses a <pie> element from the theme.xml file. ///////////////////////////////////////////////////////////////////// - + private void parse_pie(Xml.Node* pie) { for (Xml.Attr* attribute = pie->properties; attribute != null; attribute = attribute->next) { string attr_name = attribute->name.down(); string attr_content = attribute->children->content; - + switch (attr_name) { case "radius": radius = double.parse(attr_content) * Config.global.global_scale; @@ -234,16 +235,16 @@ public class Theme : GLib.Object { } } } - + ///////////////////////////////////////////////////////////////////// /// Parses a <center> element from the theme.xml file. ///////////////////////////////////////////////////////////////////// - + private void parse_center(Xml.Node* center) { for (Xml.Attr* attribute = center->properties; attribute != null; attribute = attribute->next) { string attr_name = attribute->name.down(); string attr_content = attribute->children->content; - + switch (attr_name) { case "radius": center_radius = double.parse(attr_content) * Config.global.global_scale; @@ -259,7 +260,7 @@ public class Theme : GLib.Object { for (Xml.Node* node = center->children; node != null; node = node->next) { if (node->type == Xml.ElementType.ELEMENT_NODE) { string element_name = node->name.down(); - + if (element_name == "center_layer") { parse_center_layer(node); } else { @@ -268,19 +269,20 @@ public class Theme : GLib.Object { } } } - + ///////////////////////////////////////////////////////////////////// /// Parses a <slices> element from the theme.xml file. ///////////////////////////////////////////////////////////////////// - + private void parse_slices(Xml.Node* slices) { for (Xml.Attr* attribute = slices->properties; attribute != null; attribute = attribute->next) { string attr_name = attribute->name.down(); string attr_content = attribute->children->content; - + switch (attr_name) { case "radius": slice_radius = double.parse(attr_content) * Config.global.global_scale; + visible_slice_radius = double.parse(attr_content) * Config.global.global_scale; break; case "mingap": slice_gap = double.parse(attr_content) * Config.global.global_scale; @@ -293,7 +295,7 @@ public class Theme : GLib.Object { for (Xml.Node* node = slices->children; node != null; node = node->next) { if (node->type == Xml.ElementType.ELEMENT_NODE) { string element_name = node->name.down(); - + if (element_name == "activeslice" || element_name == "inactiveslice") { parse_slice_layers(node); } else { @@ -302,11 +304,11 @@ public class Theme : GLib.Object { } } } - + ///////////////////////////////////////////////////////////////////// /// Parses a <center_layer> element from the theme.xml file. ///////////////////////////////////////////////////////////////////// - + private void parse_center_layer(Xml.Node* layer) { string file = ""; @@ -320,11 +322,11 @@ public class Theme : GLib.Object { bool inactive_colorize = false; CenterLayer.RotationMode active_rotation_mode = CenterLayer.RotationMode.AUTO; CenterLayer.RotationMode inactive_rotation_mode = CenterLayer.RotationMode.AUTO; - + for (Xml.Attr* attribute = layer->properties; attribute != null; attribute = attribute->next) { string attr_name = attribute->name.down(); string attr_content = attribute->children->content; - + switch (attr_name) { case "file": file = attr_content; @@ -342,10 +344,10 @@ public class Theme : GLib.Object { break; case "turn_to_active": active_rotation_mode = CenterLayer.RotationMode.TO_ACTIVE; - break; + break; case "turn_to_mouse": active_rotation_mode = CenterLayer.RotationMode.TO_MOUSE; - break; + break; default: warning("Invalid value \"" + attr_content + "\" for attribute \"" + attr_name + "\" in <center_layer> element!"); break; @@ -370,10 +372,10 @@ public class Theme : GLib.Object { break; case "turn_to_active": inactive_rotation_mode = CenterLayer.RotationMode.TO_ACTIVE; - break; + break; case "turn_to_mouse": inactive_rotation_mode = CenterLayer.RotationMode.TO_MOUSE; - break; + break; default: warning("Invalid value \"" + attr_content + "\" for attribute \"" + attr_name + "\" in <center_layer> element!"); break; @@ -392,19 +394,19 @@ public class Theme : GLib.Object { } double max_scale = GLib.Math.fmax(active_scale, inactive_scale); - center_layers.add(new CenterLayer(directory + "/" + file, (int)(center_radius*max_scale), active_scale/max_scale, active_rotation_speed, active_alpha, active_colorize, active_rotation_mode, + center_layers.add(new CenterLayer(directory + "/" + file, (int)(center_radius*max_scale), active_scale/max_scale, active_rotation_speed, active_alpha, active_colorize, active_rotation_mode, inactive_scale/max_scale, inactive_rotation_speed, inactive_alpha, inactive_colorize, inactive_rotation_mode)); } - + ///////////////////////////////////////////////////////////////////// /// Parses a <slice_layer> element from the theme.xml file. ///////////////////////////////////////////////////////////////////// - + private void parse_slice_layers(Xml.Node* slice) { for (Xml.Node* layer = slice->children; layer != null; layer = layer->next) { if (layer->type == Xml.ElementType.ELEMENT_NODE) { string element_name = layer->name.down(); - + if (element_name == "slice_layer") { string file = ""; double scale = 1.0; @@ -417,11 +419,11 @@ public class Theme : GLib.Object { int pos_x = 0; int pos_y = 0; Color slice_caption_color = new Color.from_rgb(1.0f, 1.0f, 1.0f); - + for (Xml.Attr* attribute = layer->properties; attribute != null; attribute = attribute->next) { string attr_name = attribute->name.down(); string attr_content = attribute->children->content; - + switch (attr_name) { case "file": file = attr_content; @@ -476,11 +478,12 @@ public class Theme : GLib.Object { break; } } - + if (file != "") file = directory + "/" + file; - + int size = 2*(int)(slice_radius*scale*max_zoom); + this.visible_slice_radius = Math.fmax(slice_radius*scale, this.visible_slice_radius); if (slice->name.down() == "activeslice") { if (type == SliceLayer.Type.ICON) active_slice_layers.add(new SliceLayer.icon(file, size, colorize, visibility)); @@ -502,16 +505,16 @@ public class Theme : GLib.Object { } } } - + ///////////////////////////////////////////////////////////////////// /// Parses a <caption> element from the theme.xml file. ///////////////////////////////////////////////////////////////////// - + private void parse_caption(Xml.Node* caption) { for (Xml.Attr* attribute = caption->properties; attribute != null; attribute = attribute->next) { string attr_name = attribute->name.down(); string attr_content = attribute->children->content; - + switch (attr_name) { case "font": caption_font = attr_content; diff --git a/src/utilities/animatedValue.vala b/src/utilities/animatedValue.vala index 7acc7a7..79be155 100644 --- a/src/utilities/animatedValue.vala +++ b/src/utilities/animatedValue.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// -namespace GnomePie { +namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A class which interpolates smoothly between to given values. /// Duration and interpolation mode can be specified. ///////////////////////////////////////////////////////////////////////// @@ -29,77 +29,77 @@ public class AnimatedValue : GLib.Object { ///////////////////////////////////////////////////////////////////// public enum Direction { IN, OUT, IN_OUT, OUT_IN } - + ///////////////////////////////////////////////////////////////////// /// Type of the interpolation, linear or cubic. ///////////////////////////////////////////////////////////////////// - + private enum Type { LINEAR, CUBIC } - + ///////////////////////////////////////////////////////////////////// /// Current value, interpolated. ///////////////////////////////////////////////////////////////////// - + public double val { get; private set; } - + ///////////////////////////////////////////////////////////////////// /// Starting value of the interpolation. ///////////////////////////////////////////////////////////////////// - + public double start { get; private set; default=0.0; } - + ///////////////////////////////////////////////////////////////////// /// Final value of the interpolation. ///////////////////////////////////////////////////////////////////// - - public double end { get; private set; default=0.0; } - + + public double end { get; private set; default=0.0; } + ///////////////////////////////////////////////////////////////////// /// The current state. In range 0 .. 1 ///////////////////////////////////////////////////////////////////// - + private double state = 0.0; - + ///////////////////////////////////////////////////////////////////// - /// Duration of the interpolation. Should be in the same unit as + /// Duration of the interpolation. Should be in the same unit as /// taken for the update() method. ///////////////////////////////////////////////////////////////////// - + private double duration = 0.0; - + ///////////////////////////////////////////////////////////////////// /// The amount of over-shooting of the cubicly interpolated value. ///////////////////////////////////////////////////////////////////// - + private double multiplier = 0.0; - + ///////////////////////////////////////////////////////////////////// /// Type of the interpolation, linear or cubic. ///////////////////////////////////////////////////////////////////// - + private Type type = Type.LINEAR; - + ///////////////////////////////////////////////////////////////////// /// The direction of the interpolation. ///////////////////////////////////////////////////////////////////// - + private Direction direction = Direction.IN; - + ///////////////////////////////////////////////////////////////////// /// Creates a new linearly interpolated value. ///////////////////////////////////////////////////////////////////// - + public AnimatedValue.linear(double start, double end, double duration) { this.val = start; this.start = start; this.end = end; this.duration = duration; } - + ///////////////////////////////////////////////////////////////////// /// Creates a new cubicly interpolated value. ///////////////////////////////////////////////////////////////////// - + public AnimatedValue.cubic(Direction direction, double start, double end, double duration, double multiplier = 0) { this.val = start; this.start = start; @@ -109,17 +109,17 @@ public class AnimatedValue : GLib.Object { this.type = Type.CUBIC; this.multiplier = multiplier; } - + ///////////////////////////////////////////////////////////////////// /// Resets the final value of the interpolation to a new value. The /// current state is taken for the beginning from now. ///////////////////////////////////////////////////////////////////// - + public void reset_target(double end, double duration) { this.end = end; this.duration = duration; this.start = this.val; - + if (duration == 0.0) { this.val = end; this.state = 1.0; @@ -127,16 +127,16 @@ public class AnimatedValue : GLib.Object { this.state = 0.0; } } - + ///////////////////////////////////////////////////////////////////// /// Updates the interpolated value according to it's type. ///////////////////////////////////////////////////////////////////// - + public void update(double time) { this.state += time/this.duration; - + if (this.state < 1) { - + switch (this.type) { case Type.LINEAR: this.val = update_linear(); @@ -158,36 +158,36 @@ public class AnimatedValue : GLib.Object { } break; } - + } else if (this.val != this.end) { this.val = this.end; - } + } } ///////////////////////////////////////////////////////////////////// - /// The following equations are based on Robert Penner's easing - /// equations. See (http://www.robertpenner.com/easing/) and their + /// The following equations are based on Robert Penner's easing + /// equations. See (http://www.robertpenner.com/easing/) and their /// adaption by Zeh Fernando, Nate Chatellier and Arthur Debert for /// the Tweener class. See (http://code.google.com/p/tweener/). ///////////////////////////////////////////////////////////////////// - + private double update_linear(double t = this.state, double s = this.start, double e = this.end) { return (s + t*(e - s)); } - + private double update_ease_in(double t = this.state, double s = this.start, double e = this.end) { return (s + (t*t*((multiplier+1)*t-multiplier))*(e - s)); } - + private double update_ease_out(double t = this.state, double s = this.start, double e = this.end) { return (s + ((t-1) * (t-1) * ((multiplier+1)*(t-1)+multiplier) + 1) * (e - s)); } - + private double update_ease_in_out(double t = this.state, double s = this.start, double e = this.end) { if (this.state < 0.5) return update_ease_in(t*2, s, e - (e-s)*0.5); else return update_ease_out(t*2-1, s + (e-s)*0.5, e); } - + private double update_ease_out_in(double t = this.state, double s = this.start, double e = this.end) { if (this.state < 0.5) return update_ease_out(t*2, s, e - (e-s)*0.5); else return update_ease_in(t*2-1, s + (e-s)*0.5, e); diff --git a/src/utilities/bindingManager.vala b/src/utilities/bindingManager.vala index 0c74ece..e90fa74 100644 --- a/src/utilities/bindingManager.vala +++ b/src/utilities/bindingManager.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -98,7 +98,7 @@ public class BindingManager : GLib.Object { ///////////////////////////////////////////////////////////////////// public void bind(Trigger trigger, string id) { - if(trigger.key_code != 0) { + if (trigger.key_code != 0) { X.Display display = Gdk.X11.get_default_xdisplay(); X.ID xid = Gdk.X11.get_default_root_xwindow(); @@ -116,10 +116,13 @@ public class BindingManager : GLib.Object { } Gdk.flush(); - Keybinding binding = new Keybinding(trigger, id); bindings.add(binding); display.flush(); + } else { + //no key_code: just add the bindind to the list to save optional trigger parameters + Keybinding binding = new Keybinding(trigger, id); + bindings.add(binding); } } @@ -128,6 +131,17 @@ public class BindingManager : GLib.Object { ///////////////////////////////////////////////////////////////////// public void unbind(string id) { + foreach (var binding in bindings) { + if (id == binding.id) { + if (binding.trigger.key_code == 0) { + //no key_code: just remove the bindind from the list + bindings.remove(binding); + return; + } + break; + } + } + X.Display display = Gdk.X11.get_default_xdisplay(); X.ID xid = Gdk.X11.get_default_root_xwindow(); @@ -206,14 +220,59 @@ public class BindingManager : GLib.Object { } ///////////////////////////////////////////////////////////////////// + /// Returns whether the pie with the given ID is in warp mode. + ///////////////////////////////////////////////////////////////////// + + public bool get_is_warp(string id) { + foreach (var binding in bindings) { + if (binding.id == id) { + return binding.trigger.warp; + } + } + + return false; + } + + ///////////////////////////////////////////////////////////////////// + /// Returns whether the pie with the given ID is auto shaped + ///////////////////////////////////////////////////////////////////// + + public bool get_is_auto_shape(string id) { + foreach (var binding in bindings) { + if (binding.id == id) { + return (binding.trigger.shape == 0); + } + } + + return false; + } + + ///////////////////////////////////////////////////////////////////// + /// Returns the prefered pie shape number + ///////////////////////////////////////////////////////////////////// + + public int get_shape_number(string id) { + foreach (var binding in bindings) { + if (binding.id == id) { + if (binding.trigger.shape == 0) + break; //return default if auto-shaped + return binding.trigger.shape; //use selected shape + } + } + + return 5; //default= full pie + } + + + ///////////////////////////////////////////////////////////////////// /// Returns the name ID of the Pie bound to the given Trigger. /// Returns "" if there is nothing bound to this trigger. ///////////////////////////////////////////////////////////////////// public string get_assigned_id(Trigger trigger) { foreach (var binding in bindings) { - var first = binding.trigger.name.replace("[turbo]", "").replace("[delayed]", ""); - var second = trigger.name.replace("[turbo]", "").replace("[delayed]", ""); + var first = Trigger.remove_optional(binding.trigger.name); + var second = Trigger.remove_optional(trigger.name); if (first == second) { return binding.id; } @@ -276,48 +335,52 @@ public class BindingManager : GLib.Object { ///////////////////////////////////////////////////////////////////// private void activate_delayed(Keybinding? binding , X.Event event) { - // increase event count, so any waiting event will realize that - // something happened in the meantime + // increase event count, so any waiting event will realize that + // something happened in the meantime var current_count = ++this.delayed_count; if (binding == null && this.delayed_event != null) { - // if the trigger is released and an event is currently waiting - // simulate that the trigger has been pressed without any inter- - // ference of Gnome-Pie - X.Display display = Gdk.X11.get_default_xdisplay(); + // if the trigger is released and an event is currently waiting + // simulate that the trigger has been pressed without any inter- + // ference of Gnome-Pie + X.Display display = Gdk.X11.get_default_xdisplay(); - // unbind the trigger, else we'll capture that event again ;) - unbind(delayed_binding.id); + // unbind the trigger, else we'll capture that event again ;) + unbind(delayed_binding.id); - if (this.delayed_binding.trigger.with_mouse) { - // simulate mouse click - X.Test.fake_button_event(display, this.delayed_event.xbutton.button, true, 0); - display.flush(); + if (this.delayed_binding.trigger.with_mouse) { + // simulate mouse click + X.Test.fake_button_event(display, this.delayed_event.xbutton.button, true, 0); + display.flush(); - X.Test.fake_button_event(display, this.delayed_event.xbutton.button, false, 0); - display.flush(); + X.Test.fake_button_event(display, this.delayed_event.xbutton.button, false, 0); + display.flush(); - } else { - // simulate key press - X.Test.fake_key_event(display, this.delayed_event.xkey.keycode, true, 0); - display.flush(); + } else { + // simulate key press + X.Test.fake_key_event(display, this.delayed_event.xkey.keycode, true, 0); + display.flush(); - X.Test.fake_key_event(display, this.delayed_event.xkey.keycode, false, 0); - display.flush(); - } + X.Test.fake_key_event(display, this.delayed_event.xkey.keycode, false, 0); + display.flush(); + } // bind it again bind(delayed_binding.trigger, delayed_binding.id); + + this.delayed_binding = null; + this.delayed_event = null; + } else if (binding != null) { - // if the trigger has been pressed, store it and wait for any interuption - // within the next 300 milliseconds + // if the trigger has been pressed, store it and wait for any interuption + // within the next 300 milliseconds this.delayed_event = event; this.delayed_binding = binding; Timeout.add(300, () => { - // if nothing has been pressed in the meantime + // if nothing has been pressed in the meantime if (current_count == this.delayed_count) { - this.delayed_binding = null; + this.delayed_binding = null; this.delayed_event = null; on_press(binding.id); } diff --git a/src/utilities/color.vala b/src/utilities/color.vala index bf60e3f..6bb9d06 100644 --- a/src/utilities/color.vala +++ b/src/utilities/color.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// using GLib.Math; @@ -258,10 +258,10 @@ public class Color: GLib.Object { private void setHSV(float hue, float saturation, float val) { if(saturation == 0) { - r = val; - g = val; - b = val; - return; + r = val; + g = val; + b = val; + return; } hue = fmodf(hue, 360); hue /= 60; @@ -269,36 +269,36 @@ public class Color: GLib.Object { float f = hue - i; switch(i) { - case 0: - r = val; - g = val * (1.0f - saturation * (1.0f - f)); - b = val * (1.0f - saturation); - break; - case 1: - r = val * (1.0f - saturation * f); - g = val; - b = val * (1.0f - saturation); - break; - case 2: - r = val * (1.0f - saturation); - g = val; - b = val * (1.0f - saturation * (1.0f - f)); - break; - case 3: - r = val * (1.0f - saturation); - g = val * (1.0f - saturation * f); - b = val; - break; - case 4: - r = val * (1.0f - saturation * (1.0f - f)); - g = val * (1.0f - saturation); - b = val; - break; - default: - r = val; - g = val * (1.0f - saturation); - b = val * (1.0f - saturation * f); - break; + case 0: + r = val; + g = val * (1.0f - saturation * (1.0f - f)); + b = val * (1.0f - saturation); + break; + case 1: + r = val * (1.0f - saturation * f); + g = val; + b = val * (1.0f - saturation); + break; + case 2: + r = val * (1.0f - saturation); + g = val; + b = val * (1.0f - saturation * (1.0f - f)); + break; + case 3: + r = val * (1.0f - saturation); + g = val * (1.0f - saturation * f); + b = val; + break; + case 4: + r = val * (1.0f - saturation * (1.0f - f)); + g = val * (1.0f - saturation); + b = val; + break; + default: + r = val; + g = val * (1.0f - saturation); + b = val * (1.0f - saturation * f); + break; } } } diff --git a/src/utilities/config.vala b/src/utilities/config.vala index 2ec2788..abb8b23 100644 --- a/src/utilities/config.vala +++ b/src/utilities/config.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -54,7 +54,8 @@ public class Config : GLib.Object { public Theme theme { get; set; } public double refresh_rate { get; set; default = 60.0; } public double global_scale { get; set; default = 1.0; } - public int activation_range { get; set; default = 300; } + public int activation_range { get; set; default = 200; } + public int max_visible_slices { get; set; default = 24; } public bool show_indicator { get; set; default = true; } public bool show_captions { get; set; default = true; } public bool auto_start { get; set; default = false; } @@ -73,6 +74,7 @@ public class Config : GLib.Object { writer.write_attribute("refresh_rate", refresh_rate.to_string()); writer.write_attribute("global_scale", global_scale.to_string()); writer.write_attribute("activation_range", activation_range.to_string()); + writer.write_attribute("max_visible_slices", max_visible_slices.to_string()); writer.write_attribute("show_indicator", show_indicator ? "true" : "false"); writer.write_attribute("show_captions", show_captions ? "true" : "false"); writer.write_attribute("showed_news", showed_news.to_string()); @@ -117,7 +119,11 @@ public class Config : GLib.Object { break; case "activation_range": activation_range = int.parse(attr_content); - activation_range.clamp(100, 2000); + activation_range.clamp(0, 2000); + break; + case "max_visible_slices": + max_visible_slices = int.parse(attr_content); + max_visible_slices.clamp(10, 2000); break; case "show_indicator": show_indicator = bool.parse(attr_content); @@ -166,10 +172,10 @@ public class Config : GLib.Object { // load global themes var d = Dir.open(Paths.global_themes); while ((name = d.read_name()) != null) { - var theme = new Theme(Paths.global_themes + "/" + name); + var theme = new Theme(Paths.global_themes + "/" + name); - if (theme.load()) - themes.add(theme); + if (theme.load()) + themes.add(theme); } // load local themes diff --git a/src/utilities/focusGrabber.vala b/src/utilities/focusGrabber.vala index b551def..baa5fed 100644 --- a/src/utilities/focusGrabber.vala +++ b/src/utilities/focusGrabber.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/utilities/key.vala b/src/utilities/key.vala index af6e86a..7cf425f 100644 --- a/src/utilities/key.vala +++ b/src/utilities/key.vala @@ -1,24 +1,24 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// -/// A class which represents a key stroke. It can be used to "press" +///////////////////////////////////////////////////////////////////////// +/// A class which represents a key stroke. It can be used to "press" /// the associated keys. ///////////////////////////////////////////////////////////////////////// @@ -26,7 +26,7 @@ public class Key : GLib.Object { ///////////////////////////////////////////////////////////////////// /// Some static members, which are often used by this class. - ///////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////////// private static X.Display display; @@ -40,62 +40,62 @@ public class Key : GLib.Object { ///////////////////////////////////////////////////////////////////// public string label { get; private set; } - + ///////////////////////////////////////////////////////////////////// /// The accelerator of the Key. ///////////////////////////////////////////////////////////////////// - + public string accelerator { get; private set; } - + ///////////////////////////////////////////////////////////////////// /// Keycode and modifiers of this stroke. ///////////////////////////////////////////////////////////////////// - + private int key_code; private Gdk.ModifierType modifiers; - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members to defaults. ///////////////////////////////////////////////////////////////////// - + public Key() { this.accelerator = ""; this.modifiers = 0; this.key_code = 0; this.label = _("Not bound"); } - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members. ///////////////////////////////////////////////////////////////////// - + public Key.from_string(string stroke) { this.accelerator = stroke; - + uint keysym; Gtk.accelerator_parse(stroke, out keysym, out this.modifiers); this.key_code = display.keysym_to_keycode(keysym); this.label = Gtk.accelerator_get_label(keysym, this.modifiers); } - + ///////////////////////////////////////////////////////////////////// /// C'tor, initializes all members. ///////////////////////////////////////////////////////////////////// - + public Key.from_values(uint keysym, Gdk.ModifierType modifiers) { this.accelerator = Gtk.accelerator_name(keysym, modifiers); this.label = Gtk.accelerator_get_label(keysym, modifiers); this.key_code = display.keysym_to_keycode(keysym); this.modifiers = modifiers; } - + ///////////////////////////////////////////////////////////////////// /// Initializes static members. ///////////////////////////////////////////////////////////////////// - + static construct { display = new X.Display(); - + shift_code = display.keysym_to_keycode(Gdk.keyval_from_name("Shift_L")); ctrl_code = display.keysym_to_keycode(Gdk.keyval_from_name("Control_L")); alt_code = display.keysym_to_keycode(Gdk.keyval_from_name("Alt_L")); @@ -113,7 +113,7 @@ public class Key : GLib.Object { // release them and press the desired ones press_modifiers(current_modifiers, false); press_modifiers(this.modifiers, true); - + // send events to X display.flush(); @@ -128,28 +128,28 @@ public class Key : GLib.Object { // send events to X display.flush(); } - + ///////////////////////////////////////////////////////////////////// /// Helper method returning currently hold down modifier keys. ///////////////////////////////////////////////////////////////////// - + private Gdk.ModifierType get_modifiers() { Gdk.ModifierType modifiers; Gtk.get_current_event_state(out modifiers); return modifiers; } - + ///////////////////////////////////////////////////////////////////// /// Helper method which 'presses' the desired modifier keys. ///////////////////////////////////////////////////////////////////// - + private void press_modifiers(Gdk.ModifierType modifiers, bool down) { if ((modifiers & Gdk.ModifierType.CONTROL_MASK) > 0) X.Test.fake_key_event(display, ctrl_code, down, 0); if ((modifiers & Gdk.ModifierType.SHIFT_MASK) > 0) X.Test.fake_key_event(display, shift_code, down, 0); - + if ((modifiers & Gdk.ModifierType.MOD1_MASK) > 0) X.Test.fake_key_event(display, alt_code, down, 0); diff --git a/src/utilities/logger.vala b/src/utilities/logger.vala index 69310fc..7c66615 100644 --- a/src/utilities/logger.vala +++ b/src/utilities/logger.vala @@ -1,26 +1,26 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// A static class which beautifies the messages of the default logger. -/// Some of this code is inspired by plank's written by Robert Dyer. -/// Thanks a lot for this project! +/// Some of this code is inspired by plank's written by Robert Dyer. +/// Thanks a lot for this project! ///////////////////////////////////////////////////////////////////////// public class Logger { @@ -28,53 +28,53 @@ public class Logger { ///////////////////////////////////////////////////////////////////// /// If these are set to false, the according messages are not shown ///////////////////////////////////////////////////////////////////// - - private static const bool display_debug = true; - private static const bool display_warning = true; - private static const bool display_error = true; - private static const bool display_message = true; - + + private static const bool display_debug = true; + private static const bool display_warning = true; + private static const bool display_error = true; + private static const bool display_message = true; + ///////////////////////////////////////////////////////////////////// /// If these are set to false, the according messages are not logged ///////////////////////////////////////////////////////////////////// - - private static const bool log_debug = false; - private static const bool log_warning = true; - private static const bool log_error = true; - private static const bool log_message = true; - + + private static const bool log_debug = false; + private static const bool log_warning = true; + private static const bool log_error = true; + private static const bool log_message = true; + ///////////////////////////////////////////////////////////////////// /// If true, a time stamp is shown in each message. ///////////////////////////////////////////////////////////////////// - - private static const bool display_time = false; - private static const bool log_time = true; - + + private static const bool display_time = false; + private static const bool log_time = true; + ///////////////////////////////////////////////////////////////////// /// If true, the origin of the message is shown. In form file:line ///////////////////////////////////////////////////////////////////// - - private static const bool display_file = false; - private static const bool log_file = false; - + + private static const bool display_file = false; + private static const bool log_file = false; + ///////////////////////////////////////////////////////////////////// /// A regex, used to format the standard message. ///////////////////////////////////////////////////////////////////// - + private static Regex regex = null; - + ///////////////////////////////////////////////////////////////////// /// Limit log and statistics size to roughly 1 MB. ///////////////////////////////////////////////////////////////////// - + private static const int max_log_length = 1000000; - + private static int log_length; - + ///////////////////////////////////////////////////////////////////// /// Possible terminal colors. ///////////////////////////////////////////////////////////////////// - + private enum Color { BLACK, RED, @@ -85,186 +85,186 @@ public class Logger { TURQUOISE, WHITE } - + ///////////////////////////////////////////////////////////////////// /// Creates the regex and binds the handler. ///////////////////////////////////////////////////////////////////// - + public static void init() { log_length = -1; - + try { - regex = new Regex("""(.*)\.vala(:\d+): (.*)"""); - } catch {} - + regex = new Regex("""(.*)\.vala(:\d+): (.*)"""); + } catch {} + GLib.Log.set_handler(null, GLib.LogLevelFlags.LEVEL_MASK, log_func); } - + ///////////////////////////////////////////////////////////////////// /// Appends a line to the log file ///////////////////////////////////////////////////////////////////// - + private static void write_log_line(string line) { var log = GLib.FileStream.open(Paths.log, "a"); - + if (log != null) { - if (log_length == -1) + if (log_length == -1) log_length = (int)log.tell(); - + log.puts(line); log_length += line.length; } - + if (log_length > max_log_length) { string content = ""; - + try { GLib.FileUtils.get_contents(Paths.log, out content); - int split_index = content.index_of_char('\n', log_length - (int)(max_log_length*0.9)); + int split_index = content.index_of_char('\n', log_length - (int)(max_log_length*0.9)); GLib.FileUtils.set_contents(Paths.log, content.substring(split_index+1)); - + log_length -= (split_index+1); } catch (GLib.FileError e) {} } } - + ///////////////////////////////////////////////////////////////////// /// Displays a message. ///////////////////////////////////////////////////////////////////// - + private static void message(string message, string message_log) { if (display_message) { stdout.printf(set_color(Color.GREEN, false) + "[" + (display_time ? get_time() + " " : "") + "MESSAGE]" + message); } - + if (log_message) { write_log_line("[" + (log_time ? get_time() + " " : "") + "MESSAGE]" + message_log); } } - + ///////////////////////////////////////////////////////////////////// /// Displays a Debug message. ///////////////////////////////////////////////////////////////////// - + private static void debug(string message, string message_log) { if (display_debug) { stdout.printf(set_color(Color.BLUE, false) + "[" + (display_time ? get_time() + " " : "") + " DEBUG ]" + message); } - + if (log_debug) { write_log_line("[" + (log_time ? get_time() + " " : "") + " DEBUG ]" + message_log); } } - + ///////////////////////////////////////////////////////////////////// /// Displays a Warning message. ///////////////////////////////////////////////////////////////////// - + private static void warning(string message, string message_log) { if (display_warning) { stdout.printf(set_color(Color.YELLOW, false) + "[" + (display_time ? get_time() + " " : "") + "WARNING]" + message); } - + if (log_warning) { write_log_line("[" + (log_time ? get_time() + " " : "") + "WARNING]" + message_log); } } - + ///////////////////////////////////////////////////////////////////// /// Displays a Error message. ///////////////////////////////////////////////////////////////////// - + private static void error(string message, string message_log) { if (display_error) { stdout.printf(set_color(Color.RED, false) + "[" + (display_time ? get_time() + " " : "") + " ERROR ]" + message); } - + if (log_error) { write_log_line("[" + (log_time ? get_time() + " " : "") + " ERROR ]" + message_log); } } - + ///////////////////////////////////////////////////////////////////// /// Helper method which resets the terminal color. ///////////////////////////////////////////////////////////////////// - + private static string reset_color() { - return "\x001b[0m"; - } - - ///////////////////////////////////////////////////////////////////// - /// Helper method which sets the terminal color. - ///////////////////////////////////////////////////////////////////// - - private static string set_color(Color color, bool bold) { - if (bold) return "\x001b[1;%dm".printf((int)color + 30); - else return "\x001b[0;%dm".printf((int)color + 30); - } - - ///////////////////////////////////////////////////////////////////// - /// Returns the current time in hh:mm:ss:mmmmmm - ///////////////////////////////////////////////////////////////////// - - private static string get_time() { + return "\x001b[0m"; + } + + ///////////////////////////////////////////////////////////////////// + /// Helper method which sets the terminal color. + ///////////////////////////////////////////////////////////////////// + + private static string set_color(Color color, bool bold) { + if (bold) return "\x001b[1;%dm".printf((int)color + 30); + else return "\x001b[0;%dm".printf((int)color + 30); + } + + ///////////////////////////////////////////////////////////////////// + /// Returns the current time in hh:mm:ss:mmmmmm + ///////////////////////////////////////////////////////////////////// + + private static string get_time() { var now = new DateTime.now_local(); - return "%.4d:%.2d:%.2d:%.2d:%.2d:%.2d:%.6d".printf(now.get_year(), now.get_month(), now.get_day_of_month(), now.get_hour(), now.get_minute(), now.get_second(), now.get_microsecond()); - } - - ///////////////////////////////////////////////////////////////////// + return "%.4d:%.2d:%.2d:%.2d:%.2d:%.2d:%.6d".printf(now.get_year(), now.get_month(), now.get_day_of_month(), now.get_hour(), now.get_minute(), now.get_second(), now.get_microsecond()); + } + + ///////////////////////////////////////////////////////////////////// /// Helper method to format the message. ///////////////////////////////////////////////////////////////////// - - private static string create_message(string message) { - if (display_file && regex != null && regex.match(message)) { - var parts = regex.split(message); - return " [%s%s]%s %s\n".printf(parts[1], parts[2], reset_color(), parts[3]); - } else if (regex != null && regex.match(message)) { - var parts = regex.split(message); - return "%s %s\n".printf(reset_color(), parts[3]); - } else { - return reset_color() + " " + message + "\n"; - } - } - - ///////////////////////////////////////////////////////////////////// + + private static string create_message(string message) { + if (display_file && regex != null && regex.match(message)) { + var parts = regex.split(message); + return " [%s%s]%s %s\n".printf(parts[1], parts[2], reset_color(), parts[3]); + } else if (regex != null && regex.match(message)) { + var parts = regex.split(message); + return "%s %s\n".printf(reset_color(), parts[3]); + } else { + return reset_color() + " " + message + "\n"; + } + } + + ///////////////////////////////////////////////////////////////////// /// Helper method to format the message for logging. ///////////////////////////////////////////////////////////////////// - - private static string create_log_message(string message) { - if (log_file && regex != null && regex.match(message)) { - var parts = regex.split(message); - return " [%s%s] %s\n".printf(parts[1], parts[2], parts[3]); - } else if (regex != null && regex.match(message)) { - var parts = regex.split(message); - return " %s\n".printf(parts[3]); - } else { - return " " + message + "\n"; - } - } - - ///////////////////////////////////////////////////////////////////// - /// The handler function. - ///////////////////////////////////////////////////////////////////// - - private static void log_func(string? d, LogLevelFlags flags, string text) { - switch (flags) { - case LogLevelFlags.LEVEL_ERROR: - case LogLevelFlags.LEVEL_CRITICAL: - error(create_message(text), create_log_message(text)); - break; - case LogLevelFlags.LEVEL_INFO: - case LogLevelFlags.LEVEL_MESSAGE: - message(create_message(text), create_log_message(text)); - break; - case LogLevelFlags.LEVEL_DEBUG: - debug(create_message(text), create_log_message(text)); - break; - case LogLevelFlags.LEVEL_WARNING: - default: - warning(create_message(text), create_log_message(text)); - break; - } - } + + private static string create_log_message(string message) { + if (log_file && regex != null && regex.match(message)) { + var parts = regex.split(message); + return " [%s%s] %s\n".printf(parts[1], parts[2], parts[3]); + } else if (regex != null && regex.match(message)) { + var parts = regex.split(message); + return " %s\n".printf(parts[3]); + } else { + return " " + message + "\n"; + } + } + + ///////////////////////////////////////////////////////////////////// + /// The handler function. + ///////////////////////////////////////////////////////////////////// + + private static void log_func(string? d, LogLevelFlags flags, string text) { + switch (flags) { + case LogLevelFlags.LEVEL_ERROR: + case LogLevelFlags.LEVEL_CRITICAL: + error(create_message(text), create_log_message(text)); + break; + case LogLevelFlags.LEVEL_INFO: + case LogLevelFlags.LEVEL_MESSAGE: + message(create_message(text), create_log_message(text)); + break; + case LogLevelFlags.LEVEL_DEBUG: + debug(create_message(text), create_log_message(text)); + break; + case LogLevelFlags.LEVEL_WARNING: + default: + warning(create_message(text), create_log_message(text)); + break; + } + } } } diff --git a/src/utilities/paths.vala b/src/utilities/paths.vala index 5b39c45..61111e3 100644 --- a/src/utilities/paths.vala +++ b/src/utilities/paths.vala @@ -1,19 +1,19 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/utilities/trigger.vala b/src/utilities/trigger.vala index 854cbb4..fbd74f8 100644 --- a/src/utilities/trigger.vala +++ b/src/utilities/trigger.vala @@ -1,23 +1,23 @@ -/* -Copyright (c) 2011 by Simon Schneegans - -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 3 of the License, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -more details. - -You should have received a copy of the GNU General Public License along with -this program. If not, see <http://www.gnu.org/licenses/>. -*/ +///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +///////////////////////////////////////////////////////////////////////// namespace GnomePie { -///////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////// /// This class represents a hotkey, used to open pies. It supports any /// combination of modifier keys with keyboard and mouse buttons. ///////////////////////////////////////////////////////////////////////// @@ -29,185 +29,253 @@ public class Trigger : GLib.Object { ///////////////////////////////////////////////////////////////////// public string label { get; private set; default=""; } - + ///////////////////////////////////////////////////////////////////// /// Returns a human-readable version of this Trigger. Small /// identifiers for turbo mode and delayed mode are added. ///////////////////////////////////////////////////////////////////// public string label_with_specials { get; private set; default=""; } - + ///////////////////////////////////////////////////////////////////// /// The Trigger string. Like [delayed]<Control>button3 ///////////////////////////////////////////////////////////////////// - + public string name { get; private set; default=""; } - + ///////////////////////////////////////////////////////////////////// /// The key code of the hotkey or the button number of the mouse. ///////////////////////////////////////////////////////////////////// - + public int key_code { get; private set; default=0; } - + ///////////////////////////////////////////////////////////////////// /// The keysym of the hotkey or the button number of the mouse. ///////////////////////////////////////////////////////////////////// - + public uint key_sym { get; private set; default=0; } - + ///////////////////////////////////////////////////////////////////// /// Modifier keys pressed for this hotkey. ///////////////////////////////////////////////////////////////////// - + public Gdk.ModifierType modifiers { get; private set; default=0; } - + ///////////////////////////////////////////////////////////////////// /// True if this hotkey involves the mouse. ///////////////////////////////////////////////////////////////////// - + public bool with_mouse { get; private set; default=false; } - + ///////////////////////////////////////////////////////////////////// /// True if the pie closes when the trigger hotkey is released. ///////////////////////////////////////////////////////////////////// - + public bool turbo { get; private set; default=false; } - + ///////////////////////////////////////////////////////////////////// /// True if the trigger should wait a short delay before being /// triggered. ///////////////////////////////////////////////////////////////////// - + public bool delayed { get; private set; default=false; } - + ///////////////////////////////////////////////////////////////////// /// True if the pie opens in the middle of the screen. ///////////////////////////////////////////////////////////////////// - + public bool centered { get; private set; default=false; } - + + ///////////////////////////////////////////////////////////////////// + /// True if the mouse pointer is warped to the pie's center. + ///////////////////////////////////////////////////////////////////// + + public bool warp { get; private set; default=false; } + + ///////////////////////////////////////////////////////////////////// + /// Returns the current selected "radio-button" shape: 0= automatic + /// 5= full pie; 1,3,7,8= quarters; 2,4,6,8=halves + /// 1 | 4 | 7 + /// 2 | 5 | 8 + /// 3 | 6 | 9 + ///////////////////////////////////////////////////////////////////// + + public int shape { get; private set; default=5; } + ///////////////////////////////////////////////////////////////////// /// C'tor, creates a new, "unbound" Trigger. ///////////////////////////////////////////////////////////////////// - + public Trigger() { this.set_unbound(); } - + ///////////////////////////////////////////////////////////////////// /// C'tor, creates a new Trigger from a given Trigger string. This is /// in this format: "[option(s)]<modifier(s)>button" where /// "<modifier>" is something like "<Alt>" or "<Control>", "button" /// something like "s", "F4" or "button0" and "[option]" is either - /// "[turbo]", "[centered]" or "["delayed"]". + /// "[turbo]", "[centered]", "[warp]", "["delayed"]" or "["shape#"]" ///////////////////////////////////////////////////////////////////// - + public Trigger.from_string(string trigger) { this.parse_string(trigger); } - + ///////////////////////////////////////////////////////////////////// /// C'tor, creates a new Trigger from the key values. ///////////////////////////////////////////////////////////////////// - - public Trigger.from_values(uint key_sym, Gdk.ModifierType modifiers, + + public Trigger.from_values(uint key_sym, Gdk.ModifierType modifiers, bool with_mouse, bool turbo, bool delayed, - bool centered ) { - + bool centered, bool warp, int shape ) { + string trigger = (turbo ? "[turbo]" : "") + (delayed ? "[delayed]" : "") - + (centered ? "[centered]" : ""); - + + (centered ? "[centered]" : "") + + (warp ? "[warp]" : "") + + (shape!=5 ? "[shape%d]".printf(shape) : ""); + if (with_mouse) { trigger += Gtk.accelerator_name(0, modifiers) + "button%u".printf(key_sym); } else { trigger += Gtk.accelerator_name(key_sym, modifiers); } - + this.parse_string(trigger); } - + ///////////////////////////////////////////////////////////////////// /// Parses a Trigger string. This is /// in this format: "[option(s)]<modifier(s)>button" where /// "<modifier>" is something like "<Alt>" or "<Control>", "button" /// something like "s", "F4" or "button0" and "[option]" is either - /// "[turbo]", "[centered]" or "["delayed"]". + /// "[turbo]", "[centered]", "[warp]", "["delayed"]" or "["shape#"]" ///////////////////////////////////////////////////////////////////// - + public void parse_string(string trigger) { if (this.is_valid(trigger)) { // copy string string check_string = trigger; - + this.name = check_string; - + this.turbo = check_string.contains("[turbo]"); this.delayed = check_string.contains("[delayed]"); this.centered = check_string.contains("[centered]"); - + this.warp = check_string.contains("[warp]"); + + this.shape= parse_shape( check_string ); + // remove optional arguments - check_string = check_string.replace("[turbo]", ""); - check_string = check_string.replace("[delayed]", ""); - check_string = check_string.replace("[centered]", ""); - + check_string = remove_optional(check_string); + int button = this.get_mouse_button(check_string); if (button > 0) { this.with_mouse = true; this.key_code = button; this.key_sym = button; - + Gtk.accelerator_parse(check_string, null, out this._modifiers); this.label = Gtk.accelerator_get_label(0, this.modifiers); - + string button_text = _("Button %i").printf(this.key_code); - + if (this.key_code == 1) button_text = _("LeftButton"); else if (this.key_code == 3) button_text = _("RightButton"); else if (this.key_code == 2) button_text = _("MiddleButton"); - + this.label += button_text; } else { - this.with_mouse = false; - - var display = new X.Display(); - - uint keysym = 0; - Gtk.accelerator_parse(check_string, out keysym, out this._modifiers); - this.key_code = display.keysym_to_keycode(keysym); - this.key_sym = keysym; - this.label = Gtk.accelerator_get_label(keysym, this.modifiers); + //empty triggers are ok now, they carry open options as well + if (check_string == "") { + this.label = _("Not bound"); + this.key_code = 0; + this.key_sym = 0; + this.modifiers = 0; + } else { + this.with_mouse = false; + + var display = new X.Display(); + + uint keysym = 0; + Gtk.accelerator_parse(check_string, out keysym, out this._modifiers); + this.key_code = display.keysym_to_keycode(keysym); + this.key_sym = keysym; + this.label = Gtk.accelerator_get_label(keysym, this.modifiers); + } } - + this.label_with_specials = GLib.Markup.escape_text(this.label); - - if (this.turbo && this.delayed && this.centered) - this.label_with_specials += (" <small><span weight='light'>[ " + _("Turbo") + " | " + _("Delayed") + " | " + _("Centered") + " ]</span></small>"); - else if (this.turbo && this.centered) - this.label_with_specials += (" <small><span weight='light'>[ " + _("Turbo") + " | " + _("Centered") + " ]</span></small>"); - else if (this.turbo && this.delayed) - this.label_with_specials += (" <small><span weight='light'>[ " + _("Turbo") + " | " + _("Delayed") + " ]</span></small>"); - else if (this.centered && this.delayed) - this.label_with_specials += (" <small><span weight='light'>[ " + _("Delayed") + " | " + _("Centered") + " ]</span></small>"); - else if (this.turbo) - this.label_with_specials += (" <small><span weight='light'>[ " + _("Turbo") + " ]</span></small>"); - else if (this.delayed) - this.label_with_specials += (" <small><span weight='light'>[ " + _("Delayed") + " ]</span></small>"); - else if (this.centered) - this.label_with_specials += (" <small><span weight='light'>[ " + _("Centered") + " ]</span></small>"); - + + string msg= ""; + if (this.turbo) { + msg= _("Turbo"); + } + if (this.delayed) { + if (msg == "") + msg= _("Delayed"); + else + msg += " | " + _("Delayed"); + } + if (this.centered) { + if (msg == "") + msg= _("Centered"); + else + msg += " | " + _("Centered"); + } + if (this.warp) { + if (msg == "") + msg= _("Warp"); + else + msg += " | " + _("Warp"); + } + if (this.shape == 0) { + if (msg == "") + msg= _("Auto-shaped"); + else + msg += " | " + _("Auto-shaped"); + } else if (this.shape == 1 || this.shape ==3 || this.shape == 7 || this.shape == 9) { + if (msg == "") + msg= _("Quarter pie"); + else + msg += " | " + _("Quarter pie"); + + } else if (this.shape == 2 || this.shape == 4 || this.shape == 6 || this.shape == 8) { + if (msg == "") + msg= _("Half pie"); + else + msg += " | " + _("Half pie"); + } + if (msg != "") + this.label_with_specials += (" <small><span weight='light'>[ " + msg + " ]</span></small>"); + } else { this.set_unbound(); } } - + + ///////////////////////////////////////////////////////////////////// + /// Extract shape number from trigger string + /// "[0]".."[9]" 0:auto 5:full pie (default) + /// 1,3,7,9=quarters 2,4,6,8= halves + ///////////////////////////////////////////////////////////////////// + + private int parse_shape(string trigger) { + int rs; + for( rs= 0; rs < 10; rs++ ) + if (trigger.contains("[shape%d]".printf(rs) )) + return rs; + return 5; //default= full pie + } + ///////////////////////////////////////////////////////////////////// /// Resets all member variables to their defaults. ///////////////////////////////////////////////////////////////////// - + private void set_unbound() { this.label = _("Not bound"); this.label_with_specials = _("Not bound"); @@ -217,53 +285,71 @@ public class Trigger : GLib.Object { this.modifiers = 0; this.turbo = false; this.delayed = false; + this.centered = false; + this.warp = false; + this.shape = 5; //full pie this.with_mouse = false; } - + + ///////////////////////////////////////////////////////////////////// + /// Remove optional arguments from the given string + /// "[turbo]", "[delayed]", "[warp]" "[centered]" and "[shape#]" + ///////////////////////////////////////////////////////////////////// + + public static string remove_optional(string trigger) { + string trg= trigger; + trg = trg.replace("[turbo]", ""); + trg = trg.replace("[delayed]", ""); + trg = trg.replace("[centered]", ""); + trg = trg.replace("[warp]", ""); + for (int rs= 0; rs < 10; rs++) + trg = trg.replace("[shape%d]".printf(rs), ""); + return trg; + } + ///////////////////////////////////////////////////////////////////// /// Returns true, if the trigger string is in a valid format. ///////////////////////////////////////////////////////////////////// - + private bool is_valid(string trigger) { - // copy string - string check_string = trigger; - // remove optional arguments - check_string = check_string.replace("[turbo]", ""); - check_string = check_string.replace("[delayed]", ""); - check_string = check_string.replace("[centered]", ""); - + string check_string = remove_optional(trigger); + if (this.get_mouse_button(check_string) > 0) { // it seems to be a valid mouse-trigger so replace button part, // with something accepted by gtk, and check it with gtk int button_index = check_string.index_of("button"); check_string = check_string.slice(0, button_index) + "a"; - } - + } + + //empty triggers are ok now, they carry open options as well + if (check_string == "") + return true; + // now it shouls be a normal gtk accelerator uint keysym = 0; Gdk.ModifierType modifiers = 0; Gtk.accelerator_parse(check_string, out keysym, out modifiers); if (keysym == 0) return false; - - return true; + + return true; } - + ///////////////////////////////////////////////////////////////////// - /// Returns the mouse button number of the given trigger string. + /// Returns the mouse button number of the given trigger string. /// Returns -1 if it is not a mouse trigger. ///////////////////////////////////////////////////////////////////// - + private int get_mouse_button(string trigger) { if (trigger.contains("button")) { // it seems to be a mouse-trigger so check the button part. int button_index = trigger.index_of("button"); - int number = int.parse(trigger.slice(button_index + 6, trigger.length)); - if (number > 0) + int number = int.parse(trigger.slice(button_index + 6, trigger.length)); + if (number > 0) return number; } - + return -1; } } diff --git a/update_copy_notice.sh b/update_copy_notice.sh new file mode 100755 index 0000000..6325e37 --- /dev/null +++ b/update_copy_notice.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +shopt -s globstar + +text="///////////////////////////////////////////////////////////////////////// +// Copyright (c) 2011-2015 by Simon Schneegans +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or (at +// your option) any later version. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +/////////////////////////////////////////////////////////////////////////" + +types=( + ".vala" +) + +folders=( + "src" +) + +for folder in "${folders[@]}" +do + for type in "${types[@]}" + do + for file in ${folder}/**/*${type} + do + if [ -f $file ] + then + if grep -q "Simon Schneegans" ${file} + then + echo "Reformatting ${file} ..." + sed -e '1,16d' ${file} > /tmp/copyright_tmp && mv /tmp/copyright_tmp ${file} + echo "${text}" > /tmp/copyright_tmp + cat ${file} >> /tmp/copyright_tmp && mv /tmp/copyright_tmp ${file} + fi + fi + done + done +done + + + |
