diff options
author | Walter Bender <walter@walter-laptop.(none)> | 2010-02-20 18:40:23 (GMT) |
---|---|---|
committer | Walter Bender <walter@walter-laptop.(none)> | 2010-02-20 18:40:23 (GMT) |
commit | a5e7b3bbf80513e9ea9b9497d60e851cde0f44c8 (patch) | |
tree | 4c92aed109ea139c84cc8a4fe587fceb805ccb39 | |
parent | e3973fddefad1e714cc98becea2bfe1cec32da44 (diff) |
cleaning up artwork
-rw-r--r-- | icons/UCB-save.svg | 135 | ||||
-rw-r--r-- | icons/htmloff.svg | 104 | ||||
-rw-r--r-- | icons/htmlon.svg | 120 | ||||
-rw-r--r-- | icons/image-saveoff.svg | 82 | ||||
-rw-r--r-- | icons/image-saveon.svg | 84 | ||||
-rw-r--r-- | icons/load-from-journal.svg | 216 | ||||
-rw-r--r-- | icons/logo-saveoff.svg | 163 | ||||
-rw-r--r-- | icons/logo-saveon.svg | 126 | ||||
-rw-r--r-- | icons/pippy-openoff.svg | 100 | ||||
-rw-r--r-- | icons/pippy-openon.svg | 107 | ||||
-rw-r--r-- | po/TurtleArt.pot | 513 | ||||
-rw-r--r-- | taconstants.py | 4 | ||||
-rw-r--r-- | talogo.py | 14 | ||||
-rwxr-xr-x | tasprite_factory.py | 26 | ||||
-rw-r--r-- | tawindow.py | 6 |
15 files changed, 736 insertions, 1064 deletions
diff --git a/icons/UCB-save.svg b/icons/UCB-save.svg deleted file mode 100644 index 08fb9e8..0000000 --- a/icons/UCB-save.svg +++ /dev/null @@ -1,135 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448) --> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [ - <!ENTITY ns_svg "http://www.w3.org/2000/svg"> - <!ENTITY ns_xlink "http://www.w3.org/1999/xlink"> - <!ENTITY stroke_color "#ffffff"> -]> -<svg - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - version="1.0" - width="55" - height="55" - viewBox="0 0 55 55" - id="svg2" - xml:space="preserve"> -<g - transform="translate(-0.5507515,-1.7569535)"> - <line - fill="none" - stroke="&stroke_color;" - style="stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="line3290" - y2="4.9169998" - y1="16.188" - x2="52.441002" - x1="41.169998" /> - <polyline - fill="none" - stroke="&stroke_color;" - style="stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="polyline3292" - points="51.562,15.306 41.17,16.188 42.053,5.794" /> -</g> -<g - transform="translate(-6,2)"> - <polygon - points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 " - id="polygon9" - fill="none" - stroke="&stroke_color;" - style="stroke-width:3.5" /> - <polyline - fill="none" - stroke="&stroke_color;" - style="stroke-width:3.5" - id="polyline11" - points="43.818,18.027 31.874,18.027 31.874,6.088" /> - - <path - d="M 27.379465,42.19975 C 27.102965,42.19975 26.829965,42.18225 26.560965,42.14975 L 27.254965,43.32425 L 27.938965,42.16775 C 27.753465,42.18275 27.568465,42.19975 27.379465,42.19975 z" - fill="none" - stroke="&stroke_color;" - style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <g - transform="matrix(0.5,0,0,0.5,13.630965,18.06025)" - fill="none" - stroke="&stroke_color;" - style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"> - <path - d="M 40.16,11.726 C 37.996,11.726 36.202,13.281 35.817,15.333 C 37.676,16.678 39.274,18.448 40.492,20.541 C 42.777,20.369 44.586,18.48 44.586,16.151 C 44.586,13.707 42.604,11.726 40.16,11.726 z" - fill="none" - stroke="&stroke_color;" - style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 40.713,39.887 C 39.489,42.119 37.853,44.018 35.916,45.443 C 36.437,47.307 38.129,48.682 40.16,48.682 C 42.603,48.682 44.586,46.702 44.586,44.258 C 44.586,42.003 42.893,40.162 40.713,39.887 z" - fill="none" - stroke="&stroke_color;" - style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 14.273,39.871 C 12.02,40.077 10.249,41.95 10.249,44.258 C 10.249,46.701 12.229,48.682 14.673,48.682 C 16.737,48.682 18.457,47.262 18.945,45.35 C 17.062,43.934 15.47,42.061 14.273,39.871 z" - fill="none" - stroke="&stroke_color;" - style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 19.026,15.437 C 18.683,13.334 16.872,11.726 14.673,11.726 C 12.229,11.726 10.249,13.707 10.249,16.15 C 10.249,18.532 12.135,20.46 14.494,20.556 C 15.68,18.513 17.226,16.772 19.026,15.437 z" - fill="none" - stroke="&stroke_color;" - style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - <path - d="M 27.379465,24.34175 C 28.333465,24.34175 29.243465,24.54725 30.088465,24.90575 C 30.458965,24.36775 30.677465,23.71725 30.677465,23.01425 C 30.677465,21.17075 29.182965,19.67575 27.338965,19.67575 C 25.495465,19.67575 24.000965,21.17075 24.000965,23.01425 C 24.000965,23.72825 24.226965,24.38875 24.608965,24.93125 C 25.470965,24.55675 26.402465,24.34175 27.379465,24.34175 z" - fill="none" - stroke="&stroke_color;" - style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <g - transform="matrix(0.5,0,0,0.5,13.630965,18.06025)" - fill="none" - stroke="&stroke_color;" - style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"> - <path - d="M 43.102,30.421 C 43.102,35.1554 41.4568,39.7008 38.5314,43.0485 C 35.606,46.3963 31.6341,48.279 27.497,48.279 C 23.3599,48.279 19.388,46.3963 16.4626,43.0485 C 13.5372,39.7008 11.892,35.1554 11.892,30.421 C 11.892,20.6244 18.9364,12.563 27.497,12.563 C 36.0576,12.563 43.102,20.6244 43.102,30.421 z" - id="path2988" - fill="none" - stroke="&stroke_color;" - style="stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> - <g - transform="matrix(0.5,0,0,0.5,13.630965,18.06025)" - fill="none" - stroke="&stroke_color;" - style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"> - <path - d="M 25.875,33.75 L 24.333,29.125 L 27.497,26.538 L 31.112,29.164 L 29.625,33.833 L 25.875,33.75 z" - fill="none" - stroke="&stroke_color;" - style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 27.501,41.551 C 23.533,41.391 21.958,39.542 21.958,39.542 L 25.528,35.379 L 29.993,35.547 L 33.125,39.667 C 33.125,39.667 30.235,41.661 27.501,41.551 z" - fill="none" - stroke="&stroke_color;" - style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 18.453,33.843 C 17.604,30.875 18.625,26.959 18.625,26.959 L 22.625,29.126 L 24.118,33.755 L 20.536,37.988 C 20.536,37.987 19.071,35.998 18.453,33.843 z" - fill="none" - stroke="&stroke_color;" - style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 19.458,25.125 C 19.458,25.125 19.958,23.167 22.497,21.303 C 24.734,19.66 26.962,19.583 26.962,19.583 L 26.925,24.564 L 23.404,27.314 L 19.458,25.125 z" - id="path2998" - fill="none" - stroke="&stroke_color;" - style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 32.084,27.834 L 28.625,24.959 L 29,19.75 C 29,19.75 30.834,19.708 32.959,21.417 C 35.187,23.208 36.321,26.4 36.321,26.4 L 32.084,27.834 z" - fill="none" - stroke="&stroke_color;" - style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 31.292,34.042 L 32.605,29.578 L 36.792,28.042 C 36.792,28.042 37.469,30.705 36.75,33.709 C 36.21,35.965 34.666,38.07 34.666,38.07 L 31.292,34.042 z" - id="path3002" - style="stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> -</g> -</svg> diff --git a/icons/htmloff.svg b/icons/htmloff.svg index fe0c01a..d6f83c6 100644 --- a/icons/htmloff.svg +++ b/icons/htmloff.svg @@ -1,81 +1,23 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - version="1.0" - width="55" - height="55" - viewBox="0 0 55 55" - id="svg2" - xml:space="preserve"><defs - id="defs29" /> -<g - transform="translate(-0.25,-1.75)" - id="g4"> - <line - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - y2="5" - y1="16" - x2="52.5" - x1="41" - id="line6" /> - <polyline - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - points="51.5,15.5 41,16 42,5.75" - id="polyline8" /> -</g> - <polygon - points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 " - transform="translate(-5.182,3.336)" - id="polygon10" - style="fill:none;stroke:#ffffff;stroke-width:3.5" /> - <polyline - points="43.818,18.027 31.874,18.027 31.874,6.088 " - id="polyline12" - transform="translate(-5.182,3.336)" - style="fill:none;stroke:#ffffff;stroke-width:3.5" /> - - - - - - - <circle - cx="27.375" - cy="33.5" - r="9.9510002" - transform="translate(-5.1815003,1.7989998)" - id="circle14" - style="fill:#ffffff;fill-opacity:1" /><path - d="M 22.1945,25.348 C 22.1945,25.348 16.5915,29.545 16.5915,35.336 C 16.5915,41.127 22.1945,45.25 22.1945,45.25" - id="path16" - style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.5" /><path - d="M 22.1945,25.348 C 22.1945,25.348 27.7265,29.918 27.7265,35.336 C 27.7265,40.755 22.1945,45.25 22.1945,45.25" - id="path18" - style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.5" /><line - style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:1.5" - x1="22.1945" - x2="22.1945" - y1="25.348" - y2="45.25" - id="line20" /><line - style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:1.5" - x1="22.1945" - x2="22.1945" - y1="25.348" - y2="45.25" - id="line22" /><line - style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:1.5" - x1="22.1945" - x2="22.1945" - y1="25.348" - y2="45.25" - id="line24" /><line - style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-opacity:1" - x1="12.2415" - x2="32.144501" - y1="35.299" - y2="35.299" - id="line26" /> -</svg>
\ No newline at end of file +<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [ + <!ENTITY stroke_color "#010101"> + <!ENTITY fill_color "#666666"> +]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-from-url"> + <g> + <polygon fill="&fill_color;" points="50.056,32.715 50.056,2 8.433,2 8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543 " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/> + </g> + <g> + <g> + <polygon fill="#ffffff" points="18.435,10.583 32.046,10.583 39.811,18.343 39.811,38.42 18.435,38.42 " stroke="&fill_color;" stroke-width="2.275"/> + <polyline fill="none" points="39.811,18.343 32.046,18.343 32.046,10.583 " stroke="&fill_color;" stroke-width="2.275"/> + </g> + </g> + <g> + <circle cx="29.123" cy="28.4" fill="&fill_color;" r="6.469"/> + <g> + <path d="M29.124,21.932c0,0,3.596,2.971,3.596,6.492 c0,3.523-3.596,6.445-3.596,6.445" fill="none" stroke="#ffffff" stroke-width="0.975"/> + <path d="M29.124,21.932c0,0-3.642,2.728-3.642,6.492 c0,3.765,3.642,6.445,3.642,6.445" fill="none" stroke="#ffffff" stroke-width="0.975"/> + <line fill="none" stroke="#ffffff" stroke-width="0.975" x1="29.124" x2="29.124" y1="21.932" y2="34.869"/> + <line fill="none" stroke="#ffffff" stroke-width="0.975" x1="22.654" x2="35.591" y1="28.4" y2="28.4"/> + </g> + </g> +</g></svg> diff --git a/icons/htmlon.svg b/icons/htmlon.svg index af7331e..c4e50b8 100644 --- a/icons/htmlon.svg +++ b/icons/htmlon.svg @@ -1,66 +1,70 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> + <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - version="1.0" - width="55" + version="1.1" + width="58.5" height="55" - viewBox="0 0 55 55" + viewBox="0 0 58.5 55" id="svg2" xml:space="preserve"><defs - id="defs29" /> - - <polygon - points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 " - transform="translate(-5.182,3.336)" - id="polygon10" - style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <polyline - points="43.818,18.027 31.874,18.027 31.874,6.088 " - id="polyline12" - style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - transform="translate(-5.182,3.336)" /> - <circle - cx="27.375" - cy="33.5" - r="9.9510002" - transform="translate(-5.182,2.549)" - id="circle14" /> - <path - d="M 22.194,26.098 C 22.194,26.098 16.591,30.295 16.591,36.086 C 16.591,41.877 22.194,46 22.194,46" - id="path16" - style="stroke:#ffffff;stroke-opacity:1" /> - <path - d="M 22.194,26.098 C 22.194,26.098 27.726,30.668 27.726,36.086 C 27.726,41.505 22.194,46 22.194,46" - id="path18" - style="stroke:#ffffff;stroke-opacity:1" /> - <line - x1="22.194" - x2="22.194" - y1="26.098" - y2="46" - id="line20" - style="stroke:#0000ff;stroke-opacity:1" /> - <line - x1="22.194" - x2="22.194" - y1="26.098" - y2="46" - id="line22" - style="stroke:#0000ff;stroke-opacity:1" /> - <line - x1="22.194" - x2="22.194" - y1="26.098" - y2="46" - id="line24" - style="stroke:#ffffff;stroke-opacity:1" /> - <line - x1="12.241" - x2="32.144001" - y1="36.049" - y2="36.049" - id="line26" - style="stroke:#ffffff;stroke-opacity:1" /> -</svg>
\ No newline at end of file + id="defs33"> + + + +</defs><g + id="g5" + style="fill:#00ff00;fill-opacity:1"> + <polygon + points="8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543 50.056,32.715 50.056,2 8.433,2 " + id="polygon7" + style="fill:#00ff00;fill-opacity:1;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" /> + </g><g + id="g9"> + <g + id="g11"> + <polygon + points="39.811,38.42 18.435,38.42 18.435,10.583 32.046,10.583 39.811,18.343 " + id="polygon13" + style="fill:#ffffff;stroke:#666666;stroke-width:2.2750001" /> + <polyline + style="fill:none;stroke:#666666;stroke-width:2.2750001" + id="polyline15" + points="39.811,18.343 32.046,18.343 32.046,10.583 " /> + </g> + </g><g + id="g17"> + <circle + cx="29.122999" + cy="28.4" + r="6.4689999" + id="circle19" + style="fill:#666666" /> + <g + id="g21"> + <path + d="m 29.124,21.932 c 0,0 3.596,2.971 3.596,6.492 0,3.523 -3.596,6.445 -3.596,6.445" + id="path23" + style="fill:none;stroke:#ffffff;stroke-width:0.97500002" /> + <path + d="m 29.124,21.932 c 0,0 -3.642,2.728 -3.642,6.492 0,3.765 3.642,6.445 3.642,6.445" + id="path25" + style="fill:none;stroke:#ffffff;stroke-width:0.97500002" /> + <line + style="fill:none;stroke:#ffffff;stroke-width:0.97500002" + id="line27" + y2="34.868999" + y1="21.931999" + x2="29.124001" + x1="29.124001" /> + <line + style="fill:none;stroke:#ffffff;stroke-width:0.97500002" + id="line29" + y2="28.4" + y1="28.4" + x2="35.591" + x1="22.653999" /> + </g> + </g></svg>
\ No newline at end of file diff --git a/icons/image-saveoff.svg b/icons/image-saveoff.svg index 2a8b197..b1b485f 100644 --- a/icons/image-saveoff.svg +++ b/icons/image-saveoff.svg @@ -1,66 +1,16 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - version="1.0" - width="55" - height="55" - viewBox="0 0 55 55" - id="svg2" - xml:space="preserve"><defs - id="defs41"> -</defs> -<g - transform="translate(-0.5507515,-1.7569535)" - id="g3" - style="fill:none"> - <line - style="fill:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="line3290" - y2="4.9169998" - y1="16.188" - x2="52.441002" - x1="41.169998" /> - <polyline - style="fill:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="polyline3292" - points="51.562,15.306 41.17,16.188 42.053,5.794" /> -</g> -<polygon - points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 " - transform="translate(-6,2)" - id="polygon9" - style="fill:none;stroke:#ffffff;stroke-width:3.5" /><polyline - points="43.818,18.027 31.874,18.027 31.874,6.088" - id="polyline11" - style="fill:none;stroke:#ffffff;stroke-width:3.5" - transform="translate(-6,2)" /> -<line - x1="40.75" - x2="52.021004" - y1="15.249998" - y2="3.9789984" - id="line2513" - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><polyline - points="51.562,15.306 41.17,16.188 42.053,5.794" - id="polyline2515" - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - transform="translate(-0.4199989,-0.938)" /><polyline - points="43.818,18.027 31.874,18.027 31.874,6.088" - id="polyline2519" - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" - transform="translate(45.97349,37.199819)" /><g - transform="matrix(0.6016528,0,0,0.5962542,20.149385,7.0668138)" - id="g2488" - style="fill:#ffffff;fill-opacity:1"><path - d="M 3.196409,27.818399 C -6.063591,27.818399 -13.778591,37.053399 -13.778591,37.053399 C -13.778591,37.053399 -6.064591,46.330398 3.196409,46.325398 C 12.456409,46.318399 20.174409,37.040399 20.174409,37.040399 C 20.174409,37.040399 12.457409,27.811399 3.196409,27.818399 z M 3.196409,43.566399 C -0.388591,43.566399 -3.295591,40.656399 -3.295591,37.072398 C -3.295591,33.493399 -0.389591,30.578398 3.196409,30.578398 C 6.777409,30.578398 9.686409,33.493399 9.686409,37.072398 C 9.686409,40.656399 6.777409,43.566399 3.196409,43.566399 z" - id="path2465" - style="fill:#ffffff;fill-opacity:1;display:inline" /><circle - cx="27.504" - cy="27.598" - r="2.9460001" - transform="translate(-24.306591,9.4763985)" - id="circle2467" - style="fill:#ffffff;fill-opacity:1;display:inline" /></g> -</svg> +<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [ + <!ENTITY stroke_color "#010101"> + <!ENTITY fill_color "#666666"> +]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-from-image"> + <g display="inline"> + <polygon fill="&fill_color;" points="50.056,32.715 50.056,2 8.433,2 8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543 " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/> + </g> + <g display="inline"> + <g> + <polygon fill="#ffffff" points="43.041,35.189 43.041,21.577 35.281,13.812 15.204,13.812 15.204,35.189 " stroke="&fill_color;" stroke-width="2.275"/> + <polyline fill="none" points="35.281,13.812 35.281,21.577 43.041,21.577 " stroke="&fill_color;" stroke-width="2.275"/> + </g> + </g> + <path d="M29.206,21.798c-4.067,0-7.456,4.056-7.456,4.056s3.389,4.076,7.456,4.074 c4.069-0.004,7.458-4.078,7.458-4.078S33.275,21.795,29.206,21.798z M29.206,28.715c-1.575,0-2.852-1.277-2.852-2.853 c0-1.572,1.277-2.852,2.852-2.852c1.573,0,2.85,1.28,2.85,2.852C32.056,27.438,30.779,28.715,29.206,28.715z" display="inline" fill="&fill_color;"/> + <circle cx="29.207" cy="25.863" display="inline" fill="&fill_color;" r="1.294"/> +</g></svg> diff --git a/icons/image-saveon.svg b/icons/image-saveon.svg index 933aa9e..b4e9270 100644 --- a/icons/image-saveon.svg +++ b/icons/image-saveon.svg @@ -1,53 +1,47 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> + <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - version="1.0" - width="55" + version="1.1" + width="58.5" height="55" - viewBox="0 0 55 55" + viewBox="0 0 58.5 55" id="svg2" xml:space="preserve"><defs - id="defs41"> - -</defs> -<g - transform="translate(-0.5507515,-1.7569535)" - id="g3" - style="fill:none;stroke:#ffffff;stroke-opacity:1"> - <line - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="line3290" - y2="4.9169998" - y1="16.188" - x2="52.441002" - x1="41.169998" /> - <polyline - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="polyline3292" - points="51.562,15.306 41.17,16.188 42.053,5.794" /> -</g> -<polygon - points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 " - transform="translate(-6,2)" - id="polygon9" - style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" /><polyline - points="43.818,18.027 31.874,18.027 31.874,6.088" - id="polyline11" - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" - transform="translate(-6,2)" /> -<g - transform="matrix(0.6016528,0,0,0.5962542,20.149385,7.0668138)" - id="g2488" - style="fill:#000000;fill-opacity:1"><path - d="M 3.196409,27.818399 C -6.063591,27.818399 -13.778591,37.053399 -13.778591,37.053399 C -13.778591,37.053399 -6.064591,46.330398 3.196409,46.325398 C 12.456409,46.318399 20.174409,37.040399 20.174409,37.040399 C 20.174409,37.040399 12.457409,27.811399 3.196409,27.818399 z M 3.196409,43.566399 C -0.388591,43.566399 -3.295591,40.656399 -3.295591,37.072398 C -3.295591,33.493399 -0.389591,30.578398 3.196409,30.578398 C 6.777409,30.578398 9.686409,33.493399 9.686409,37.072398 C 9.686409,40.656399 6.777409,43.566399 3.196409,43.566399 z" - id="path2465" - style="fill:#000000;fill-opacity:1;display:inline" /><circle - cx="27.504" - cy="27.598" - r="2.9460001" - transform="translate(-24.306591,9.4763985)" - id="circle2467" - style="fill:#000000;fill-opacity:1;display:inline" /></g> -</svg>
\ No newline at end of file + id="defs23"> + + + + +</defs><g + id="g5" + style="fill:#00ff00;fill-opacity:1;display:inline"> + <polygon + points="8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543 50.056,32.715 50.056,2 8.433,2 " + id="polygon7" + style="fill:#00ff00;fill-opacity:1;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" /> + </g><g + id="g9" + style="display:inline"> + <g + id="g11"> + <polygon + points="15.204,13.812 15.204,35.189 43.041,35.189 43.041,21.577 35.281,13.812 " + id="polygon13" + style="fill:#ffffff;stroke:#666666;stroke-width:2.2750001" /> + <polyline + style="fill:none;stroke:#666666;stroke-width:2.2750001" + id="polyline15" + points="35.281,13.812 35.281,21.577 43.041,21.577 " /> + </g> + </g><path + d="m 29.206,21.798 c -4.067,0 -7.456,4.056 -7.456,4.056 0,0 3.389,4.076 7.456,4.074 4.069,-0.004 7.458,-4.078 7.458,-4.078 0,0 -3.389,-4.055 -7.458,-4.052 z m 0,6.917 c -1.575,0 -2.852,-1.277 -2.852,-2.853 0,-1.572 1.277,-2.852 2.852,-2.852 1.573,0 2.85,1.28 2.85,2.852 0,1.576 -1.277,2.853 -2.85,2.853 z" + id="path17" + style="fill:#666666;display:inline" /><circle + cx="29.207001" + cy="25.863001" + r="1.294" + id="circle19" + style="fill:#666666;display:inline" /></svg>
\ No newline at end of file diff --git a/icons/load-from-journal.svg b/icons/load-from-journal.svg index f111ac2..f30a6f1 100644 --- a/icons/load-from-journal.svg +++ b/icons/load-from-journal.svg @@ -1,148 +1,84 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> + <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - version="1.0" - width="55" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.1" + width="58.5" height="55" - viewBox="0 0 55 55" + viewBox="0 0 58.5 55" id="svg2" xml:space="preserve"><defs - id="defs41"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -</defs> -<g - transform="translate(-0.5507515,-1.7569535)" - id="g3" - style="fill:none"> - <line - style="fill:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="line3290" - y2="4.9169998" - y1="16.188" - x2="52.441002" - x1="41.169998" /> - <polyline - style="fill:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="polyline3292" - points="51.562,15.306 41.17,16.188 42.053,5.794" /> -</g> -<polygon - points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 " - transform="translate(-6,2)" - id="polygon9" - style="fill:none;stroke:#ffffff;stroke-width:3.5" /><polyline - points="43.818,18.027 31.874,18.027 31.874,6.088" - id="polyline11" - style="fill:none;stroke:#ffffff;stroke-width:3.5" - transform="translate(-6,2)" /><path - d="M 21.379465,44.19975 C 21.102965,44.19975 20.829965,44.18225 20.560965,44.14975 L 21.254965,45.32425 L 21.938965,44.16775 C 21.753465,44.18275 21.568465,44.19975 21.379465,44.19975 z" - id="path11" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g - transform="matrix(0.5,0,0,0.5,7.630965,20.06025)" - id="g13" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"> - <path - d="M 40.16,11.726 C 37.996,11.726 36.202,13.281 35.817,15.333 C 37.676,16.678 39.274,18.448 40.492,20.541 C 42.777,20.369 44.586,18.48 44.586,16.151 C 44.586,13.707 42.604,11.726 40.16,11.726 z" - id="path15" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 40.713,39.887 C 39.489,42.119 37.853,44.018 35.916,45.443 C 36.437,47.307 38.129,48.682 40.16,48.682 C 42.603,48.682 44.586,46.702 44.586,44.258 C 44.586,42.003 42.893,40.162 40.713,39.887 z" - id="path17" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 14.273,39.871 C 12.02,40.077 10.249,41.95 10.249,44.258 C 10.249,46.701 12.229,48.682 14.673,48.682 C 16.737,48.682 18.457,47.262 18.945,45.35 C 17.062,43.934 15.47,42.061 14.273,39.871 z" - id="path19" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 19.026,15.437 C 18.683,13.334 16.872,11.726 14.673,11.726 C 12.229,11.726 10.249,13.707 10.249,16.15 C 10.249,18.532 12.135,20.46 14.494,20.556 C 15.68,18.513 17.226,16.772 19.026,15.437 z" - id="path21" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g><path - d="M 21.379465,26.34175 C 22.333465,26.34175 23.243465,26.54725 24.088465,26.90575 C 24.458965,26.36775 24.677465,25.71725 24.677465,25.01425 C 24.677465,23.17075 23.182965,21.67575 21.338965,21.67575 C 19.495465,21.67575 18.000965,23.17075 18.000965,25.01425 C 18.000965,25.72825 18.226965,26.38875 18.608965,26.93125 C 19.470965,26.55675 20.402465,26.34175 21.379465,26.34175 z" - id="path23" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g - transform="matrix(0.5,0,0,0.5,7.630965,20.06025)" - id="g25" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"> - <path - d="M 43.102,30.421 C 43.102,35.1554 41.4568,39.7008 38.5314,43.0485 C 35.606,46.3963 31.6341,48.279 27.497,48.279 C 23.3599,48.279 19.388,46.3963 16.4626,43.0485 C 13.5372,39.7008 11.892,35.1554 11.892,30.421 C 11.892,20.6244 18.9364,12.563 27.497,12.563 C 36.0576,12.563 43.102,20.6244 43.102,30.421 z" - id="path2988" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g><g - transform="matrix(0.5,0,0,0.5,7.630965,20.06025)" - id="g28" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"> - <path - d="M 25.875,33.75 L 24.333,29.125 L 27.497,26.538 L 31.112,29.164 L 29.625,33.833 L 25.875,33.75 z" - id="path30" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 27.501,41.551 C 23.533,41.391 21.958,39.542 21.958,39.542 L 25.528,35.379 L 29.993,35.547 L 33.125,39.667 C 33.125,39.667 30.235,41.661 27.501,41.551 z" - id="path32" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 18.453,33.843 C 17.604,30.875 18.625,26.959 18.625,26.959 L 22.625,29.126 L 24.118,33.755 L 20.536,37.988 C 20.536,37.987 19.071,35.998 18.453,33.843 z" - id="path34" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 19.458,25.125 C 19.458,25.125 19.958,23.167 22.497,21.303 C 24.734,19.66 26.962,19.583 26.962,19.583 L 26.925,24.564 L 23.404,27.314 L 19.458,25.125 z" - id="path2998" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 32.084,27.834 L 28.625,24.959 L 29,19.75 C 29,19.75 30.834,19.708 32.959,21.417 C 35.187,23.208 36.321,26.4 36.321,26.4 L 32.084,27.834 z" - id="path37" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - <path - d="M 31.292,34.042 L 32.605,29.578 L 36.792,28.042 C 36.792,28.042 37.469,30.705 36.75,33.709 C 36.21,35.965 34.666,38.07 34.666,38.07 L 31.292,34.042 z" - id="path3002" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> -<polyline - points="43.818,18.027 31.874,18.027 31.874,6.088" - id="polyline2519" - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" - transform="translate(45.97349,37.199819)" /><text - x="31.578125" - y="20.0625" - id="text2406" - xml:space="preserve" - style="font-size:32px;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:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"><tspan - x="31.578125" - y="20.0625" - id="tspan2408">+</tspan></text> -</svg>
\ No newline at end of file + id="defs25"> + + + + + +<linearGradient + x1="0.94254935" + y1="-31.669659" + x2="104.37702" + y2="20.434471" + id="linearGradient3172" + xlink:href="#linearGradient3166" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" /><linearGradient + id="linearGradient3166"><stop + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /><stop + id="stop3170" + style="stop-color:#ffff00;stop-opacity:1" + offset="1" /></linearGradient></defs><g + id="g5" + style="display:inline"> + <polygon + points="50.067,21.866 56.75,20.039 29.248,2 1.75,20.038 8.443,21.866 8.443,52.581 50.067,52.58 " + id="polygon7" + style="fill:#666666;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" /> + </g><line + style="fill:none;stroke:#666666;stroke-width:2.2750001;display:inline" + id="line17" + y2="29.688" + y1="29.688" + x2="35.298" + x1="22.948" + display="inline" /><line + style="fill:none;stroke:#666666;stroke-width:2.2750001;display:inline" + id="line19" + y2="34.237999" + y1="34.237999" + x2="35.298" + x1="22.948" + display="inline" /><line + style="fill:none;stroke:#666666;stroke-width:2.2750001;display:inline" + id="line21" + y2="38.786999" + y1="38.786999" + x2="35.298" + x1="22.948" + display="inline" /><g + transform="matrix(0.67,0,0,0.67,11.410915,13.075)" + id="activity-journal" + style="stroke:#000000;stroke-opacity:1;display:block"><path + d="M 45.866,44.669 C 45.866,47.18 44.338,49 41.534,49 l -29.457,0 0,-43 29.458,0 c 2.15,0 4.332,2.154 4.332,4.33 l -10e-4,34.339 0,0 z" + id="path2458" + style="fill:#ffffff;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line + style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" + x1="21.341" + x2="21.341" + y1="6.1209998" + y2="48.881001" + id="line2460" /><path + d="m 7.384,14.464 c 0,0 2.084,0.695 4.17,0.695 2.086,0 4.173,-0.695 4.173,-0.695" + id="path2462" + style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path + d="m 7.384,28.021 c 0,0 1.912,0.695 4.345,0.695 2.433,0 3.999,-0.695 3.999,-0.695" + id="path2464" + style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path + d="m 7.384,41.232 c 0,0 1.736,0.695 4.518,0.695 2.781,0 3.825,-0.695 3.825,-0.695" + id="path2466" + style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></svg>
\ No newline at end of file diff --git a/icons/logo-saveoff.svg b/icons/logo-saveoff.svg index 602af75..0c3dfe2 100644 --- a/icons/logo-saveoff.svg +++ b/icons/logo-saveoff.svg @@ -1,23 +1,19 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> + <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - version="1.0" - width="55" + version="1.1" + width="58.5" height="55" - viewBox="0 0 55 55" + viewBox="0 0 58.5 55" id="svg2" xml:space="preserve"><defs - id="defs41"> - - - - - - - - + id="defs33"> + + + @@ -27,123 +23,74 @@ - - - - - - - - - - - - - - - - - -</defs> -<g - transform="translate(-0.5507515,-1.7569535)" - id="g3" - style="fill:none"> - <line - style="fill:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="line3290" - y2="4.9169998" - y1="16.188" - x2="52.441002" - x1="41.169998" /> - <polyline - style="fill:none;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="polyline3292" - points="51.562,15.306 41.17,16.188 42.053,5.794" /> -</g> -<polygon - points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 " - transform="translate(-6,2)" - id="polygon9" - style="fill:none;stroke:#ffffff;stroke-width:3.5" /><polyline - points="43.818,18.027 31.874,18.027 31.874,6.088" - id="polyline11" - style="fill:none;stroke:#ffffff;stroke-width:3.5" - transform="translate(-6,2)" /><path - d="M 21.379465,44.19975 C 21.102965,44.19975 20.829965,44.18225 20.560965,44.14975 L 21.254965,45.32425 L 21.938965,44.16775 C 21.753465,44.18275 21.568465,44.19975 21.379465,44.19975 z" - id="path11" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g - transform="matrix(0.5,0,0,0.5,7.630965,20.06025)" - id="g13" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"> +</defs><g + id="g5"> + <polygon + points="1.75,34.542 29.252,52.581 56.75,34.543 50.056,32.715 50.056,2 8.433,2 8.433,32.715 " + id="polygon7" + style="fill:#666666;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" /> + </g><g + transform="translate(16.080508,-9.0889831)" + id="g3105"><path + d="m 12.896306,44.429676 c -0.2765,0 -0.5495,-0.0175 -0.8185,-0.05 l 0.694,1.1745 0.684,-1.1565 c -0.1855,0.015 -0.3705,0.032 -0.5595,0.032 z" + id="path11" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g + transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)" + id="g13" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"> <path - d="M 40.16,11.726 C 37.996,11.726 36.202,13.281 35.817,15.333 C 37.676,16.678 39.274,18.448 40.492,20.541 C 42.777,20.369 44.586,18.48 44.586,16.151 C 44.586,13.707 42.604,11.726 40.16,11.726 z" + d="m 40.16,11.726 c -2.164,0 -3.958,1.555 -4.343,3.607 1.859,1.345 3.457,3.115 4.675,5.208 2.285,-0.172 4.094,-2.061 4.094,-4.39 0,-2.444 -1.982,-4.425 -4.426,-4.425 z" id="path15" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 40.713,39.887 C 39.489,42.119 37.853,44.018 35.916,45.443 C 36.437,47.307 38.129,48.682 40.16,48.682 C 42.603,48.682 44.586,46.702 44.586,44.258 C 44.586,42.003 42.893,40.162 40.713,39.887 z" + d="m 40.713,39.887 c -1.224,2.232 -2.86,4.131 -4.797,5.556 0.521,1.864 2.213,3.239 4.244,3.239 2.443,0 4.426,-1.98 4.426,-4.424 0,-2.255 -1.693,-4.096 -3.873,-4.371 z" id="path17" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 14.273,39.871 C 12.02,40.077 10.249,41.95 10.249,44.258 C 10.249,46.701 12.229,48.682 14.673,48.682 C 16.737,48.682 18.457,47.262 18.945,45.35 C 17.062,43.934 15.47,42.061 14.273,39.871 z" + d="m 14.273,39.871 c -2.253,0.206 -4.024,2.079 -4.024,4.387 0,2.443 1.98,4.424 4.424,4.424 2.064,0 3.784,-1.42 4.272,-3.332 -1.883,-1.416 -3.475,-3.289 -4.672,-5.479 z" id="path19" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 19.026,15.437 C 18.683,13.334 16.872,11.726 14.673,11.726 C 12.229,11.726 10.249,13.707 10.249,16.15 C 10.249,18.532 12.135,20.46 14.494,20.556 C 15.68,18.513 17.226,16.772 19.026,15.437 z" + d="m 19.026,15.437 c -0.343,-2.103 -2.154,-3.711 -4.353,-3.711 -2.444,0 -4.424,1.981 -4.424,4.424 0,2.382 1.886,4.31 4.245,4.406 1.186,-2.043 2.732,-3.784 4.532,-5.119 z" id="path21" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> </g><path - d="M 21.379465,26.34175 C 22.333465,26.34175 23.243465,26.54725 24.088465,26.90575 C 24.458965,26.36775 24.677465,25.71725 24.677465,25.01425 C 24.677465,23.17075 23.182965,21.67575 21.338965,21.67575 C 19.495465,21.67575 18.000965,23.17075 18.000965,25.01425 C 18.000965,25.72825 18.226965,26.38875 18.608965,26.93125 C 19.470965,26.55675 20.402465,26.34175 21.379465,26.34175 z" - id="path23" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g - transform="matrix(0.5,0,0,0.5,7.630965,20.06025)" - id="g25" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"> + d="m 12.896306,26.571676 c 0.954,0 1.864,0.2055 2.709,0.564 0.3705,-0.538 0.589,-1.1885 0.589,-1.8915 0,-1.8435 -1.4945,-3.3385 -3.3385,-3.3385 -1.8435,0 -3.3380001,1.495 -3.3380001,3.3385 0,0.714 0.226,1.3745 0.6080001,1.917 0.862,-0.3745 1.7935,-0.5895 2.7705,-0.5895 z" + id="path23" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g + transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)" + id="g25" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"> <path - d="M 43.102,30.421 C 43.102,35.1554 41.4568,39.7008 38.5314,43.0485 C 35.606,46.3963 31.6341,48.279 27.497,48.279 C 23.3599,48.279 19.388,46.3963 16.4626,43.0485 C 13.5372,39.7008 11.892,35.1554 11.892,30.421 C 11.892,20.6244 18.9364,12.563 27.497,12.563 C 36.0576,12.563 43.102,20.6244 43.102,30.421 z" + d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z" id="path2988" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> </g><g - transform="matrix(0.5,0,0,0.5,7.630965,20.06025)" - id="g28" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"> + transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)" + id="g28" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"> <path - d="M 25.875,33.75 L 24.333,29.125 L 27.497,26.538 L 31.112,29.164 L 29.625,33.833 L 25.875,33.75 z" + d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 -3.75,-0.083 z" id="path30" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 27.501,41.551 C 23.533,41.391 21.958,39.542 21.958,39.542 L 25.528,35.379 L 29.993,35.547 L 33.125,39.667 C 33.125,39.667 30.235,41.661 27.501,41.551 z" + d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z" id="path32" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 18.453,33.843 C 17.604,30.875 18.625,26.959 18.625,26.959 L 22.625,29.126 L 24.118,33.755 L 20.536,37.988 C 20.536,37.987 19.071,35.998 18.453,33.843 z" + d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z" id="path34" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 19.458,25.125 C 19.458,25.125 19.958,23.167 22.497,21.303 C 24.734,19.66 26.962,19.583 26.962,19.583 L 26.925,24.564 L 23.404,27.314 L 19.458,25.125 z" + d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z" id="path2998" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 32.084,27.834 L 28.625,24.959 L 29,19.75 C 29,19.75 30.834,19.708 32.959,21.417 C 35.187,23.208 36.321,26.4 36.321,26.4 L 32.084,27.834 z" + d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z" id="path37" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 31.292,34.042 L 32.605,29.578 L 36.792,28.042 C 36.792,28.042 37.469,30.705 36.75,33.709 C 36.21,35.965 34.666,38.07 34.666,38.07 L 31.292,34.042 z" + d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z" id="path3002" - style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> -<line - x1="40.75" - x2="52.021004" - y1="15.249998" - y2="3.9789984" - id="line2513" - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><polyline - points="51.562,15.306 41.17,16.188 42.053,5.794" - id="polyline2515" - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - transform="translate(-0.4199989,-0.938)" /><polyline - points="43.818,18.027 31.874,18.027 31.874,6.088" - id="polyline2519" - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" - transform="translate(45.97349,37.199819)" /></svg>
\ No newline at end of file + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + </g></g></svg>
\ No newline at end of file diff --git a/icons/logo-saveon.svg b/icons/logo-saveon.svg index 7a3f231..9c9ae52 100644 --- a/icons/logo-saveon.svg +++ b/icons/logo-saveon.svg @@ -1,15 +1,20 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> + <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - version="1.0" - width="55" + version="1.1" + width="58.5" height="55" - viewBox="0 0 55 55" + viewBox="0 0 58.5 55" id="svg2" xml:space="preserve"><defs - id="defs41"> + id="defs33"> + + + + @@ -18,92 +23,75 @@ -</defs> -<g - transform="translate(-0.5507515,-1.7569535)" - id="g3" - style="fill:none;stroke:#ffffff;stroke-opacity:1"> - <line - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="line3290" - y2="4.9169998" - y1="16.188" - x2="52.441002" - x1="41.169998" /> - <polyline - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="polyline3292" - points="51.562,15.306 41.17,16.188 42.053,5.794" /> -</g> -<polygon - points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 " - transform="translate(-6,2)" - id="polygon9" - style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" /><polyline - points="43.818,18.027 31.874,18.027 31.874,6.088" - id="polyline11" - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" - transform="translate(-6,2)" /><path - d="M 21.379465,44.19975 C 21.102965,44.19975 20.829965,44.18225 20.560965,44.14975 L 21.254965,45.32425 L 21.938965,44.16775 C 21.753465,44.18275 21.568465,44.19975 21.379465,44.19975 z" - id="path11" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g - transform="matrix(0.5,0,0,0.5,7.630965,20.06025)" - id="g13" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"> + + + + + </defs><polygon + points="56.75,34.543 50.056,32.715 50.056,2 8.433,2 8.433,32.715 1.75,34.542 29.252,52.581 " + id="polygon7" + style="fill:#00ff00;fill-opacity:1;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" /><g + transform="translate(16.080508,-9.0889831)" + id="g3105"><path + d="m 12.896306,44.429676 c -0.2765,0 -0.5495,-0.0175 -0.8185,-0.05 l 0.694,1.1745 0.684,-1.1565 c -0.1855,0.015 -0.3705,0.032 -0.5595,0.032 z" + id="path11" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g + transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)" + id="g13" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"> <path - d="M 40.16,11.726 C 37.996,11.726 36.202,13.281 35.817,15.333 C 37.676,16.678 39.274,18.448 40.492,20.541 C 42.777,20.369 44.586,18.48 44.586,16.151 C 44.586,13.707 42.604,11.726 40.16,11.726 z" + d="m 40.16,11.726 c -2.164,0 -3.958,1.555 -4.343,3.607 1.859,1.345 3.457,3.115 4.675,5.208 2.285,-0.172 4.094,-2.061 4.094,-4.39 0,-2.444 -1.982,-4.425 -4.426,-4.425 z" id="path15" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 40.713,39.887 C 39.489,42.119 37.853,44.018 35.916,45.443 C 36.437,47.307 38.129,48.682 40.16,48.682 C 42.603,48.682 44.586,46.702 44.586,44.258 C 44.586,42.003 42.893,40.162 40.713,39.887 z" + d="m 40.713,39.887 c -1.224,2.232 -2.86,4.131 -4.797,5.556 0.521,1.864 2.213,3.239 4.244,3.239 2.443,0 4.426,-1.98 4.426,-4.424 0,-2.255 -1.693,-4.096 -3.873,-4.371 z" id="path17" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 14.273,39.871 C 12.02,40.077 10.249,41.95 10.249,44.258 C 10.249,46.701 12.229,48.682 14.673,48.682 C 16.737,48.682 18.457,47.262 18.945,45.35 C 17.062,43.934 15.47,42.061 14.273,39.871 z" + d="m 14.273,39.871 c -2.253,0.206 -4.024,2.079 -4.024,4.387 0,2.443 1.98,4.424 4.424,4.424 2.064,0 3.784,-1.42 4.272,-3.332 -1.883,-1.416 -3.475,-3.289 -4.672,-5.479 z" id="path19" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 19.026,15.437 C 18.683,13.334 16.872,11.726 14.673,11.726 C 12.229,11.726 10.249,13.707 10.249,16.15 C 10.249,18.532 12.135,20.46 14.494,20.556 C 15.68,18.513 17.226,16.772 19.026,15.437 z" + d="m 19.026,15.437 c -0.343,-2.103 -2.154,-3.711 -4.353,-3.711 -2.444,0 -4.424,1.981 -4.424,4.424 0,2.382 1.886,4.31 4.245,4.406 1.186,-2.043 2.732,-3.784 4.532,-5.119 z" id="path21" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> </g><path - d="M 21.379465,26.34175 C 22.333465,26.34175 23.243465,26.54725 24.088465,26.90575 C 24.458965,26.36775 24.677465,25.71725 24.677465,25.01425 C 24.677465,23.17075 23.182965,21.67575 21.338965,21.67575 C 19.495465,21.67575 18.000965,23.17075 18.000965,25.01425 C 18.000965,25.72825 18.226965,26.38875 18.608965,26.93125 C 19.470965,26.55675 20.402465,26.34175 21.379465,26.34175 z" - id="path23" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g - transform="matrix(0.5,0,0,0.5,7.630965,20.06025)" - id="g25" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"> + d="m 12.896306,26.571676 c 0.954,0 1.864,0.2055 2.709,0.564 0.3705,-0.538 0.589,-1.1885 0.589,-1.8915 0,-1.8435 -1.4945,-3.3385 -3.3385,-3.3385 -1.8435,0 -3.3380001,1.495 -3.3380001,3.3385 0,0.714 0.226,1.3745 0.6080001,1.917 0.862,-0.3745 1.7935,-0.5895 2.7705,-0.5895 z" + id="path23" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g + transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)" + id="g25" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"> <path - d="M 43.102,30.421 C 43.102,35.1554 41.4568,39.7008 38.5314,43.0485 C 35.606,46.3963 31.6341,48.279 27.497,48.279 C 23.3599,48.279 19.388,46.3963 16.4626,43.0485 C 13.5372,39.7008 11.892,35.1554 11.892,30.421 C 11.892,20.6244 18.9364,12.563 27.497,12.563 C 36.0576,12.563 43.102,20.6244 43.102,30.421 z" + d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z" id="path2988" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> </g><g - transform="matrix(0.5,0,0,0.5,7.630965,20.06025)" - id="g28" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"> + transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)" + id="g28" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"> <path - d="M 25.875,33.75 L 24.333,29.125 L 27.497,26.538 L 31.112,29.164 L 29.625,33.833 L 25.875,33.75 z" + d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 -3.75,-0.083 z" id="path30" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 27.501,41.551 C 23.533,41.391 21.958,39.542 21.958,39.542 L 25.528,35.379 L 29.993,35.547 L 33.125,39.667 C 33.125,39.667 30.235,41.661 27.501,41.551 z" + d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z" id="path32" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 18.453,33.843 C 17.604,30.875 18.625,26.959 18.625,26.959 L 22.625,29.126 L 24.118,33.755 L 20.536,37.988 C 20.536,37.987 19.071,35.998 18.453,33.843 z" + d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z" id="path34" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 19.458,25.125 C 19.458,25.125 19.958,23.167 22.497,21.303 C 24.734,19.66 26.962,19.583 26.962,19.583 L 26.925,24.564 L 23.404,27.314 L 19.458,25.125 z" + d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z" id="path2998" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 32.084,27.834 L 28.625,24.959 L 29,19.75 C 29,19.75 30.834,19.708 32.959,21.417 C 35.187,23.208 36.321,26.4 36.321,26.4 L 32.084,27.834 z" + d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z" id="path37" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path - d="M 31.292,34.042 L 32.605,29.578 L 36.792,28.042 C 36.792,28.042 37.469,30.705 36.75,33.709 C 36.21,35.965 34.666,38.07 34.666,38.07 L 31.292,34.042 z" + d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z" id="path3002" - style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - </g> -</svg>
\ No newline at end of file + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + </g></g></svg>
\ No newline at end of file diff --git a/icons/pippy-openoff.svg b/icons/pippy-openoff.svg index 628c207..0a11627 100644 --- a/icons/pippy-openoff.svg +++ b/icons/pippy-openoff.svg @@ -1,50 +1,66 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> + <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - version="1.0" - width="55" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.1" + width="58.5" height="55" - viewBox="0 0 55 55" + viewBox="0 0 58.5 55" id="svg2" xml:space="preserve"><defs - id="defs12" /> -<g - transform="matrix(-1,0,0,-1,93.060248,19.348046)" - id="g3" - style="fill:none;stroke:#ffffff;stroke-opacity:1"> - <line - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="line3290" - y2="4.9169998" - y1="16.188" - x2="52.441002" - x1="41.169998" /> - <polyline - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="polyline3292" - points="51.562,15.306 41.17,16.188 42.053,5.794" /> -</g> -<polygon - points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 " - transform="translate(-6,2)" - id="polygon9" - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" /><polyline - points="43.818,18.027 31.874,18.027 31.874,6.088" - id="polyline11" - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" - transform="translate(-6,2)" /> -<path - d="M 21.811546,47.176099 C 25.489595,47.176099 30.951388,45.596321 30.951388,40.94995 C 30.951388,35.781439 26.195353,35.303832 24.223039,34.780579 C 22.043113,34.335814 20.591057,33.715148 20.503836,32.857347 C 20.354576,31.386674 21.215122,30.813879 22.927614,30.813879 C 22.927614,30.813879 27.001232,32.853451 30.461841,31.225801 C 31.437249,30.767677 33.184138,28.627351 33.184138,27.151111 C 33.184138,25.674314 27.544831,23.96762 25.833568,23.96762 C 24.121076,23.96762 22.66472,26.109059 22.66472,26.109059 C 19.240965,26.109059 15.816595,29.062653 15.816595,32.016247 C 15.816595,34.969284 19.09232,37.279388 23.007464,37.923434 C 24.827448,38.184504 26.349526,39.159201 26.003711,40.950506 C 25.723005,42.405037 24.164072,43.9041 20.868078,43.9041 C 18.256344,43.9041 12.69873,43.782194 11.811158,41.633518 C 11.240532,40.249682 11.91435,38.736146 12.770596,38.736146 L 12.754011,38.647082 C 11.881795,38.559131 9.3462261,38.736146 9.3462261,41.689183 C 9.3456118,45.475528 14.962806,47.176099 21.811546,47.176099 z" - id="path2474" - style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path - d="M 30.461227,31.226358 C 28.850084,31.066599 26.400508,30.113054 25.874721,28.430853" - id="path2476" - style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><circle - cx="35.805" - cy="10.96" - r="1.676" - transform="matrix(0.6142367,0,0,0.5566517,4.3076424,20.174595)" - id="circle2478" - style="fill:#ffffff;fill-opacity:1;stroke-width:3.42034841;stroke-miterlimit:4;stroke-dasharray:none" /></svg>
\ No newline at end of file + id="defs25"> + + + + + +<linearGradient + x1="0.94254935" + y1="-31.669659" + x2="104.37702" + y2="20.434471" + id="linearGradient3172" + xlink:href="#linearGradient3166" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" /><linearGradient + id="linearGradient3166"><stop + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /><stop + id="stop3170" + style="stop-color:#ffff00;stop-opacity:1" + offset="1" /></linearGradient><linearGradient + x1="0" + y1="22" + x2="74" + y2="22" + id="linearGradient3172-9" + xlink:href="#linearGradient3166-6" + gradientUnits="userSpaceOnUse" /><linearGradient + id="linearGradient3166-6"><stop + id="stop3168-5" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /><stop + id="stop3170-6" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /></linearGradient> + + </defs><polygon + points="1.75,20.038 8.443,21.866 8.443,52.581 50.067,52.58 50.067,21.866 56.75,20.039 29.248,2 " + id="polygon7" + style="fill:#666666;fill-opacity:1;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" /><path + d="m 29.778093,43.02051 c 3.555069,0 8.83424,-1.56838 8.83424,-6.181226 0,-5.131219 -4.597011,-5.60538 -6.503378,-6.124857 -2.107038,-0.441556 -3.510542,-1.057744 -3.594847,-1.909356 -0.144269,-1.460061 0.687503,-2.028723 2.342736,-2.028723 0,0 3.937412,2.024856 7.282311,0.40895 0.942794,-0.454819 2.631273,-2.579702 2.631273,-4.04529 0,-1.466142 -5.450749,-3.160522 -7.104794,-3.160522 -1.655233,0 -3.062894,2.125988 -3.062894,2.125988 -3.309277,0 -6.619149,2.932283 -6.619149,5.864566 0,2.93173 3.166197,5.225166 6.950433,5.864565 1.759131,0.259187 3.230316,1.226851 2.896064,3.005231 -0.27132,1.444036 -1.778128,2.932283 -4.963917,2.932283 -2.524407,0 -7.896195,-0.121026 -8.75409,-2.254199 -0.551547,-1.373851 0.09974,-2.876467 0.927358,-2.876467 l -0.01603,-0.08842 c -0.843052,-0.08732 -3.293841,0.08842 -3.293841,3.020151 -5.94e-4,3.759026 5.428782,5.447327 12.048526,5.447327 z" + id="path2474" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.95917296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 38.138561,27.185851 c -1.557272,-0.158607 -3.924943,-1.105272 -4.43315,-2.775335" + id="path2476" + style="fill:none;stroke:#000000;stroke-width:1.95917296;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><circle + cx="35.805" + cy="10.96" + r="1.676" + transform="matrix(0.59369893,0,0,0.5526353,12.859454,16.213829)" + id="circle2478" + style="fill:#000000;fill-opacity:1;stroke-width:3.42034841;stroke-miterlimit:4;stroke-dasharray:none" /></svg>
\ No newline at end of file diff --git a/icons/pippy-openon.svg b/icons/pippy-openon.svg index 0209ba6..687120e 100644 --- a/icons/pippy-openon.svg +++ b/icons/pippy-openon.svg @@ -1,63 +1,66 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> + <svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - version="1.0" - width="55" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.1" + width="58.5" height="55" - viewBox="0 0 55 55" + viewBox="0 0 58.5 55" id="svg2" xml:space="preserve"><defs - id="defs41"> - - - - - - - - - + id="defs25"> + + -</defs> -<g - transform="matrix(-1,0,0,-1,93.060248,19.348046)" - id="g3" - style="fill:none;stroke:#ffffff;stroke-opacity:1"> - <line - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="line3290" - y2="4.9169998" - y1="16.188" - x2="52.441002" - x1="41.169998" /> - <polyline - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" - id="polyline3292" - points="51.562,15.306 41.17,16.188 42.053,5.794" /> -</g> -<polygon - points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 " - transform="translate(-6,2)" - id="polygon9" - style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" /><polyline - points="43.818,18.027 31.874,18.027 31.874,6.088" - id="polyline11" - style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" - transform="translate(-6,2)" /> -<path - d="M 21.811546,47.176099 C 25.489595,47.176099 30.951388,45.596321 30.951388,40.94995 C 30.951388,35.781439 26.195353,35.303832 24.223039,34.780579 C 22.043113,34.335814 20.591057,33.715148 20.503836,32.857347 C 20.354576,31.386674 21.215122,30.813879 22.927614,30.813879 C 22.927614,30.813879 27.001232,32.853451 30.461841,31.225801 C 31.437249,30.767677 33.184138,28.627351 33.184138,27.151111 C 33.184138,25.674314 27.544831,23.96762 25.833568,23.96762 C 24.121076,23.96762 22.66472,26.109059 22.66472,26.109059 C 19.240965,26.109059 15.816595,29.062653 15.816595,32.016247 C 15.816595,34.969284 19.09232,37.279388 23.007464,37.923434 C 24.827448,38.184504 26.349526,39.159201 26.003711,40.950506 C 25.723005,42.405037 24.164072,43.9041 20.868078,43.9041 C 18.256344,43.9041 12.69873,43.782194 11.811158,41.633518 C 11.240532,40.249682 11.91435,38.736146 12.770596,38.736146 L 12.754011,38.647082 C 11.881795,38.559131 9.3462261,38.736146 9.3462261,41.689183 C 9.3456118,45.475528 14.962806,47.176099 21.811546,47.176099 z" - id="path2474" - style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path - d="M 30.461227,31.226358 C 28.850084,31.066599 26.400508,30.113054 25.874721,28.430853" - id="path2476" - style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><circle - cx="35.805" - cy="10.96" - r="1.676" - transform="matrix(0.6142367,0,0,0.5566517,4.3076424,20.174595)" - id="circle2478" - style="fill:#000000;fill-opacity:1;stroke-width:3.42034841;stroke-miterlimit:4;stroke-dasharray:none" /></svg>
\ No newline at end of file +<linearGradient + x1="0.94254935" + y1="-31.669659" + x2="104.37702" + y2="20.434471" + id="linearGradient3172" + xlink:href="#linearGradient3166" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" /><linearGradient + id="linearGradient3166"><stop + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /><stop + id="stop3170" + style="stop-color:#ffff00;stop-opacity:1" + offset="1" /></linearGradient><linearGradient + x1="0" + y1="22" + x2="74" + y2="22" + id="linearGradient3172-9" + xlink:href="#linearGradient3166-6" + gradientUnits="userSpaceOnUse" /><linearGradient + id="linearGradient3166-6"><stop + id="stop3168-5" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /><stop + id="stop3170-6" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /></linearGradient> + + </defs><polygon + points="1.75,20.038 8.443,21.866 8.443,52.581 50.067,52.58 50.067,21.866 56.75,20.039 29.248,2 " + id="polygon7" + style="fill:#00ff00;fill-opacity:1;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" /><path + d="m 29.778093,43.02051 c 3.555069,0 8.83424,-1.56838 8.83424,-6.181226 0,-5.131219 -4.597011,-5.60538 -6.503378,-6.124857 -2.107038,-0.441556 -3.510542,-1.057744 -3.594847,-1.909356 -0.144269,-1.460061 0.687503,-2.028723 2.342736,-2.028723 0,0 3.937412,2.024856 7.282311,0.40895 0.942794,-0.454819 2.631273,-2.579702 2.631273,-4.04529 0,-1.466142 -5.450749,-3.160522 -7.104794,-3.160522 -1.655233,0 -3.062894,2.125988 -3.062894,2.125988 -3.309277,0 -6.619149,2.932283 -6.619149,5.864566 0,2.93173 3.166197,5.225166 6.950433,5.864565 1.759131,0.259187 3.230316,1.226851 2.896064,3.005231 -0.27132,1.444036 -1.778128,2.932283 -4.963917,2.932283 -2.524407,0 -7.896195,-0.121026 -8.75409,-2.254199 -0.551547,-1.373851 0.09974,-2.876467 0.927358,-2.876467 l -0.01603,-0.08842 c -0.843052,-0.08732 -3.293841,0.08842 -3.293841,3.020151 -5.94e-4,3.759026 5.428782,5.447327 12.048526,5.447327 z" + id="path2474" + style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.95917296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path + d="m 38.138561,27.185851 c -1.557272,-0.158607 -3.924943,-1.105272 -4.43315,-2.775335" + id="path2476" + style="fill:none;stroke:#000000;stroke-width:1.95917296;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><circle + cx="35.805" + cy="10.96" + r="1.676" + transform="matrix(0.59369893,0,0,0.5526353,12.859454,16.213829)" + id="circle2478" + style="fill:#000000;fill-opacity:1;stroke-width:3.42034841;stroke-miterlimit:4;stroke-dasharray:none" /></svg>
\ No newline at end of file diff --git a/po/TurtleArt.pot b/po/TurtleArt.pot index 062926e..9b8c2ff 100644 --- a/po/TurtleArt.pot +++ b/po/TurtleArt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-17 14:45+0000\n" +"POT-Creation-Date: 2010-02-20 00:34+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,100 +17,94 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: activity/activity.info:2 -#: /home/walter/Desktop/ta-refactoring/tawindow.py:1157 -#: /home/walter/Desktop/ta-refactoring/tawindow.py:2351 +#: /home/walter/Desktop/ta-refactoring/tawindow.py:1199 +#: /home/walter/Desktop/ta-refactoring/tawindow.py:2402 #: /home/walter/Desktop/ta-refactoring/turtleart.py:76 #: /home/walter/Desktop/ta-refactoring/taexporthtml.py:286 msgid "Turtle Art" msgstr "" -#: /home/walter/Desktop/ta-refactoring/tawindow.py:1411 +#: /home/walter/Desktop/ta-refactoring/tawindow.py:1453 #: /home/walter/Desktop/ta-refactoring/taconstants.py:313 msgid "click to open" msgstr "" -#: /home/walter/Desktop/ta-refactoring/tawindow.py:2348 -#: /home/walter/Desktop/ta-refactoring/tawindow.py:2352 -#: /home/walter/Desktop/ta-refactoring/talogo.py:732 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:702 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1157 +#: /home/walter/Desktop/ta-refactoring/tawindow.py:2399 +#: /home/walter/Desktop/ta-refactoring/tawindow.py:2403 +#: /home/walter/Desktop/ta-refactoring/talogo.py:736 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:698 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1153 #: /home/walter/Desktop/ta-refactoring/taconstants.py:354 msgid "xcor" msgstr "" -#: /home/walter/Desktop/ta-refactoring/tawindow.py:2348 -#: /home/walter/Desktop/ta-refactoring/tawindow.py:2352 -#: /home/walter/Desktop/ta-refactoring/talogo.py:733 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:702 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1157 +#: /home/walter/Desktop/ta-refactoring/tawindow.py:2399 +#: /home/walter/Desktop/ta-refactoring/tawindow.py:2403 +#: /home/walter/Desktop/ta-refactoring/talogo.py:737 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:698 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1153 #: /home/walter/Desktop/ta-refactoring/taconstants.py:355 msgid "ycor" msgstr "" -#: /home/walter/Desktop/ta-refactoring/tawindow.py:2348 -#: /home/walter/Desktop/ta-refactoring/tawindow.py:2352 -#: /home/walter/Desktop/ta-refactoring/talogo.py:733 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:703 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1158 +#: /home/walter/Desktop/ta-refactoring/tawindow.py:2399 +#: /home/walter/Desktop/ta-refactoring/tawindow.py:2403 +#: /home/walter/Desktop/ta-refactoring/talogo.py:737 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:699 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1154 #: /home/walter/Desktop/ta-refactoring/taconstants.py:262 msgid "heading" msgstr "" -#: /home/walter/Desktop/ta-refactoring/tawindow.py:2411 +#: /home/walter/Desktop/ta-refactoring/tawindow.py:2462 msgid "image" msgstr "" -#: /home/walter/Desktop/ta-refactoring/talogo.py:695 +#: /home/walter/Desktop/ta-refactoring/talogo.py:699 msgid "did not output to" msgstr "" -#: /home/walter/Desktop/ta-refactoring/talogo.py:734 +#: /home/walter/Desktop/ta-refactoring/talogo.py:738 #: /home/walter/Desktop/ta-refactoring/taconstants.py:311 msgid "scale" msgstr "" -#: /home/walter/Desktop/ta-refactoring/talogo.py:737 +#: /home/walter/Desktop/ta-refactoring/talogo.py:741 #: /home/walter/Desktop/ta-refactoring/taconstants.py:285 msgid "pen down" msgstr "" -#: /home/walter/Desktop/ta-refactoring/talogo.py:739 +#: /home/walter/Desktop/ta-refactoring/talogo.py:743 #: /home/walter/Desktop/ta-refactoring/taconstants.py:287 msgid "pen up" msgstr "" -#: /home/walter/Desktop/ta-refactoring/talogo.py:741 +#: /home/walter/Desktop/ta-refactoring/talogo.py:745 #: /home/walter/Desktop/ta-refactoring/taconstants.py:246 #: /home/walter/Desktop/ta-refactoring/taconstants.py:253 msgid "color" msgstr "" -#: /home/walter/Desktop/ta-refactoring/talogo.py:742 +#: /home/walter/Desktop/ta-refactoring/talogo.py:746 #: /home/walter/Desktop/ta-refactoring/taconstants.py:253 #: /home/walter/Desktop/ta-refactoring/taconstants.py:323 msgid "shade" msgstr "" -#: /home/walter/Desktop/ta-refactoring/talogo.py:743 +#: /home/walter/Desktop/ta-refactoring/talogo.py:747 #: /home/walter/Desktop/ta-refactoring/taconstants.py:286 msgid "pen size" msgstr "" -#: /home/walter/Desktop/ta-refactoring/talogo.py:746 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:241 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:333 -msgid "box" -msgstr "" - -#: /home/walter/Desktop/ta-refactoring/talogo.py:759 +#: /home/walter/Desktop/ta-refactoring/talogo.py:762 msgid "I don't know how to" msgstr "" -#: /home/walter/Desktop/ta-refactoring/talogo.py:913 +#: /home/walter/Desktop/ta-refactoring/talogo.py:916 msgid "doesn't like" msgstr "" -#: /home/walter/Desktop/ta-refactoring/talogo.py:913 +#: /home/walter/Desktop/ta-refactoring/talogo.py:916 msgid "as input" msgstr "" @@ -119,7 +113,7 @@ msgid "presentation" msgstr "" #: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:188 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:864 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:860 msgid "Project" msgstr "" @@ -139,8 +133,8 @@ msgstr "" #: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:306 #: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:322 #: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:334 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:746 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1342 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:742 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1338 #: /home/walter/Desktop/ta-refactoring/turtleart.py:146 msgid "Hide palette" msgstr "" @@ -152,8 +146,9 @@ msgstr "" #: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:315 #: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:332 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:755 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1355 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:751 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1351 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:657 msgid "Hide blocks" msgstr "" @@ -162,180 +157,185 @@ msgid "Rescale coordinates down" msgstr "" #: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:436 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:725 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1186 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:721 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1182 msgid "Rescale coordinates up" msgstr "" #: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:618 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1445 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1441 msgid "Save snapshot" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:629 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1280 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:625 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1276 msgid "Save as HTML" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:636 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:632 msgid "Save as Logo" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:643 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1298 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:639 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1294 msgid "Save as image" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:650 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1312 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:646 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1308 msgid "Load my block" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:658 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1322 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:654 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1318 msgid "Import project from the Journal" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:678 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1121 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:674 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1117 msgid "Fullscreen" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:685 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1134 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:681 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1130 #: /home/walter/Desktop/ta-refactoring/turtleart.py:96 msgid "Cartesian coordinates" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:691 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1143 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:687 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1139 #: /home/walter/Desktop/ta-refactoring/turtleart.py:100 msgid "Polar coordinates" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:731 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1172 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:727 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1168 #: /home/walter/Desktop/ta-refactoring/turtleart.py:108 msgid "Grow blocks" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:738 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1179 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:734 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1175 #: /home/walter/Desktop/ta-refactoring/turtleart.py:112 msgid "Shrink blocks" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:749 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1347 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:745 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1343 msgid "<Ctrl>p" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:758 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1360 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:754 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1356 msgid "<Ctrl>b" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:764 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1427 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:760 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1423 #: /home/walter/Desktop/ta-refactoring/turtleart.py:161 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:642 msgid "Clean" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:767 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1432 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:763 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1428 msgid "<Ctrl>e" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:773 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1373 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:769 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1369 #: /home/walter/Desktop/ta-refactoring/turtleart.py:165 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:701 msgid "Run" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:776 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1377 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:772 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1373 msgid "<Ctrl>r" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:782 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1385 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:778 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1381 #: /home/walter/Desktop/ta-refactoring/turtleart.py:169 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:702 msgid "Step" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:785 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1389 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:781 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1385 msgid "<Ctrl>w" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:791 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1397 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:787 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1393 #: /home/walter/Desktop/ta-refactoring/turtleart.py:173 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:638 msgid "Debug" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:794 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:790 msgid "<Alt>d" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:800 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1410 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:796 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1406 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:721 msgid "Stop turtle" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:803 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1414 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:799 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1410 msgid "<Ctrl>s" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:815 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1463 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:811 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1459 msgid "Samples" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:826 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1261 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:822 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1257 msgid "Move the cursor over the orange palette for help." msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:835 -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:872 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:831 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:868 msgid "Help" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:866 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:862 #: /home/walter/Desktop/ta-refactoring/turtleart.py:121 msgid "View" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:868 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:864 #: /home/walter/Desktop/ta-refactoring/turtleart.py:136 msgid "Edit" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:870 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:866 msgid "Import/Export" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1202 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1198 #: /home/walter/Desktop/ta-refactoring/turtleart.py:127 msgid "Copy" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1214 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1210 #: /home/walter/Desktop/ta-refactoring/turtleart.py:131 msgid "Paste" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1289 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1285 msgid "Save Logo" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1402 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1398 msgid "<Ctrl>d" msgstr "" -#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1468 +#: /home/walter/Desktop/ta-refactoring/TurtleArtActivity.py:1464 msgid "<Ctrl>o" msgstr "" @@ -412,6 +412,11 @@ msgstr "" msgid "picture bottom" msgstr "" +#: /home/walter/Desktop/ta-refactoring/taconstants.py:241 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:333 +msgid "box" +msgstr "" + #: /home/walter/Desktop/ta-refactoring/taconstants.py:242 msgid "box 1" msgstr "" @@ -689,7 +694,7 @@ msgid "text" msgstr "" #: /home/walter/Desktop/ta-refactoring/taconstants.py:343 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:610 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:616 msgid "text size" msgstr "" @@ -748,572 +753,572 @@ msgstr "" #: /home/walter/Desktop/ta-refactoring/taconstants.py:521 #: /home/walter/Desktop/ta-refactoring/taconstants.py:522 #: /home/walter/Desktop/ta-refactoring/taconstants.py:523 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:796 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:811 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:827 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:858 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:889 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:920 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:808 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:823 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:839 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:870 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:901 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:932 msgid "Title" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:588 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:594 msgid "audio" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:589 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:595 msgid "divide" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:590 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:596 msgid "equal" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:591 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:597 msgid "greater than" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:592 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:598 msgid "horizontal space" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:593 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:599 msgid "identity" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:594 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:600 msgid "if then" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:595 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:601 msgid "if then else" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:596 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:602 msgid "journal" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:597 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:603 msgid "less than" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:598 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:604 msgid "minus" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:599 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:605 msgid "Python code" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:600 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:606 msgid "number" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:601 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:607 msgid "plus" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:602 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:608 msgid "multiply" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:603 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:609 msgid "square root" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:604 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:605 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:610 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:611 msgid "presentation 1x1" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:606 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:612 msgid "presentation 1x2" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:607 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:613 msgid "presentation 2x1" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:608 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:614 msgid "presentation 2x2" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:609 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:615 msgid "presentation bulleted list" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:611 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:617 msgid "vertical space" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:617 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:623 msgid "chooses which turtle to command" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:618 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:624 msgid "logical AND operator" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:619 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:625 msgid "moves turtle along an arc" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:620 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:626 msgid "Sugar Journal audio object" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:621 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:627 msgid "moves turtle backward" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:622 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:628 msgid "palette of variable blocks" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:623 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:629 msgid "ycor of bottom of screen" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:624 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:630 msgid "Variable 1 (numeric value)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:625 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:631 msgid "Variable 2 (numeric value)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:626 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:632 msgid "named variable (numeric value)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:627 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:633 msgid "clears the screen and reset the turtle" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:628 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:634 msgid "emptys FILO (first-in-last-out heap)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:629 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:635 msgid "holds current pen color (can be used in place of a number block)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:630 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:636 msgid "a palette of pen colors" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:631 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:637 msgid "places a comment in your code" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:632 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:639 msgid "Sugar Journal description field" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:633 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:640 msgid "" "divides top numeric input (numerator) by bottom numeric input (denominator)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:634 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:641 msgid "permanently deletes items in trash" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:635 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:643 msgid "logical equal-to operator" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:636 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:644 msgid "palette of extra options" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:637 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:645 msgid "fills the background with (color, shade)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:638 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:646 msgid "palette of flow operators" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:639 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:647 msgid "loops forever" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:640 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:648 msgid "moves turtle forward" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:641 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:649 msgid "hides the Sugar toolbars" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:642 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:650 msgid "logical greater-than operator" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:643 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:651 msgid "top of Action 1 stack" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:644 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:652 msgid "top of Action 2 stack" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:645 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:653 msgid "top of nameable action stack" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:646 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:654 msgid "" "holds current heading value of the turtle (can be used in place of a number " "block)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:647 -msgid "declutters canvas by hiding blocks" +#: /home/walter/Desktop/ta-refactoring/taconstants.py:655 +msgid "the canvas height" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:648 -msgid "the canvas height" +#: /home/walter/Desktop/ta-refactoring/taconstants.py:656 +msgid "declutters canvas by hiding blocks" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:649 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:658 msgid "jogs stack right" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:650 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:659 msgid "identity operator used for extending blocks" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:651 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:660 msgid "if-then-else operator that uses boolean operators from Numbers palette" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:652 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:661 msgid "if-then operator that uses boolean operators from Numbers palette" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:653 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:662 msgid "Sugar Journal media object" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:654 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:663 msgid "query for keyboard input (results stored in keyboard block)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:655 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:664 msgid "holds results of query-keyboard block" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:656 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:665 msgid "xcor of left of screen" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:657 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:666 msgid "turns turtle counterclockwise (angle in degrees)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:658 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:667 msgid "logical less-than operator" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:659 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:668 msgid "subtracts bottom numeric input from top numeric input" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:660 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:661 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:669 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:670 msgid "a programmable block: used to add advanced math equations, e.g., sin(x)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:662 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:671 msgid "runs code found in the tamyblock.py module found in the Journal" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:663 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:672 msgid "logical NOT operator" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:664 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:673 msgid "palette of numeric operators" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:665 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:674 msgid "used as numeric input in mathematic operators" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:666 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:675 msgid "logical OR operator" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:667 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:676 msgid "changes the orientation of the palette of blocks" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:668 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:677 msgid "Turtle will draw when moved." msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:669 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:678 msgid "palette of pen commands" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:670 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:679 msgid "holds current pen size (can be used in place of a number block)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:671 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:680 msgid "Turtle will not draw when moved." msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:672 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:715 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:681 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:727 msgid "presentation template: select Journal object (with description)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:673 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:716 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:682 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:728 msgid "presentation template: select Journal object (no description)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:674 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:675 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:717 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:718 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:683 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:684 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:729 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:730 msgid "presentation template: select two Journal objects" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:676 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:719 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:685 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:731 msgid "presentation template: select four Journal objects" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:677 -#: /home/walter/Desktop/ta-refactoring/taconstants.py:720 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:686 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:732 msgid "presentation template: list of bullets" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:678 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:687 msgid "adds two alphanumeric inputs" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:679 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:688 msgid "pops value off FILO (first-in last-out heap)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:680 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:689 msgid "palette of presentation templates" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:681 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:690 msgid "prints value in status block at bottom of the screen" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:682 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:691 msgid "shows values in FILO (first-in last-out heap)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:683 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:692 msgid "multiplies two numeric inputs" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:684 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:693 msgid "pushes value onto FILO (first-in last-out heap)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:685 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:694 msgid "returns random number between minimum (top) and maximum (bottom) values" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:686 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:695 msgid "modular (remainder) operator" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:687 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:696 msgid "loops specified number of times" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:688 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:697 msgid "restores most recent blocks from trash" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:689 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:698 msgid "restore all blocks from trash" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:690 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:699 msgid "xcor of right of screen" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:691 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:700 msgid "turns turtle clockwise (angle in degrees)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:692 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:703 msgid "saves a picture to the Sugar Journal" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:693 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:704 msgid "holds current scale value" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:694 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:705 msgid "sets color of the line drawn by the turtle" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:695 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:706 msgid "sets the heading of the turtle (0 is towards the top of the screen.)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:696 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:707 msgid "sets size of the line drawn by the turtle" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:697 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:708 msgid "sets the scale of media" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:698 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:709 msgid "sets shade of the line drawn by the turtle" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:699 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:710 msgid "sets color of text drawn by the turtle" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:700 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:711 msgid "sets size of text drawn by turtle" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:701 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:712 msgid "" "moves turtle to position xcor, ycor; (0, 0) is in the center of the screen." msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:702 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:713 msgid "holds current pen shade" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:703 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:714 msgid "draws text or show media from the Journal" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:704 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:715 msgid "restores hidden blocks" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:705 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:716 msgid "calculates square root" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:706 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:717 msgid "invokes Action 1 stack" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:707 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:718 msgid "invokes Action 2 stack" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:708 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:719 msgid "invokes named action stack" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:709 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:720 msgid "connects action to toolbar run buttons" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:710 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:722 msgid "stops current action" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:711 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:723 msgid "stores numeric value in Variable 1" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:712 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:724 msgid "stores numeric value in Variable 2" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:713 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:725 msgid "stores numeric value in named variable" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:714 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:726 msgid "string value" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:721 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:733 msgid "holds current text color (can be used in place of a number block)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:722 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:734 msgid "holds current text size (can be used in place of a number block)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:723 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:735 msgid "ycor of top of screen" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:724 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:736 msgid "a place to throw away blocks" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:725 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:737 msgid "palette of turtle commands" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:726 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:738 msgid "do-until-True operator that uses boolean operators from Numbers palette" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:727 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:739 msgid "jogs stack down" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:728 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:740 msgid "pauses program execution a specified number of seconds" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:729 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:741 msgid "do-while-True operator that uses boolean operators from Numbers palette" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:730 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:742 msgid "the canvas width" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:731 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:743 msgid "" "holds current x-coordinate value of the turtle (can be used in place of a " "number block)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:732 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:744 msgid "" "holds current y-coordinate value of the turtle (can be used in place of a " "number block)" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:791 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:803 msgid "bulleted list" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:806 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:818 msgid "picture" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:822 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:834 msgid "2×2 pictures" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:853 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:865 msgid "2×1 pictures" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:884 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:896 msgid "1×2 pictures" msgstr "" -#: /home/walter/Desktop/ta-refactoring/taconstants.py:915 +#: /home/walter/Desktop/ta-refactoring/taconstants.py:927 msgid "1×1 picture" msgstr "" diff --git a/taconstants.py b/taconstants.py index 166addf..8549796 100644 --- a/taconstants.py +++ b/taconstants.py @@ -162,7 +162,7 @@ BASIC_STYLE_HEAD_1ARG = ['hat'] BASIC_STYLE_TAIL = ['stopstack', 'empty'] BASIC_STYLE = ['clean', 'penup', 'pendown', 'stack1', 'stack2', 'vspace', 'hideblocks', 'showblocks', 'clearheap', 'printheap', 'kbinput', - 'fullscreen', 'sandwichcollapsed', 'while', 'until'] + 'fullscreen', 'sandwichcollapsed'] BASIC_STYLE_EXTENDED = ['picturelist', 'picture1x1', 'picture2x2', 'picture2x1', 'picture1x2', 'picture1x1a'] BASIC_STYLE_1ARG = ['forward', 'back', 'left', 'right', 'seth', 'show', @@ -188,7 +188,7 @@ NOT_STYLE = ['not'] FLOW_STYLE = ['forever'] FLOW_STYLE_TAIL = ['hspace'] FLOW_STYLE_1ARG = ['repeat'] -FLOW_STYLE_BOOLEAN = ['if'] +FLOW_STYLE_BOOLEAN = ['if', 'while', 'until'] FLOW_STYLE_ELSE = ['ifelse'] COLLAPSIBLE_TOP = ['sandwichtop'] COLLAPSIBLE_BOTTOM = ['sandwichbottom'] @@ -456,7 +456,7 @@ class LogoCode: self.stacks['stack3'+str(x)] = self.readline(code) code = self.blocks_to_code(blk) - if run_flag is True: + if run_flag: print "running code: %s" % (code) self.setup_cmd(code) else: @@ -464,7 +464,6 @@ class LogoCode: """ Convert a stack of blocks to pseudocode. - Maintains a parallel datastructure for backpointers to blocks. """ def blocks_to_code(self, blk): if blk is None: @@ -650,6 +649,7 @@ class LogoCode: # Either we are processing a symbol or a value. if type(token) == self.symtype: # We highlight blocks here in case an error occurs... + # print "> ", token if not self.tw.hide and bindex is not None: self.tw.block_list.list[bindex].highlight() self.icall(self.evalsym, token) @@ -659,6 +659,7 @@ class LogoCode: self.tw.block_list.list[bindex].unhighlight() res = self.iresult else: + # print ": ", token res = token self.ireturn(res) @@ -701,6 +702,7 @@ class LogoCode: yield True def ufuncall(self, body): + print "ufuncall: ", self.evline, body ijmp(self.evline, body) yield True @@ -724,9 +726,11 @@ class LogoCode: def ireturn(self, res=None): self.step = self.istack.pop() + # print "ireturn: ", self.step self.iresult = res def ijmp(self, fcn, *args): + # print "ijmp: ", fcn, args self.step = fcn(*(args)) def debug_trace(self, token): @@ -1018,13 +1022,13 @@ class LogoCode: elif string[0:6] == 'audio_': self.play_sound(string) else: - if center is True: + if center: y -= self.tw.textsize self.tw.canvas.draw_text(string,x,y,self.tw.textsize, self.tw.canvas.width-x) elif type(string) == float or type(string) == int: string = round_int(string) - if center is True: + if center: y -= self.tw.textsize self.tw.canvas.draw_text(string, x, y, self.tw.textsize, self.tw.canvas.width-x) @@ -1113,7 +1117,7 @@ class LogoCode: # convert from Turtle coordinates to screen coordinates x = self.tw.canvas.width/2+int(self.tw.canvas.xcor) y = self.tw.canvas.height/2-int(self.tw.canvas.ycor) - if center is True: + if center: x -= w/2 y -= h/2 if media[0:5] == 'media': diff --git a/tasprite_factory.py b/tasprite_factory.py index 1bd3e8e..f76f40d 100755 --- a/tasprite_factory.py +++ b/tasprite_factory.py @@ -595,12 +595,30 @@ class SVG: "\" height=\"", h,"\" x=\"", x, "\" y=\"", y, "\" />\n") def _turtle_body(self): - return "%s%s%s%s%s" % ("<path style=\"", self._fill, ";stroke:", - self._stroke, "\" d=\"M 20,42 C 21,41 23,40 24,40 C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z\" />\n") + return "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s" % ( + "<path style=\"", self._fill, ";stroke:", + self._stroke, "\" d=\"M 20,42 C 21,41 23,40 24,40 ", + "C 24,39 24,40 26,41 C 28,43 31,43 34,41 C 35,40 35,39 36,40 ", + "C 36,40 38,41 39,42 C 41,42 45,43 46,43 C 47,43 46,41 43,39 ", + "L 39,36 L 42,34 C 44,30 45,28 43,25 L 41,22 L 46,18 ", + "C 48,16 47.5,13.5 47,13 C 46.5,12.5 46,13 45,13 ", + "C 44,13 43.5,14 42.5,15 C 39.5,17 40,18 37,17 ", + "C 32,16 31.5,15 34.5,12 C 36.5,10 36,7 34,6 C 32,3 28,4 26,6 ", + "C 24,8 23,10 25,12 C 28,15 27,16 22,17 C 18,18 19,17 17,15 ", + "C 16,14 16,13 15,13 C 14,13 13,13 13,13 C 12,13 11,16 14,18 ", + "L 19,22 L 17,25 C 15,28 16,30 18,34 L 20,36 L 16,39 ", + "C 13,41 12,43 13,43 C 14,43 18,42 20,42 z M 30,18 ", + "C 32,18 36,19 38,20 C 40,22 39.5,25 39.5,28 ", + "C 39.5,30 40,32.5 38.5,35 C 37,36.5 36.5,37.5 35,38 ", + "C 33.5,38.5 31,39 30,39 C 28,39 26,39 25,38 ", + "C 23,37 22.5,37 21.5,35 C 20.5,33 20.5,30 20.5,28 ", + "C 20.5,25 20,22 22,20 C 24,19 27,18 30,18 z\" />\n") def _turtle_shell(self): - return "%s%s%s%s%s" % ("<path style=\"", self._fill, ";stroke:", - self._stroke, "\" d=\"M 33,10 C 33,11 31.5,12 30,12 C 28,12 27,11 27,10 C 27,9 28,8 30,8 C 31.5,8 33,9 33,10 z\" />\n") + return "%s%s%s%s%s%s%s" % ("<path style=\"", self._fill, ";stroke:", + self._stroke, "\" d=\"M 33,10 C 33,11 31.5,12 30,12 ", + "C 28,12 27,11 27,10 C 27,9 28,8 30,8 ", + "C 31.5,8 33,9 33,10 z\" />\n") def _check_min_max(self): if self._x < self._min_x: diff --git a/tawindow.py b/tawindow.py index 897e672..6a585ad 100644 --- a/tawindow.py +++ b/tawindow.py @@ -944,7 +944,7 @@ class TurtleArtWindow(): self.block_operation = 'new' """ - Create a "macro" (predefined stack of blocks) + Create a "macro" (predefined stack of blocks). """ def _new_macro(self, name, x, y): macro = MACROS[name] @@ -2458,8 +2458,8 @@ class TurtleArtWindow(): if self.running_sugar: dsobject = datastore.create() if len(name) == 0: - dsobject.metadata['title'] = "%s %s" % (self.metadata['title'], - _("image")) + dsobject.metadata['title'] = "%s %s" % ( + self.activity.metadata['title'], _("image")) else: dsobject.metadata['title'] = name dsobject.metadata['icon-color'] = profile.get_color().to_string() |