From 3e480dd17927aaf4bc1017e12303cdc2593cdffd Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Thu, 19 Mar 2009 21:30:30 +0000 Subject: adding "pippy-programmable" block --- diff --git a/NEWS b/NEWS index d1bc2b0..e0e1144 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +44 + +* adding user defineable block + 43 * new de artwork diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index a28333b..9a76bf1 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -123,6 +123,17 @@ class TurtleArtActivity(activity.Activity): _logger.debug("writing new version data") _logger.debug("and creating a tamyblock.py Journal entry") + if newversion is True: + dsobject = datastore.create() + dsobject.metadata['title'] = 'tamyblock.py' + dsobject.metadata['icon-color'] = \ + profile.get_color().to_string() + dsobject.metadata['mime_type'] = 'text/x-python' + dsobject.set_file_path(os.path.join( \ + activity.get_bundle_path(), 'tamyblock.py')) + datastore.write(dsobject) + dsobject.destroy() + versiondata.append(lang + version) FILE = open(os.path.join(datapath, filename), "w") FILE.writelines(versiondata) @@ -409,6 +420,19 @@ class SaveAsToolbar(gtk.Toolbar): self.insert(self.savelogo, -1) self.savelogo.show() + separator = gtk.SeparatorToolItem() + separator.set_draw(True) + self.insert(separator, -1) + separator.show() + + # Pippy load myblock source button + self.loadmyblock = ToolButton( "pippy-openoff" ) + self.loadmyblock.set_tooltip(_('load my block')) + self.loadmyblock.props.sensitive = True + self.loadmyblock.connect('clicked', self.do_loadmyblock) + self.insert(self.loadmyblock, -1) + self.loadmyblock.show() + def do_savehtml(self, button): # write html out to datastore self.savehtml.set_icon("htmlon") @@ -507,6 +531,32 @@ class SaveAsToolbar(gtk.Toolbar): gobject.timeout_add(250,self.savelogo.set_icon, "logo-saveoff") return + def do_loadmyblock(self, button): + self.loadmyblock.set_icon("pippy-openon") + self.import_py() + gobject.timeout_add(250,self.loadmyblock.set_icon, "pippy-openoff") + return + + def import_py(self): + from sugar.graphics.objectchooser import ObjectChooser + chooser = ObjectChooser('Python code', None, gtk.DIALOG_MODAL | \ + gtk.DIALOG_DESTROY_WITH_PARENT) + try: + result = chooser.run() + if result == gtk.RESPONSE_ACCEPT: + dsobject = chooser.get_selected_object() + try: + _logger.debug("opening %s " % dsobject.file_path) + FILE = open(dsobject.file_path, "r") + self.activity.tw.myblock = FILE.read() + FILE.close() + except: + _logger.debug("couldn't open %s" % dsobject.file_path) + dsobject.destroy() + finally: + chooser.destroy() + del chooser + class ProjectToolbar(gtk.Toolbar): def __init__(self, pc): diff --git a/activity/activity.info b/activity/activity.info index 3085dd3..c3e3483 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Turtle Art -activity_version = 43 +activity_version = 44 license = MIT bundle_id = org.laptop.TurtleArtActivity exec = sugar-activity TurtleArtActivity.TurtleArtActivity diff --git a/icons/pippy-openoff.svg b/icons/pippy-openoff.svg new file mode 100644 index 0000000..16d5b78 --- /dev/null +++ b/icons/pippy-openoff.svg @@ -0,0 +1,49 @@ + + + + + + + + + diff --git a/icons/pippy-openon.svg b/icons/pippy-openon.svg new file mode 100644 index 0000000..44871ee --- /dev/null +++ b/icons/pippy-openon.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/de/sensors/hres.svg b/images/de/sensors/hres.svg index 9f27bac..9a06c86 100644 --- a/images/de/sensors/hres.svg +++ b/images/de/sensors/hres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">hres + style="font-size:16px">hor. diff --git a/images/de/sensors/keyboard.svg b/images/de/sensors/keyboard.svg index bb09552..9c5f3fb 100644 --- a/images/de/sensors/keyboard.svg +++ b/images/de/sensors/keyboard.svg @@ -41,6 +41,6 @@ x="54" y="15.5" id="tspan14" - style="font-size:16px">keyboard + style="font-size:16px">tastatur diff --git a/images/de/sensors/nop.svg b/images/de/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/de/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/de/sensors/sensorsgroup.svg b/images/de/sensors/sensorsgroup.svg index 15a29b1..ae0d34f 100644 --- a/images/de/sensors/sensorsgroup.svg +++ b/images/de/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + read + style="font-size:12.06000042px">lies @@ -228,7 +237,7 @@ x="72." y="67." id="tspan18" - style="font-size:12.06000042px">key + style="font-size:12.06000042px">Taste keyboard + style="font-size:11px">tastatur hres + style="font-size:11px">hor. vert. Auflösung + style="font-size:11px">vert. @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">push + + + + diff --git a/images/de/sensors/sensorsmask.svg b/images/de/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/de/sensors/sensorsmask.svg +++ b/images/de/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/de/sensors/vres.svg b/images/de/sensors/vres.svg index dd18e36..79490f2 100644 --- a/images/de/sensors/vres.svg +++ b/images/de/sensors/vres.svg @@ -41,6 +41,6 @@ x="52" y="15.5" id="tspan14" - style="font-size:16px">vert. Auflösung + style="font-size:16px">vert. diff --git a/images/el/sensors/nop.svg b/images/el/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/el/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/el/sensors/sensorsgroup.svg b/images/el/sensors/sensorsgroup.svg index 00a5ee9..c1c71e6 100644 --- a/images/el/sensors/sensorsgroup.svg +++ b/images/el/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -385,7 +394,7 @@ x="102" y="301" id="tspan3275" - style="font-size:12.06000042px">clear + style="font-size:12.06000042px">empty @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">push + + + + diff --git a/images/el/sensors/sensorsmask.svg b/images/el/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/el/sensors/sensorsmask.svg +++ b/images/el/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/en/sensors/nop.svg b/images/en/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/en/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/en/sensors/sensorsgroup.svg b/images/en/sensors/sensorsgroup.svg index ef700c5..c377aab 100644 --- a/images/en/sensors/sensorsgroup.svg +++ b/images/en/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + hres + style="font-size:11px">hdim vres + style="font-size:11px">vdim @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -385,7 +394,7 @@ x="102" y="301" id="tspan3275" - style="font-size:12.06000042px">clear + style="font-size:12.06000042px">empty @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">push + + + + diff --git a/images/en/sensors/sensorsmask.svg b/images/en/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/en/sensors/sensorsmask.svg +++ b/images/en/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/es/sensors/keyboard.svg b/images/es/sensors/keyboard.svg index 5949e22..55e9729 100644 --- a/images/es/sensors/keyboard.svg +++ b/images/es/sensors/keyboard.svg @@ -1,46 +1,46 @@ - - - - - - - - - - - - - teclado - - + + + + + + + + + + + + + teclado + + diff --git a/images/es/sensors/nop.svg b/images/es/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/es/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/es/sensors/sensorsgroup.svg b/images/es/sensors/sensorsgroup.svg index fe44e5f..5c4f360 100644 --- a/images/es/sensors/sensorsgroup.svg +++ b/images/es/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + keyboard + style="font-size:11px">teclado @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -362,7 +371,7 @@ x="40" y="301" id="tspan3255" - style="font-size:12.06000042px">mostrar + style="font-size:12.06000042px">show @@ -370,7 +379,7 @@ x="40" y="313.8" id="tspan3259" - style="font-size:12.06000042px">pila + style="font-size:12.06000042px">heap vaciar + style="font-size:12.06000042px">empty @@ -393,7 +402,7 @@ x="102" y="314" id="tspan3279" - style="font-size:12.06000042px">pila + style="font-size:12.06000042px">heap @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">empujar + + + + diff --git a/images/es/sensors/sensorsmask.svg b/images/es/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/es/sensors/sensorsmask.svg +++ b/images/es/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/fi/sensors/keyboard.svg b/images/fi/sensors/keyboard.svg index 9ce2adc..bb09552 100644 --- a/images/fi/sensors/keyboard.svg +++ b/images/fi/sensors/keyboard.svg @@ -1,46 +1,46 @@ - - - - - - - - - - - - - keyboard - - + + + + + + + + + + + + + keyboard + + diff --git a/images/fi/sensors/nop.svg b/images/fi/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/fi/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/fi/sensors/sensorsgroup.svg b/images/fi/sensors/sensorsgroup.svg index 00a5ee9..c1c71e6 100644 --- a/images/fi/sensors/sensorsgroup.svg +++ b/images/fi/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -385,7 +394,7 @@ x="102" y="301" id="tspan3275" - style="font-size:12.06000042px">clear + style="font-size:12.06000042px">empty @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">push + + + + diff --git a/images/fi/sensors/sensorsmask.svg b/images/fi/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/fi/sensors/sensorsmask.svg +++ b/images/fi/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/fr/sensors/keyboard.svg b/images/fr/sensors/keyboard.svg index 9ce2adc..9aa0948 100644 --- a/images/fr/sensors/keyboard.svg +++ b/images/fr/sensors/keyboard.svg @@ -1,46 +1,46 @@ - - - - - - - - - - - - - keyboard - - + + + + + + + + + + + + + clavier + + diff --git a/images/fr/sensors/nop.svg b/images/fr/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/fr/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/fr/sensors/sensorsgroup.svg b/images/fr/sensors/sensorsgroup.svg index 158f5b7..c0a5c41 100644 --- a/images/fr/sensors/sensorsgroup.svg +++ b/images/fr/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + keyboard + style="font-size:11px">clavier @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -385,7 +394,7 @@ x="102" y="301" id="tspan3275" - style="font-size:12.06000042px">clear + style="font-size:12.06000042px">empty @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">push + + + + diff --git a/images/fr/sensors/sensorsmask.svg b/images/fr/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/fr/sensors/sensorsmask.svg +++ b/images/fr/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/it/sensors/keyboard.svg b/images/it/sensors/keyboard.svg index 5e756ec..e27759f 100644 --- a/images/it/sensors/keyboard.svg +++ b/images/it/sensors/keyboard.svg @@ -1,46 +1,46 @@ - - - - - - - - - - - - - tastiera - - + + + + + + + + + + + + + tastiera + + diff --git a/images/it/sensors/nop.svg b/images/it/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/it/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/it/sensors/sensorsgroup.svg b/images/it/sensors/sensorsgroup.svg index 00a5ee9..825e428 100644 --- a/images/it/sensors/sensorsgroup.svg +++ b/images/it/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + Keyboard + style="font-size:20px">Tastiera read + style="font-size:12.06000042px">leggi @@ -228,7 +237,7 @@ x="72." y="67." id="tspan18" - style="font-size:12.06000042px">key + style="font-size:12.06000042px">tasto keyboard + style="font-size:11px">tastiera @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -385,7 +394,7 @@ x="102" y="301" id="tspan3275" - style="font-size:12.06000042px">clear + style="font-size:12.06000042px">empty @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">push + + + + diff --git a/images/it/sensors/sensorsmask.svg b/images/it/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/it/sensors/sensorsmask.svg +++ b/images/it/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/mn/sensors/keyboard.svg b/images/mn/sensors/keyboard.svg index 9ce2adc..b4b109d 100644 --- a/images/mn/sensors/keyboard.svg +++ b/images/mn/sensors/keyboard.svg @@ -1,46 +1,46 @@ - - - - - - - - - - - - - keyboard - - + + + + + + + + + + + + + гар + + diff --git a/images/mn/sensors/nop.svg b/images/mn/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/mn/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/mn/sensors/sensorsgroup.svg b/images/mn/sensors/sensorsgroup.svg index 7427e56..37a8ee6 100644 --- a/images/mn/sensors/sensorsgroup.svg +++ b/images/mn/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + keyboard + style="font-size:11px">гар @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -385,7 +394,7 @@ x="102" y="301" id="tspan3275" - style="font-size:12.06000042px">clear + style="font-size:12.06000042px">empty @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">push + + + + diff --git a/images/mn/sensors/sensorsmask.svg b/images/mn/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/mn/sensors/sensorsmask.svg +++ b/images/mn/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/nl/sensors/keyboard.svg b/images/nl/sensors/keyboard.svg index bb09552..8fc1446 100644 --- a/images/nl/sensors/keyboard.svg +++ b/images/nl/sensors/keyboard.svg @@ -41,6 +41,6 @@ x="54" y="15.5" id="tspan14" - style="font-size:16px">keyboard + style="font-size:16px">toetsenbord diff --git a/images/nl/sensors/nop.svg b/images/nl/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/nl/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/nl/sensors/sensorsgroup.svg b/images/nl/sensors/sensorsgroup.svg index f2d2150..7fb3893 100644 --- a/images/nl/sensors/sensorsgroup.svg +++ b/images/nl/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + keyboard + style="font-size:11px">toetsenbord @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -413,16 +422,23 @@ style="font-size:12.06000042px;text-align:center;text-anchor:middle;font-family:Bitstream Vera Sans"> neer- - - - leggen + style="font-size:12.06000042px;font-family:Bitstream Vera Sans">neerleggen + + + + diff --git a/images/nl/sensors/sensorsmask.svg b/images/nl/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/nl/sensors/sensorsmask.svg +++ b/images/nl/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/nocode.svg b/images/nocode.svg new file mode 100644 index 0000000..2c35684 --- /dev/null +++ b/images/nocode.svg @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + X + + + + ??? + + + + + + + + ! + + + + + + diff --git a/images/pt/sensors/keyboard.svg b/images/pt/sensors/keyboard.svg index 9ce2adc..55e9729 100644 --- a/images/pt/sensors/keyboard.svg +++ b/images/pt/sensors/keyboard.svg @@ -1,46 +1,46 @@ - - - - - - - - - - - - - keyboard - - + + + + + + + + + + + + + teclado + + diff --git a/images/pt/sensors/nop.svg b/images/pt/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/pt/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/pt/sensors/sensorsgroup.svg b/images/pt/sensors/sensorsgroup.svg index dbb3bd3..d1539a2 100644 --- a/images/pt/sensors/sensorsgroup.svg +++ b/images/pt/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + keyboard + style="font-size:11px">teclado @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -385,7 +394,7 @@ x="102" y="301" id="tspan3275" - style="font-size:12.06000042px">clear + style="font-size:12.06000042px">empty @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">push + + + + diff --git a/images/pt/sensors/sensorsmask.svg b/images/pt/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/pt/sensors/sensorsmask.svg +++ b/images/pt/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/ru/sensors/keyboard.svg b/images/ru/sensors/keyboard.svg index 9ce2adc..bb09552 100644 --- a/images/ru/sensors/keyboard.svg +++ b/images/ru/sensors/keyboard.svg @@ -1,46 +1,46 @@ - - - - - - - - - - - - - keyboard - - + + + + + + + + + + + + + keyboard + + diff --git a/images/ru/sensors/nop.svg b/images/ru/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/ru/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/ru/sensors/sensorsgroup.svg b/images/ru/sensors/sensorsgroup.svg index 00a5ee9..c1c71e6 100644 --- a/images/ru/sensors/sensorsgroup.svg +++ b/images/ru/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -385,7 +394,7 @@ x="102" y="301" id="tspan3275" - style="font-size:12.06000042px">clear + style="font-size:12.06000042px">empty @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">push + + + + diff --git a/images/ru/sensors/sensorsmask.svg b/images/ru/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/ru/sensors/sensorsmask.svg +++ b/images/ru/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/sl/sensors/nop.svg b/images/sl/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/sl/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/sl/sensors/sensorsgroup.svg b/images/sl/sensors/sensorsgroup.svg index 7cfe844..c1c71e6 100644 --- a/images/sl/sensors/sensorsgroup.svg +++ b/images/sl/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">push + + + + diff --git a/images/sl/sensors/sensorsmask.svg b/images/sl/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/sl/sensors/sensorsmask.svg +++ b/images/sl/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/sv/sensors/keyboard.svg b/images/sv/sensors/keyboard.svg index bb09552..98c1aa5 100644 --- a/images/sv/sensors/keyboard.svg +++ b/images/sv/sensors/keyboard.svg @@ -41,6 +41,6 @@ x="54" y="15.5" id="tspan14" - style="font-size:16px">keyboard + style="font-size:16px">tangentbord diff --git a/images/sv/sensors/nop.svg b/images/sv/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/sv/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/sv/sensors/sensorsgroup.svg b/images/sv/sensors/sensorsgroup.svg index 8a322a6..9f20433 100644 --- a/images/sv/sensors/sensorsgroup.svg +++ b/images/sv/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + keyboard + style="font-size:11px">tangentbord @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">lägg till sist + + + + diff --git a/images/sv/sensors/sensorsmask.svg b/images/sv/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/sv/sensors/sensorsmask.svg +++ b/images/sv/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/tr/sensors/keyboard.svg b/images/tr/sensors/keyboard.svg index 9ce2adc..bb09552 100644 --- a/images/tr/sensors/keyboard.svg +++ b/images/tr/sensors/keyboard.svg @@ -1,46 +1,46 @@ - - - - - - - - - - - - - keyboard - - + + + + + + + + + + + + + keyboard + + diff --git a/images/tr/sensors/nop.svg b/images/tr/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/tr/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/tr/sensors/sensorsgroup.svg b/images/tr/sensors/sensorsgroup.svg index 00a5ee9..c1c71e6 100644 --- a/images/tr/sensors/sensorsgroup.svg +++ b/images/tr/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -385,7 +394,7 @@ x="102" y="301" id="tspan3275" - style="font-size:12.06000042px">clear + style="font-size:12.06000042px">empty @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">push + + + + diff --git a/images/tr/sensors/sensorsmask.svg b/images/tr/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/tr/sensors/sensorsmask.svg +++ b/images/tr/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/vi/sensors/keyboard.svg b/images/vi/sensors/keyboard.svg index bb09552..bec564b 100644 --- a/images/vi/sensors/keyboard.svg +++ b/images/vi/sensors/keyboard.svg @@ -41,6 +41,6 @@ x="54" y="15.5" id="tspan14" - style="font-size:16px">keyboard + style="font-size:16px">bàn phím diff --git a/images/vi/sensors/nop.svg b/images/vi/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/vi/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/vi/sensors/sensorsgroup.svg b/images/vi/sensors/sensorsgroup.svg index 10b9377..498959b 100644 --- a/images/vi/sensors/sensorsgroup.svg +++ b/images/vi/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + keyboard + style="font-size:11px">bàn phím @@ -286,7 +295,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -385,7 +394,7 @@ x="102" y="301" id="tspan3275" - style="font-size:12.06000042px">clear + style="font-size:12.06000042px">miền @@ -393,7 +402,7 @@ x="102" y="314" id="tspan3279" - style="font-size:12.06000042px">heap + style="font-size:12.06000042px">nhớ @@ -417,4 +426,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">đẩy + + + + diff --git a/images/vi/sensors/sensorsmask.svg b/images/vi/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/vi/sensors/sensorsmask.svg +++ b/images/vi/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/images/zh_TW/sensors/keyboard.svg b/images/zh_TW/sensors/keyboard.svg index bb09552..5c7de14 100644 --- a/images/zh_TW/sensors/keyboard.svg +++ b/images/zh_TW/sensors/keyboard.svg @@ -41,6 +41,6 @@ x="54" y="15.5" id="tspan14" - style="font-size:16px">keyboard + style="font-size:16px">鍵盤 diff --git a/images/zh_TW/sensors/nop.svg b/images/zh_TW/sensors/nop.svg new file mode 100644 index 0000000..862e03f --- /dev/null +++ b/images/zh_TW/sensors/nop.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + diff --git a/images/zh_TW/sensors/sensorsgroup.svg b/images/zh_TW/sensors/sensorsgroup.svg index 5a605c2..5ced1c9 100644 --- a/images/zh_TW/sensors/sensorsgroup.svg +++ b/images/zh_TW/sensors/sensorsgroup.svg @@ -150,6 +150,15 @@ xlink:href="#linearGradient3712" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.67,0,0,0.67,43.3125,226.87273)" /> + 讀取按鍵 + style="font-size:12.06000042px">讀取按鍵 keyboard + style="font-size:11px">鍵盤 @@ -278,7 +287,7 @@ width="137.5" height="0.14" x="3.75" - y="-108.8" + y="-107." transform="scale(1,-1)" id="rect2658" style="opacity:1;fill:#ffd000;fill-opacity:1;stroke:#fff080;stroke-width:1;stroke-opacity:1" /> @@ -409,4 +418,19 @@ id="tspan3430" style="font-size:12.06000042px;font-family:Bitstream Vera Sans">存入堆疊 + + + + diff --git a/images/zh_TW/sensors/sensorsmask.svg b/images/zh_TW/sensors/sensorsmask.svg index a0341c2..07151f0 100644 --- a/images/zh_TW/sensors/sensorsmask.svg +++ b/images/zh_TW/sensors/sensorsmask.svg @@ -5,6 +5,7 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" @@ -54,6 +55,79 @@ inkscape:vp_z="145 : 250 : 1" inkscape:persp3d-origin="72.5 : 166.66667 : 1" id="perspective3575" /> + + + + + + + + + + + + + + + style="fill:#303030;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#383838;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#282828;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1"> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1.50000000000000000;stroke-opacity:1" /> + style="fill:#404040;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#484848;fill-opacity:1;stroke:none"> + style="fill:#484848;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#505050;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + style="fill:#585858;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1" /> + + + + + diff --git a/svg/keyboard.py b/svg/keyboard.py index a1a2634..87563f3 100644 --- a/svg/keyboard.py +++ b/svg/keyboard.py @@ -29,7 +29,7 @@ import gettext def main(): myname = "keyboard" - mystring = "keyboard" + mystring = "Keyboard" mygroup = "sensors" if len(sys.argv) != 2: @@ -40,7 +40,9 @@ def main(): _ = t.ugettext t.install() - print _(mystring) + s = _(mystring) + slower = s.lower() + print slower data0 = \ " \n \ \n \ @@ -95,7 +97,7 @@ def main(): FILE = open(os.path.join("../images", sys.argv[1], mygroup, myname + ".svg"), "w") FILE.write(data0) - FILE.write(_(mystring).encode("utf-8")) + FILE.write(slower.encode("utf-8")) FILE.write(data1) FILE.close() return diff --git a/svg/sensorsgroup.py b/svg/sensorsgroup.py index 8eeec3b..0873767 100644 --- a/svg/sensorsgroup.py +++ b/svg/sensorsgroup.py @@ -50,7 +50,9 @@ def main(): print _(mystring1) print _(mystring2) - print _(mystring3) + s3 = _(mystring1) + s3lower = s3.lower() + print s3lower print _(mystring4) print _(mystring5) print _(mystring6) @@ -212,6 +214,15 @@ def main(): xlink:href=\"#linearGradient3712\" \n \ gradientUnits=\"userSpaceOnUse\" \n \ gradientTransform=\"matrix(0.67,0,0,0.67,43.3125,226.87273)\" /> \n \ + \n \ \n \ \n \ @@ -375,7 +386,7 @@ def main(): width=\"137.5\" \n \ height=\"0.14\" \n \ x=\"3.75\" \n \ - y=\"-108.8\" \n \ + y=\"-107.\" \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 \ @@ -546,6 +557,21 @@ def main(): data15 = \ " \n \ \n \ + \n \ + \n \ + \n \ + \n \ \n" @@ -563,7 +589,7 @@ def main(): FILE.write(data3b) FILE.write(strings[1].encode("utf-8")) FILE.write(data4) - FILE.write(_(mystring3).encode("utf-8")) + FILE.write(s3lower.encode("utf-8")) FILE.write(data5) FILE.write(_(mystring4).encode("utf-8")) FILE.write(data6) diff --git a/tajail.py b/tajail.py index 7fafed5..af57e56 100644 --- a/tajail.py +++ b/tajail.py @@ -1,4 +1,4 @@ -#Copyright (c) 2007-9, Playful Invention Company. +#Copyright (c) 2009, Walter Bender (on behalf of 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 @@ -23,6 +23,7 @@ import re from time import * from math import * from numpy import * +from taturtle import * def myfunc(lc, f, x): # check to make sure no import calls are made @@ -34,3 +35,8 @@ def myfunc(lc, f, x): except: return None +def myfunc_import(lc, f, x): + userdefined = {} + exec f in globals(), userdefined + return userdefined['myblock'](lc,x) + diff --git a/talogo.py b/talogo.py index e333455..250512f 100644 --- a/talogo.py +++ b/talogo.py @@ -1,4 +1,5 @@ -#Copyright (c) 2007-9, Playful Invention Company. +#Copyright (c) 2007, Playful Invention Company. +#Copyright (c) 2008-9, Walter Bender #Permission is hereby granted, free of charge, to any person obtaining a copy #of this software and associated documentation files (the "Software"), to deal @@ -403,6 +404,7 @@ def lcNew(tw): defprim(lc,'kbinput', 0, lambda lc: kbinput(lc)) defprim(lc,'keyboard', 0, lambda lc: lc.keyboard) + defprim(lc,'userdefined', 1, lambda lc,x: loadmyblock(lc,x)) defprim(lc,'myfunc', 2, lambda lc,f,x: callmyfunc(lc, f, x)) defprim(lc,'hres', 0, lambda lc: lc.tw.turtle.width) defprim(lc,'vres', 0, lambda lc: lc.tw.turtle.height) @@ -507,6 +509,14 @@ def lcNew(tw): return lc +def loadmyblock(lc,x): + # execute code inported from the Journal + if lc.tw.myblock != None: + y = myfunc_import(lc, lc.tw.myblock, x) + else: + raise logoerror("#nocode") + return + def callmyfunc(lc, f, x): y = myfunc(lc, f, x) if y is None: @@ -742,6 +752,7 @@ def showlabel(lc,l): elif l=='#noinput': shp = 'noinput'; l='' elif l=='#emptyheap': shp = 'emptyheap'; l='' elif l=='#nomedia': shp = 'nomedia'; l='' + elif l=='#nocode': shp = 'nocode'; l='' elif l=='#syntaxerror': shp = 'syntaxerror'; l='' else:shp = 'status' setshape(lc.tw.status_spr, lc.tw.status_shapes[shp]) diff --git a/tamyblock.py b/tamyblock.py new file mode 100644 index 0000000..33bc10c --- /dev/null +++ b/tamyblock.py @@ -0,0 +1,82 @@ +#Copyright (c) 2009, Walter Bender + +#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. + +# This procedure is invoked when the user-definable block on the "extras" +# palette is selected. Some examples of how to use this block are included +# below. Try uncommenting an example or write your own Python code. +# +# To uncomment code, remove the # from the beginning of each line. +# Lines with ## at the beginning are comments and should not be changed. +# + +# for Pippy, we also need to add Activities/TAPortfolio to the syspath + +def myblock(lc,x): + +## draw a dotted line of length x +# # make sure x is a number +# if type(x) != int and type(x) != float: +# return +# dist = 0 +# # save current turtle pen state +# pen = lc.tw.turtle.pendown +# # repeat drawing dots +# while dist+lc.tw.turtle.pensize < x: +# setpen(lc.tw.turtle, True) +# forward(lc.tw.turtle, 1) +# setpen(lc.tw.turtle, False) +# forward(lc.tw.turtle, (lc.tw.turtle.pensize*2)-1) +# dist += (lc.tw.turtle.pensize*2) +# # make sure we have moved exactly x +# forward(lc.tw.turtle, x-dist) +# # restore pen state +# setpen(lc.tw.turtle, pen) + +## push an uppercase version of a string onto the heap +# if type(x) != str: +# X = str(x).upper() +# else: +# X = x.upper() +# # push result onto heap (use the pop block to use the new string) +# lc.heap.append(X) + +## push hours, minutes, seconds onto the heap +## use three pop blocks to retrieve the values +## remember: the heap is a FILO (first in, last out) +## the first value you will pop will be seconds +# lc.heap.append(localtime().tm_hour) +# lc.heap.append(localtime().tm_min) +# lc.heap.append(localtime().tm_sec) + +## add a third dimension (gray) to the color model +# # calculate the value (brightness) of the current color +# val = 0.3 * lc.tw.rgb[0] + 0.6 * lc.tw.rgb[1] + 0.1 * lc.tw.rgb[2] +# # make sure gray is in range from 0 to 100 +# if x != 100: +# x = int(x)%100 +# # mix in gray +# r = int((val*(100-x) + lc.tw.rgb[0]*x)/100) +# g = int((val*(100-x) + lc.tw.rgb[1]*x)/100) +# b = int((val*(100-x) + lc.tw.rgb[2]*x)/100) +# # reallocate current color +# lc.tw.fgcolor = lc.tw.cm.alloc_color(r<<8,g<<8,b<<8) + + return + diff --git a/tasetup.py b/tasetup.py index 5241230..ce324b2 100644 --- a/tasetup.py +++ b/tasetup.py @@ -94,6 +94,7 @@ selectors = ( ('sensors', 55, (('kbinput','kbinput','noarg2'), ('keyboard','keyboard','num'), + ('nop','userdefined','onearg',100), ('myfunc','myfunc','myfunc',_('x'),100), ('hres','hres','num'), ('vres','vres','num'), @@ -249,13 +250,14 @@ def setup_misc(tw): tw.status_shapes['noinput'] = load_image(tw.path, '', 'noinput') tw.status_shapes['emptyheap'] = load_image(tw.path, '', 'emptyheap') tw.status_shapes['nomedia'] = load_image(tw.path, '', 'nomedia') + tw.status_shapes['nocode'] = load_image(tw.path, '', 'nocode') tw.status_shapes['syntaxerror'] = load_image(tw.path, '', 'syntaxerror') # for some reason, the status bar is displayed off screen on the XO if os.path.exists('/sys/power/olpc-pm'): tw.status_spr = sprNew(tw,0,(tw.height-83), \ tw.status_shapes['status'],True) else: - tw.status_spr = sprNew(tw,0,(tw.height-70), \ + tw.status_spr = sprNew(tw,0,(tw.height-73), \ tw.status_shapes['status'],True) tw.status_spr.type = 'status' setlayer(tw.status_spr,400) diff --git a/tawindow.py b/tawindow.py index 0c583be..d90bc1f 100644 --- a/tawindow.py +++ b/tawindow.py @@ -86,6 +86,7 @@ def twNew(win, path, lang, tboxh, parent=None): tw.selected_block = None tw.draggroup = None prep_selectors(tw) + tw.myblock = None tw.loaded = 0 for s in selectors: setup_selectors(tw,s) -- cgit v0.9.1