Merge lp:~jesuisbenjamin/cairo-dock-plug-ins-extras/Facebook into lp:~cairo-dock-team/cairo-dock-plug-ins-extras/third-party
- Merge into third-party
Proposed by
benjamin
| Status: | Merged |
|---|---|
| Merged at revision: | 168 |
| Proposed branch: | lp:~jesuisbenjamin/cairo-dock-plug-ins-extras/Facebook |
| Merge into: | lp:~cairo-dock-team/cairo-dock-plug-ins-extras/third-party |
| Diff against target: |
186 lines (+54/-17) 4 files modified
Facebook/Facebook (+24/-15) Facebook/Facebook.conf (+1/-1) Facebook/auto-load.conf (+1/-1) Facebook/svg_mod.py (+28/-0) |
| To merge this branch: | bzr merge lp:~jesuisbenjamin/cairo-dock-plug-ins-extras/Facebook |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Matthieu Baerts | Approve | ||
|
Review via email:
|
|||
Commit message
Description of the change
Facebook: Emblem's SVG data moved to a separate module. SVG emblem now written at configuration file's dynamic path. Update some functions from os.popen to subprocess.Popen. Use CDApplet.run() rather than CDApplet.begin(). gtk.main() removed (commented).
To post a comment you must log in.
Revision history for this message
| benjamin (jesuisbenjamin) wrote : | # |
Revision history for this message
| Matthieu Baerts (matttbe) wrote : | # |
Thank you ;)
PS: you can use one merge proposal until the status is not marked as "merged"
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'Facebook/Facebook' | |||
| 2 | --- Facebook/Facebook 2011-04-24 06:56:15 +0000 | |||
| 3 | +++ Facebook/Facebook 2011-04-26 10:44:48 +0000 | |||
| 4 | @@ -31,6 +31,8 @@ | |||
| 5 | 31 | from subprocess import PIPE | 31 | from subprocess import PIPE |
| 6 | 32 | import sys | 32 | import sys |
| 7 | 33 | import time | 33 | import time |
| 8 | 34 | import svg_mod | ||
| 9 | 35 | import re | ||
| 10 | 34 | 36 | ||
| 11 | 35 | class FaceBook(CDApplet): | 37 | class FaceBook(CDApplet): |
| 12 | 36 | def __init__(self): | 38 | def __init__(self): |
| 13 | @@ -42,6 +44,10 @@ | |||
| 14 | 42 | self.recurence = int | 44 | self.recurence = int |
| 15 | 43 | # in self.appconfig is the alarm configuration information | 45 | # in self.appconfig is the alarm configuration information |
| 16 | 44 | self.appconfig = {} | 46 | self.appconfig = {} |
| 17 | 47 | # possible values and keys for ATTENTION_HOW in configuration file | ||
| 18 | 48 | self.HOW_DICT = {0 : 'bounce', 1 : 'blink', 2 : 'pulse', 3 : 'rotate', 4 : 'spot', 5 : 'wave', 6: 'wobbly', 7: 'none'} | ||
| 19 | 49 | # possible vales and keys for ATTENTION_WHEN in configuration file | ||
| 20 | 50 | self.WHEN_DICT = {0 : 'superior', 1 : 'alway', 2 : 'different', 4 : 'never'} | ||
| 21 | 45 | # self.counter hold the nubner of notifications | 51 | # self.counter hold the nubner of notifications |
| 22 | 46 | self.counter = 0 | 52 | self.counter = 0 |
| 23 | 47 | # log file where self.fbcmd and self.fbcmd values are recorded | 53 | # log file where self.fbcmd and self.fbcmd values are recorded |
| 24 | @@ -60,8 +66,10 @@ | |||
| 25 | 60 | self.dialog_type = 0 | 66 | self.dialog_type = 0 |
| 26 | 61 | # how should info be displayed on the icon (quickinfo or emblem) | 67 | # how should info be displayed on the icon (quickinfo or emblem) |
| 27 | 62 | self.info = "emblem" | 68 | self.info = "emblem" |
| 29 | 63 | # data for svg emblem | 69 | # imported xml data for svg emblem |
| 30 | 64 | self.svg_data = str | 70 | self.svg_data = str |
| 31 | 71 | # path where the current svg emblem should be stored | ||
| 32 | 72 | self.svg_path = str | ||
| 33 | 65 | # commandline on click | 73 | # commandline on click |
| 34 | 66 | self.click = "x-www-browser 'http://www.facebook.com/'" | 74 | self.click = "x-www-browser 'http://www.facebook.com/'" |
| 35 | 67 | # name of user fetched from Facebook | 75 | # name of user fetched from Facebook |
| 36 | @@ -223,8 +231,8 @@ | |||
| 37 | 223 | self.fbconfig['NOTICES_UNREAD'] = keyfile.getboolean('Configuration', 'NOTICES_UNREAD') | 231 | self.fbconfig['NOTICES_UNREAD'] = keyfile.getboolean('Configuration', 'NOTICES_UNREAD') |
| 38 | 224 | # then it checks when and how the user wants to be informed | 232 | # then it checks when and how the user wants to be informed |
| 39 | 225 | # and it appends that to the self.appconfig dictionary | 233 | # and it appends that to the self.appconfig dictionary |
| 42 | 226 | self.appconfig['ATTENTION_WHEN'] = keyfile.get('Configuration', 'ATTENTION_WHEN') | 234 | self.appconfig['ATTENTION_WHEN'] = self.WHEN_DICT[keyfile.getint('Configuration', 'ATTENTION_WHEN')] |
| 43 | 227 | self.appconfig['ATTENTION_HOW'] = keyfile.get('Configuration', 'ATTENTION_HOW') | 235 | self.appconfig['ATTENTION_HOW'] = self.HOW_DICT[keyfile.getint('Configuration', 'ATTENTION_HOW')] |
| 44 | 228 | self.appconfig['ATTENTION_DIA'] = keyfile.getboolean('Configuration', 'ATTENTION_DIA') | 236 | self.appconfig['ATTENTION_DIA'] = keyfile.getboolean('Configuration', 'ATTENTION_DIA') |
| 45 | 229 | self.appconfig['ATTENTION_SOUND'] = keyfile.getboolean('Configuration', 'ATTENTION_SOUND') | 237 | self.appconfig['ATTENTION_SOUND'] = keyfile.getboolean('Configuration', 'ATTENTION_SOUND') |
| 46 | 230 | # then it fetches the update interval requested by user in minutes | 238 | # then it fetches the update interval requested by user in minutes |
| 47 | @@ -235,9 +243,14 @@ | |||
| 48 | 235 | self.recurence = 60000 | 243 | self.recurence = 60000 |
| 49 | 236 | else: | 244 | else: |
| 50 | 237 | self.recurence = r * 60000 | 245 | self.recurence = r * 60000 |
| 52 | 238 | # finally it checks the user's choice in appearance: emblem or quickinfo | 246 | # it checks the user's choice in appearance: emblem or quickinfo |
| 53 | 239 | self.info = keyfile.get('Configuration', 'INFO') | 247 | self.info = keyfile.get('Configuration', 'INFO') |
| 54 | 240 | 248 | ||
| 55 | 249 | # then it writes the path where the svg file should be stored | ||
| 56 | 250 | # next to the configuration file | ||
| 57 | 251 | path = re.search('/.+/', self.cConfFile).group() | ||
| 58 | 252 | self.svg_path = path+'emblem.svg' | ||
| 59 | 253 | |||
| 60 | 241 | def set_quick_info(self): | 254 | def set_quick_info(self): |
| 61 | 242 | # this method places a quick info displaying the counter | 255 | # this method places a quick info displaying the counter |
| 62 | 243 | # if the counter is different from 0 | 256 | # if the counter is different from 0 |
| 63 | @@ -254,15 +267,15 @@ | |||
| 64 | 254 | pass | 267 | pass |
| 65 | 255 | else: | 268 | else: |
| 66 | 256 | # write svg emblem | 269 | # write svg emblem |
| 70 | 257 | # data for svg emblem | 270 | # data for svg emblem (calling external module svg_mod.py |
| 71 | 258 | self.svg_data = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n<!-- Created with Inkscape (http://www.inkscape.org/) -->\n\n<svg\n xmlns:dc="http://purl.org/dc/elements/1.1/"\n xmlns:cc="http://creativecommons.org/ns#"\n xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"\n xmlns:svg="http://www.w3.org/2000/svg"\n xmlns="http://www.w3.org/2000/svg"\n xmlns:xlink="http://www.w3.org/1999/xlink"\n xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"\n xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"\n version="1.0"\n width="39.983284"\n height="39.945618"\n id="svg2408"\n inkscape:version="0.48.0 r9654"\n sodipodi:docname="emblem.svg">\n <sodipodi:namedview\n pagecolor="#ffffff"\n bordercolor="#666666"\n borderopacity="1"\n objecttolerance="10"\n gridtolerance="10"\n guidetolerance="10"\n inkscape:pageopacity="0"\n inkscape:pageshadow="2"\n inkscape:window-width="1280"\n inkscape:window-height="748"\n id="namedview94"\n showgrid="false"\n inkscape:zoom="3.4546968"\n inkscape:cx="-27.204217"\n inkscape:cy="-10.241983"\n inkscape:window-x="0"\n inkscape:window-y="0"\n inkscape:window-maximized="1"\n inkscape:current-layer="layer4"\n fit-margin-top="0"\n fit-margin-left="0"\n fit-margin-right="0"\n fit-margin-bottom="0"\n inkscape:snap-bbox="true"\n inkscape:snap-page="true" />\n <defs\n id="defs2410">\n <linearGradient\n id="linearGradient3942">\n <stop\n id="stop3944"\n style="stop-color:#ffffff;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3946"\n style="stop-color:#ffffff;stop-opacity:0"\n offset="1" />\n </linearGradient>\n <linearGradient\n id="linearGradient3727">\n <stop\n id="stop3729"\n style="stop-color:#d5d5d5;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3731"\n style="stop-color:#f1f1f1;stop-opacity:1"\n offset="1" />\n </linearGradient>\n <linearGradient\n id="linearGradient3641">\n <stop\n id="stop3643"\n style="stop-color:#000000;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3645"\n style="stop-color:#000000;stop-opacity:0"\n offset="1" />\n </linearGradient>\n <linearGradient\n x1="45.447727"\n y1="92.539597"\n x2="45.447727"\n y2="7.0165396"\n id="ButtonShadow"\n gradientUnits="userSpaceOnUse"\n gradientTransform="scale(1.0058652,0.994169)">\n <stop\n id="stop3750"\n style="stop-color:#000000;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3752"\n style="stop-color:#000000;stop-opacity:0.58823532"\n offset="1" />\n </linearGradient>\n <linearGradient\n id="linearGradient3737">\n <stop\n id="stop3739"\n style="stop-color:#ffffff;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3741"\n style="stop-color:#ffffff;stop-opacity:0"\n offset="1" />\n </linearGradient>\n <linearGradient\n id="linearGradient3700">\n <stop\n id="stop3702"\n style="stop-color:#dcdcdc;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3704"\n style="stop-color:#f0f0f0;stop-opacity:1"\n offset="1" />\n </linearGradient>\n <filter\n color-interpolation-filters="sRGB"\n id="filter3174">\n <feGaussianBlur\n id="feGaussianBlur3176"\n stdDeviation="1.71" />\n </filter>\n <filter\n x="-0.192"\n y="-0.192"\n width="1.3839999"\n height="1.3839999"\n color-interpolation-filters="sRGB"\n id="filter3794">\n <feGaussianBlur\n id="feGaussianBlur3796"\n stdDeviation="5.28" />\n </filter>\n <linearGradient\n x1="48"\n y1="20.220806"\n x2="48"\n y2="138.66119"\n id="linearGradient3613"\n xlink:href="#linearGradient3737"\n gradientUnits="userSpaceOnUse" />\n <radialGradient\n cx="48"\n cy="90.171875"\n r="42"\n fx="48"\n fy="90.171875"\n id="radialGradient3619"\n xlink:href="#linearGradient3737"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)" />\n <clipPath\n id="clipPath3613">\n <rect\n width="84"\n height="84"\n rx="6"\n ry="6"\n x="6"\n y="6"\n id="rect3615"\n style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />\n </clipPath>\n <linearGradient\n x1="48"\n y1="88"\n x2="48"\n y2="32"\n id="linearGradient3627"\n xlink:href="#linearGradient3700"\n gradientUnits="userSpaceOnUse" />\n <linearGradient\n x1="48"\n y1="88"\n x2="48"\n y2="36"\n id="linearGradient3635"\n xlink:href="#linearGradient3727"\n gradientUnits="userSpaceOnUse" />\n <filter\n color-interpolation-filters="sRGB"\n id="filter3649">\n <feGaussianBlur\n id="feGaussianBlur3651"\n stdDeviation="1.38" />\n </filter>\n <filter\n color-interpolation-filters="sRGB"\n id="filter3665">\n <feGaussianBlur\n id="feGaussianBlur3667"\n stdDeviation="0.69" />\n </filter>\n <linearGradient\n x1="36.357143"\n y1="6"\n x2="36.357143"\n y2="63.893143"\n id="linearGradient3687"\n xlink:href="#linearGradient3737"\n gradientUnits="userSpaceOnUse" />\n <linearGradient\n x1="48"\n y1="90"\n x2="48"\n y2="5.9877172"\n id="linearGradient3689"\n xlink:href="#linearGradient3700"\n gradientUnits="userSpaceOnUse" />\n <clipPath\n id="clipPath3696">\n <rect\n width="84"\n height="84"\n rx="6"\n ry="6"\n x="106"\n y="6"\n id="rect3698"\n style="fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none" />\n </clipPath>\n <linearGradient\n x1="48"\n y1="32"\n x2="48"\n y2="80"\n id="linearGradient3701"\n xlink:href="#linearGradient3641"\n gradientUnits="userSpaceOnUse"\n gradientTransform="translate(100,0)" />\n <clipPath\n id="clipPath3703">\n <rect\n width="84"\n height="84"\n rx="6"\n ry="6"\n x="106"\n y="6"\n id="rect3705"\n style="fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none" />\n </clipPath>\n <linearGradient\n x1="51"\n y1="62"\n x2="51"\n y2="21"\n id="linearGradient3707"\n xlink:href="#linearGradient3641"\n gradientUnits="userSpaceOnUse"\n gradientTransform="translate(100,-1)" />\n <linearGradient\n id="linearGradient3737-3">\n <stop\n id="stop3739-5"\n style="stop-color:#ffffff;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3741-7"\n style="stop-color:#ffffff;stop-opacity:0"\n offset="1" />\n </linearGradient>\n <radialGradient\n cx="48"\n cy="90.171875"\n r="42"\n fx="48"\n fy="90.171875"\n id="radialGradient2858"\n xlink:href="#linearGradient3737-3"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.551021,0.1971319)" />\n <linearGradient\n x1="45.447727"\n y1="92.539597"\n x2="45.447727"\n y2="7.0165396"\n id="ButtonShadow-0"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.0058652,0,0,0.994169,100,0)">\n <stop\n id="stop3750-8"\n style="stop-color:#000000;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3752-5"\n style="stop-color:#000000;stop-opacity:0.58823532"\n offset="1" />\n </linearGradient>\n <linearGradient\n x1="32.251034"\n y1="6.1317081"\n x2="32.251034"\n y2="90.238609"\n id="linearGradient3780"\n xlink:href="#ButtonShadow-0"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />\n <linearGradient\n x1="32.251034"\n y1="6.1317081"\n x2="32.251034"\n y2="90.238609"\n id="linearGradient3772"\n xlink:href="#ButtonShadow-0"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />\n <linearGradient\n x1="32.251034"\n y1="6.1317081"\n x2="32.251034"\n y2="90.238609"\n id="linearGradient3725"\n xlink:href="#ButtonShadow-0"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />\n <linearGradient\n x1="32.251034"\n y1="6.1317081"\n x2="32.251034"\n y2="90.238609"\n id="linearGradient3721"\n xlink:href="#ButtonShadow-0"\n gradientUnits="userSpaceOnUse"\n gradientTransform="translate(0,-97)" />\n <linearGradient\n x1="32.251034"\n y1="6.1317081"\n x2="32.251034"\n y2="90.238609"\n id="linearGradient2918"\n xlink:href="#ButtonShadow-0"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />\n <linearGradient\n id="linearGradient3801">\n <stop\n id="stop3803"\n style="stop-color:#a4d620;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3805"\n style="stop-color:#62a915;stop-opacity:1"\n offset="1" />\n </linearGradient>\n <linearGradient\n x1="45.298355"\n y1="72.618279"\n x2="79.622185"\n y2="72.618279"\n id="linearGradient3915"\n xlink:href="#linearGradient3801"\n gradientUnits="userSpaceOnUse" />\n <linearGradient\n x1="68"\n y1="52"\n x2="68"\n y2="84"\n id="linearGradient3948"\n xlink:href="#linearGradient3942"\n gradientUnits="userSpaceOnUse" />\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3942-7"\n id="linearGradient3948-1"\n y2="84"\n x2="68"\n y1="52"\n x1="68" />\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3801-9"\n id="linearGradient3915-7"\n y2="72.618279"\n x2="79.622185"\n y1="72.618279"\n x1="45.298355" />\n <linearGradient\n id="linearGradient3801-9">\n <stop\n offset="0"\n style="stop-color:#a4d620;stop-opacity:1"\n id="stop3803-1" />\n <stop\n offset="1"\n style="stop-color:#62a915;stop-opacity:1"\n id="stop3805-7" />\n </linearGradient>\n <linearGradient\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#ButtonShadow-0-0"\n id="linearGradient2918-0"\n y2="90.238609"\n x2="32.251034"\n y1="6.1317081"\n x1="32.251034" />\n <linearGradient\n gradientTransform="translate(0,-97)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#ButtonShadow-0-0"\n id="linearGradient3721-9"\n y2="90.238609"\n x2="32.251034"\n y1="6.1317081"\n x1="32.251034" />\n <linearGradient\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#ButtonShadow-0-0"\n id="linearGradient3725-4"\n y2="90.238609"\n x2="32.251034"\n y1="6.1317081"\n x1="32.251034" />\n <linearGradient\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#ButtonShadow-0-0"\n id="linearGradient3772-9"\n y2="90.238609"\n x2="32.251034"\n y1="6.1317081"\n x1="32.251034" />\n <linearGradient\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#ButtonShadow-0-0"\n id="linearGradient3780-5"\n y2="90.238609"\n x2="32.251034"\n y1="6.1317081"\n x1="32.251034" />\n <linearGradient\n gradientTransform="matrix(1.0058652,0,0,0.994169,100,0)"\n gradientUnits="userSpaceOnUse"\n id="ButtonShadow-0-0"\n y2="7.0165396"\n x2="45.447727"\n y1="92.539597"\n x1="45.447727">\n <stop\n offset="0"\n style="stop-color:#000000;stop-opacity:1"\n id="stop3750-8-6" />\n <stop\n offset="1"\n style="stop-color:#000000;stop-opacity:0.58823532"\n id="stop3752-5-1" />\n </linearGradient>\n <radialGradient\n gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.551021,0.1971319)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3737-3-2"\n id="radialGradient2858-1"\n fy="90.171875"\n fx="48"\n r="42"\n cy="90.171875"\n cx="48" />\n <linearGradient\n id="linearGradient3737-3-2">\n <stop\n offset="0"\n style="stop-color:#ffffff;stop-opacity:1"\n id="stop3739-5-2" />\n <stop\n offset="1"\n style="stop-color:#ffffff;stop-opacity:0"\n id="stop3741-7-6" />\n </linearGradient>\n <linearGradient\n gradientTransform="translate(100,-1)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3641-7"\n id="linearGradient3707-7"\n y2="21"\n x2="51"\n y1="62"\n x1="51" />\n <clipPath\n id="clipPath3703-7">\n <rect\n style="fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none"\n id="rect3705-2"\n y="6"\n x="106"\n ry="6"\n rx="6"\n height="84"\n width="84" />\n </clipPath>\n <linearGradient\n gradientTransform="translate(100,0)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3641-7"\n id="linearGradient3701-1"\n y2="80"\n x2="48"\n y1="32"\n x1="48" />\n <clipPath\n id="clipPath3696-8">\n <rect\n style="fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none"\n id="rect3698-7"\n y="6"\n x="106"\n ry="6"\n rx="6"\n height="84"\n width="84" />\n </clipPath>\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3700-8"\n id="linearGradient3689-4"\n y2="5.9877172"\n x2="48"\n y1="90"\n x1="48" />\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3737-8"\n id="linearGradient3687-0"\n y2="63.893143"\n x2="36.357143"\n y1="6"\n x1="36.357143" />\n <filter\n id="filter3665-9"\n color-interpolation-filters="sRGB">\n <feGaussianBlur\n stdDeviation="0.69"\n id="feGaussianBlur3667-5" />\n </filter>\n <filter\n id="filter3649-6"\n color-interpolation-filters="sRGB">\n <feGaussianBlur\n stdDeviation="1.38"\n id="feGaussianBlur3651-4" />\n </filter>\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3727-2"\n id="linearGradient3635-6"\n y2="36"\n x2="48"\n y1="88"\n x1="48" />\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3700-8"\n id="linearGradient3627-2"\n y2="32"\n x2="48"\n y1="88"\n x1="48" />\n <clipPath\n id="clipPath3613-8">\n <rect\n style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"\n id="rect3615-9"\n y="6"\n x="6"\n ry="6"\n rx="6"\n height="84"\n width="84" />\n </clipPath>\n <radialGradient\n gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3737-8"\n id="radialGradient3619-6"\n fy="90.171875"\n fx="48"\n r="42"\n cy="90.171875"\n cx="48" />\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3737-8"\n id="linearGradient3613-0"\n y2="138.66119"\n x2="48"\n y1="20.220806"\n x1="48" />\n <filter\n id="filter3794-9"\n color-interpolation-filters="sRGB"\n height="1.3839999"\n width="1.3839999"\n y="-0.192"\n x="-0.192">\n <feGaussianBlur\n stdDeviation="5.28"\n id="feGaussianBlur3796-2" />\n </filter>\n <filter\n id="filter3174-1"\n color-interpolation-filters="sRGB">\n <feGaussianBlur\n stdDeviation="1.71"\n id="feGaussianBlur3176-4" />\n </filter>\n <linearGradient\n id="linearGradient3700-8">\n <stop\n offset="0"\n style="stop-color:#dcdcdc;stop-opacity:1"\n id="stop3702-4" />\n <stop\n offset="1"\n style="stop-color:#f0f0f0;stop-opacity:1"\n id="stop3704-3" />\n </linearGradient>\n <linearGradient\n id="linearGradient3737-8">\n <stop\n offset="0"\n style="stop-color:#ffffff;stop-opacity:1"\n id="stop3739-6" />\n <stop\n offset="1"\n style="stop-color:#ffffff;stop-opacity:0"\n id="stop3741-8" />\n </linearGradient>\n <linearGradient\n gradientTransform="scale(1.0058652,0.994169)"\n gradientUnits="userSpaceOnUse"\n id="ButtonShadow-3"\n y2="7.0165396"\n x2="45.447727"\n y1="92.539597"\n x1="45.447727">\n <stop\n offset="0"\n style="stop-color:#000000;stop-opacity:1"\n id="stop3750-0" />\n <stop\n offset="1"\n style="stop-color:#000000;stop-opacity:0.58823532"\n id="stop3752-7" />\n </linearGradient>\n <linearGradient\n id="linearGradient3641-7">\n <stop\n offset="0"\n style="stop-color:#000000;stop-opacity:1"\n id="stop3643-4" />\n <stop\n offset="1"\n style="stop-color:#000000;stop-opacity:0"\n id="stop3645-4" />\n </linearGradient>\n <linearGradient\n id="linearGradient3727-2">\n <stop\n offset="0"\n style="stop-color:#d5d5d5;stop-opacity:1"\n id="stop3729-5" />\n <stop\n offset="1"\n style="stop-color:#f1f1f1;stop-opacity:1"\n id="stop3731-4" />\n </linearGradient>\n <linearGradient\n id="linearGradient3942-7">\n <stop\n offset="0"\n style="stop-color:#ffffff;stop-opacity:1"\n id="stop3944-4" />\n <stop\n offset="1"\n style="stop-color:#ffffff;stop-opacity:0"\n id="stop3946-5" />\n </linearGradient>\n <linearGradient\n inkscape:collect="always"\n xlink:href="#ButtonShadow-3"\n id="linearGradient3250"\n gradientUnits="userSpaceOnUse"\n gradientTransform="scale(1.0058652,0.994169)"\n x1="45.447727"\n y1="92.539597"\n x2="45.447727"\n y2="7.0165396" />\n <linearGradient\n inkscape:collect="always"\n xlink:href="#linearGradient3801-9"\n id="linearGradient3252"\n gradientUnits="userSpaceOnUse"\n x1="45.298355"\n y1="72.618279"\n x2="79.622185"\n y2="72.618279" />\n <linearGradient\n inkscape:collect="always"\n xlink:href="#linearGradient3942-7"\n id="linearGradient3254"\n gradientUnits="userSpaceOnUse"\n x1="68"\n y1="52"\n x2="68"\n y2="84" />\n </defs>\n <metadata\n id="metadata2413">\n <rdf:RDF>\n <cc:Work\n rdf:about="">\n <dc:format>image/svg+xml</dc:format>\n <dc:type\n rdf:resource="http://purl.org/dc/dcmitype/StillImage" />\n <dc:title />\n </cc:Work>\n </rdf:RDF>\n </metadata>\n <g\n id="layer2"\n style="display:none"\n transform="translate(-176.03343,-51.028478)">\n <rect\n width="86"\n height="85"\n rx="6"\n ry="6"\n x="5"\n y="7"\n id="rect3745"\n style="opacity:0.9;fill:url(#ButtonShadow);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174)" />\n </g>\n <g\n id="layer4"\n transform="translate(-50.007625,-51.028478)">\n <g\n id="g3234"\n transform="matrix(0.68115941,0,0,0.68115941,28.692755,16.26995)">\n <path\n style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"\n id="path3960"\n inkscape:connector-curvature="0"\n d="m 89.986349,69.238985 c -0.21488,-1.561093 -1.973583,-1.971086 -3.08095,-2.785965 0.452305,-1.002477 1.307299,-1.880744 1.442147,-2.982622 0.09844,-1.212445 -1.013508,-2.114893 -2.161243,-2.135756 -0.574938,-0.191984 -1.529962,-0.121132 -1.883184,-0.466436 0.105461,-1.303923 0.927598,-2.804937 -0.05258,-3.95302 -0.907896,-1.060888 -2.339545,-0.509432 -3.503632,-0.325674 -0.950635,0.504422 -0.81239,-0.565783 -0.973216,-1.2035 -0.130627,-1.071533 -0.401383,-2.422333 -1.652276,-2.666162 -1.269606,-0.351715 -2.257329,0.785416 -3.345553,1.248885 -0.564682,0.197811 -0.761585,-1.032508 -1.178359,-1.409042 -0.426005,-1.011804 -1.521655,-1.848863 -2.654045,-1.413094 -1.095119,0.436651 -1.63445,1.627605 -2.458205,2.425428 -0.973647,-0.65486 -1.72467,-1.7847 -2.91707,-1.99934 -1.243767,-0.181639 -2.134633,0.905175 -2.372989,2.019516 -0.345055,0.444832 -0.243497,1.842522 -1.003052,1.403006 -1.213096,-0.355405 -2.631658,-1.302577 -3.801916,-0.341572 -1.164288,0.944179 -0.641361,2.603822 -0.785903,3.912444 -1.186176,0.269467 -2.880347,-0.340038 -3.868298,0.741757 -1.026659,1.143887 -0.143349,2.597452 0.237559,3.813095 0.487992,0.76899 -0.891072,0.672735 -1.319748,1.016916 -1.098052,0.268634 -2.195073,1.121664 -2.064313,2.380723 0.249354,1.192288 1.335753,1.97237 1.99934,2.949845 -0.871859,0.915157 -2.269562,1.493314 -2.556533,2.818742 -0.186067,1.142981 0.709312,1.986005 1.663193,2.403037 0.374257,0.418594 1.762649,0.565214 1.196802,1.235928 -0.585967,1.153839 -1.765734,2.450576 -0.926208,3.768425 0.810341,1.207354 2.476744,0.956157 3.736472,1.311043 -0.08576,1.227497 -0.781478,2.521328 -0.229433,3.703695 0.526899,1.071756 1.844115,1.213477 2.87647,0.879241 0.560732,0.07218 1.729076,-0.722239 1.724808,0.155757 0.28962,1.207178 0.140911,2.908592 1.527846,3.422546 1.38487,0.596205 2.576146,-0.697698 3.773565,-1.225564 0.454783,0.276534 0.742145,1.177337 1.132089,1.695641 0.455828,1.285443 2.259105,1.820804 3.255585,0.80819 0.610876,-0.645848 1.17573,-1.360459 1.769908,-2.032116 1.070537,0.696774 1.92142,2.036743 3.310382,1.999339 1.284689,-0.0939 1.81764,-1.335721 2.151522,-2.404812 0.206115,-0.763429 0.45194,-1.441171 1.291319,-0.838121 1.079697,0.400421 2.40691,1.016712 3.407356,0.09643 1.036768,-1.007403 0.54752,-2.574581 0.688297,-3.867575 1.24572,-0.135375 2.670869,0.29881 3.736472,-0.524417 0.936001,-0.804307 0.694064,-2.129136 0.219537,-3.122161 -0.129526,-0.619425 -0.912001,-1.544893 0.15361,-1.604149 1.111548,-0.448238 2.718145,-0.69704 2.904459,-2.123887 0.293747,-1.438242 -1.158981,-2.317711 -1.863365,-3.381883 -0.0012,-0.497479 0.978512,-0.910082 1.354831,-1.374896 0.68176,-0.486375 1.154931,-1.160958 1.098503,-2.027866 z" />\n <path\n inkscape:connector-curvature="0"\n style="opacity:0.15;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"\n id="path3956"\n transform="matrix(0,1.048834,-1.048834,0,146.16452,5.4895435)"\n d="m 60.9375,54.59375 a 0.86264402,0.86264402 0 0 0 -0.71875,0.4375 L 58.5,57.875 55.625,56.25 a 0.86264402,0.86264402 0 0 0 -1.28125,0.59375 l -0.625,3.3125 -3.28125,-0.5625 a 0.86264402,0.86264402 0 0 0 -1,1 L 50,63.875 46.6875,64.5 a 0.86264402,0.86264402 0 0 0 -0.59375,1.28125 l 1.625,2.875 L 44.875,70.375 A 0.86264402,0.86264402 0 0 0 44.75,71.78125 L 47.25,73.9375 45.15625,76.5 A 0.86264402,0.86264402 0 0 0 45.5,77.875 l 3.15625,1.1875 -1.125,3.15625 a 0.86264402,0.86264402 0 0 0 0.8125,1.15625 l 3.3125,0.03125 0.0625,3.3125 a 0.86264402,0.86264402 0 0 0 1.15625,0.8125 L 56,86.4375 l 1.1875,3.125 a 0.86264402,0.86264402 0 0 0 1.34375,0.34375 l 2.59375,-2.125 2.1875,2.5625 a 0.86264402,0.86264402 0 0 0 1.40625,-0.125 l 1.6875,-2.875 2.9375,1.625 a 0.86264402,0.86264402 0 0 0 1.25,-0.59375 l 0.59375,-3.28125 3.3125,0.5625 a 0.86264402,0.86264402 0 0 0 1,-1 L 74.9375,81.34375 78.21875,80.75 A 0.86264402,0.86264402 0 0 0 78.8125,79.5 l -1.625,-2.9375 2.875,-1.6875 a 0.86264402,0.86264402 0 0 0 0.125,-1.40625 L 77.625,71.28125 79.75,68.6875 a 0.86264402,0.86264402 0 0 0 -0.34375,-1.34375 l -3.125,-1.1875 1.09375,-3.125 A 0.86264402,0.86264402 0 0 0 76.5625,61.875 L 73.25,61.8125 73.21875,58.5 A 0.86264402,0.86264402 0 0 0 72.0625,57.6875 l -3.15625,1.125 -1.1875,-3.15625 a 0.86264402,0.86264402 0 0 0 -1.375,-0.34375 l -2.5625,2.09375 -2.15625,-2.5 a 0.86264402,0.86264402 0 0 0 -0.6875,-0.3125 z" />\n <path\n inkscape:connector-curvature="0"\n style="opacity:0.3;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"\n id="path3950"\n transform="matrix(0,1.048834,-1.048834,0,146.16452,5.4895435)"\n d="m 74.641931,84.79994 -4.128425,-0.680449 -0.772592,4.112178 -3.646724,-2.051417 -2.132447,3.599941 -2.725174,-3.174954 -3.235096,2.653498 -1.474928,-3.915545 -3.947546,1.387004 -0.04678,-4.183864 -4.183864,-0.04678 1.387005,-3.947547 -3.915546,-1.474927 2.653499,-3.235097 -3.174955,-2.725173 3.599941,-2.132447 -2.051417,-3.646724 4.112178,-0.772592 -0.680448,-4.128426 4.128425,0.680449 0.772592,-4.112178 3.646724,2.051417 2.132447,-3.599941 2.725173,3.174954 3.235097,-2.653498 1.474927,3.915545 3.947547,-1.387004 0.04678,4.183864 4.183863,0.04678 -1.387004,3.947547 3.915545,1.474927 -2.653498,3.235097 3.174955,2.725173 -3.599942,2.132447 2.051418,3.646724 -4.112178,0.772592 z" />\n <path\n transform="matrix(0,1.048834,-1.048834,0,146.16452,4.4895435)"\n inkscape:connector-curvature="0"\n style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"\n id="path3139"\n d="m 74.641931,84.79994 -4.128425,-0.680449 -0.772592,4.112178 -3.646724,-2.051417 -2.132447,3.599941 -2.725174,-3.174954 -3.235096,2.653498 -1.474928,-3.915545 -3.947546,1.387004 -0.04678,-4.183864 -4.183864,-0.04678 1.387005,-3.947547 -3.915546,-1.474927 2.653499,-3.235097 -3.174955,-2.725173 3.599941,-2.132447 -2.051417,-3.646724 4.112178,-0.772592 -0.680448,-4.128426 4.128425,0.680449 0.772592,-4.112178 3.646724,2.051417 2.132447,-3.599941 2.725173,3.174954 3.235097,-2.653498 1.474927,3.915545 3.947547,-1.387004 0.04678,4.183864 4.183863,0.04678 -1.387004,3.947547 3.915545,1.474927 -2.653498,3.235097 3.174955,2.725173 -3.599942,2.132447 2.051418,3.646724 -4.112178,0.772592 z" />\n <text\n xml:space="preserve"\n style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-1.32000005px;writing-mode:lr-tb;text-anchor:start;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"\n x="59.530632"\n y="77.325226"\n id="text3856"\n sodipodi:linespacing="125%"\n transform="scale(0.9999961,1.0000039)"><tspan\n sodipodi:role="line"\n id="tspan3858"\n x="59.530632"\n y="77.325226"\n style="font-size:16px;font-weight:bold;letter-spacing:-1.32000005px;fill:#000000;-inkscape-font-specification:Sans Bold">'+str('%02d' % self.counter)+'</tspan></text>\n <path\n style="opacity:0;fill:#000000;stroke:none;display:inline"\n id="path3919"\n inkscape:connector-curvature="0"\n d="m 60,72 4,-4 4,4 8,-8 4,4 -12,12 -8,-8 z" />\n <path\n style="opacity:0.6;color:#000000;fill:url(#linearGradient3948);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"\n id="path3933"\n inkscape:connector-curvature="0"\n d="M 71.5625,52 68.71875,55.34375 65.3125,52.5625 63.78125,56.65625 59.625,55.1875 l 0,1 4.15625,1.46875 1.53125,-4.09375 3.40625,2.78125 L 71.5625,53 73.8125,56.78125 77.625,54.625 78.4375,58.9375 82.625,58.25 82.78125,57.21875 78.4375,57.9375 77.625,53.625 73.8125,55.78125 71.5625,52 z m -11.96875,7.59375 -4.40625,0.03125 0.34375,1 4.0625,-0.03125 0,-1 z m 22.625,2 -0.15625,0.96875 3.8125,0.71875 0.5,-0.90625 -4.15625,-0.78125 z m -25.875,2.3125 -3.78125,1.40625 0.625,0.78125 3.46875,-1.3125 -0.3125,-0.875 z m 28.3125,2.53125 -0.4375,0.75 3.09375,1.84375 L 88,68.4375 l -3.34375,-2 z M 54.875,69.125 52,71.5625 l 0.6875,0.40625 2.65625,-2.25 L 54.875,69.125 z m 30.25,2.75 -0.46875,0.40625 2.15625,2.625 0.625,-0.21875 -2.3125,-2.8125 z m -29.78125,2.6875 -1.71875,3.0625 0.5,0.09375 1.65625,-2.90625 -0.4375,-0.25 z m 28.3125,2.53125 -0.3125,0.125 1.125,3.15625 0.34375,0 -1.15625,-3.28125 z m -25.875,2.3125 -0.5625,3.375 L 57.375,82.75 57.9375,79.4375 57.78125,79.40625 z" />\n <text\n xml:space="preserve"\n style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"\n x="60.261475"\n y="76.597481"\n id="text3074"\n sodipodi:linespacing="125%"><tspan\n sodipodi:role="line"\n id="tspan3076"\n x="60.261475"\n y="76.597481"\n style="font-size:14px;fill:#000000">'+str('%02d' % self.counter)+'</tspan></text>\n <text\n transform="scale(0.9999961,1.0000039)"\n sodipodi:linespacing="125%"\n id="text3852"\n y="78.053253"\n x="58.71452"\n style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-1.32000005px;writing-mode:lr-tb;text-anchor:start;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"\n xml:space="preserve"><tspan\n style="font-size:18px;font-weight:bold;letter-spacing:-2.47000003px;fill:#000000;-inkscape-font-specification:Sans Bold"\n y="78.053253"\n x="58.71452"\n id="tspan3854"\n sodipodi:role="line">'+str('%02d' % self.counter)+'</tspan></text>\n <text\n sodipodi:linespacing="125%"\n id="text3070"\n y="76.097481"\n x="60.261475"\n style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"\n xml:space="preserve"><tspan\n style="font-size:14px;fill:#ffffff"\n y="76.097481"\n x="60.261475"\n id="tspan3072"\n sodipodi:role="line">'+str('%02d' % self.counter)+'</tspan></text>\n </g>\n </g>\n</svg>\n' | 271 | self.svg_data = svg_mod.insert_counter(self.counter) |
| 72 | 259 | svg = open('emblem.svg', 'w') | 272 | svg = open(self.svg_path, 'w') |
| 73 | 260 | svg.write(self.svg_data) | 273 | svg.write(self.svg_data) |
| 74 | 261 | svg.close() | 274 | svg.close() |
| 75 | 262 | # rest icon | 275 | # rest icon |
| 76 | 263 | self.icon.SetIcon(os.path.abspath("./icon")) | 276 | self.icon.SetIcon(os.path.abspath("./icon")) |
| 77 | 264 | # put svg emblem on icon | 277 | # put svg emblem on icon |
| 79 | 265 | self.icon.SetEmblem(os.path.abspath("./emblem.svg"), CDApplet.UPPER_RIGHT) | 278 | self.icon.SetEmblem(self.svg_path, CDApplet.UPPER_RIGHT) |
| 80 | 266 | 279 | ||
| 81 | 267 | def check_when(self, diff): | 280 | def check_when(self, diff): |
| 82 | 268 | # this method checks whether the user needs attention or not | 281 | # this method checks whether the user needs attention or not |
| 83 | @@ -300,7 +313,7 @@ | |||
| 84 | 300 | os.popen('aplay ' + os.path.abspath("./alarm.wav")) | 313 | os.popen('aplay ' + os.path.abspath("./alarm.wav")) |
| 85 | 301 | else: | 314 | else: |
| 86 | 302 | pass | 315 | pass |
| 88 | 303 | self.icon.DemandsAttention(False, 'how') | 316 | self.icon.DemandsAttention(False, how) |
| 89 | 304 | 317 | ||
| 90 | 305 | def consider(self): | 318 | def consider(self): |
| 91 | 306 | # this method will check whether the user should be alarmed | 319 | # this method will check whether the user should be alarmed |
| 92 | @@ -338,13 +351,11 @@ | |||
| 93 | 338 | 351 | ||
| 94 | 339 | def read_fb(self): | 352 | def read_fb(self): |
| 95 | 340 | # reset fblist | 353 | # reset fblist |
| 96 | 341 | print "reading facebook" | ||
| 97 | 342 | fblist = [] | 354 | fblist = [] |
| 98 | 343 | # this method fetches information from FaceBook with fbcmd | 355 | # this method fetches information from FaceBook with fbcmd |
| 99 | 344 | # it runs the "fbcmd NOTIFY" command, returns and parses results in a "fblist" list | 356 | # it runs the "fbcmd NOTIFY" command, returns and parses results in a "fblist" list |
| 100 | 345 | result = subprocess.Popen(['fbcmd', 'NOTIFY'], stdout=PIPE).stdout | 357 | result = subprocess.Popen(['fbcmd', 'NOTIFY'], stdout=PIPE).stdout |
| 101 | 346 | fblist = result.readlines() | 358 | fblist = result.readlines() |
| 102 | 347 | print fblist | ||
| 103 | 348 | # if there is no internet connection, the list will be empty | 359 | # if there is no internet connection, the list will be empty |
| 104 | 349 | if fblist != []: | 360 | if fblist != []: |
| 105 | 350 | pass | 361 | pass |
| 106 | @@ -395,7 +406,6 @@ | |||
| 107 | 395 | # the update method continues asking read_fb() to fetch data from Facebook | 406 | # the update method continues asking read_fb() to fetch data from Facebook |
| 108 | 396 | try_read = self.read_fb() | 407 | try_read = self.read_fb() |
| 109 | 397 | if try_read == True: | 408 | if try_read == True: |
| 110 | 398 | print try_read | ||
| 111 | 399 | # then it checks whether there is any need to alarm the user | 409 | # then it checks whether there is any need to alarm the user |
| 112 | 400 | self.consider() | 410 | self.consider() |
| 113 | 401 | else: | 411 | else: |
| 114 | @@ -412,7 +422,6 @@ | |||
| 115 | 412 | # this is a function inherited from the CDApplet class | 422 | # this is a function inherited from the CDApplet class |
| 116 | 413 | # it will run automatically as the CDApplet instance is initated | 423 | # it will run automatically as the CDApplet instance is initated |
| 117 | 414 | # after the get_config() method: | 424 | # after the get_config() method: |
| 118 | 415 | |||
| 119 | 416 | # check if fbcmd is installed: | 425 | # check if fbcmd is installed: |
| 120 | 417 | # the log file should already have provided info, otherwise: | 426 | # the log file should already have provided info, otherwise: |
| 121 | 418 | if self.fbcmd == False: | 427 | if self.fbcmd == False: |
| 122 | @@ -520,6 +529,6 @@ | |||
| 123 | 520 | 529 | ||
| 124 | 521 | if __name__ == '__main__': | 530 | if __name__ == '__main__': |
| 125 | 522 | facebook = FaceBook() | 531 | facebook = FaceBook() |
| 128 | 523 | facebook.begin() | 532 | facebook.run() |
| 129 | 524 | gtk.main() | 533 | #gtk.main() |
| 130 | 525 | 534 | ||
| 131 | 526 | 535 | ||
| 132 | === modified file 'Facebook/Facebook.conf' | |||
| 133 | --- Facebook/Facebook.conf 2011-04-23 21:58:44 +0000 | |||
| 134 | +++ Facebook/Facebook.conf 2011-04-26 10:44:48 +0000 | |||
| 135 | @@ -1,4 +1,4 @@ | |||
| 137 | 1 | #!en;1.11.04.23 | 1 | #!en;1.11.04.26 |
| 138 | 2 | 2 | ||
| 139 | 3 | #[gtk-about] | 3 | #[gtk-about] |
| 140 | 4 | [Icon] | 4 | [Icon] |
| 141 | 5 | 5 | ||
| 142 | === modified file 'Facebook/auto-load.conf' | |||
| 143 | --- Facebook/auto-load.conf 2011-04-23 21:58:44 +0000 | |||
| 144 | +++ Facebook/auto-load.conf 2011-04-26 10:44:48 +0000 | |||
| 145 | @@ -9,7 +9,7 @@ | |||
| 146 | 9 | category = 3 | 9 | category = 3 |
| 147 | 10 | 10 | ||
| 148 | 11 | # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file. | 11 | # Version of the applet; change it everytime you change something in the config file. Don't forget to update the version both in this file and in the config file. |
| 150 | 12 | version = 1.11.04.23 | 12 | version = 1.11.04.26 |
| 151 | 13 | 13 | ||
| 152 | 14 | # Default icon to use if no icon has been defined by the user. If not specified, or if the file is not found, the "icon" file will be used. | 14 | # Default icon to use if no icon has been defined by the user. If not specified, or if the file is not found, the "icon" file will be used. |
| 153 | 15 | icon = | 15 | icon = |
| 154 | 16 | 16 | ||
| 155 | === added file 'Facebook/svg_mod.py' | |||
| 156 | --- Facebook/svg_mod.py 1970-01-01 00:00:00 +0000 | |||
| 157 | +++ Facebook/svg_mod.py 2011-04-26 10:44:48 +0000 | |||
| 158 | @@ -0,0 +1,28 @@ | |||
| 159 | 1 | #!/usr/bin/env python | ||
| 160 | 2 | # -*- coding: utf-8 -*- | ||
| 161 | 3 | # | ||
| 162 | 4 | # svg_mod.py is a module appending the Facebook Applet for Cairo-Dock | ||
| 163 | 5 | # | ||
| 164 | 6 | # Copyright 2011 benjamin <benjamin@vidya> | ||
| 165 | 7 | # | ||
| 166 | 8 | # This program is free software; you can redistribute it and/or modify | ||
| 167 | 9 | # it under the terms of the GNU General Public License as published by | ||
| 168 | 10 | # the Free Software Foundation; either version 2 of the License, or | ||
| 169 | 11 | # (at your option) any later version. | ||
| 170 | 12 | # | ||
| 171 | 13 | # This program is distributed in the hope that it will be useful, | ||
| 172 | 14 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 173 | 15 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 174 | 16 | # GNU General Public License for more details. | ||
| 175 | 17 | # | ||
| 176 | 18 | # You should have received a copy of the GNU General Public License | ||
| 177 | 19 | # along with this program; if not, write to the Free Software | ||
| 178 | 20 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, | ||
| 179 | 21 | # MA 02110-1301, USA. | ||
| 180 | 22 | |||
| 181 | 23 | |||
| 182 | 24 | |||
| 183 | 25 | def insert_counter(counter): | ||
| 184 | 26 | svg_string = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n<!-- Created with Inkscape (http://www.inkscape.org/) -->\n\n<svg\n xmlns:dc="http://purl.org/dc/elements/1.1/"\n xmlns:cc="http://creativecommons.org/ns#"\n xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"\n xmlns:svg="http://www.w3.org/2000/svg"\n xmlns="http://www.w3.org/2000/svg"\n xmlns:xlink="http://www.w3.org/1999/xlink"\n xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"\n xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"\n version="1.0"\n width="39.983284"\n height="39.945618"\n id="svg2408"\n inkscape:version="0.48.0 r9654"\n sodipodi:docname="emblem.svg">\n <sodipodi:namedview\n pagecolor="#ffffff"\n bordercolor="#666666"\n borderopacity="1"\n objecttolerance="10"\n gridtolerance="10"\n guidetolerance="10"\n inkscape:pageopacity="0"\n inkscape:pageshadow="2"\n inkscape:window-width="1280"\n inkscape:window-height="748"\n id="namedview94"\n showgrid="false"\n inkscape:zoom="3.4546968"\n inkscape:cx="-27.204217"\n inkscape:cy="-10.241983"\n inkscape:window-x="0"\n inkscape:window-y="0"\n inkscape:window-maximized="1"\n inkscape:current-layer="layer4"\n fit-margin-top="0"\n fit-margin-left="0"\n fit-margin-right="0"\n fit-margin-bottom="0"\n inkscape:snap-bbox="true"\n inkscape:snap-page="true" />\n <defs\n id="defs2410">\n <linearGradient\n id="linearGradient3942">\n <stop\n id="stop3944"\n style="stop-color:#ffffff;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3946"\n style="stop-color:#ffffff;stop-opacity:0"\n offset="1" />\n </linearGradient>\n <linearGradient\n id="linearGradient3727">\n <stop\n id="stop3729"\n style="stop-color:#d5d5d5;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3731"\n style="stop-color:#f1f1f1;stop-opacity:1"\n offset="1" />\n </linearGradient>\n <linearGradient\n id="linearGradient3641">\n <stop\n id="stop3643"\n style="stop-color:#000000;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3645"\n style="stop-color:#000000;stop-opacity:0"\n offset="1" />\n </linearGradient>\n <linearGradient\n x1="45.447727"\n y1="92.539597"\n x2="45.447727"\n y2="7.0165396"\n id="ButtonShadow"\n gradientUnits="userSpaceOnUse"\n gradientTransform="scale(1.0058652,0.994169)">\n <stop\n id="stop3750"\n style="stop-color:#000000;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3752"\n style="stop-color:#000000;stop-opacity:0.58823532"\n offset="1" />\n </linearGradient>\n <linearGradient\n id="linearGradient3737">\n <stop\n id="stop3739"\n style="stop-color:#ffffff;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3741"\n style="stop-color:#ffffff;stop-opacity:0"\n offset="1" />\n </linearGradient>\n <linearGradient\n id="linearGradient3700">\n <stop\n id="stop3702"\n style="stop-color:#dcdcdc;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3704"\n style="stop-color:#f0f0f0;stop-opacity:1"\n offset="1" />\n </linearGradient>\n <filter\n color-interpolation-filters="sRGB"\n id="filter3174">\n <feGaussianBlur\n id="feGaussianBlur3176"\n stdDeviation="1.71" />\n </filter>\n <filter\n x="-0.192"\n y="-0.192"\n width="1.3839999"\n height="1.3839999"\n color-interpolation-filters="sRGB"\n id="filter3794">\n <feGaussianBlur\n id="feGaussianBlur3796"\n stdDeviation="5.28" />\n </filter>\n <linearGradient\n x1="48"\n y1="20.220806"\n x2="48"\n y2="138.66119"\n id="linearGradient3613"\n xlink:href="#linearGradient3737"\n gradientUnits="userSpaceOnUse" />\n <radialGradient\n cx="48"\n cy="90.171875"\n r="42"\n fx="48"\n fy="90.171875"\n id="radialGradient3619"\n xlink:href="#linearGradient3737"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)" />\n <clipPath\n id="clipPath3613">\n <rect\n width="84"\n height="84"\n rx="6"\n ry="6"\n x="6"\n y="6"\n id="rect3615"\n style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />\n </clipPath>\n <linearGradient\n x1="48"\n y1="88"\n x2="48"\n y2="32"\n id="linearGradient3627"\n xlink:href="#linearGradient3700"\n gradientUnits="userSpaceOnUse" />\n <linearGradient\n x1="48"\n y1="88"\n x2="48"\n y2="36"\n id="linearGradient3635"\n xlink:href="#linearGradient3727"\n gradientUnits="userSpaceOnUse" />\n <filter\n color-interpolation-filters="sRGB"\n id="filter3649">\n <feGaussianBlur\n id="feGaussianBlur3651"\n stdDeviation="1.38" />\n </filter>\n <filter\n color-interpolation-filters="sRGB"\n id="filter3665">\n <feGaussianBlur\n id="feGaussianBlur3667"\n stdDeviation="0.69" />\n </filter>\n <linearGradient\n x1="36.357143"\n y1="6"\n x2="36.357143"\n y2="63.893143"\n id="linearGradient3687"\n xlink:href="#linearGradient3737"\n gradientUnits="userSpaceOnUse" />\n <linearGradient\n x1="48"\n y1="90"\n x2="48"\n y2="5.9877172"\n id="linearGradient3689"\n xlink:href="#linearGradient3700"\n gradientUnits="userSpaceOnUse" />\n <clipPath\n id="clipPath3696">\n <rect\n width="84"\n height="84"\n rx="6"\n ry="6"\n x="106"\n y="6"\n id="rect3698"\n style="fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none" />\n </clipPath>\n <linearGradient\n x1="48"\n y1="32"\n x2="48"\n y2="80"\n id="linearGradient3701"\n xlink:href="#linearGradient3641"\n gradientUnits="userSpaceOnUse"\n gradientTransform="translate(100,0)" />\n <clipPath\n id="clipPath3703">\n <rect\n width="84"\n height="84"\n rx="6"\n ry="6"\n x="106"\n y="6"\n id="rect3705"\n style="fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none" />\n </clipPath>\n <linearGradient\n x1="51"\n y1="62"\n x2="51"\n y2="21"\n id="linearGradient3707"\n xlink:href="#linearGradient3641"\n gradientUnits="userSpaceOnUse"\n gradientTransform="translate(100,-1)" />\n <linearGradient\n id="linearGradient3737-3">\n <stop\n id="stop3739-5"\n style="stop-color:#ffffff;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3741-7"\n style="stop-color:#ffffff;stop-opacity:0"\n offset="1" />\n </linearGradient>\n <radialGradient\n cx="48"\n cy="90.171875"\n r="42"\n fx="48"\n fy="90.171875"\n id="radialGradient2858"\n xlink:href="#linearGradient3737-3"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.551021,0.1971319)" />\n <linearGradient\n x1="45.447727"\n y1="92.539597"\n x2="45.447727"\n y2="7.0165396"\n id="ButtonShadow-0"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.0058652,0,0,0.994169,100,0)">\n <stop\n id="stop3750-8"\n style="stop-color:#000000;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3752-5"\n style="stop-color:#000000;stop-opacity:0.58823532"\n offset="1" />\n </linearGradient>\n <linearGradient\n x1="32.251034"\n y1="6.1317081"\n x2="32.251034"\n y2="90.238609"\n id="linearGradient3780"\n xlink:href="#ButtonShadow-0"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />\n <linearGradient\n x1="32.251034"\n y1="6.1317081"\n x2="32.251034"\n y2="90.238609"\n id="linearGradient3772"\n xlink:href="#ButtonShadow-0"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />\n <linearGradient\n x1="32.251034"\n y1="6.1317081"\n x2="32.251034"\n y2="90.238609"\n id="linearGradient3725"\n xlink:href="#ButtonShadow-0"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />\n <linearGradient\n x1="32.251034"\n y1="6.1317081"\n x2="32.251034"\n y2="90.238609"\n id="linearGradient3721"\n xlink:href="#ButtonShadow-0"\n gradientUnits="userSpaceOnUse"\n gradientTransform="translate(0,-97)" />\n <linearGradient\n x1="32.251034"\n y1="6.1317081"\n x2="32.251034"\n y2="90.238609"\n id="linearGradient2918"\n xlink:href="#ButtonShadow-0"\n gradientUnits="userSpaceOnUse"\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)" />\n <linearGradient\n id="linearGradient3801">\n <stop\n id="stop3803"\n style="stop-color:#a4d620;stop-opacity:1"\n offset="0" />\n <stop\n id="stop3805"\n style="stop-color:#62a915;stop-opacity:1"\n offset="1" />\n </linearGradient>\n <linearGradient\n x1="45.298355"\n y1="72.618279"\n x2="79.622185"\n y2="72.618279"\n id="linearGradient3915"\n xlink:href="#linearGradient3801"\n gradientUnits="userSpaceOnUse" />\n <linearGradient\n x1="68"\n y1="52"\n x2="68"\n y2="84"\n id="linearGradient3948"\n xlink:href="#linearGradient3942"\n gradientUnits="userSpaceOnUse" />\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3942-7"\n id="linearGradient3948-1"\n y2="84"\n x2="68"\n y1="52"\n x1="68" />\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3801-9"\n id="linearGradient3915-7"\n y2="72.618279"\n x2="79.622185"\n y1="72.618279"\n x1="45.298355" />\n <linearGradient\n id="linearGradient3801-9">\n <stop\n offset="0"\n style="stop-color:#a4d620;stop-opacity:1"\n id="stop3803-1" />\n <stop\n offset="1"\n style="stop-color:#62a915;stop-opacity:1"\n id="stop3805-7" />\n </linearGradient>\n <linearGradient\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#ButtonShadow-0-0"\n id="linearGradient2918-0"\n y2="90.238609"\n x2="32.251034"\n y1="6.1317081"\n x1="32.251034" />\n <linearGradient\n gradientTransform="translate(0,-97)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#ButtonShadow-0-0"\n id="linearGradient3721-9"\n y2="90.238609"\n x2="32.251034"\n y1="6.1317081"\n x1="32.251034" />\n <linearGradient\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#ButtonShadow-0-0"\n id="linearGradient3725-4"\n y2="90.238609"\n x2="32.251034"\n y1="6.1317081"\n x1="32.251034" />\n <linearGradient\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#ButtonShadow-0-0"\n id="linearGradient3772-9"\n y2="90.238609"\n x2="32.251034"\n y1="6.1317081"\n x1="32.251034" />\n <linearGradient\n gradientTransform="matrix(1.0238095,0,0,1.0119048,-1.1428571,-98.071429)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#ButtonShadow-0-0"\n id="linearGradient3780-5"\n y2="90.238609"\n x2="32.251034"\n y1="6.1317081"\n x1="32.251034" />\n <linearGradient\n gradientTransform="matrix(1.0058652,0,0,0.994169,100,0)"\n gradientUnits="userSpaceOnUse"\n id="ButtonShadow-0-0"\n y2="7.0165396"\n x2="45.447727"\n y1="92.539597"\n x1="45.447727">\n <stop\n offset="0"\n style="stop-color:#000000;stop-opacity:1"\n id="stop3750-8-6" />\n <stop\n offset="1"\n style="stop-color:#000000;stop-opacity:0.58823532"\n id="stop3752-5-1" />\n </linearGradient>\n <radialGradient\n gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.551021,0.1971319)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3737-3-2"\n id="radialGradient2858-1"\n fy="90.171875"\n fx="48"\n r="42"\n cy="90.171875"\n cx="48" />\n <linearGradient\n id="linearGradient3737-3-2">\n <stop\n offset="0"\n style="stop-color:#ffffff;stop-opacity:1"\n id="stop3739-5-2" />\n <stop\n offset="1"\n style="stop-color:#ffffff;stop-opacity:0"\n id="stop3741-7-6" />\n </linearGradient>\n <linearGradient\n gradientTransform="translate(100,-1)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3641-7"\n id="linearGradient3707-7"\n y2="21"\n x2="51"\n y1="62"\n x1="51" />\n <clipPath\n id="clipPath3703-7">\n <rect\n style="fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none"\n id="rect3705-2"\n y="6"\n x="106"\n ry="6"\n rx="6"\n height="84"\n width="84" />\n </clipPath>\n <linearGradient\n gradientTransform="translate(100,0)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3641-7"\n id="linearGradient3701-1"\n y2="80"\n x2="48"\n y1="32"\n x1="48" />\n <clipPath\n id="clipPath3696-8">\n <rect\n style="fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none"\n id="rect3698-7"\n y="6"\n x="106"\n ry="6"\n rx="6"\n height="84"\n width="84" />\n </clipPath>\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3700-8"\n id="linearGradient3689-4"\n y2="5.9877172"\n x2="48"\n y1="90"\n x1="48" />\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3737-8"\n id="linearGradient3687-0"\n y2="63.893143"\n x2="36.357143"\n y1="6"\n x1="36.357143" />\n <filter\n id="filter3665-9"\n color-interpolation-filters="sRGB">\n <feGaussianBlur\n stdDeviation="0.69"\n id="feGaussianBlur3667-5" />\n </filter>\n <filter\n id="filter3649-6"\n color-interpolation-filters="sRGB">\n <feGaussianBlur\n stdDeviation="1.38"\n id="feGaussianBlur3651-4" />\n </filter>\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3727-2"\n id="linearGradient3635-6"\n y2="36"\n x2="48"\n y1="88"\n x1="48" />\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3700-8"\n id="linearGradient3627-2"\n y2="32"\n x2="48"\n y1="88"\n x1="48" />\n <clipPath\n id="clipPath3613-8">\n <rect\n style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"\n id="rect3615-9"\n y="6"\n x="6"\n ry="6"\n rx="6"\n height="84"\n width="84" />\n </clipPath>\n <radialGradient\n gradientTransform="matrix(1.1573129,0,0,0.99590774,-7.5510206,0.19713193)"\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3737-8"\n id="radialGradient3619-6"\n fy="90.171875"\n fx="48"\n r="42"\n cy="90.171875"\n cx="48" />\n <linearGradient\n gradientUnits="userSpaceOnUse"\n xlink:href="#linearGradient3737-8"\n id="linearGradient3613-0"\n y2="138.66119"\n x2="48"\n y1="20.220806"\n x1="48" />\n <filter\n id="filter3794-9"\n color-interpolation-filters="sRGB"\n height="1.3839999"\n width="1.3839999"\n y="-0.192"\n x="-0.192">\n <feGaussianBlur\n stdDeviation="5.28"\n id="feGaussianBlur3796-2" />\n </filter>\n <filter\n id="filter3174-1"\n color-interpolation-filters="sRGB">\n <feGaussianBlur\n stdDeviation="1.71"\n id="feGaussianBlur3176-4" />\n </filter>\n <linearGradient\n id="linearGradient3700-8">\n <stop\n offset="0"\n style="stop-color:#dcdcdc;stop-opacity:1"\n id="stop3702-4" />\n <stop\n offset="1"\n style="stop-color:#f0f0f0;stop-opacity:1"\n id="stop3704-3" />\n </linearGradient>\n <linearGradient\n id="linearGradient3737-8">\n <stop\n offset="0"\n style="stop-color:#ffffff;stop-opacity:1"\n id="stop3739-6" />\n <stop\n offset="1"\n style="stop-color:#ffffff;stop-opacity:0"\n id="stop3741-8" />\n </linearGradient>\n <linearGradient\n gradientTransform="scale(1.0058652,0.994169)"\n gradientUnits="userSpaceOnUse"\n id="ButtonShadow-3"\n y2="7.0165396"\n x2="45.447727"\n y1="92.539597"\n x1="45.447727">\n <stop\n offset="0"\n style="stop-color:#000000;stop-opacity:1"\n id="stop3750-0" />\n <stop\n offset="1"\n style="stop-color:#000000;stop-opacity:0.58823532"\n id="stop3752-7" />\n </linearGradient>\n <linearGradient\n id="linearGradient3641-7">\n <stop\n offset="0"\n style="stop-color:#000000;stop-opacity:1"\n id="stop3643-4" />\n <stop\n offset="1"\n style="stop-color:#000000;stop-opacity:0"\n id="stop3645-4" />\n </linearGradient>\n <linearGradient\n id="linearGradient3727-2">\n <stop\n offset="0"\n style="stop-color:#d5d5d5;stop-opacity:1"\n id="stop3729-5" />\n <stop\n offset="1"\n style="stop-color:#f1f1f1;stop-opacity:1"\n id="stop3731-4" />\n </linearGradient>\n <linearGradient\n id="linearGradient3942-7">\n <stop\n offset="0"\n style="stop-color:#ffffff;stop-opacity:1"\n id="stop3944-4" />\n <stop\n offset="1"\n style="stop-color:#ffffff;stop-opacity:0"\n id="stop3946-5" />\n </linearGradient>\n <linearGradient\n inkscape:collect="always"\n xlink:href="#ButtonShadow-3"\n id="linearGradient3250"\n gradientUnits="userSpaceOnUse"\n gradientTransform="scale(1.0058652,0.994169)"\n x1="45.447727"\n y1="92.539597"\n x2="45.447727"\n y2="7.0165396" />\n <linearGradient\n inkscape:collect="always"\n xlink:href="#linearGradient3801-9"\n id="linearGradient3252"\n gradientUnits="userSpaceOnUse"\n x1="45.298355"\n y1="72.618279"\n x2="79.622185"\n y2="72.618279" />\n <linearGradient\n inkscape:collect="always"\n xlink:href="#linearGradient3942-7"\n id="linearGradient3254"\n gradientUnits="userSpaceOnUse"\n x1="68"\n y1="52"\n x2="68"\n y2="84" />\n </defs>\n <metadata\n id="metadata2413">\n <rdf:RDF>\n <cc:Work\n rdf:about="">\n <dc:format>image/svg+xml</dc:format>\n <dc:type\n rdf:resource="http://purl.org/dc/dcmitype/StillImage" />\n <dc:title />\n </cc:Work>\n </rdf:RDF>\n </metadata>\n <g\n id="layer2"\n style="display:none"\n transform="translate(-176.03343,-51.028478)">\n <rect\n width="86"\n height="85"\n rx="6"\n ry="6"\n x="5"\n y="7"\n id="rect3745"\n style="opacity:0.9;fill:url(#ButtonShadow);fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter3174)" />\n </g>\n <g\n id="layer4"\n transform="translate(-50.007625,-51.028478)">\n <g\n id="g3234"\n transform="matrix(0.68115941,0,0,0.68115941,28.692755,16.26995)">\n <path\n style="opacity:0.1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"\n id="path3960"\n inkscape:connector-curvature="0"\n d="m 89.986349,69.238985 c -0.21488,-1.561093 -1.973583,-1.971086 -3.08095,-2.785965 0.452305,-1.002477 1.307299,-1.880744 1.442147,-2.982622 0.09844,-1.212445 -1.013508,-2.114893 -2.161243,-2.135756 -0.574938,-0.191984 -1.529962,-0.121132 -1.883184,-0.466436 0.105461,-1.303923 0.927598,-2.804937 -0.05258,-3.95302 -0.907896,-1.060888 -2.339545,-0.509432 -3.503632,-0.325674 -0.950635,0.504422 -0.81239,-0.565783 -0.973216,-1.2035 -0.130627,-1.071533 -0.401383,-2.422333 -1.652276,-2.666162 -1.269606,-0.351715 -2.257329,0.785416 -3.345553,1.248885 -0.564682,0.197811 -0.761585,-1.032508 -1.178359,-1.409042 -0.426005,-1.011804 -1.521655,-1.848863 -2.654045,-1.413094 -1.095119,0.436651 -1.63445,1.627605 -2.458205,2.425428 -0.973647,-0.65486 -1.72467,-1.7847 -2.91707,-1.99934 -1.243767,-0.181639 -2.134633,0.905175 -2.372989,2.019516 -0.345055,0.444832 -0.243497,1.842522 -1.003052,1.403006 -1.213096,-0.355405 -2.631658,-1.302577 -3.801916,-0.341572 -1.164288,0.944179 -0.641361,2.603822 -0.785903,3.912444 -1.186176,0.269467 -2.880347,-0.340038 -3.868298,0.741757 -1.026659,1.143887 -0.143349,2.597452 0.237559,3.813095 0.487992,0.76899 -0.891072,0.672735 -1.319748,1.016916 -1.098052,0.268634 -2.195073,1.121664 -2.064313,2.380723 0.249354,1.192288 1.335753,1.97237 1.99934,2.949845 -0.871859,0.915157 -2.269562,1.493314 -2.556533,2.818742 -0.186067,1.142981 0.709312,1.986005 1.663193,2.403037 0.374257,0.418594 1.762649,0.565214 1.196802,1.235928 -0.585967,1.153839 -1.765734,2.450576 -0.926208,3.768425 0.810341,1.207354 2.476744,0.956157 3.736472,1.311043 -0.08576,1.227497 -0.781478,2.521328 -0.229433,3.703695 0.526899,1.071756 1.844115,1.213477 2.87647,0.879241 0.560732,0.07218 1.729076,-0.722239 1.724808,0.155757 0.28962,1.207178 0.140911,2.908592 1.527846,3.422546 1.38487,0.596205 2.576146,-0.697698 3.773565,-1.225564 0.454783,0.276534 0.742145,1.177337 1.132089,1.695641 0.455828,1.285443 2.259105,1.820804 3.255585,0.80819 0.610876,-0.645848 1.17573,-1.360459 1.769908,-2.032116 1.070537,0.696774 1.92142,2.036743 3.310382,1.999339 1.284689,-0.0939 1.81764,-1.335721 2.151522,-2.404812 0.206115,-0.763429 0.45194,-1.441171 1.291319,-0.838121 1.079697,0.400421 2.40691,1.016712 3.407356,0.09643 1.036768,-1.007403 0.54752,-2.574581 0.688297,-3.867575 1.24572,-0.135375 2.670869,0.29881 3.736472,-0.524417 0.936001,-0.804307 0.694064,-2.129136 0.219537,-3.122161 -0.129526,-0.619425 -0.912001,-1.544893 0.15361,-1.604149 1.111548,-0.448238 2.718145,-0.69704 2.904459,-2.123887 0.293747,-1.438242 -1.158981,-2.317711 -1.863365,-3.381883 -0.0012,-0.497479 0.978512,-0.910082 1.354831,-1.374896 0.68176,-0.486375 1.154931,-1.160958 1.098503,-2.027866 z" />\n <path\n inkscape:connector-curvature="0"\n style="opacity:0.15;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"\n id="path3956"\n transform="matrix(0,1.048834,-1.048834,0,146.16452,5.4895435)"\n d="m 60.9375,54.59375 a 0.86264402,0.86264402 0 0 0 -0.71875,0.4375 L 58.5,57.875 55.625,56.25 a 0.86264402,0.86264402 0 0 0 -1.28125,0.59375 l -0.625,3.3125 -3.28125,-0.5625 a 0.86264402,0.86264402 0 0 0 -1,1 L 50,63.875 46.6875,64.5 a 0.86264402,0.86264402 0 0 0 -0.59375,1.28125 l 1.625,2.875 L 44.875,70.375 A 0.86264402,0.86264402 0 0 0 44.75,71.78125 L 47.25,73.9375 45.15625,76.5 A 0.86264402,0.86264402 0 0 0 45.5,77.875 l 3.15625,1.1875 -1.125,3.15625 a 0.86264402,0.86264402 0 0 0 0.8125,1.15625 l 3.3125,0.03125 0.0625,3.3125 a 0.86264402,0.86264402 0 0 0 1.15625,0.8125 L 56,86.4375 l 1.1875,3.125 a 0.86264402,0.86264402 0 0 0 1.34375,0.34375 l 2.59375,-2.125 2.1875,2.5625 a 0.86264402,0.86264402 0 0 0 1.40625,-0.125 l 1.6875,-2.875 2.9375,1.625 a 0.86264402,0.86264402 0 0 0 1.25,-0.59375 l 0.59375,-3.28125 3.3125,0.5625 a 0.86264402,0.86264402 0 0 0 1,-1 L 74.9375,81.34375 78.21875,80.75 A 0.86264402,0.86264402 0 0 0 78.8125,79.5 l -1.625,-2.9375 2.875,-1.6875 a 0.86264402,0.86264402 0 0 0 0.125,-1.40625 L 77.625,71.28125 79.75,68.6875 a 0.86264402,0.86264402 0 0 0 -0.34375,-1.34375 l -3.125,-1.1875 1.09375,-3.125 A 0.86264402,0.86264402 0 0 0 76.5625,61.875 L 73.25,61.8125 73.21875,58.5 A 0.86264402,0.86264402 0 0 0 72.0625,57.6875 l -3.15625,1.125 -1.1875,-3.15625 a 0.86264402,0.86264402 0 0 0 -1.375,-0.34375 l -2.5625,2.09375 -2.15625,-2.5 a 0.86264402,0.86264402 0 0 0 -0.6875,-0.3125 z" />\n <path\n inkscape:connector-curvature="0"\n style="opacity:0.3;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"\n id="path3950"\n transform="matrix(0,1.048834,-1.048834,0,146.16452,5.4895435)"\n d="m 74.641931,84.79994 -4.128425,-0.680449 -0.772592,4.112178 -3.646724,-2.051417 -2.132447,3.599941 -2.725174,-3.174954 -3.235096,2.653498 -1.474928,-3.915545 -3.947546,1.387004 -0.04678,-4.183864 -4.183864,-0.04678 1.387005,-3.947547 -3.915546,-1.474927 2.653499,-3.235097 -3.174955,-2.725173 3.599941,-2.132447 -2.051417,-3.646724 4.112178,-0.772592 -0.680448,-4.128426 4.128425,0.680449 0.772592,-4.112178 3.646724,2.051417 2.132447,-3.599941 2.725173,3.174954 3.235097,-2.653498 1.474927,3.915545 3.947547,-1.387004 0.04678,4.183864 4.183863,0.04678 -1.387004,3.947547 3.915545,1.474927 -2.653498,3.235097 3.174955,2.725173 -3.599942,2.132447 2.051418,3.646724 -4.112178,0.772592 z" />\n <path\n transform="matrix(0,1.048834,-1.048834,0,146.16452,4.4895435)"\n inkscape:connector-curvature="0"\n style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"\n id="path3139"\n d="m 74.641931,84.79994 -4.128425,-0.680449 -0.772592,4.112178 -3.646724,-2.051417 -2.132447,3.599941 -2.725174,-3.174954 -3.235096,2.653498 -1.474928,-3.915545 -3.947546,1.387004 -0.04678,-4.183864 -4.183864,-0.04678 1.387005,-3.947547 -3.915546,-1.474927 2.653499,-3.235097 -3.174955,-2.725173 3.599941,-2.132447 -2.051417,-3.646724 4.112178,-0.772592 -0.680448,-4.128426 4.128425,0.680449 0.772592,-4.112178 3.646724,2.051417 2.132447,-3.599941 2.725173,3.174954 3.235097,-2.653498 1.474927,3.915545 3.947547,-1.387004 0.04678,4.183864 4.183863,0.04678 -1.387004,3.947547 3.915545,1.474927 -2.653498,3.235097 3.174955,2.725173 -3.599942,2.132447 2.051418,3.646724 -4.112178,0.772592 z" />\n <text\n xml:space="preserve"\n style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-1.32000005px;writing-mode:lr-tb;text-anchor:start;opacity:0.15;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"\n x="59.530632"\n y="77.325226"\n id="text3856"\n sodipodi:linespacing="125%"\n transform="scale(0.9999961,1.0000039)"><tspan\n sodipodi:role="line"\n id="tspan3858"\n x="59.530632"\n y="77.325226"\n style="font-size:16px;font-weight:bold;letter-spacing:-1.32000005px;fill:#000000;-inkscape-font-specification:Sans Bold">'+str('%02d' % counter)+'</tspan></text>\n <path\n style="opacity:0;fill:#000000;stroke:none;display:inline"\n id="path3919"\n inkscape:connector-curvature="0"\n d="m 60,72 4,-4 4,4 8,-8 4,4 -12,12 -8,-8 z" />\n <path\n style="opacity:0.6;color:#000000;fill:url(#linearGradient3948);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"\n id="path3933"\n inkscape:connector-curvature="0"\n d="M 71.5625,52 68.71875,55.34375 65.3125,52.5625 63.78125,56.65625 59.625,55.1875 l 0,1 4.15625,1.46875 1.53125,-4.09375 3.40625,2.78125 L 71.5625,53 73.8125,56.78125 77.625,54.625 78.4375,58.9375 82.625,58.25 82.78125,57.21875 78.4375,57.9375 77.625,53.625 73.8125,55.78125 71.5625,52 z m -11.96875,7.59375 -4.40625,0.03125 0.34375,1 4.0625,-0.03125 0,-1 z m 22.625,2 -0.15625,0.96875 3.8125,0.71875 0.5,-0.90625 -4.15625,-0.78125 z m -25.875,2.3125 -3.78125,1.40625 0.625,0.78125 3.46875,-1.3125 -0.3125,-0.875 z m 28.3125,2.53125 -0.4375,0.75 3.09375,1.84375 L 88,68.4375 l -3.34375,-2 z M 54.875,69.125 52,71.5625 l 0.6875,0.40625 2.65625,-2.25 L 54.875,69.125 z m 30.25,2.75 -0.46875,0.40625 2.15625,2.625 0.625,-0.21875 -2.3125,-2.8125 z m -29.78125,2.6875 -1.71875,3.0625 0.5,0.09375 1.65625,-2.90625 -0.4375,-0.25 z m 28.3125,2.53125 -0.3125,0.125 1.125,3.15625 0.34375,0 -1.15625,-3.28125 z m -25.875,2.3125 -0.5625,3.375 L 57.375,82.75 57.9375,79.4375 57.78125,79.40625 z" />\n <text\n xml:space="preserve"\n style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;opacity:0.3;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"\n x="60.261475"\n y="76.597481"\n id="text3074"\n sodipodi:linespacing="125%"><tspan\n sodipodi:role="line"\n id="tspan3076"\n x="60.261475"\n y="76.597481"\n style="font-size:14px;fill:#000000">'+str('%02d' % counter)+'</tspan></text>\n <text\n transform="scale(0.9999961,1.0000039)"\n sodipodi:linespacing="125%"\n id="text3852"\n y="78.053253"\n x="58.71452"\n style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:-1.32000005px;writing-mode:lr-tb;text-anchor:start;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"\n xml:space="preserve"><tspan\n style="font-size:18px;font-weight:bold;letter-spacing:-2.47000003px;fill:#000000;-inkscape-font-specification:Sans Bold"\n y="78.053253"\n x="58.71452"\n id="tspan3854"\n sodipodi:role="line">'+str('%02d' % counter)+'</tspan></text>\n <text\n sodipodi:linespacing="125%"\n id="text3070"\n y="76.097481"\n x="60.261475"\n style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"\n xml:space="preserve"><tspan\n style="font-size:14px;fill:#ffffff"\n y="76.097481"\n x="60.261475"\n id="tspan3072"\n sodipodi:role="line">'+str('%02d' % counter)+'</tspan></text>\n </g>\n </g>\n</svg>\n' | ||
| 185 | 27 | return svg_string | ||
| 186 | 28 | |||
PS i also fixed the configuration menu where ATTENTION_HOW and ATTENTION_WHEN needed integer reference and not threads because of the drop-down widget returns.
I realise the emblem.svg file can be removed from the package since it will be created in the configuration file's path. How can i removed the file from the branch?