From 3d195dff75c3f99a647d7e0d995e91648fd85db3 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Sat, 28 Feb 2009 22:19:20 +0000 Subject: reorg of SVGs --- diff --git a/NEWS b/NEWS index 3a7d271..4561ff6 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +37 + +* cleaned up SVGs + 36 * added el, vi, zh_TW diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index 88b9ec4..e48c828 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -45,7 +45,7 @@ from sugar import profile from gettext import gettext as _ import locale import os.path -import os +import subprocess import tarfile import sys from taexporthtml import * @@ -117,7 +117,8 @@ class TurtleArtActivity(activity.Activity): newversion = False else: _logger.debug("out with the old, in with the new") - os.system("rm " + os.path.join(datapath, '*.png')) + cmd = "rm " + os.path.join(datapath, '*.png') + subprocess.check_call(cmd, shell=True) except: _logger.debug("writing new version data") _logger.debug("and creating a tamyblock.py Journal entry") diff --git a/activity/activity.info b/activity/activity.info index 8097efe..3e494e1 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Turtle Art -activity_version = 36 +activity_version = 37 license = MIT bundle_id = org.laptop.TurtleArtActivity exec = sugar-activity TurtleArtActivity.TurtleArtActivity diff --git a/images/el/myblocks/myblocksgroup.svg b/images/el/myblocks/myblocksgroup.svg index 85960f8..d6fa6c9 100644 --- a/images/el/myblocks/myblocksgroup.svg +++ b/images/el/myblocks/myblocksgroup.svg @@ -28,7 +28,8 @@ y2="46.558704" id="linearGradient3245" xlink:href="#linearGradient3239" - gradientUnits="userSpaceOnUse" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,4.441294)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,41.9838)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,41.9838)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> @@ -311,7 +325,7 @@ width="137.5" height="0.14" x="3.7153397" - y="-383.43195" + y="-467.43195" transform="scale(1,-1)" id="rect37" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -324,142 +338,122 @@ id="text41" style="font-size:12px;font-variant:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-opacity:1;font-family:Bitstream Vera Sans"> X Τα τμήματά μου + style="font-size:16px">Τα τμήματά μου στοίβα 1 + style="font-size:11px">στοίβα1 στοίβα 1 + style="font-size:11px">στοίβα1 στοίβα 2 + style="font-size:11px">στοίβα2 στοίβα 2 + style="font-size:11px">στοίβα2 - αποθήκευση + style="font-size:8px">αποθήκευση στο + style="font-size:8px">στο πλαίσιο 1 + style="font-size:8px">πλαίσιο1 πλαίσιο 1 + style="font-size:11px">πλαίσιο1 - αποθήκευση + style="font-size:8px">αποθήκευση στο + style="font-size:8px">στο πλαίσιο 2 + style="font-size:8px">πλαίσιο2 πλαίσιο 2 + style="font-size:11px">πλαίσιο2 - - - - - - push - - - - pop - - - - - show - - - heap - - - - - - clear - - - heap - - - name + style="font-size:11px">name start + style="font-size:11px">start diff --git a/images/el/myblocks/myblocksmask.svg b/images/el/myblocks/myblocksmask.svg index f9a5ca7..efadbaf 100644 --- a/images/el/myblocks/myblocksmask.svg +++ b/images/el/myblocks/myblocksmask.svg @@ -3,11 +3,12 @@ + - - - - - - - - - - - - diff --git a/images/el/myblocks/push.svg b/images/el/myblocks/push.svg deleted file mode 100644 index 2e0d236..0000000 --- a/images/el/myblocks/push.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - push - - diff --git a/images/el/myblocks/clearheap.svg b/images/el/sensors/clearheap.svg index adef19e..f277b41 100644 --- a/images/el/myblocks/clearheap.svg +++ b/images/el/sensors/clearheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/nl/myblocks/pop.svg b/images/el/sensors/pop.svg index 059c571..568fcd9 100644 --- a/images/nl/myblocks/pop.svg +++ b/images/el/sensors/pop.svg @@ -1,39 +1,46 @@ + - + height="21" + id="svg2"> + + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3170" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /> + d="M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z" + id="path10" + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1" /> + id="text12" + style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pop - \ No newline at end of file diff --git a/images/vi/myblocks/printheap.svg b/images/el/sensors/printheap.svg index f27d3fc..026631e 100644 --- a/images/vi/myblocks/printheap.svg +++ b/images/el/sensors/printheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/el/sensors/push.svg b/images/el/sensors/push.svg new file mode 100644 index 0000000..9683008 --- /dev/null +++ b/images/el/sensors/push.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + push + + diff --git a/images/el/sensors/sensorsgroup.svg b/images/el/sensors/sensorsgroup.svg index 272280c..00a5ee9 100644 --- a/images/el/sensors/sensorsgroup.svg +++ b/images/el/sensors/sensorsgroup.svg @@ -6,7 +6,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="145" - height="404" + height="500" id="svg2"> @@ -22,65 +22,10 @@ offset="1" /> - - - - - - - - - + gradientTransform="translate(-32.524278,106.11408)" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - + gradientTransform="translate(-32.524276,132.44905)" /> + id="linearGradient2513" + xlink:href="#linearGradient3712" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.5,0,0,0.5,34.0625,146.60834)" /> - - - - - - - - - - - - - - + x1="34.0625" + y1="156.60834" + x2="110.9375" + y2="156.60834" + id="linearGradient3222" + xlink:href="#linearGradient3712" + gradientUnits="userSpaceOnUse" /> - - - + x1="34.0625" + y1="156.60834" + x2="110.9375" + y2="156.60834" + id="linearGradient3225" + xlink:href="#linearGradient3712" + gradientUnits="userSpaceOnUse" /> + gradientTransform="matrix(0.67,0,0,0.67,15.710001,283.04264)" /> - + gradientTransform="matrix(0.67,0,0,0.67,77.710001,282.90001)" /> - - - - - - + gradientTransform="translate(-33.02428,30.4667)" /> + gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + + + X + - - - X - @@ -477,17 +216,17 @@ style="fill:url(#linearGradient3208);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - read key @@ -498,27 +237,11 @@ keyboard - - - - - hres - @@ -529,9 +252,25 @@ hres + + + + + + vres @@ -539,7 +278,7 @@ width="137.5" height="0.14" x="3.75" - y="-109.89137" + y="-109." transform="scale(1,-1)" id="rect2656" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#e0a000;stroke-width:1;stroke-opacity:1" /> @@ -547,35 +286,135 @@ width="137.5" height="0.14" x="3.75" - y="-108.77495" + y="-108.8" transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> + + + + + + x + + + + transform="translate(0,14)" + id="g3283"> - - - + d="M 37.498269,250.45337 L 40.83177,250.45337 L 40.83177,253.12016 L 45.498669,253.12016 L 45.498669,250.45337 L 106.50173,250.45337 L 106.50173,263.78737 L 45.498669,263.78737 L 45.498669,261.12056 L 40.83177,261.12056 L 40.83177,263.78737 L 37.498269,263.78737 L 37.498269,250.45337 z" + id="path3261" + style="fill:url(#linearGradient3322);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1" /> x + x="72" + y="260" + id="tspan3265" + style="font-size:11px">pop + + + + + show + + + heap + + + + + + clear + + + heap + + + + + + + + push + diff --git a/images/el/sensors/sensorsmask.svg b/images/el/sensors/sensorsmask.svg index a36f7d1..a0341c2 100644 --- a/images/el/sensors/sensorsmask.svg +++ b/images/el/sensors/sensorsmask.svg @@ -1,98 +1,76 @@ - + height="500" + id="svg2646" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="sensorsmask.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + image/svg+xml + + + + + - - - - - - - - - - - - - + id="defs12"> + + + + + + + + + + + + + diff --git a/images/en/myblocks/clearheap.svg b/images/en/myblocks/clearheap.svg deleted file mode 100644 index 6c200e4..0000000 --- a/images/en/myblocks/clearheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - empty - - - heap - - diff --git a/images/en/myblocks/myblocksgroup.svg b/images/en/myblocks/myblocksgroup.svg index ce9136f..4cbbbc0 100644 --- a/images/en/myblocks/myblocksgroup.svg +++ b/images/en/myblocks/myblocksgroup.svg @@ -1,656 +1,563 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - MyBlocks - - - - action1 - - - - action1 - - - - action2 - - - - action2 - - - - - - - - store in - - - box1 - - - - box1 - - - - - - - - store in - - - box2 - - - - box2 - - - - - - - - - - - push - - - - pop - - - - - show - - - heap - - - - - - empty - - - heap - - - - - - - - name - - - - - - start - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + My Blocks + + + + stack 1 + + + + stack 1 + + + + stack 2 + + + + stack 2 + + + + + + + + store + + + in + + + box 1 + + + + box 1 + + + + + + + + store + + + in + + + box 2 + + + + box 2 + + + + + + + + + + name + + + + + + start + + diff --git a/images/en/myblocks/myblocksmask.svg b/images/en/myblocks/myblocksmask.svg index f9a5ca7..efadbaf 100644 --- a/images/en/myblocks/myblocksmask.svg +++ b/images/en/myblocks/myblocksmask.svg @@ -3,11 +3,12 @@ + - - - - - - - - - - - - diff --git a/images/en/myblocks/pop.svg b/images/en/myblocks/pop.svg deleted file mode 100644 index 54825af..0000000 --- a/images/en/myblocks/pop.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - pop - - diff --git a/images/en/myblocks/printheap.svg b/images/en/myblocks/printheap.svg deleted file mode 100644 index e8434ab..0000000 --- a/images/en/myblocks/printheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - show - - - heap - - diff --git a/images/en/myblocks/push.svg b/images/en/myblocks/push.svg deleted file mode 100644 index 2e0d236..0000000 --- a/images/en/myblocks/push.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - push - - diff --git a/images/en/sensors/clearheap.svg b/images/en/sensors/clearheap.svg new file mode 100644 index 0000000..2951642 --- /dev/null +++ b/images/en/sensors/clearheap.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + empty + + + heap + + diff --git a/images/en/sensors/hres.svg b/images/en/sensors/hres.svg index 630111c..2b15cd9 100644 --- a/images/en/sensors/hres.svg +++ b/images/en/sensors/hres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">hres + style="font-size:16px">hdim diff --git a/images/fi/myblocks/pop.svg b/images/en/sensors/pop.svg index 54825af..34dd8e1 100644 --- a/images/fi/myblocks/pop.svg +++ b/images/en/sensors/pop.svg @@ -1,38 +1,46 @@ - + + - + height="21" + id="svg2"> + + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3170" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /> + d="M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z" + id="path10" + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1" /> + id="text12" + style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pop diff --git a/images/en/sensors/printheap.svg b/images/en/sensors/printheap.svg new file mode 100644 index 0000000..63bd842 --- /dev/null +++ b/images/en/sensors/printheap.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + show + + + heap + + diff --git a/images/en/sensors/push.svg b/images/en/sensors/push.svg new file mode 100644 index 0000000..9683008 --- /dev/null +++ b/images/en/sensors/push.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + push + + diff --git a/images/en/sensors/sensorsgroup.svg b/images/en/sensors/sensorsgroup.svg index 6d94c39..ef700c5 100644 --- a/images/en/sensors/sensorsgroup.svg +++ b/images/en/sensors/sensorsgroup.svg @@ -1,599 +1,420 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Keyboard - - - - query - - - kb - - - - keyboard - - - - - vres - - - - - - hres - - - - - - - - - - - x - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + + + + + Keyboard + + + + query + + + kb + + + + keyboard + + + + + hres + + + + + + vres + + + + + + + + + + x + + + + + + + pop + + + + + + + show + + + heap + + + + + + clear + + + heap + + + + + + + + push + + diff --git a/images/en/sensors/sensorsmask.svg b/images/en/sensors/sensorsmask.svg index a36f7d1..a0341c2 100644 --- a/images/en/sensors/sensorsmask.svg +++ b/images/en/sensors/sensorsmask.svg @@ -1,98 +1,76 @@ - + height="500" + id="svg2646" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="sensorsmask.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + image/svg+xml + + + + + - - - - - - - - - - - - - + id="defs12"> + + + + + + + + + + + + + diff --git a/images/en/sensors/vres.svg b/images/en/sensors/vres.svg index cd25565..4811007 100644 --- a/images/en/sensors/vres.svg +++ b/images/en/sensors/vres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">vres + style="font-size:16px">vdim diff --git a/images/es/myblocks/clearheap.svg b/images/es/myblocks/clearheap.svg deleted file mode 100644 index 81ca2b7..0000000 --- a/images/es/myblocks/clearheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - vaciar - - - pila - - diff --git a/images/es/myblocks/myblocksgroup.svg b/images/es/myblocks/myblocksgroup.svg index 749eae4..6bb8f0d 100644 --- a/images/es/myblocks/myblocksgroup.svg +++ b/images/es/myblocks/myblocksgroup.svg @@ -1,686 +1,563 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Mis Bloques - - - - acción1 - - - - acción1 - - - - acción2 - - - - acción2 - - - - - - - - poner - - - caja 1 - - - - caja 1 - - - - - - - - poner - - - caja 2 - - - - caja 2 - - - - - - - - - - - empujar - - - - sacar - - - - - mostrar - - - pila - - - - - - vaciar - - - pila - - - - - - - - nombre - - - - - - empezar - - - - en - - - en - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + Mis bloques + + + + acción 1 + + + + acción 1 + + + + acción 2 + + + + acción 2 + + + + + + + + poner + + + en + + + caja 1 + + + + caja 1 + + + + + + + + poner + + + en + + + caja 2 + + + + caja 2 + + + + + + + + + + nombre + + + + + + empezar + + diff --git a/images/es/myblocks/myblocksmask.svg b/images/es/myblocks/myblocksmask.svg index f9a5ca7..efadbaf 100644 --- a/images/es/myblocks/myblocksmask.svg +++ b/images/es/myblocks/myblocksmask.svg @@ -3,11 +3,12 @@ + - - - - - - - - - - - - diff --git a/images/es/myblocks/pop.svg b/images/es/myblocks/pop.svg deleted file mode 100644 index 7ac8548..0000000 --- a/images/es/myblocks/pop.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - sacar - - diff --git a/images/es/myblocks/printheap.svg b/images/es/myblocks/printheap.svg deleted file mode 100644 index 62e6460..0000000 --- a/images/es/myblocks/printheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - mostrar - - - pila - - diff --git a/images/es/myblocks/push.svg b/images/es/myblocks/push.svg deleted file mode 100644 index 51f7bab..0000000 --- a/images/es/myblocks/push.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - empujar - - diff --git a/images/el/myblocks/clearheap.svg b/images/es/sensors/clearheap.svg index adef19e..20bdba1 100644 --- a/images/el/myblocks/clearheap.svg +++ b/images/es/sensors/clearheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,20 +27,20 @@ gradientUnits="userSpaceOnUse" /> clear + style="font-size:18px;">vaciar heap + style="font-size:18px;">pila diff --git a/images/nl/myblocks/pop.svg b/images/es/sensors/pop.svg index 059c571..5ed4e5e 100644 --- a/images/nl/myblocks/pop.svg +++ b/images/es/sensors/pop.svg @@ -1,39 +1,46 @@ + - + height="21" + id="svg2"> + + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3170" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /> + d="M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z" + id="path10" + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1" /> + id="text12" + style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pop + id="tspan14" + style="font-size:16px">sacar - \ No newline at end of file diff --git a/images/vi/myblocks/printheap.svg b/images/es/sensors/printheap.svg index f27d3fc..3c7dc54 100644 --- a/images/vi/myblocks/printheap.svg +++ b/images/es/sensors/printheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,20 +27,20 @@ gradientUnits="userSpaceOnUse" /> show + style="font-size:18px;">mostrar heap + style="font-size:18px;">pila diff --git a/images/es/sensors/push.svg b/images/es/sensors/push.svg new file mode 100644 index 0000000..d90a232 --- /dev/null +++ b/images/es/sensors/push.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + empujar + + diff --git a/images/es/sensors/sensorsgroup.svg b/images/es/sensors/sensorsgroup.svg index dae8c20..fe44e5f 100644 --- a/images/es/sensors/sensorsgroup.svg +++ b/images/es/sensors/sensorsgroup.svg @@ -1,599 +1,420 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Teclado - - - - leer - - - tecla - - - - teclado - - - - - vres - - - - - - hres - - - - - - - - - - - x - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + + + + + Teclado + + + + leer + + + tecla + + + + keyboard + + + + + res h + + + + + + res v + + + + + + + + + + x + + + + + + + sacar + + + + + + + mostrar + + + pila + + + + + + vaciar + + + pila + + + + + + + + empujar + + diff --git a/images/es/sensors/sensorsmask.svg b/images/es/sensors/sensorsmask.svg index a36f7d1..a0341c2 100644 --- a/images/es/sensors/sensorsmask.svg +++ b/images/es/sensors/sensorsmask.svg @@ -1,98 +1,76 @@ - + height="500" + id="svg2646" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="sensorsmask.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + image/svg+xml + + + + + - - - - - - - - - - - - - + id="defs12"> + + + + + + + + + + + + + diff --git a/images/fi/myblocks/clearheap.svg b/images/fi/myblocks/clearheap.svg deleted file mode 100644 index 6c200e4..0000000 --- a/images/fi/myblocks/clearheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - empty - - - heap - - diff --git a/images/fi/myblocks/myblocksgroup.svg b/images/fi/myblocks/myblocksgroup.svg index 8f6af77..8d4f4f6 100644 --- a/images/fi/myblocks/myblocksgroup.svg +++ b/images/fi/myblocks/myblocksgroup.svg @@ -1,681 +1,563 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Minun lohkoni - - - - pino 1 - - - - pino 1 - - - - pino 2 - - - - pino 2 - - - - - - - - säilytä - - - kossa1 - - - - kossa1 - - - - - - - - säilytä - - - kossa 2 - - - - kossa 2 - - - - - - - - - - - push - - - - pop - - - - - show - - - heap - - - - - - empty - - - heap - - - - - - - - nimi - - - - - - alku - - - laati - - - laati - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + Minun lohkoni + + + + pino 1 + + + + pino 1 + + + + pino 2 + + + + pino 2 + + + + + + + + säilytä + + + laatikossa + + + 1 + + + + laatikko 1 + + + + + + + + Säilytä + + + laatikossa + + + 2 + + + + laatikko 2 + + + + + + + + + + name + + + + + + start + + diff --git a/images/fi/myblocks/myblocksmask.svg b/images/fi/myblocks/myblocksmask.svg index 90fbfb6..efadbaf 100644 --- a/images/fi/myblocks/myblocksmask.svg +++ b/images/fi/myblocks/myblocksmask.svg @@ -1,183 +1,148 @@ - - + - - - - - - - - - - + + - - - + - - + - - + + - - - - + - - + + - - - - - - - + - - + - - - + - - - - - - - - - - - - - - - + - + diff --git a/images/fi/myblocks/printheap.svg b/images/fi/myblocks/printheap.svg deleted file mode 100644 index e8434ab..0000000 --- a/images/fi/myblocks/printheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - show - - - heap - - diff --git a/images/fi/myblocks/push.svg b/images/fi/myblocks/push.svg deleted file mode 100644 index 2e0d236..0000000 --- a/images/fi/myblocks/push.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - push - - diff --git a/images/vi/myblocks/clearheap.svg b/images/fi/sensors/clearheap.svg index adef19e..f277b41 100644 --- a/images/vi/myblocks/clearheap.svg +++ b/images/fi/sensors/clearheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/el/myblocks/pop.svg b/images/fi/sensors/pop.svg index 059c571..568fcd9 100644 --- a/images/el/myblocks/pop.svg +++ b/images/fi/sensors/pop.svg @@ -1,39 +1,46 @@ + - + height="21" + id="svg2"> + + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3170" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /> + d="M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z" + id="path10" + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1" /> + id="text12" + style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pop - \ No newline at end of file diff --git a/images/nl/myblocks/printheap.svg b/images/fi/sensors/printheap.svg index f27d3fc..026631e 100644 --- a/images/nl/myblocks/printheap.svg +++ b/images/fi/sensors/printheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/fi/sensors/push.svg b/images/fi/sensors/push.svg new file mode 100644 index 0000000..9683008 --- /dev/null +++ b/images/fi/sensors/push.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + push + + diff --git a/images/fi/sensors/sensorsgroup.svg b/images/fi/sensors/sensorsgroup.svg index 6d94c39..00a5ee9 100644 --- a/images/fi/sensors/sensorsgroup.svg +++ b/images/fi/sensors/sensorsgroup.svg @@ -1,599 +1,420 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Keyboard - - - - query - - - kb - - - - keyboard - - - - - vres - - - - - - hres - - - - - - - - - - - x - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + + + + + Keyboard + + + + read + + + key + + + + keyboard + + + + + hres + + + + + + vres + + + + + + + + + + x + + + + + + + pop + + + + + + + show + + + heap + + + + + + clear + + + heap + + + + + + + + push + + diff --git a/images/fi/sensors/sensorsmask.svg b/images/fi/sensors/sensorsmask.svg index a36f7d1..a0341c2 100644 --- a/images/fi/sensors/sensorsmask.svg +++ b/images/fi/sensors/sensorsmask.svg @@ -1,98 +1,76 @@ - + height="500" + id="svg2646" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="sensorsmask.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + image/svg+xml + + + + + - - - - - - - - - - - - - + id="defs12"> + + + + + + + + + + + + + diff --git a/images/fr/myblocks/clearheap.svg b/images/fr/myblocks/clearheap.svg deleted file mode 100644 index 6c200e4..0000000 --- a/images/fr/myblocks/clearheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - empty - - - heap - - diff --git a/images/fr/myblocks/myblocksgroup.svg b/images/fr/myblocks/myblocksgroup.svg index 4177bdd..572f7d6 100644 --- a/images/fr/myblocks/myblocksgroup.svg +++ b/images/fr/myblocks/myblocksgroup.svg @@ -1,681 +1,563 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Mes Blocs - - - - pile 1 - - - - pile 1 - - - - pile 2 - - - - pile 2 - - - - - - - - stocke - - - boîte 1 - - - - boîte 1 - - - - - - - - stocke - - - boîte 2 - - - - boîte 2 - - - - - - - - - - - push - - - - pop - - - - - show - - - heap - - - - - - empty - - - heap - - - - - - - - nom - - - - - - commencer - - - dans la - - - dans la - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + Mes blocs + + + + pile 1 + + + + pile 1 + + + + pile 2 + + + + pile 2 + + + + + + + + range + + + dans la + + + boîte 1 + + + + boîte 1 + + + + + + + + range + + + dans la + + + boîte 2 + + + + boîte 2 + + + + + + + + + + nom + + + + + + démarre + + diff --git a/images/fr/myblocks/myblocksmask.svg b/images/fr/myblocks/myblocksmask.svg index 90fbfb6..efadbaf 100644 --- a/images/fr/myblocks/myblocksmask.svg +++ b/images/fr/myblocks/myblocksmask.svg @@ -1,183 +1,148 @@ - - + - - - - - - - - - - + + - - - + - - + - - + + - - - - + - - + + - - - - - - - + - - + - - - + - - - - - - - - - - - - - - - + - + diff --git a/images/fr/myblocks/pop.svg b/images/fr/myblocks/pop.svg deleted file mode 100644 index 54825af..0000000 --- a/images/fr/myblocks/pop.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - pop - - diff --git a/images/fr/myblocks/printheap.svg b/images/fr/myblocks/printheap.svg deleted file mode 100644 index e8434ab..0000000 --- a/images/fr/myblocks/printheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - show - - - heap - - diff --git a/images/fr/myblocks/push.svg b/images/fr/myblocks/push.svg deleted file mode 100644 index 2e0d236..0000000 --- a/images/fr/myblocks/push.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - push - - diff --git a/images/zh_TW/myblocks/clearheap.svg b/images/fr/sensors/clearheap.svg index adef19e..f277b41 100644 --- a/images/zh_TW/myblocks/clearheap.svg +++ b/images/fr/sensors/clearheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/vi/myblocks/pop.svg b/images/fr/sensors/pop.svg index 059c571..568fcd9 100644 --- a/images/vi/myblocks/pop.svg +++ b/images/fr/sensors/pop.svg @@ -1,39 +1,46 @@ + - + height="21" + id="svg2"> + + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3170" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /> + d="M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z" + id="path10" + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1" /> + id="text12" + style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pop - \ No newline at end of file diff --git a/images/el/myblocks/printheap.svg b/images/fr/sensors/printheap.svg index f27d3fc..026631e 100644 --- a/images/el/myblocks/printheap.svg +++ b/images/fr/sensors/printheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/fr/sensors/push.svg b/images/fr/sensors/push.svg new file mode 100644 index 0000000..9683008 --- /dev/null +++ b/images/fr/sensors/push.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + push + + diff --git a/images/fr/sensors/sensorsgroup.svg b/images/fr/sensors/sensorsgroup.svg index 6d94c39..158f5b7 100644 --- a/images/fr/sensors/sensorsgroup.svg +++ b/images/fr/sensors/sensorsgroup.svg @@ -1,599 +1,420 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Keyboard - - - - query - - - kb - - - - keyboard - - - - - vres - - - - - - hres - - - - - - - - - - - x - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + + + + + Clavier + + + + read + + + key + + + + keyboard + + + + + hres + + + + + + vres + + + + + + + + + + x + + + + + + + pop + + + + + + + show + + + heap + + + + + + clear + + + heap + + + + + + + + push + + diff --git a/images/fr/sensors/sensorsmask.svg b/images/fr/sensors/sensorsmask.svg index a36f7d1..a0341c2 100644 --- a/images/fr/sensors/sensorsmask.svg +++ b/images/fr/sensors/sensorsmask.svg @@ -1,98 +1,76 @@ - + height="500" + id="svg2646" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="sensorsmask.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + image/svg+xml + + + + + - - - - - - - - - - - - - + id="defs12"> + + + + + + + + + + + + + diff --git a/images/it/myblocks/clearheap.svg b/images/it/myblocks/clearheap.svg deleted file mode 100644 index 6c200e4..0000000 --- a/images/it/myblocks/clearheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - empty - - - heap - - diff --git a/images/it/myblocks/myblocksgroup.svg b/images/it/myblocks/myblocksgroup.svg index 7710e5e..1675e72 100644 --- a/images/it/myblocks/myblocksgroup.svg +++ b/images/it/myblocks/myblocksgroup.svg @@ -1,679 +1,563 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - I miei Blocchi - - - - action1 - - - - action1 - - - - action2 - - - - action2 - - - - - - - - metti - - - scatola1 - - - - scatola1 - - - - - - - - scatola2 - - - - scatola2 - - - - - - - - - - - push - - - - pop - - - - - show - - - heap - - - - - - empty - - - heap - - - - - - - - nome - - - - - - inizio - - - nella - - - metti - - - nella - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + I Miei Blocchi + + + + stack 1 + + + + stack 1 + + + + stack 2 + + + + stack 2 + + + + + + + + metti + + + nella + + + scatola 1 + + + + scatola 1 + + + + + + + + metti + + + nella + + + scatola 2 + + + + scatola 2 + + + + + + + + + + nome + + + + + + inizio + + diff --git a/images/it/myblocks/myblocksmask.svg b/images/it/myblocks/myblocksmask.svg index f9a5ca7..efadbaf 100644 --- a/images/it/myblocks/myblocksmask.svg +++ b/images/it/myblocks/myblocksmask.svg @@ -3,11 +3,12 @@ + - - - - - - - - - - - - diff --git a/images/it/myblocks/pop.svg b/images/it/myblocks/pop.svg deleted file mode 100644 index 54825af..0000000 --- a/images/it/myblocks/pop.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - pop - - diff --git a/images/it/myblocks/printheap.svg b/images/it/myblocks/printheap.svg deleted file mode 100644 index e8434ab..0000000 --- a/images/it/myblocks/printheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - show - - - heap - - diff --git a/images/it/myblocks/push.svg b/images/it/myblocks/push.svg deleted file mode 100644 index 2e0d236..0000000 --- a/images/it/myblocks/push.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - push - - diff --git a/images/nl/myblocks/clearheap.svg b/images/it/sensors/clearheap.svg index adef19e..f277b41 100644 --- a/images/nl/myblocks/clearheap.svg +++ b/images/it/sensors/clearheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/zh_TW/myblocks/pop.svg b/images/it/sensors/pop.svg index 059c571..568fcd9 100644 --- a/images/zh_TW/myblocks/pop.svg +++ b/images/it/sensors/pop.svg @@ -1,39 +1,46 @@ + - + height="21" + id="svg2"> + + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3170" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /> + d="M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z" + id="path10" + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1" /> + id="text12" + style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pop - \ No newline at end of file diff --git a/images/zh_TW/myblocks/printheap.svg b/images/it/sensors/printheap.svg index f27d3fc..026631e 100644 --- a/images/zh_TW/myblocks/printheap.svg +++ b/images/it/sensors/printheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/it/sensors/push.svg b/images/it/sensors/push.svg new file mode 100644 index 0000000..9683008 --- /dev/null +++ b/images/it/sensors/push.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + push + + diff --git a/images/it/sensors/sensorsgroup.svg b/images/it/sensors/sensorsgroup.svg index 745452a..00a5ee9 100644 --- a/images/it/sensors/sensorsgroup.svg +++ b/images/it/sensors/sensorsgroup.svg @@ -1,599 +1,420 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Tastiera - - - - leggi - - - tasto - - - - tastiera - - - - - vres - - - - - - hres - - - - - - - - - - - x - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + + + + + Keyboard + + + + read + + + key + + + + keyboard + + + + + hres + + + + + + vres + + + + + + + + + + x + + + + + + + pop + + + + + + + show + + + heap + + + + + + clear + + + heap + + + + + + + + push + + diff --git a/images/it/sensors/sensorsmask.svg b/images/it/sensors/sensorsmask.svg index a36f7d1..a0341c2 100644 --- a/images/it/sensors/sensorsmask.svg +++ b/images/it/sensors/sensorsmask.svg @@ -1,98 +1,76 @@ - + height="500" + id="svg2646" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="sensorsmask.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + image/svg+xml + + + + + - - - - - - - - - - - - - + id="defs12"> + + + + + + + + + + + + + diff --git a/images/mn/myblocks/clearheap.svg b/images/mn/myblocks/clearheap.svg deleted file mode 100644 index 6c200e4..0000000 --- a/images/mn/myblocks/clearheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - empty - - - heap - - diff --git a/images/mn/myblocks/myblocksgroup.svg b/images/mn/myblocks/myblocksgroup.svg index d2e1c21..5d2132d 100644 --- a/images/mn/myblocks/myblocksgroup.svg +++ b/images/mn/myblocks/myblocksgroup.svg @@ -1,695 +1,563 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Миний Блокуд - - - - залгас 1 - - - - залгас1 - - - - залгас 2 - - - - залгас2 - - - - - - - - богц - - - хадгал - - - - богц1 - - - - - - - - богц - - - хадгал - - - - богц2 - - - - - - - - - - - push - - - - pop - - - - - show - - - heap - - - - - - empty - - - heap - - - - - - - - name - - - - - - start - - - - 1-д - - - 1-д - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + Миний Блокуд + + + + залгас 1 + + + + залгас 1 + + + + залгас 2 + + + + залгас 2 + + + + + + + + богц + + + 1-д + + + хадгал + + + + богц 1 + + + + + + + + богц + + + 2-д + + + хадгал + + + + богц 2 + + + + + + + + + + нэр + + + + + + эхлүүлэх + + diff --git a/images/mn/myblocks/myblocksmask.svg b/images/mn/myblocks/myblocksmask.svg index 90fbfb6..efadbaf 100644 --- a/images/mn/myblocks/myblocksmask.svg +++ b/images/mn/myblocks/myblocksmask.svg @@ -1,183 +1,148 @@ - - + - - - - - - - - - - + + - - - + - - + - - + + - - - - + - - + + - - - - - - - + - - + - - - + - - - - - - - - - - - - - - - + - + diff --git a/images/mn/myblocks/pop.svg b/images/mn/myblocks/pop.svg deleted file mode 100644 index 54825af..0000000 --- a/images/mn/myblocks/pop.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - pop - - diff --git a/images/mn/myblocks/printheap.svg b/images/mn/myblocks/printheap.svg deleted file mode 100644 index e8434ab..0000000 --- a/images/mn/myblocks/printheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - show - - - heap - - diff --git a/images/mn/myblocks/push.svg b/images/mn/myblocks/push.svg deleted file mode 100644 index 2e0d236..0000000 --- a/images/mn/myblocks/push.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - push - - diff --git a/images/el/myblocks/clearheap.svg b/images/mn/sensors/clearheap.svg index adef19e..f277b41 100644 --- a/images/el/myblocks/clearheap.svg +++ b/images/mn/sensors/clearheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/nl/myblocks/pop.svg b/images/mn/sensors/pop.svg index 059c571..568fcd9 100644 --- a/images/nl/myblocks/pop.svg +++ b/images/mn/sensors/pop.svg @@ -1,39 +1,46 @@ + - + height="21" + id="svg2"> + + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3170" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /> + d="M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z" + id="path10" + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1" /> + id="text12" + style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pop - \ No newline at end of file diff --git a/images/vi/myblocks/printheap.svg b/images/mn/sensors/printheap.svg index f27d3fc..026631e 100644 --- a/images/vi/myblocks/printheap.svg +++ b/images/mn/sensors/printheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/mn/sensors/push.svg b/images/mn/sensors/push.svg new file mode 100644 index 0000000..9683008 --- /dev/null +++ b/images/mn/sensors/push.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + push + + diff --git a/images/mn/sensors/sensorsgroup.svg b/images/mn/sensors/sensorsgroup.svg index 6d94c39..7427e56 100644 --- a/images/mn/sensors/sensorsgroup.svg +++ b/images/mn/sensors/sensorsgroup.svg @@ -1,599 +1,420 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Keyboard - - - - query - - - kb - - - - keyboard - - - - - vres - - - - - - hres - - - - - - - - - - - x - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + + + + + Гар + + + + read + + + key + + + + keyboard + + + + + hres + + + + + + vres + + + + + + + + + + x + + + + + + + pop + + + + + + + show + + + heap + + + + + + clear + + + heap + + + + + + + + push + + diff --git a/images/mn/sensors/sensorsmask.svg b/images/mn/sensors/sensorsmask.svg index a36f7d1..a0341c2 100644 --- a/images/mn/sensors/sensorsmask.svg +++ b/images/mn/sensors/sensorsmask.svg @@ -1,98 +1,76 @@ - + height="500" + id="svg2646" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="sensorsmask.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + image/svg+xml + + + + + - - - - - - - - - - - - - + id="defs12"> + + + + + + + + + + + + + diff --git a/images/nl/myblocks/myblocksgroup.svg b/images/nl/myblocks/myblocksgroup.svg index 73dad81..4028ea4 100644 --- a/images/nl/myblocks/myblocksgroup.svg +++ b/images/nl/myblocks/myblocksgroup.svg @@ -28,7 +28,8 @@ y2="46.558704" id="linearGradient3245" xlink:href="#linearGradient3239" - gradientUnits="userSpaceOnUse" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,4.441294)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,41.9838)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,41.9838)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> @@ -311,7 +325,7 @@ width="137.5" height="0.14" x="3.7153397" - y="-383.43195" + y="-467.43195" transform="scale(1,-1)" id="rect37" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -324,142 +338,122 @@ id="text41" style="font-size:12px;font-variant:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-opacity:1;font-family:Bitstream Vera Sans"> X Mijn blokken + style="font-size:20px">Mijn blokken stapel 1 + style="font-size:11px">stapel 1 stapel 1 + style="font-size:11px">stapel 1 stapel 2 + style="font-size:11px">stapel 2 stapel 2 + style="font-size:11px">stapel 2 - opslaan in doos 1 doos 1 + style="font-size:11px">doos 1 - opslaan in doos 2 doos 2 + style="font-size:11px">doos 2 - - - - - - push - - - - pop - - - - - show - - - heap - - - - - - clear - - - heap - - - name + style="font-size:11px">name start + style="font-size:11px">start diff --git a/images/nl/myblocks/myblocksmask.svg b/images/nl/myblocks/myblocksmask.svg index f9a5ca7..efadbaf 100644 --- a/images/nl/myblocks/myblocksmask.svg +++ b/images/nl/myblocks/myblocksmask.svg @@ -3,11 +3,12 @@ + - - - - - - - - - - - - diff --git a/images/nl/myblocks/push.svg b/images/nl/myblocks/push.svg deleted file mode 100644 index 2e0d236..0000000 --- a/images/nl/myblocks/push.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - push - - diff --git a/images/el/myblocks/clearheap.svg b/images/nl/sensors/clearheap.svg index adef19e..f277b41 100644 --- a/images/el/myblocks/clearheap.svg +++ b/images/nl/sensors/clearheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/nl/myblocks/pop.svg b/images/nl/sensors/pop.svg index 059c571..568fcd9 100644 --- a/images/nl/myblocks/pop.svg +++ b/images/nl/sensors/pop.svg @@ -1,39 +1,46 @@ + - + height="21" + id="svg2"> + + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3170" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /> + d="M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z" + id="path10" + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1" /> + id="text12" + style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pop - \ No newline at end of file diff --git a/images/vi/myblocks/printheap.svg b/images/nl/sensors/printheap.svg index f27d3fc..026631e 100644 --- a/images/vi/myblocks/printheap.svg +++ b/images/nl/sensors/printheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/nl/sensors/push.svg b/images/nl/sensors/push.svg new file mode 100644 index 0000000..9683008 --- /dev/null +++ b/images/nl/sensors/push.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + push + + diff --git a/images/nl/sensors/sensorsgroup.svg b/images/nl/sensors/sensorsgroup.svg index 272280c..00a5ee9 100644 --- a/images/nl/sensors/sensorsgroup.svg +++ b/images/nl/sensors/sensorsgroup.svg @@ -6,7 +6,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="145" - height="404" + height="500" id="svg2"> @@ -22,65 +22,10 @@ offset="1" /> - - - - - - - - - + gradientTransform="translate(-32.524278,106.11408)" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - + gradientTransform="translate(-32.524276,132.44905)" /> + id="linearGradient2513" + xlink:href="#linearGradient3712" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.5,0,0,0.5,34.0625,146.60834)" /> - - - - - - - - - - - - - - + x1="34.0625" + y1="156.60834" + x2="110.9375" + y2="156.60834" + id="linearGradient3222" + xlink:href="#linearGradient3712" + gradientUnits="userSpaceOnUse" /> - - - + x1="34.0625" + y1="156.60834" + x2="110.9375" + y2="156.60834" + id="linearGradient3225" + xlink:href="#linearGradient3712" + gradientUnits="userSpaceOnUse" /> + gradientTransform="matrix(0.67,0,0,0.67,15.710001,283.04264)" /> - + gradientTransform="matrix(0.67,0,0,0.67,77.710001,282.90001)" /> - - - - - - + gradientTransform="translate(-33.02428,30.4667)" /> + gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + + + X + - - - X - @@ -477,17 +216,17 @@ style="fill:url(#linearGradient3208);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - read key @@ -498,27 +237,11 @@ keyboard - - - - - hres - @@ -529,9 +252,25 @@ hres + + + + + + vres @@ -539,7 +278,7 @@ width="137.5" height="0.14" x="3.75" - y="-109.89137" + y="-109." transform="scale(1,-1)" id="rect2656" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#e0a000;stroke-width:1;stroke-opacity:1" /> @@ -547,35 +286,135 @@ width="137.5" height="0.14" x="3.75" - y="-108.77495" + y="-108.8" transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> + + + + + + x + + + + transform="translate(0,14)" + id="g3283"> - - - + d="M 37.498269,250.45337 L 40.83177,250.45337 L 40.83177,253.12016 L 45.498669,253.12016 L 45.498669,250.45337 L 106.50173,250.45337 L 106.50173,263.78737 L 45.498669,263.78737 L 45.498669,261.12056 L 40.83177,261.12056 L 40.83177,263.78737 L 37.498269,263.78737 L 37.498269,250.45337 z" + id="path3261" + style="fill:url(#linearGradient3322);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1" /> x + x="72" + y="260" + id="tspan3265" + style="font-size:11px">pop + + + + + show + + + heap + + + + + + clear + + + heap + + + + + + + + push + diff --git a/images/nl/sensors/sensorsmask.svg b/images/nl/sensors/sensorsmask.svg index a36f7d1..a0341c2 100644 --- a/images/nl/sensors/sensorsmask.svg +++ b/images/nl/sensors/sensorsmask.svg @@ -1,98 +1,76 @@ - + height="500" + id="svg2646" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="sensorsmask.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + image/svg+xml + + + + + - - - - - - - - - - - - - + id="defs12"> + + + + + + + + + + + + + diff --git a/images/nl/turtle/turtlegroup.svg~ b/images/nl/turtle/turtlegroup.svg~ deleted file mode 100644 index d4006f9..0000000 --- a/images/nl/turtle/turtlegroup.svg~ +++ /dev/null @@ -1,502 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - - wissen - - - - - - vooruit - - - - - - terug - - - - - - links - - - - - - rechts - - - - - - - - boog - - - hoek - straal - - - - - - - - setyx - - - x - y - - - - - - - - - - - - - - - - diff --git a/images/pt/myblocks/clearheap.svg b/images/pt/myblocks/clearheap.svg deleted file mode 100644 index 6c200e4..0000000 --- a/images/pt/myblocks/clearheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - empty - - - heap - - diff --git a/images/pt/myblocks/myblocksgroup.svg b/images/pt/myblocks/myblocksgroup.svg index b2901f9..1a19da6 100644 --- a/images/pt/myblocks/myblocksgroup.svg +++ b/images/pt/myblocks/myblocksgroup.svg @@ -28,7 +28,8 @@ y2="46.558704" id="linearGradient3245" xlink:href="#linearGradient3239" - gradientUnits="userSpaceOnUse" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,4.441294)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,41.9838)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,41.9838)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> @@ -311,7 +325,7 @@ width="137.5" height="0.14" x="3.7153397" - y="-383.43195" + y="-467.43195" transform="scale(1,-1)" id="rect37" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -324,142 +338,122 @@ id="text41" style="font-size:12px;font-variant:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-opacity:1;font-family:Bitstream Vera Sans"> X Os meus blocos + style="font-size:20px">Os meus blocos pilha 1 + style="font-size:11px">pilha 1 pilha 1 + style="font-size:11px">pilha 1 pilha 2 + style="font-size:11px">pilha 2 pilha 2 + style="font-size:11px">pilha 2 - pôr na caixa 1 caixa 1 + style="font-size:11px">caixa 1 - pôr na caixa 2 caixa 2 + style="font-size:11px">caixa 2 - - - - - - push - - - - pop - - - - - show - - - heap - - - - - - clear - - - heap - - - nome + style="font-size:11px">nome iniciar + style="font-size:11px">iniciar diff --git a/images/pt/myblocks/myblocksmask.svg b/images/pt/myblocks/myblocksmask.svg index 90fbfb6..efadbaf 100644 --- a/images/pt/myblocks/myblocksmask.svg +++ b/images/pt/myblocks/myblocksmask.svg @@ -1,183 +1,148 @@ - - + - - - - - - - - - - + + - - - + - - + - - + + - - - - + - - + + - - - - - - - + - - + - - - + - - - - - - - - - - - - - - - + - + diff --git a/images/pt/myblocks/pop.svg b/images/pt/myblocks/pop.svg deleted file mode 100644 index 54825af..0000000 --- a/images/pt/myblocks/pop.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - pop - - diff --git a/images/pt/myblocks/printheap.svg b/images/pt/myblocks/printheap.svg deleted file mode 100644 index e8434ab..0000000 --- a/images/pt/myblocks/printheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - show - - - heap - - diff --git a/images/pt/myblocks/push.svg b/images/pt/myblocks/push.svg deleted file mode 100644 index 2e0d236..0000000 --- a/images/pt/myblocks/push.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - push - - diff --git a/images/el/myblocks/clearheap.svg b/images/pt/sensors/clearheap.svg index adef19e..f277b41 100644 --- a/images/el/myblocks/clearheap.svg +++ b/images/pt/sensors/clearheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/nl/myblocks/pop.svg b/images/pt/sensors/pop.svg index 059c571..568fcd9 100644 --- a/images/nl/myblocks/pop.svg +++ b/images/pt/sensors/pop.svg @@ -1,39 +1,46 @@ + - + height="21" + id="svg2"> + + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3170" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /> + d="M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z" + id="path10" + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1" /> + id="text12" + style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pop - \ No newline at end of file diff --git a/images/vi/myblocks/printheap.svg b/images/pt/sensors/printheap.svg index f27d3fc..026631e 100644 --- a/images/vi/myblocks/printheap.svg +++ b/images/pt/sensors/printheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/pt/sensors/push.svg b/images/pt/sensors/push.svg new file mode 100644 index 0000000..9683008 --- /dev/null +++ b/images/pt/sensors/push.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + push + + diff --git a/images/pt/sensors/sensorsgroup.svg b/images/pt/sensors/sensorsgroup.svg index 6d94c39..dbb3bd3 100644 --- a/images/pt/sensors/sensorsgroup.svg +++ b/images/pt/sensors/sensorsgroup.svg @@ -1,599 +1,420 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Keyboard - - - - query - - - kb - - - - keyboard - - - - - vres - - - - - - hres - - - - - - - - - - - x - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + + + + + Teclado + + + + ler + + + a + + + + keyboard + + + + + hres + + + + + + vres + + + + + + + + + + x + + + + + + + pop + + + + + + + show + + + heap + + + + + + clear + + + heap + + + + + + + + push + + diff --git a/images/pt/sensors/sensorsmask.svg b/images/pt/sensors/sensorsmask.svg index a36f7d1..a0341c2 100644 --- a/images/pt/sensors/sensorsmask.svg +++ b/images/pt/sensors/sensorsmask.svg @@ -1,98 +1,76 @@ - + height="500" + id="svg2646" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="sensorsmask.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + image/svg+xml + + + + + - - - - - - - - - - - - - + id="defs12"> + + + + + + + + + + + + + diff --git a/images/ru/myblocks/clearheap.svg b/images/ru/myblocks/clearheap.svg deleted file mode 100644 index 6c200e4..0000000 --- a/images/ru/myblocks/clearheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - empty - - - heap - - diff --git a/images/ru/myblocks/myblocksgroup.svg b/images/ru/myblocks/myblocksgroup.svg index d3edd16..b44b295 100644 --- a/images/ru/myblocks/myblocksgroup.svg +++ b/images/ru/myblocks/myblocksgroup.svg @@ -1,656 +1,563 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Мои блоки - - - - цепь1 - - - - цепь1 - - - - цепь2 - - - - цепь2 - - - - - - - - в - - - склад1 - - - - блок1 - - - - - - - - в - - - склад2 - - - - блок2 - - - - - - - - - - - push - - - - pop - - - - - show - - - heap - - - - - - empty - - - heap - - - - - - - - name - - - - - - start - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + Мои блоки + + + + цепь 1 + + + + цепь 1 + + + + цепь 2 + + + + цепь 2 + + + + + + + + сохранить + + + в + + + кармане 1 + + + + блок 1 + + + + + + + + сохранить + + + в + + + кармане 2 + + + + блок 2 + + + + + + + + + + name + + + + + + start + + diff --git a/images/ru/myblocks/myblocksmask.svg b/images/ru/myblocks/myblocksmask.svg index 90fbfb6..efadbaf 100644 --- a/images/ru/myblocks/myblocksmask.svg +++ b/images/ru/myblocks/myblocksmask.svg @@ -1,183 +1,148 @@ - - + - - - - - - - - - - + + - - - + - - + - - + + - - - - + - - + + - - - - - - - + - - + - - - + - - - - - - - - - - - - - - - + - + diff --git a/images/ru/myblocks/pop.svg b/images/ru/myblocks/pop.svg deleted file mode 100644 index 54825af..0000000 --- a/images/ru/myblocks/pop.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - pop - - diff --git a/images/ru/myblocks/printheap.svg b/images/ru/myblocks/printheap.svg deleted file mode 100644 index e8434ab..0000000 --- a/images/ru/myblocks/printheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - show - - - heap - - diff --git a/images/ru/myblocks/push.svg b/images/ru/myblocks/push.svg deleted file mode 100644 index 2e0d236..0000000 --- a/images/ru/myblocks/push.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - push - - diff --git a/images/el/myblocks/clearheap.svg b/images/ru/sensors/clearheap.svg index adef19e..f277b41 100644 --- a/images/el/myblocks/clearheap.svg +++ b/images/ru/sensors/clearheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/nl/myblocks/pop.svg b/images/ru/sensors/pop.svg index 059c571..568fcd9 100644 --- a/images/nl/myblocks/pop.svg +++ b/images/ru/sensors/pop.svg @@ -1,39 +1,46 @@ + - + height="21" + id="svg2"> + + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3170" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /> + d="M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z" + id="path10" + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1" /> + id="text12" + style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pop - \ No newline at end of file diff --git a/images/vi/myblocks/printheap.svg b/images/ru/sensors/printheap.svg index f27d3fc..026631e 100644 --- a/images/vi/myblocks/printheap.svg +++ b/images/ru/sensors/printheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/ru/sensors/push.svg b/images/ru/sensors/push.svg new file mode 100644 index 0000000..9683008 --- /dev/null +++ b/images/ru/sensors/push.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + push + + diff --git a/images/ru/sensors/sensorsgroup.svg b/images/ru/sensors/sensorsgroup.svg index 6d94c39..00a5ee9 100644 --- a/images/ru/sensors/sensorsgroup.svg +++ b/images/ru/sensors/sensorsgroup.svg @@ -1,599 +1,420 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Keyboard - - - - query - - - kb - - - - keyboard - - - - - vres - - - - - - hres - - - - - - - - - - - x - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + + + + + Keyboard + + + + read + + + key + + + + keyboard + + + + + hres + + + + + + vres + + + + + + + + + + x + + + + + + + pop + + + + + + + show + + + heap + + + + + + clear + + + heap + + + + + + + + push + + diff --git a/images/ru/sensors/sensorsmask.svg b/images/ru/sensors/sensorsmask.svg index a36f7d1..a0341c2 100644 --- a/images/ru/sensors/sensorsmask.svg +++ b/images/ru/sensors/sensorsmask.svg @@ -1,98 +1,76 @@ - + height="500" + id="svg2646" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="sensorsmask.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + image/svg+xml + + + + + - - - - - - - - - - - - - + id="defs12"> + + + + + + + + + + + + + diff --git a/images/tr/myblocks/clearheap.svg b/images/tr/myblocks/clearheap.svg deleted file mode 100644 index 6c200e4..0000000 --- a/images/tr/myblocks/clearheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - empty - - - heap - - diff --git a/images/tr/myblocks/myblocksgroup.svg b/images/tr/myblocks/myblocksgroup.svg index 27f9fc9..0fffa17 100644 --- a/images/tr/myblocks/myblocksgroup.svg +++ b/images/tr/myblocks/myblocksgroup.svg @@ -1,686 +1,563 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Parçalar - - - - yığın1 - - - - yığın1 - - - - yığın2 - - - - yığın2 - - - - - - - - kutu1 - - - sakla - - - - kutu1 - - - - - - - - kutu2 - - - sakla - - - - kutu2 - - - - - - - - - - - push - - - - pop - - - - - show - - - heap - - - - - - empty - - - heap - - - - - - - - nam - - - - - - start - - - - de - - - de - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + Parçalar + + + + yığın 1 + + + + yığın 1 + + + + yığın 2 + + + + yığın 2 + + + + + + + + kutu + + + 1 + + + de sakla + + + + kutu 1 + + + + + + + + kutu + + + 1 + + + de sakla + + + + kutu 2 + + + + + + + + + + name + + + + + + start + + diff --git a/images/tr/myblocks/myblocksmask.svg b/images/tr/myblocks/myblocksmask.svg index 90fbfb6..efadbaf 100644 --- a/images/tr/myblocks/myblocksmask.svg +++ b/images/tr/myblocks/myblocksmask.svg @@ -1,183 +1,148 @@ - - + - - - - - - - - - - + + - - - + - - + - - + + - - - - + - - + + - - - - - - - + - - + - - - + - - - - - - - - - - - - - - - + - + diff --git a/images/tr/myblocks/pop.svg b/images/tr/myblocks/pop.svg deleted file mode 100644 index 54825af..0000000 --- a/images/tr/myblocks/pop.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - pop - - diff --git a/images/tr/myblocks/printheap.svg b/images/tr/myblocks/printheap.svg deleted file mode 100644 index e8434ab..0000000 --- a/images/tr/myblocks/printheap.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - show - - - heap - - diff --git a/images/tr/myblocks/push.svg b/images/tr/myblocks/push.svg deleted file mode 100644 index 2e0d236..0000000 --- a/images/tr/myblocks/push.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - push - - diff --git a/images/el/myblocks/clearheap.svg b/images/tr/sensors/clearheap.svg index adef19e..f277b41 100644 --- a/images/el/myblocks/clearheap.svg +++ b/images/tr/sensors/clearheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/nl/myblocks/pop.svg b/images/tr/sensors/pop.svg index 059c571..568fcd9 100644 --- a/images/nl/myblocks/pop.svg +++ b/images/tr/sensors/pop.svg @@ -1,39 +1,46 @@ + - + height="21" + id="svg2"> + + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3170" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /> + d="M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z" + id="path10" + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1" /> + id="text12" + style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pop - \ No newline at end of file diff --git a/images/vi/myblocks/printheap.svg b/images/tr/sensors/printheap.svg index f27d3fc..026631e 100644 --- a/images/vi/myblocks/printheap.svg +++ b/images/tr/sensors/printheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/tr/sensors/push.svg b/images/tr/sensors/push.svg new file mode 100644 index 0000000..9683008 --- /dev/null +++ b/images/tr/sensors/push.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + push + + diff --git a/images/tr/sensors/sensorsgroup.svg b/images/tr/sensors/sensorsgroup.svg index 6d94c39..00a5ee9 100644 --- a/images/tr/sensors/sensorsgroup.svg +++ b/images/tr/sensors/sensorsgroup.svg @@ -1,599 +1,420 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - X - - - Keyboard - - - - query - - - kb - - - - keyboard - - - - - vres - - - - - - hres - - - - - - - - - - - x - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + X + + + + + + + Keyboard + + + + read + + + key + + + + keyboard + + + + + hres + + + + + + vres + + + + + + + + + + x + + + + + + + pop + + + + + + + show + + + heap + + + + + + clear + + + heap + + + + + + + + push + + diff --git a/images/tr/sensors/sensorsmask.svg b/images/tr/sensors/sensorsmask.svg index a36f7d1..a0341c2 100644 --- a/images/tr/sensors/sensorsmask.svg +++ b/images/tr/sensors/sensorsmask.svg @@ -1,98 +1,76 @@ - + height="500" + id="svg2646" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="sensorsmask.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + image/svg+xml + + + + + - - - - - - - - - - - - - + id="defs12"> + + + + + + + + + + + + + diff --git a/images/vi/myblocks/myblocksgroup.svg b/images/vi/myblocks/myblocksgroup.svg index 18b2a0a..f6b4cf0 100644 --- a/images/vi/myblocks/myblocksgroup.svg +++ b/images/vi/myblocks/myblocksgroup.svg @@ -28,7 +28,8 @@ y2="46.558704" id="linearGradient3245" xlink:href="#linearGradient3239" - gradientUnits="userSpaceOnUse" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,4.441294)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,41.9838)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,41.9838)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> @@ -311,7 +325,7 @@ width="137.5" height="0.14" x="3.7153397" - y="-383.43195" + y="-467.43195" transform="scale(1,-1)" id="rect37" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -324,142 +338,122 @@ id="text41" style="font-size:12px;font-variant:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-opacity:1;font-family:Bitstream Vera Sans"> X Khối của mình + style="font-size:20px">Khối của mình đống 1 + style="font-size:11px">đống 1 đống 1 + style="font-size:11px">đống 1 đống 2 + style="font-size:11px">đống 2 đống 2 + style="font-size:11px">đống 2 - lưu vào hộp 1 hộp 1 + style="font-size:11px">hộp 1 - lưu vào hộp 2 hộp 2 + style="font-size:11px">hộp 2 - - - - - - push - - - - pop - - - - - show - - - heap - - - - - - clear - - - heap - - - name + style="font-size:11px">tên start + style="font-size:11px">đầu diff --git a/images/vi/myblocks/myblocksmask.svg b/images/vi/myblocks/myblocksmask.svg index f9a5ca7..efadbaf 100644 --- a/images/vi/myblocks/myblocksmask.svg +++ b/images/vi/myblocks/myblocksmask.svg @@ -3,11 +3,12 @@ + - - - - - - - - - - - - diff --git a/images/vi/myblocks/push.svg b/images/vi/myblocks/push.svg deleted file mode 100644 index 2e0d236..0000000 --- a/images/vi/myblocks/push.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - push - - diff --git a/images/el/myblocks/clearheap.svg b/images/vi/sensors/clearheap.svg index adef19e..f277b41 100644 --- a/images/el/myblocks/clearheap.svg +++ b/images/vi/sensors/clearheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/nl/myblocks/pop.svg b/images/vi/sensors/pop.svg index 059c571..568fcd9 100644 --- a/images/nl/myblocks/pop.svg +++ b/images/vi/sensors/pop.svg @@ -1,39 +1,46 @@ + - + height="21" + id="svg2"> + + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3170" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /> + d="M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z" + id="path10" + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1" /> + id="text12" + style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pop - \ No newline at end of file diff --git a/images/vi/myblocks/printheap.svg b/images/vi/sensors/printheap.svg index f27d3fc..d16e175 100644 --- a/images/vi/myblocks/printheap.svg +++ b/images/vi/sensors/printheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,20 +27,20 @@ gradientUnits="userSpaceOnUse" /> show + style="font-size:18px;">hiện heap + style="font-size:18px;">miền diff --git a/images/vi/sensors/push.svg b/images/vi/sensors/push.svg new file mode 100644 index 0000000..93b19dc --- /dev/null +++ b/images/vi/sensors/push.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + đẩy + + diff --git a/images/vi/sensors/sensorsgroup.svg b/images/vi/sensors/sensorsgroup.svg index 272280c..10b9377 100644 --- a/images/vi/sensors/sensorsgroup.svg +++ b/images/vi/sensors/sensorsgroup.svg @@ -6,7 +6,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="145" - height="404" + height="500" id="svg2"> @@ -22,65 +22,10 @@ offset="1" /> - - - - - - - - - + gradientTransform="translate(-32.524278,106.11408)" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - + gradientTransform="translate(-32.524276,132.44905)" /> + id="linearGradient2513" + xlink:href="#linearGradient3712" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.5,0,0,0.5,34.0625,146.60834)" /> - - - - - - - - - - - - - - + x1="34.0625" + y1="156.60834" + x2="110.9375" + y2="156.60834" + id="linearGradient3222" + xlink:href="#linearGradient3712" + gradientUnits="userSpaceOnUse" /> - - - + x1="34.0625" + y1="156.60834" + x2="110.9375" + y2="156.60834" + id="linearGradient3225" + xlink:href="#linearGradient3712" + gradientUnits="userSpaceOnUse" /> + gradientTransform="matrix(0.67,0,0,0.67,15.710001,283.04264)" /> - + gradientTransform="matrix(0.67,0,0,0.67,77.710001,282.90001)" /> - - - - - - + gradientTransform="translate(-33.02428,30.4667)" /> + gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + + + X + - - - X - @@ -469,7 +208,7 @@ x="72.5" y="21.5" id="tspan30" - style="font-size:20px">Keyboard + style="font-size:20px">Bàn phím - read + style="font-size:12.06000042px">đọc key + style="font-size:12.06000042px">phím keyboard - - - - - hres - @@ -529,9 +252,25 @@ hres + + + + + + vres @@ -539,7 +278,7 @@ width="137.5" height="0.14" x="3.75" - y="-109.89137" + y="-109." transform="scale(1,-1)" id="rect2656" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#e0a000;stroke-width:1;stroke-opacity:1" /> @@ -547,35 +286,135 @@ width="137.5" height="0.14" x="3.75" - y="-108.77495" + y="-108.8" transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> + + + + + + x + + + + transform="translate(0,14)" + id="g3283"> - - - + d="M 37.498269,250.45337 L 40.83177,250.45337 L 40.83177,253.12016 L 45.498669,253.12016 L 45.498669,250.45337 L 106.50173,250.45337 L 106.50173,263.78737 L 45.498669,263.78737 L 45.498669,261.12056 L 40.83177,261.12056 L 40.83177,263.78737 L 37.498269,263.78737 L 37.498269,250.45337 z" + id="path3261" + style="fill:url(#linearGradient3322);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1" /> x + x="72" + y="260" + id="tspan3265" + style="font-size:11px">pop + + + + + hiện + + + miền + + + + + + clear + + + heap + + + + + + + + đẩy + diff --git a/images/vi/sensors/sensorsmask.svg b/images/vi/sensors/sensorsmask.svg index a36f7d1..a0341c2 100644 --- a/images/vi/sensors/sensorsmask.svg +++ b/images/vi/sensors/sensorsmask.svg @@ -1,98 +1,76 @@ - + height="500" + id="svg2646" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="sensorsmask.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + image/svg+xml + + + + + - - - - - - - - - - - - - + id="defs12"> + + + + + + + + + + + + + diff --git a/images/zh_TW/myblocks/myblocksgroup.svg b/images/zh_TW/myblocks/myblocksgroup.svg index d5b8181..2bfc350 100644 --- a/images/zh_TW/myblocks/myblocksgroup.svg +++ b/images/zh_TW/myblocks/myblocksgroup.svg @@ -28,7 +28,8 @@ y2="46.558704" id="linearGradient3245" xlink:href="#linearGradient3239" - gradientUnits="userSpaceOnUse" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,4.441294)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,17.83573)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,41.9838)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,41.9838)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,64.88299)" /> @@ -311,7 +325,7 @@ width="137.5" height="0.14" x="3.7153397" - y="-383.43195" + y="-467.43195" transform="scale(1,-1)" id="rect37" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -324,122 +338,106 @@ id="text41" style="font-size:12px;font-variant:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-opacity:1;font-family:Bitstream Vera Sans"> X 我的區塊 + style="font-size:20px">我的區塊 堆疊一 + style="font-size:10px">堆疊一 堆疊一 + style="font-size:10px">堆疊一 堆疊二 + style="font-size:10px">堆疊二 堆疊二 + style="font-size:10px">堆疊二 - 放入方塊一 + style="font-size:10px">放入方塊一 方塊一 + style="font-size:10px">方塊一 - 放入方塊二 + style="font-size:10px">放入方塊二 方塊二 + style="font-size:10px">方塊二 - - - - - - push - - - - pop - - - - - show - - - heap - - - - - - clear - - - heap - - - name + style="font-size:11px">name start + style="font-size:11px">start diff --git a/images/zh_TW/myblocks/myblocksmask.svg b/images/zh_TW/myblocks/myblocksmask.svg index f9a5ca7..efadbaf 100644 --- a/images/zh_TW/myblocks/myblocksmask.svg +++ b/images/zh_TW/myblocks/myblocksmask.svg @@ -3,11 +3,12 @@ + - - - - - - - - - - - - diff --git a/images/zh_TW/myblocks/push.svg b/images/zh_TW/myblocks/push.svg deleted file mode 100644 index 2e0d236..0000000 --- a/images/zh_TW/myblocks/push.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - push - - diff --git a/images/el/myblocks/clearheap.svg b/images/zh_TW/sensors/clearheap.svg index adef19e..f277b41 100644 --- a/images/el/myblocks/clearheap.svg +++ b/images/zh_TW/sensors/clearheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/nl/myblocks/pop.svg b/images/zh_TW/sensors/pop.svg index 059c571..568fcd9 100644 --- a/images/nl/myblocks/pop.svg +++ b/images/zh_TW/sensors/pop.svg @@ -1,39 +1,46 @@ + - + height="21" + id="svg2"> + + id="stop3168" + style="stop-color:#ffffff;stop-opacity:1" + offset="0" /> + id="stop3170" + style="stop-color:#ff0000;stop-opacity:1" + offset="1" /> + d="M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z" + id="path10" + style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1" /> + id="text12" + style="font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> pop - \ No newline at end of file diff --git a/images/vi/myblocks/printheap.svg b/images/zh_TW/sensors/printheap.svg index f27d3fc..026631e 100644 --- a/images/vi/myblocks/printheap.svg +++ b/images/zh_TW/sensors/printheap.svg @@ -13,7 +13,7 @@ offset="0" id="stop3168" /> @@ -27,7 +27,7 @@ gradientUnits="userSpaceOnUse" /> diff --git a/images/zh_TW/sensors/push.svg b/images/zh_TW/sensors/push.svg new file mode 100644 index 0000000..9683008 --- /dev/null +++ b/images/zh_TW/sensors/push.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + push + + diff --git a/images/zh_TW/sensors/sensorsgroup.svg b/images/zh_TW/sensors/sensorsgroup.svg index 272280c..00a5ee9 100644 --- a/images/zh_TW/sensors/sensorsgroup.svg +++ b/images/zh_TW/sensors/sensorsgroup.svg @@ -6,7 +6,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" version="1.0" width="145" - height="404" + height="500" id="svg2"> @@ -22,65 +22,10 @@ offset="1" /> - - - - - - - - - + gradientTransform="translate(-32.524278,106.11408)" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - + gradientTransform="translate(-32.524276,132.44905)" /> + id="linearGradient2513" + xlink:href="#linearGradient3712" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.5,0,0,0.5,34.0625,146.60834)" /> - - - - - - - - - - - - - - + x1="34.0625" + y1="156.60834" + x2="110.9375" + y2="156.60834" + id="linearGradient3222" + xlink:href="#linearGradient3712" + gradientUnits="userSpaceOnUse" /> - - - + x1="34.0625" + y1="156.60834" + x2="110.9375" + y2="156.60834" + id="linearGradient3225" + xlink:href="#linearGradient3712" + gradientUnits="userSpaceOnUse" /> + gradientTransform="matrix(0.67,0,0,0.67,15.710001,283.04264)" /> - + gradientTransform="matrix(0.67,0,0,0.67,77.710001,282.90001)" /> - - - - - - + gradientTransform="translate(-33.02428,30.4667)" /> + gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + + + X + - - - X - @@ -477,17 +216,17 @@ style="fill:url(#linearGradient3208);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> - read key @@ -498,27 +237,11 @@ keyboard - - - - - hres - @@ -529,9 +252,25 @@ hres + + + + + + vres @@ -539,7 +278,7 @@ width="137.5" height="0.14" x="3.75" - y="-109.89137" + y="-109." transform="scale(1,-1)" id="rect2656" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#e0a000;stroke-width:1;stroke-opacity:1" /> @@ -547,35 +286,135 @@ width="137.5" height="0.14" x="3.75" - y="-108.77495" + y="-108.8" transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> + + + + + + x + + + + transform="translate(0,14)" + id="g3283"> - - - + d="M 37.498269,250.45337 L 40.83177,250.45337 L 40.83177,253.12016 L 45.498669,253.12016 L 45.498669,250.45337 L 106.50173,250.45337 L 106.50173,263.78737 L 45.498669,263.78737 L 45.498669,261.12056 L 40.83177,261.12056 L 40.83177,263.78737 L 37.498269,263.78737 L 37.498269,250.45337 z" + id="path3261" + style="fill:url(#linearGradient3322);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1" /> x + x="72" + y="260" + id="tspan3265" + style="font-size:11px">pop + + + + + show + + + heap + + + + + + clear + + + heap + + + + + + + + push + diff --git a/images/zh_TW/sensors/sensorsmask.svg b/images/zh_TW/sensors/sensorsmask.svg index a36f7d1..a0341c2 100644 --- a/images/zh_TW/sensors/sensorsmask.svg +++ b/images/zh_TW/sensors/sensorsmask.svg @@ -1,98 +1,76 @@ - + height="500" + id="svg2646" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="sensorsmask.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + + + + image/svg+xml + + + + + - - - - - - - - - - - - - + id="defs12"> + + + + + + + + + + + + + diff --git a/svg/clearheap.py b/svg/clearheap.py index 88891ee..b530d0a 100644 --- a/svg/clearheap.py +++ b/svg/clearheap.py @@ -29,8 +29,8 @@ import gettext def main(): myname = "clearheap" - mystring = "clear heap" - mygroup = "myblocks" + mystring = "empty heap" + mygroup = "sensors" if len(sys.argv) != 2: print "Error: Usage is " + myname + ".py lang" @@ -58,7 +58,7 @@ def main(): offset=\"0\" \n \ id=\"stop3168\" /> \n \ \n \ \n \ @@ -72,7 +72,7 @@ def main(): gradientUnits=\"userSpaceOnUse\" /> \n \ \n \ \n " data1a = \ diff --git a/svg/makesvg.py b/svg/makesvg.py index bb05dd0..0e0366b 100644 --- a/svg/makesvg.py +++ b/svg/makesvg.py @@ -61,6 +61,7 @@ def main(): "pop.py", \ "printheap.py", \ "print.py", \ + "push.py", \ "random.py", \ "random.pyc", \ "remainder2.py", \ @@ -93,12 +94,16 @@ def main(): print "Error: Usage is makesvg.py lang" return - # start from a copy of the en images - print "os.system(" + "cp -r ../images/en ../image/" + sys.argv[1] + ")" - os.system("cp -r ../images/en ../images/" + sys.argv[1]) - - # make a copy of the samples directory too - os.system("cp -r ../samples/en ../samples/" + sys.argv[1]) + try: + FILE = open(os.path.join("../images", sys.argv[1], "turtle", \ + "forward.svg"), "r") + FILE.close() + except: + # start from a copy of the en images + print "os.system(" + "cp -r ../images/en ../image/" + sys.argv[1] + ")" + os.system("cp -r ../images/en ../images/" + sys.argv[1]) + # make a copy of the samples directory too + os.system("cp -r ../samples/en ../samples/" + sys.argv[1]) # run the scripts to generate the language-specific files for p in py: diff --git a/svg/myblocksgroup.py b/svg/myblocksgroup.py index 9275ea2..9485a22 100644 --- a/svg/myblocksgroup.py +++ b/svg/myblocksgroup.py @@ -36,12 +36,8 @@ def main(): mystring5 = "box 1" mystring6 = "store in box 2" mystring7 = "box 2" - mystring8 = "push" - mystring9 = "pop" - mystring10 = "show heap" - mystring11 = "clear heap" - mystring12 = "name" - mystring13 = "start" + mystring8 = "name" + mystring9 = "start" mygroup = "myblocks" if len(sys.argv) != 2: @@ -61,10 +57,6 @@ def main(): print _(mystring7) print _(mystring8) print _(mystring9) - print _(mystring10) - print _(mystring11) - print _(mystring12) - print _(mystring13) data0 = \ " \n \ @@ -97,7 +89,8 @@ def main(): y2=\"46.558704\" \n \ id=\"linearGradient3245\" \n \ xlink:href=\"#linearGradient3239\" \n \ - gradientUnits=\"userSpaceOnUse\" /> \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,4.441294)\" /> \n \ \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,17.83573)\" /> \n \ \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,17.83573)\" /> \n \ \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,17.83573)\" /> \n \ \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,17.83573)\" /> \n \ \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,41.9838)\" /> \n \ \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,41.9838)\" /> \n \ \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,64.88299)\" /> \n \ \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,64.88299)\" /> \n \ \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,64.88299)\" /> \n \ \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,64.88299)\" /> \n \ \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,64.88299)\" /> \n \ \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,64.88299)\" /> \n \ \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"translate(0,64.88299)\" /> \n \ \n \ \n \ \n \ \n \ @@ -380,7 +386,7 @@ def main(): width=\"137.5\" \n \ height=\"0.14\" \n \ x=\"3.7153397\" \n \ - y=\"-383.43195\" \n \ + y=\"-467.43195\" \n \ transform=\"scale(1,-1)\" \n \ id=\"rect37\" \n \ style=\"opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1\" /> \n \ @@ -393,156 +399,135 @@ def main(): id=\"text41\" \n \ style=\"font-size:12px;font-variant:normal;font-weight:bold;text-align:start;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-opacity:1;font-family:Bitstream Vera Sans\"> \n \ X \n \ \n \ \n \ " + style=\"font-size:20px\">" data1 = \ " \n \ \n \ \n \ \n \ " + style=\"font-size:11px\">" data2 = \ " \n \ \n \ \n \ \n \ " + style=\"font-size:11px\">" data3 = \ " \n \ \n \ \n \ \n \ " + style=\"font-size:11px\">" data4 = \ " \n \ \n \ \n \ \n \ " + style=\"font-size:11px\">" data5 = \ " \n \ \n \ \n \ \n \ \n \ \n \ \n " + style=\"fill:url(#linearGradient3301);fill-opacity:1;stroke:#c0a000;stroke-width:1;stroke-opacity:1\" /> \n" data6a = \ " \n \ " + style=\"font-size:11px\">" data6b = \ " \n \ " + style=\"font-size:10.5px\">" data6c = \ " \n \ " - data7b = \ " \n \ \n \ \n \ " @@ -550,12 +535,10 @@ def main(): " \n \ \n \ \n \ " @@ -563,12 +546,10 @@ def main(): " \n \ \n \ \n \ " @@ -576,24 +557,22 @@ def main(): " \n \ \n \ \n \ \n \ " + style=\"font-size:11px\">" data10 = \ " \n \ \n \ \n \ \n \ \n \ \n " + style=\"fill:url(#linearGradient3317);fill-opacity:1;stroke:#c0a000;stroke-width:1;stroke-opacity:1\" /> \n" data11a = \ " \n \ " + style=\"font-size:11px\">" data11b = \ " \n \ " data11c = \ " \n \ " @@ -646,12 +619,10 @@ def main(): " \n \ \n \ \n \ " @@ -659,12 +630,10 @@ def main(): " \n \ \n \ \n \ " @@ -672,12 +641,10 @@ def main(): " \n \ \n \ \n \ " @@ -685,203 +652,85 @@ def main(): " \n \ \n \ \n \ \n \ " + style=\"font-size:11px\">" data15 = \ " \n \ \n \ \n \ \n \ \n \ - \n \ - \n \ - \n \ - \n \ \n \ - \n \ - " - - data16 = \ -" \n \ - \n \ - \n \ - \n \ - " - - data17 = \ -" \n \ - \n \ - \n \ - \n \ - \n \ - " - - data18 = \ -" \n \ - \n \ - \n \ - " - - data19 = \ -" \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - " - - data20 = \ -" \n \ - \n \ - \n \ - " - - data21 = \ -" \n \ - \n \ - \n \ - \n \ \n \ \n \ \n \ \n \ " + style=\"font-size:11px\">" - data22 = \ + data16 = \ " \n \ \n \ \n \ \n \ \n \ \n \ " + style=\"font-size:11px\">" - data23 = \ + data17 = \ " \n \ \n \ \n" + FILE = open(os.path.join("../images", sys.argv[1], mygroup, myname+".svg"), "w") FILE.write(data0) FILE.write(_(mystring1).encode("utf-8")) @@ -940,24 +789,10 @@ def main(): FILE.write(data16) FILE.write(_(mystring9).encode("utf-8")) FILE.write(data17) - strings = _(mystring10).split(" ",2) - FILE.write(strings[0].encode("utf-8")) - FILE.write(data18) - if len(strings) == 2: - FILE.write(strings[1].encode("utf-8")) - FILE.write(data19) - strings = _(mystring11).split(" ",2) - FILE.write(strings[0].encode("utf-8")) - FILE.write(data20) - if len(strings) == 2: - FILE.write(strings[1].encode("utf-8")) - FILE.write(data21) - FILE.write(_(mystring12).encode("utf-8")) - FILE.write(data22) - FILE.write(_(mystring13).encode("utf-8")) - FILE.write(data23) FILE.close() return if __name__ == "__main__": main() + + diff --git a/svg/pop.py b/svg/pop.py index 989b661..2a5f688 100644 --- a/svg/pop.py +++ b/svg/pop.py @@ -30,7 +30,7 @@ def main(): myname = "pop" mystring = "pop" - mygroup = "myblocks" + mygroup = "sensors" if len(sys.argv) != 2: print "Error: Usage is " + myname + ".py lang" @@ -41,49 +41,56 @@ def main(): t.install() print _(mystring) - data0 = \ " \n \ + \n \ \n \ - \n \ + height=\"21\" \n \ + id=\"svg2\"> \n \ + \n \ \n \ \n \ + id=\"stop3168\" \n \ + style=\"stop-color:#ffffff;stop-opacity:1\" \n \ + offset=\"0\" /> \n \ \n \ + id=\"stop3170\" \n \ + style=\"stop-color:#ff0000;stop-opacity:1\" \n \ + offset=\"1\" /> \n \ \n \ \n \ \n \ \n \ + d=\"M 1,0.5 L 6,0.5 L 6,4.5 L 13,4.5 L 13,0.5 L 104.5,0.5 L 104.5,20.5 L 13,20.5 L 13,16.5 L 6,16.5 L 6,20.5 L 1,20.5 L 1,0.5 z\" \n \ + id=\"path10\" \n \ + style=\"fill:url(#linearGradient3172);fill-opacity:1;stroke:#a00000;stroke-width:2;stroke-opacity:1\" /> \n \ \n \ + id=\"text12\" \n \ + style=\"font-size:12px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans\"> \n \ " data1 = \ " \n \ \n \ - \n " + \n" FILE = open(os.path.join("../images", sys.argv[1], mygroup, myname + ".svg"), "w") diff --git a/svg/printheap.py b/svg/printheap.py index 6cb06a4..42cd38c 100644 --- a/svg/printheap.py +++ b/svg/printheap.py @@ -30,7 +30,7 @@ def main(): myname = "printheap" mystring = "show heap" - mygroup = "myblocks" + mygroup = "sensors" if len(sys.argv) != 2: print "Error: Usage is " + myname + ".py lang" @@ -58,7 +58,7 @@ def main(): offset=\"0\" \n \ id=\"stop3168\" /> \n \ \n \ \n \ @@ -72,7 +72,7 @@ def main(): gradientUnits=\"userSpaceOnUse\" /> \n \ \n \ \n " data1a = \ diff --git a/svg/push.py b/svg/push.py new file mode 100644 index 0000000..d8705f1 --- /dev/null +++ b/svg/push.py @@ -0,0 +1,104 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +#Copyright (c) 2009, Sugar Labs + +#Permission is hereby granted, free of charge, to any person obtaining a copy +#of this software and associated documentation files (the "Software"), to deal +#in the Software without restriction, including without limitation the rights +#to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +#copies of the Software, and to permit persons to whom the Software is +#furnished to do so, subject to the following conditions: + +#The above copyright notice and this permission notice shall be included in +#all copies or substantial portions of the Software. + +#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +#AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +#OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +#THE SOFTWARE. + +import sys +import os +import os.path +import gettext + +def main(): + + myname = "push" + mystring = "push" + mygroup = "sensors" + + if len(sys.argv) != 2: + print "Error: Usage is " + myname + ".py lang" + return + + t = gettext.translation("org.laptop.TurtleArtActivity", "../locale", languages=[sys.argv[1]]) + _ = t.ugettext + t.install() + + print _(mystring) + + data0 = \ +" \n \ + \n \ + \n \ + \n \ + \n \ + \n \ + \n \ + \n \ + \n \ + \n \ + \n \ + \n \ + \n \ + " + + data1 = \ +" \n \ + \n \ +\n" + + + FILE = open(os.path.join("../images", sys.argv[1], mygroup, myname + ".svg"), "w") + FILE.write(data0) + FILE.write(_(mystring).encode("utf-8")) + FILE.write(data1) + FILE.close() + return + +if __name__ == "__main__": + main() + diff --git a/svg/sensorsgroup.py b/svg/sensorsgroup.py index 1affb19..8eeec3b 100644 --- a/svg/sensorsgroup.py +++ b/svg/sensorsgroup.py @@ -34,6 +34,10 @@ def main(): mystring3 = "keyboard" mystring4 = "hres" mystring5 = "vres" + mystring6 = "pop" + mystring7 = "show heap" + mystring8 = "empty heap" + mystring9 = "push" mygroup = "sensors" if len(sys.argv) != 2: @@ -49,6 +53,11 @@ def main(): print _(mystring3) print _(mystring4) print _(mystring5) + print _(mystring6) + print _(mystring7) + print _(mystring8) + print _(mystring9) + data0 = \ " \n \ @@ -59,7 +68,7 @@ def main(): xmlns:xlink=\"http://www.w3.org/1999/xlink\" \n \ version=\"1.0\" \n \ width=\"145\" \n \ - height=\"404\" \n \ + height=\"500\" \n \ id=\"svg2\"> \n \ \n \ @@ -75,65 +84,10 @@ def main(): offset=\"1\" /> \n \ \n \ \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ \n \ + gradientTransform=\"translate(-32.524278,106.11408)\" /> \n \ \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ - \n \ + gradientTransform=\"translate(-32.524276,132.44905)\" /> \n \ \n \ + id=\"linearGradient2513\" \n \ + xlink:href=\"#linearGradient3712\" \n \ + gradientUnits=\"userSpaceOnUse\" \n \ + gradientTransform=\"matrix(0.5,0,0,0.5,34.0625,146.60834)\" /> \n \ \n \ \n \ - \n \ - \n \ - \n \ - \n \ \n \ - \n \ - \n \ - \n \ - \n \ - \n \ \n \ - \n \ - \n \ - \n \ - \n \ \n \ - \n \ + x1=\"34.0625\" \n \ + y1=\"156.60834\" \n \ + x2=\"110.9375\" \n \ + y2=\"156.60834\" \n \ + id=\"linearGradient3222\" \n \ + xlink:href=\"#linearGradient3712\" \n \ + gradientUnits=\"userSpaceOnUse\" /> \n \ \n \ - \n \ - \n \ - \n \ + x1=\"34.0625\" \n \ + y1=\"156.60834\" \n \ + x2=\"110.9375\" \n \ + y2=\"156.60834\" \n \ + id=\"linearGradient3225\" \n \ + xlink:href=\"#linearGradient3712\" \n \ + gradientUnits=\"userSpaceOnUse\" /> \n \ \n \ + gradientTransform=\"matrix(0.67,0,0,0.67,15.710001,283.04264)\" /> \n \ \n \ - \n \ + gradientTransform=\"matrix(0.67,0,0,0.67,77.710001,282.90001)\" /> \n \ \n \ - \n \ - \n \ - \n \ - \n \ - \n \ + gradientTransform=\"translate(-33.02428,30.4667)\" /> \n \ \n \ - \n \ + gradientTransform=\"matrix(0.67,0,0,0.67,43.3125,226.87273)\" /> \n \ \n \ \n \ + \n \ + \n \ + X \n \ + \n \ \n \ \n \ \n \ \n \ - \n \ - \n \ - X \n \ - \n \ \n \ @@ -530,23 +278,21 @@ def main(): \n " + style=\"fill:url(#linearGradient3208);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1\" /> \n \ + \n " data2a = \ -" \n \ - " data2b = \ -" \n \ - " @@ -556,8 +302,8 @@ def main(): \n \ " @@ -571,46 +317,46 @@ def main(): \n \ " data5 = \ " \n \ - \n \ + \n \ \n \ + transform=\"translate(-1e-6,-151.4585)\" \n \ + id=\"g2492\"> \n \ \n \ + d=\"M 37.998272,326.10074 L 41.331772,326.10074 L 41.331772,328.76753 L 45.998672,328.76753 L 45.998672,326.10074 L 107.00173,326.10074 L 107.00173,339.43473 L 45.998672,339.43473 L 45.998672,336.76793 L 41.331772,336.76793 L 41.331772,339.43473 L 37.998272,339.43473 L 37.998272,326.10074 z\" \n \ + id=\"path2435\" \n \ + style=\"fill:url(#linearGradient2505);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1\" /> \n \ \n \ " data6 = \ " \n \ - \n \ + \n \ \n \ \n \ + transform=\"translate(-5e-7,-155.92557)\" \n \ + id=\"g2497\"> \n \ \n \ + d=\"M 37.998271,352.4357 L 41.331771,352.4357 L 41.331771,355.1025 L 45.998671,355.1025 L 45.998671,352.4357 L 107.00173,352.4357 L 107.00173,365.7697 L 45.998671,365.7697 L 45.998671,363.1029 L 41.331771,363.1029 L 41.331771,365.7697 L 37.998271,365.7697 L 37.998271,352.4357 z\" \n \ + id=\"path2429\" \n \ + style=\"fill:url(#linearGradient2507);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1\" /> \n \ \n \ " data7 = \ @@ -621,7 +367,7 @@ def main(): width=\"137.5\" \n \ height=\"0.14\" \n \ x=\"3.75\" \n \ - y=\"-109.89137\" \n \ + y=\"-109.\" \n \ transform=\"scale(1,-1)\" \n \ id=\"rect2656\" \n \ style=\"opacity:1;fill:#ffd000;fill-opacity:1;stroke:#e0a000;stroke-width:1;stroke-opacity:1\" /> \n \ @@ -629,37 +375,177 @@ def main(): width=\"137.5\" \n \ height=\"0.14\" \n \ x=\"3.75\" \n \ - y=\"-108.77495\" \n \ + y=\"-108.8\" \n \ transform=\"scale(1,-1)\" \n \ id=\"rect2658\" \n \ style=\"opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1\" /> \n \ + \n \ + \n \ + \n \ + \n \ + \n \ + x \n \ + \n \ + \n \ + \n \ \n \ + transform=\"translate(0,14)\" \n \ + id=\"g3283\"> \n \ \n \ - \n \ - \n \ - \n \ + d=\"M 37.498269,250.45337 L 40.83177,250.45337 L 40.83177,253.12016 L 45.498669,253.12016 L 45.498669,250.45337 L 106.50173,250.45337 L 106.50173,263.78737 L 45.498669,263.78737 L 45.498669,261.12056 L 40.83177,261.12056 L 40.83177,263.78737 L 37.498269,263.78737 L 37.498269,250.45337 z\" \n \ + id=\"path3261\" \n \ + style=\"fill:url(#linearGradient3322);fill-opacity:1;stroke:#c00000;stroke-width:1;stroke-opacity:1\" /> \n \ \n \ x \n \ + x=\"72\" \n \ + y=\"260\" \n \ + id=\"tspan3265\" \n \ + style=\"font-size:11px\">" + + data8 = \ +" \n \ \n \ \n \ + \n \ + \n \ + \n" + + data9a = \ +" \n \ + " + + data9b = \ +" \n \ + " + + data10b = \ +" \n \ + \n \ + \n \ + " + + data11 = \ +" \n \ + \n \ + \n \ + \n \ + \n" + + data12a = \ +" \n \ + " + + data12b = \ +" \n \ + " + + data13b = \ +" \n \ + \n \ + \n \ + " + + data14 = \ +" \n \ + \n \ + \n \ + \n \ + \n \ + \n \ + \n \ + \n \ + " + + data15 = \ +" \n \ + \n \ \n" @@ -683,9 +569,37 @@ def main(): FILE.write(data6) FILE.write(_(mystring5).encode("utf-8")) FILE.write(data7) + FILE.write(_(mystring6).encode("utf-8")) + FILE.write(data8) + strings = _(mystring7).split(" ",2) + if len(strings) == 1: + FILE.write(data9a) + FILE.write(strings[0].encode("utf-8")) + else: + FILE.write(data9b) + FILE.write(strings[0].encode("utf-8")) + FILE.write(data10b) + FILE.write(strings[1].encode("utf-8")) + FILE.write(data11) + strings = _(mystring8).split(" ",2) + if len(strings) == 1: + FILE.write(data12a) + FILE.write(strings[0].encode("utf-8")) + else: + FILE.write(data12b) + FILE.write(strings[0].encode("utf-8")) + FILE.write(data13b) + FILE.write(strings[1].encode("utf-8")) + FILE.write(data14) + FILE.write(_(mystring9).encode("utf-8")) + FILE.write(data15) FILE.close() return if __name__ == "__main__": main() + + + + diff --git a/taexporthtml.py b/taexporthtml.py index 8474404..f3f7fbb 100644 --- a/taexporthtml.py +++ b/taexporthtml.py @@ -23,7 +23,7 @@ import talogo from sugar.activity import activity from sugar.datastore import datastore import os.path -import os +import subprocess from talogo import get_pixbuf_from_journal from gettext import gettext as _ @@ -36,13 +36,16 @@ def save_html(self, tw, embed_flag=True): datapath = \ "/home/olpc/.sugar/default/org.laptop.TurtleArtActivity/instance" - # this dictionary is used to define the html wrappers around template elements + # dictionary defines the html wrappers around template elements # start of block, end of block html_glue = { - 'doctype': ("\n", ""), + 'doctype': ("\n", ""), 'html': ("\n", "\n"), - 'head': ("\n\n", "\n"), - 'meta': ("\n", ""), + 'head': ("\n\n", \ + "\n"), + 'meta': ("\n", ""), 'title': ("", "\n"), 'style': ("\n"), 'body': ("\n", "\n\n"), @@ -51,13 +54,16 @@ def save_html(self, tw, embed_flag=True): 'h1': ("

", "

\n"), 'table': ("\n", "
\n"), 'tr': ("\n", "\n"), - 'td': ("\n", "\n\n"), - 'img': ("\"Image\"\n"), + 'td': ("\n", \ + "\n\n"), + 'img': ("\"Image\"\n"), 'ul': ("
    \n", "
\n"), 'li': ("
  • ", "
    • \n") } if embed_flag == True: - html_glue['img'] = ("\"Image\"\n") + html_glue['img'] = ("\"Image\"\n") bs = tawindow.blocks(tw) code = "" imagecount = 0 @@ -87,7 +93,10 @@ def save_html(self, tw, embed_flag=True): sevenbullets = 8 elif sevenbullets > 0: if sevenbullets == 8: - tmp = html_glue['slide'][0] + str(slidecount) + html_glue['slide'][1] + html_glue['div'][0] + html_glue['h1'][0] + d[2:] + html_glue['h1'][1] + html_glue['ul'][0] + tmp = html_glue['slide'][0] + str(slidecount) +\ + html_glue['slide'][1] + \ + html_glue['div'][0] + html_glue['h1'][0] + \ + d[2:] + html_glue['h1'][1] + html_glue['ul'][0] elif d[2:] != "": tmp = html_glue['li'][0] + d[2:] + html_glue['li'][1] this_stack += tmp @@ -96,7 +105,8 @@ def save_html(self, tw, embed_flag=True): if sevenbullets == 0: this_stack += html_glue['ul'][1] elif onepic == 1 or twopic == 1 or fourpic == 1: - tmp = html_glue['slide'][0] + str(slidecount) + html_glue['slide'][1] + \ + tmp = html_glue['slide'][0] + str(slidecount) + \ + html_glue['slide'][1] + \ html_glue['div'][0] + html_glue['h1'][0] + d[2:] + \ html_glue['h1'][1] + html_glue['table'][0] this_stack += tmp @@ -105,8 +115,8 @@ def save_html(self, tw, embed_flag=True): elif fourpic > 0: fourpic += 1 slidecount += 1 elif onepic > 1 or twopic > 1 or fourpic > 1: - # We need to get filename and copy it into instance directory - # if it is not an image, save the preview to a file instead + # Need filename to copy it into instance directory + # if it is not an image, save the preview # save the description too. print str(onepic) + " " + str(twopic) + " " + str(fourpic) if d[8:] != None: @@ -116,60 +126,70 @@ def save_html(self, tw, embed_flag=True): except: pixbuf = None if pixbuf != None: - filename = os.path.join(datapath, 'image' + str(imagecount) \ - + ".png") + filename = os.path.join(datapath, 'image' + \ + str(imagecount) + ".png") pixbuf.save(filename, "png") - # if the embed flag is True, embed base64 directly into the html + # if the embed flag is True + # embed base64 into the html if embed_flag == True: base64 = os.path.join(datapath, 'base64tmp') - os.system( "base64 <" + filename + " >" + base64) + cmd = "base64 <" + filename + " >" + base64 + subprocess.check_call(cmd, shell=True) f = open( base64, 'r') imgdata = f.read() f.close() - if onepic == 2 or twopic == 2 or twopic == 4 or fourpic == 2 or \ - fourpic == 4: + if onepic == 2 or twopic == 2 or twopic == 4 or\ + fourpic == 2 or fourpic == 4: tmp = html_glue['tr'][0] else: tmp = "" if pixbuf != None: - tmp = tmp + html_glue['td'][0] + html_glue['img'][0] + tmp = tmp + html_glue['td'][0] + \ + html_glue['img'][0] if embed_flag == True: tmp = tmp + imgdata else: tmp = tmp + str(imagecount) - tmp = tmp + html_glue['img'][1] + html_glue['td'][1] + tmp = tmp + html_glue['img'][1] + \ + html_glue['td'][1] if fourpic == 0: try: description = dsobject.metadata['description'] except: description = "" - tmp = tmp + html_glue['td'][0] + description + html_glue['td'][1] - if onepic == 2 or twopic == 3 or fourpic == 3 or fourpic == 5: + tmp = tmp + html_glue['td'][0] + description + \ + html_glue['td'][1] + if onepic == 2 or twopic == 3 or fourpic == 3 or \ + fourpic == 5: tmp = tmp + html_glue['tr'][1] imagecount += 1 this_stack += tmp if onepic > 1: - this_stack += html_glue['table'][1] + html_glue['div'][1] + this_stack += html_glue['table'][1] + \ + html_glue['div'][1] onepic = 0 elif twopic > 1: if twopic == 3: - this_stack += html_glue['table'][1] + html_glue['div'][1] + this_stack += html_glue['table'][1] + \ + html_glue['div'][1] twopic = 0 else: twopic += 1 elif fourpic > 1: if fourpic == 5: - this_stack += html_glue['table'][1] + html_glue['div'][1] + this_stack += html_glue['table'][1] + \ + html_glue['div'][1] fourpic = 0 else: fourpic += 1 this_stack += " " if len(data) > 0: code += this_stack - code = html_glue['doctype'][0] + html_glue['html'][0] + html_glue['head'][0] + \ - html_glue['meta'][0] + html_glue['title'][0] + _("Turtle Art Portfolio") + \ - html_glue['title'][1] + html_glue['style'][0] + html_glue['style'][1] + \ - html_glue['head'][1] + html_glue['body'][0] + code + html_glue['body'][1] + \ - html_glue['html'][1] -# print code + code = html_glue['doctype'][0] + html_glue['html'][0] + \ + html_glue['head'][0] + \ + html_glue['meta'][0] + html_glue['title'][0] + _("Turtle Art") + \ + html_glue['title'][1] + html_glue['style'][0] + \ + html_glue['style'][1] + \ + html_glue['head'][1] + html_glue['body'][0] + code + \ + html_glue['body'][1] + html_glue['html'][1] return code def walk_stack(self, tw, spr): diff --git a/tasetup.py b/tasetup.py index 0faf26a..5241230 100644 --- a/tasetup.py +++ b/tasetup.py @@ -96,7 +96,11 @@ selectors = ( ('keyboard','keyboard','num'), ('myfunc','myfunc','myfunc',_('x'),100), ('hres','hres','num'), - ('vres','vres','num'))), + ('vres','vres','num'), + ('push','push','onearg'), + ('pop','pop','num'), + ('printheap','heap','noarg2'), + ('clearheap','emptyheap','noarg2'))), ('flow', 55, (('wait','wait','onearg',10), ('forever','forever','forever'), @@ -121,11 +125,7 @@ selectors = ( ('box2','box2','num'), ('storeinbox','storeinbox','1sarg',_('box'),100), ('box','box','nfuncs',_('box')), - ('string','','string',_('name'),str,strcheck), #'string' - ('push','push','onearg'), - ('pop','pop','num'), - ('printheap','heap','noarg2'), - ('clearheap','emptyheap','noarg2'))), + ('string','','string',_('name'),str,strcheck))), ('templates',55, (('journal','','media','','',''), ('template1','tp1','tp1',_('title'),'None'), -- cgit v0.9.1