summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessandro Ghedini <al3xbio@gmail.com>2012-03-19 16:35:31 +0100
committerAlessandro Ghedini <al3xbio@gmail.com>2012-03-19 16:35:31 +0100
commit29a84e1125d507fcaf5d0cb39148ccaaa2d7ae58 (patch)
tree7d1c8e1c1b1d89af3a962671f60a422aa62af890
parent178b4f90e26d6240aeaf5e455e4e78b3f4883bba (diff)
parenta248b1597394b4ee9a5817bc95c3c116e76cdd8f (diff)
Merge tag 'upstream/0.5.2'
Upstream version 0.5.2
-rw-r--r--resources/gnome-pie-symbolic.svg496
-rw-r--r--resources/locale/es/LC_MESSAGES/es.po15
-rw-r--r--resources/locale/es/LC_MESSAGES/gnomepie.mobin8420 -> 8741 bytes
-rw-r--r--resources/themes/minimalistic_text/theme.xml4
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/actionGroups/windowListGroup.vala2
-rw-r--r--src/actions/actionRegistry.vala2
-rw-r--r--src/deamon.vala6
-rw-r--r--src/gui/indicator.vala17
-rw-r--r--src/gui/piePreview.vala3
-rw-r--r--src/gui/preferencesWindow.vala4
-rw-r--r--src/gui/sliceTypeList.vala2
-rw-r--r--src/images/icon.vala4
-rw-r--r--src/images/renderedText.vala18
-rw-r--r--src/pies/load.vala2
-rw-r--r--src/renderers/pieWindow.vala12
16 files changed, 552 insertions, 36 deletions
diff --git a/resources/gnome-pie-symbolic.svg b/resources/gnome-pie-symbolic.svg
new file mode 100644
index 0000000..63a662f
--- /dev/null
+++ b/resources/gnome-pie-symbolic.svg
@@ -0,0 +1,496 @@
+<?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"
+ version="1.0"
+ width="16"
+ height="16"
+ id="svg2408"
+ inkscape:version="0.48.2 r9819"
+ sodipodi:docname="gnome-pie-symbolic.svg">
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1117"
+ inkscape:window-height="801"
+ 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:window-maximized="0"
+ inkscape:current-layer="svg2408" />
+ <defs
+ id="defs2410">
+ <linearGradient
+ 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
+ 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
+ x1="45.447727"
+ y1="92.539597"
+ x2="45.447727"
+ y2="7.0165396"
+ id="ButtonShadow"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="scale(1.0058652,0.994169)">
+ <stop
+ id="stop3750"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3752"
+ style="stop-color:#000000;stop-opacity:0.58823532"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ 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
+ color-interpolation-filters="sRGB"
+ id="filter3174">
+ <feGaussianBlur
+ id="feGaussianBlur3176"
+ stdDeviation="1.71" />
+ </filter>
+ <linearGradient
+ x1="36.357143"
+ y1="6"
+ x2="36.357143"
+ y2="63.893143"
+ id="linearGradient3188"
+ xlink:href="#linearGradient3737"
+ gradientUnits="userSpaceOnUse" />
+ <filter
+ x="-0.192"
+ y="-0.192"
+ width="1.3839999"
+ height="1.3839999"
+ color-interpolation-filters="sRGB"
+ id="filter3794">
+ <feGaussianBlur
+ 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
+ cx="48"
+ cy="90.171875"
+ r="42"
+ fx="48"
+ fy="90.171875"
+ id="radialGradient3619"
+ xlink:href="#linearGradient3737"
+ gradientUnits="userSpaceOnUse"
+ 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
+ color-interpolation-filters="sRGB"
+ id="filter3657">
+ <feGaussianBlur
+ id="feGaussianBlur3659"
+ stdDeviation="1.14" />
+ </filter>
+ <linearGradient
+ x1="45.447727"
+ y1="92.539597"
+ x2="45.447727"
+ y2="7.0165396"
+ id="ButtonShadow-0"
+ gradientUnits="userSpaceOnUse"
+ 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"
+ 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"
+ 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"
+ 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"
+ 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"
+ gradientTransform="matrix(1.0238095,0,0,-1.0119048,-1.1428571,98.071429)" />
+ <linearGradient
+ x1="36.357143"
+ y1="6"
+ x2="36.357143"
+ y2="63.893143"
+ id="linearGradient3188-8"
+ xlink:href="#linearGradient3737-3"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-7.3170732,-6.2926829)" />
+ <linearGradient
+ id="linearGradient3737-3">
+ <stop
+ id="stop3739-6"
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3741-1"
+ style="stop-color:#ffffff;stop-opacity:0"
+ 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
+ x1="104"
+ y1="8"
+ x2="120"
+ y2="8"
+ id="linearGradient3905"
+ xlink:href="#linearGradient3637"
+ gradientUnits="userSpaceOnUse"
+ 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="linearGradient3183-0">
+ <stop
+ id="stop3185-9"
+ style="stop-color:#c80000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3187-6"
+ style="stop-color:#f3604d;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ 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" />
+ </defs>
+ <metadata
+ 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 />
+ </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"
+ transform="translate(0,-80)">
+ <rect
+ width="86"
+ height="85"
+ rx="6"
+ ry="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,-80)">
+ <rect
+ width="84"
+ height="84"
+ 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
+ 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"
+ style="fill:url(#linearGradient3188);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"
+ 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
+ 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="translate(0,-80)">
+ <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>
+</svg>
diff --git a/resources/locale/es/LC_MESSAGES/es.po b/resources/locale/es/LC_MESSAGES/es.po
index c52ac16..b1ba6ce 100644
--- a/resources/locale/es/LC_MESSAGES/es.po
+++ b/resources/locale/es/LC_MESSAGES/es.po
@@ -201,7 +201,7 @@ msgstr "Apagar"
#: ../../src/actionGroups/sessionGroup.vala:63
msgid "Logout"
-msgstr ""
+msgstr "Cerrar Sesión"
#: ../../src/actionGroups/sessionGroup.vala:66
msgid "Reboot"
@@ -213,8 +213,7 @@ msgstr "Grupo: Marcadores"
#: ../../src/actionGroups/bookmarkGroup.vala:38
msgid "Shows a Slice for each of your directory Bookmarks."
-msgstr ""
-"Muestra una Rebanada por cada uno de los directorios en los Marcadores."
+msgstr "Muestra una Rebanada por cada uno de los directorios en los Marcadores."
#: ../../src/actionGroups/devicesGroup.vala:35
msgid "Group: Devices"
@@ -393,11 +392,12 @@ msgstr "Mostrar panel de íconos"
msgid ""
"If not checked, you can access this menu by launching Gnome-Pie a second "
"time."
-msgstr "Puedes acceder a este menú lanzando Gnome-Pie por segundavez."
+msgstr "Si no esta activado, puedes acceder a este menú lanzando Gnome-Pie "
+"por segunda vez."
#: ../ui/settings.ui:118
msgid "Behavior"
-msgstr ""
+msgstr "Comportamiento"
#: ../ui/settings.ui:175
msgid "Global scale"
@@ -406,18 +406,19 @@ msgstr "Escala Global"
#: ../ui/settings.ui:207
#, fuzzy
msgid "Display Slice labels"
-msgstr "Mostrar panel de íconos"
+msgstr "Mostrar las etiquetas de las Rebanadas"
#: ../ui/settings.ui:212 ../ui/settings.ui:213
msgid ""
"Displays the name of each Slice next to it. Only available if supported by "
"the theme."
msgstr ""
+"Mostrar el nombre de cada Rebanada. Solo si es soportado por el theme."
#: ../ui/settings.ui:232
#, fuzzy
msgid "Appearance"
-msgstr "Apariencia y comportamiento"
+msgstr "Apariencia"
#: ../ui/slice_select.ui:9
msgid "Slice Options"
diff --git a/resources/locale/es/LC_MESSAGES/gnomepie.mo b/resources/locale/es/LC_MESSAGES/gnomepie.mo
index d3a0e7d..9b22914 100644
--- a/resources/locale/es/LC_MESSAGES/gnomepie.mo
+++ b/resources/locale/es/LC_MESSAGES/gnomepie.mo
Binary files differ
diff --git a/resources/themes/minimalistic_text/theme.xml b/resources/themes/minimalistic_text/theme.xml
index f93c5da..fca0849 100644
--- a/resources/themes/minimalistic_text/theme.xml
+++ b/resources/themes/minimalistic_text/theme.xml
@@ -9,13 +9,13 @@
<slice_layer type="file" file="bg.svg" scale="1" colorize="true" />
<slice_layer type="file" file="bg.svg" scale="0.95" colorize="false" />
<slice_layer type="file" file="fg.svg" scale="0.95" colorize="true" />
- <slice_layer type="caption" y="0" font="sans bold 10" color="#fff" width="70" height="70" />
+ <slice_layer type="caption" y="0" font="sans bold 10" color="#fff" width="65" height="65" />
</activeSlice>
<inactiveSlice>
<slice_layer type="icon" scale="0.1" />
<slice_layer type="file" file="bg.svg" scale="1" colorize="true" />
<slice_layer type="file" file="bg.svg" scale="0.95" colorize="false" />
- <slice_layer type="caption" y="0" font="sans bold 10" colorize="true" width="70" height="70" />
+ <slice_layer type="caption" y="0" font="sans bold 10" colorize="true" width="65" height="65" />
</inactiveSlice>
</slices>
</pie>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 91ed3ab..7138fdd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,6 +82,7 @@ install(
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
)
diff --git a/src/actionGroups/windowListGroup.vala b/src/actionGroups/windowListGroup.vala
index 18bf55b..774666f 100644
--- a/src/actionGroups/windowListGroup.vala
+++ b/src/actionGroups/windowListGroup.vala
@@ -32,7 +32,7 @@ public class WindowListGroup : ActionGroup {
public static GroupRegistry.TypeDescription register() {
var description = new GroupRegistry.TypeDescription();
description.name = _("Group: Window List");
- description.icon = "window-manager";
+ description.icon = "gnome-window-manager";
description.description = _("Shows a Slice for each of your opened Windows. Almost like Alt-Tab.");
description.id = "window_list";
return description;
diff --git a/src/actions/actionRegistry.vala b/src/actions/actionRegistry.vala
index 705c06c..24cc1fe 100644
--- a/src/actions/actionRegistry.vala
+++ b/src/actions/actionRegistry.vala
@@ -148,7 +148,7 @@ public class ActionRegistry : GLib.Object {
}
if (!Gtk.IconTheme.get_default().has_icon(final_icon))
- final_icon = "application-default-icon";
+ final_icon = "stock_unknown";
if (name != null)
final_name = name;
diff --git a/src/deamon.vala b/src/deamon.vala
index b622028..2424f8f 100644
--- a/src/deamon.vala
+++ b/src/deamon.vala
@@ -36,7 +36,7 @@ public class Deamon : GLib.Object {
/////////////////////////////////////////////////////////////////////
public static int main(string[] args) {
- version = "0.5.1";
+ version = "0.5.2";
Logger.init();
Gdk.threads_init();
@@ -148,6 +148,8 @@ public class Deamon : GLib.Object {
return Unique.Response.PASSTHROUGH;
});
+ Gdk.threads_enter();
+
// init locale support
Intl.bindtextdomain ("gnomepie", Paths.locales);
Intl.textdomain ("gnomepie");
@@ -174,6 +176,8 @@ public class Deamon : GLib.Object {
if (open_pie != null) PieManager.open_pie(open_pie);
Gtk.main();
+
+ Gdk.threads_leave();
}
/////////////////////////////////////////////////////////////////////
diff --git a/src/gui/indicator.vala b/src/gui/indicator.vala
index dea4d3c..c8ef445 100644
--- a/src/gui/indicator.vala
+++ b/src/gui/indicator.vala
@@ -46,7 +46,6 @@ public class Indicator : GLib.Object {
public bool active {
get {
-
#if HAVE_APPINDICATOR
return indicator.get_status() == AppIndicator.IndicatorStatus.ACTIVE;
#else
@@ -68,12 +67,18 @@ public class Indicator : GLib.Object {
/////////////////////////////////////////////////////////////////////
public Indicator() {
+ string icon = "";
+
+ if (Gdk.X11Screen.get_window_manager_name(Gdk.Screen.get_default()) == "Mutter")
+ icon = "gnome-pie";
+ else
+ icon = "gnome-pie-symbolic";
+
#if HAVE_APPINDICATOR
string path = "";
- string icon = "indicator-applet";
+
try {
path = GLib.Path.get_dirname(GLib.FileUtils.read_link("/proc/self/exe"))+"/resources";
- icon = "gnome-pie";
} catch (GLib.FileError e) {
warning("Failed to get path of executable!");
}
@@ -86,16 +91,16 @@ public class Indicator : GLib.Object {
try {
var file = GLib.File.new_for_path(GLib.Path.build_filename(
GLib.Path.get_dirname(GLib.FileUtils.read_link("/proc/self/exe"))+"/resources",
- "gnome-pie.svg"
+ icon + ".svg"
));
if (!file.query_exists())
- this.indicator.set_from_icon_name("gnome-pie");
+ this.indicator.set_from_icon_name(icon);
else
this.indicator.set_from_file(file.get_path());
} catch (GLib.FileError e) {
warning("Failed to get path of executable!");
- this.indicator.set_from_icon_name("gnome-pie");
+ this.indicator.set_from_icon_name(icon);
}
this.menu = new Gtk.Menu();
diff --git a/src/gui/piePreview.vala b/src/gui/piePreview.vala
index 4963bb2..5745fcb 100644
--- a/src/gui/piePreview.vala
+++ b/src/gui/piePreview.vala
@@ -111,9 +111,6 @@ class PiePreview : Gtk.DrawingArea {
this.new_slice_window.on_select.connect((new_action, as_new_slice, at_position) => {
var pie = PieManager.all_pies[this.current_id];
- debug(new_action.actions[0].name);
- debug(new_action.actions[0].real_command);
-
if (new_action.has_quickaction())
renderer.disable_quickactions();
diff --git a/src/gui/preferencesWindow.vala b/src/gui/preferencesWindow.vala
index 933919b..3055bc5 100644
--- a/src/gui/preferencesWindow.vala
+++ b/src/gui/preferencesWindow.vala
@@ -174,7 +174,7 @@ public class PreferencesWindow : GLib.Object {
this.id_label.label = "";
this.name_label.label = _("No Pie selected.");
this.hotkey_label.set_markup("");
- this.icon.icon_name = "application-default-icon";
+ this.icon.icon_name = "stock_unknown";
this.no_pie_label.show();
} else {
@@ -212,7 +212,7 @@ public class PreferencesWindow : GLib.Object {
/////////////////////////////////////////////////////////////////////
private void on_add_pie_button_clicked(Gtk.ToolButton button) {
- var new_pie = PieManager.create_persistent_pie(_("New Pie"), "application-default-icon", null);
+ var new_pie = PieManager.create_persistent_pie(_("New Pie"), "stock_unknown", null);
this.pie_list.reload_all();
this.pie_list.select(new_pie.id);
}
diff --git a/src/gui/sliceTypeList.vala b/src/gui/sliceTypeList.vala
index b447dc3..a339e5e 100644
--- a/src/gui/sliceTypeList.vala
+++ b/src/gui/sliceTypeList.vala
@@ -140,7 +140,7 @@ class SliceTypeList : Gtk.TreeView {
this.data.get(active, DataPos.ICON_NAME, out icon);
this.on_select(id, icon);
} else {
- this.on_select("", "application-default-icon");
+ this.on_select("", "stock_unknown");
}
}
diff --git a/src/images/icon.vala b/src/images/icon.vala
index e942e7c..42be41f 100644
--- a/src/images/icon.vala
+++ b/src/images/icon.vala
@@ -105,7 +105,7 @@ public class Icon : Image {
return icon_name;
warning("Icon \"" + icon_name + "\" not found! Using default icon...");
- icon_name = "application-default-icon";
+ icon_name = "stock_unknown";
}
@@ -115,7 +115,7 @@ public class Icon : Image {
if (result == "") {
warning("Icon \"" + icon_name + "\" not found! Using default icon...");
- icon_name = "application-default-icon";
+ icon_name = "stock_unknown";
file = icon_theme.lookup_icon(icon_name, size, 0);
if (file != null) result = file.get_filename();
}
diff --git a/src/images/renderedText.vala b/src/images/renderedText.vala
index e99d26a..544af1f 100644
--- a/src/images/renderedText.vala
+++ b/src/images/renderedText.vala
@@ -71,21 +71,29 @@ public class RenderedText : Image {
// add newlines at the end of each line, in order to allow ellipsizing
string broken_string = "";
- var lines = layout.get_lines().copy();
- foreach (var line in lines) {
+ for (int i=0; i<layout.get_line_count(); ++i) {
- string next_line = text.substring(line.start_index, line.length);
+ string next_line = "";
+ if (i == layout.get_line_count() -1)
+ next_line = text.substring(layout.get_line(i).start_index, -1);
+ 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);
+ layout_tmp.set_width(Pango.units_from_double(width));
+
+ layout_tmp.set_font_description(font_description);
- layout.set_text(broken_string_tmp, -1);
+ layout_tmp.set_text(broken_string_tmp, -1);
Pango.Rectangle extents;
- layout.get_pixel_extents(null, out 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;
diff --git a/src/pies/load.vala b/src/pies/load.vala
index 4a9274d..cb08a8a 100644
--- a/src/pies/load.vala
+++ b/src/pies/load.vala
@@ -60,8 +60,6 @@ namespace Pies {
}
}
}
- Xml.Parser.cleanup();
-
} else {
warning("Error loading pies: pies.conf is empty! The cake is a lie...");
}
diff --git a/src/renderers/pieWindow.vala b/src/renderers/pieWindow.vala
index 852a739..5238dfe 100644
--- a/src/renderers/pieWindow.vala
+++ b/src/renderers/pieWindow.vala
@@ -55,6 +55,7 @@ public class PieWindow : Gtk.Window {
/////////////////////////////////////////////////////////////////////
private bool closing = false;
+ private bool closed = false;
/////////////////////////////////////////////////////////////////////
/// A timer used for calculating the frame time.
@@ -186,7 +187,10 @@ public class PieWindow : Gtk.Window {
this.queue_draw();
// the main draw loop
- Timeout.add((uint)(1000.0/Config.global.refresh_rate), () => {
+ GLib.Timeout.add((uint)(1000.0/Config.global.refresh_rate), () => {
+ if (this.closed)
+ return false;
+
this.queue_draw();
return this.visible;
});
@@ -266,7 +270,8 @@ public class PieWindow : Gtk.Window {
FocusGrabber.ungrab();
this.renderer.activate();
- Timeout.add((uint)(Config.global.theme.fade_out_time*1000), () => {
+ GLib.Timeout.add((uint)(Config.global.theme.fade_out_time*1000), () => {
+ this.closed = true;
this.on_closed();
this.destroy();
return false;
@@ -286,7 +291,8 @@ public class PieWindow : Gtk.Window {
FocusGrabber.ungrab();
this.renderer.cancel();
- Timeout.add((uint)(Config.global.theme.fade_out_time*1000), () => {
+ GLib.Timeout.add((uint)(Config.global.theme.fade_out_time*1000), () => {
+ this.closed = true;
this.on_closed();
this.destroy();
return false;