From e493adeb7dafab55109b10ced426d709ac4717fb Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Wed, 22 Jul 2009 00:29:46 +0000 Subject: deleted: icons/debugon.svg~ deleted: icons/image-saveoff.svg~ deleted: icons/image-saveon.svg~ modified: images/de/myblocks/hat1.svg modified: images/de/myblocks/hat2.svg modified: images/de/myblocks/myblocksgroup.svg modified: images/de/myblocks/stack1.svg modified: images/de/myblocks/stack2.svg modified: images/es/myblocks/myblocksgroup.svg modified: po/TurtleArt.pot modified: tasetup.py modified: tasprites.py --- diff --git a/icons/debugon.svg~ b/icons/debugon.svg~ deleted file mode 100644 index ea2eff0..0000000 --- a/icons/debugon.svg~ +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/image-saveoff.svg~ b/icons/image-saveoff.svg~ deleted file mode 100644 index 44fa01d..0000000 --- a/icons/image-saveoff.svg~ +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/icons/image-saveon.svg~ b/icons/image-saveon.svg~ deleted file mode 100644 index e705778..0000000 --- a/icons/image-saveon.svg~ +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/images/de/myblocks/hat1.svg b/images/de/myblocks/hat1.svg index 9174e7c..0eda095 100644 --- a/images/de/myblocks/hat1.svg +++ b/images/de/myblocks/hat1.svg @@ -45,7 +45,7 @@ Stapel 1 + style="font-size:16px">Aktion 1 - \ No newline at end of file + diff --git a/images/de/myblocks/hat2.svg b/images/de/myblocks/hat2.svg index 5d01ee1..dcd8fc3 100644 --- a/images/de/myblocks/hat2.svg +++ b/images/de/myblocks/hat2.svg @@ -45,7 +45,7 @@ Stapel 2 + style="font-size:16px">Aktion 2 - \ No newline at end of file + diff --git a/images/de/myblocks/myblocksgroup.svg b/images/de/myblocks/myblocksgroup.svg index 44ef78f..6d903f8 100644 --- a/images/de/myblocks/myblocksgroup.svg +++ b/images/de/myblocks/myblocksgroup.svg @@ -361,7 +361,7 @@ x="37" y="96" id="tspan53" - style="font-size:11px">Stapel 1 + style="font-size:11px">Aktion 1 Stapel 1 + style="font-size:11px">Aktion 1 Stapel 2 + style="font-size:11px">Aktion 2 Stapel 2 + style="font-size:11px">Aktion 2 Stapel 1 + style="font-size:16px;">Aktion 1 diff --git a/images/de/myblocks/stack2.svg b/images/de/myblocks/stack2.svg index 31e78c3..d7fe9c0 100644 --- a/images/de/myblocks/stack2.svg +++ b/images/de/myblocks/stack2.svg @@ -34,6 +34,6 @@ Stapel 2 + style="font-size:16px;">Aktion 2 diff --git a/images/es/myblocks/myblocksgroup.svg b/images/es/myblocks/myblocksgroup.svg index 7d0fc41..71c6423 100644 --- a/images/es/myblocks/myblocksgroup.svg +++ b/images/es/myblocks/myblocksgroup.svg @@ -1,564 +1,674 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + + poner en + + + + caja + + + caja + + + acción + + + acción + + diff --git a/po/TurtleArt.pot b/po/TurtleArt.pot index 4e55c50..5222920 100644 --- a/po/TurtleArt.pot +++ b/po/TurtleArt.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-03 20:29+0000\n" +"POT-Creation-Date: 2009-07-22 00:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,42 +17,43 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: activity/activity.info:2 -#: /home/walter/Desktop/turtleart-activity/taexporthtml.py:189 +#: /home/walter/Desktop/turtleart-activity/taexporthtml.py:229 msgid "Turtle Art" msgstr "" #: /home/walter/Desktop/turtleart-activity/tasetup.py:55 -#: /home/walter/Desktop/turtleart-activity/tasetup.py:64 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:65 msgid "text" msgstr "" -#: /home/walter/Desktop/turtleart-activity/tasetup.py:107 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:108 #: /home/walter/Desktop/turtleart-activity/svg/turtlegroup.py:49 #: /home/walter/Desktop/turtleart-activity/svg/setxy.py:41 msgid "x" msgstr "" -#: /home/walter/Desktop/turtleart-activity/tasetup.py:130 -#: /home/walter/Desktop/turtleart-activity/tasetup.py:131 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:136 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:137 msgid "stack" msgstr "" -#: /home/walter/Desktop/turtleart-activity/tasetup.py:136 -#: /home/walter/Desktop/turtleart-activity/tasetup.py:137 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:142 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:143 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:146 msgid "box" msgstr "" -#: /home/walter/Desktop/turtleart-activity/tasetup.py:138 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:144 #: /home/walter/Desktop/turtleart-activity/svg/myblocksgroup.py:47 msgid "name" msgstr "" -#: /home/walter/Desktop/turtleart-activity/tasetup.py:143 -#: /home/walter/Desktop/turtleart-activity/tasetup.py:144 -#: /home/walter/Desktop/turtleart-activity/tasetup.py:145 -#: /home/walter/Desktop/turtleart-activity/tasetup.py:146 -#: /home/walter/Desktop/turtleart-activity/tasetup.py:147 -#: /home/walter/Desktop/turtleart-activity/tasetup.py:148 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:151 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:152 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:153 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:154 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:155 +#: /home/walter/Desktop/turtleart-activity/tasetup.py:156 msgid "title" msgstr "" @@ -92,85 +93,93 @@ msgstr "" msgid "save Logo" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:540 -msgid "save as image" -msgstr "" - -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:553 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:545 msgid "load my block" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:726 -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:810 -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:820 -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:856 -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:868 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:696 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:802 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:812 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:857 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:869 msgid "hide palette" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:729 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:699 msgid "p" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:735 -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:849 -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:866 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:705 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:850 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:867 #: /home/walter/Desktop/turtleart-activity/svg/hideblocks.py:40 #: /home/walter/Desktop/turtleart-activity/svg/templatesgroup.py:41 msgid "hide blocks" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:738 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:708 msgid "b" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:749 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:719 msgid "run" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:752 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:722 msgid "r" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:758 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:728 msgid "step" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:761 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:731 msgid "w" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:767 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:737 +msgid "debug" +msgstr "" + +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:740 +msgid "d" +msgstr "" + +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:746 msgid "stop turtle" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:770 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:749 msgid "s" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:781 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:760 #: /home/walter/Desktop/turtleart-activity/svg/clean.py:40 #: /home/walter/Desktop/turtleart-activity/svg/turtlegroup.py:40 msgid "clean" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:784 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:763 msgid "e" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:795 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:774 msgid "fullscreen" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:806 -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:815 -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:853 -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:862 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:788 +msgid "save as image" +msgstr "" + +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:798 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:807 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:854 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:863 msgid "show palette" msgstr "" -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:846 -#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:860 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:847 +#: /home/walter/Desktop/turtleart-activity/TurtleArtActivity.py:861 msgid "show blocks" msgstr "" @@ -345,10 +354,16 @@ msgid "Templates" msgstr "" #: /home/walter/Desktop/turtleart-activity/svg/right.py:40 +#: /home/walter/Desktop/turtleart-activity/svg/sensorsgroup.py:51 #: /home/walter/Desktop/turtleart-activity/svg/turtlegroup.py:44 +#: /home/walter/Desktop/turtleart-activity/svg/rightpos.py:40 msgid "right" msgstr "" +#: /home/walter/Desktop/turtleart-activity/svg/storein.py:40 +msgid "store in" +msgstr "" + #: /home/walter/Desktop/turtleart-activity/svg/textsize.py:40 #: /home/walter/Desktop/turtleart-activity/svg/pengroup.py:53 msgid "text size" @@ -364,6 +379,13 @@ msgstr "" msgid "scale" msgstr "" +#: /home/walter/Desktop/turtleart-activity/svg/leftpos.py:40 +#: /home/walter/Desktop/turtleart-activity/svg/sensorsgroup.py:49 +#: /home/walter/Desktop/turtleart-activity/svg/turtlegroup.py:43 +#: /home/walter/Desktop/turtleart-activity/svg/left.py:40 +msgid "left" +msgstr "" + #: /home/walter/Desktop/turtleart-activity/svg/sensorsgroup.py:41 #: /home/walter/Desktop/turtleart-activity/svg/kbinput.py:40 msgid "read key" @@ -398,16 +420,21 @@ msgstr "" msgid "push" msgstr "" +#: /home/walter/Desktop/turtleart-activity/svg/sensorsgroup.py:50 +#: /home/walter/Desktop/turtleart-activity/svg/toppos.py:40 +msgid "top" +msgstr "" + +#: /home/walter/Desktop/turtleart-activity/svg/sensorsgroup.py:52 +#: /home/walter/Desktop/turtleart-activity/svg/bottompos.py:40 +msgid "bottom" +msgstr "" + #: /home/walter/Desktop/turtleart-activity/svg/turtlegroup.py:42 #: /home/walter/Desktop/turtleart-activity/svg/back.py:40 msgid "back" msgstr "" -#: /home/walter/Desktop/turtleart-activity/svg/turtlegroup.py:43 -#: /home/walter/Desktop/turtleart-activity/svg/left.py:40 -msgid "left" -msgstr "" - #: /home/walter/Desktop/turtleart-activity/svg/turtlegroup.py:45 #: /home/walter/Desktop/turtleart-activity/svg/arc.py:40 msgid "arc" @@ -512,11 +539,3 @@ msgstr "" #: /home/walter/Desktop/turtleart-activity/svg/setxy.py:40 msgid "set xy" msgstr "" - -#: /home/walter/Desktop/turtleart-activity/svg/toppos.py:40 -msgid "top" -msgstr "" - -#: /home/walter/Desktop/turtleart-activity/svg/bottompos.py:40 -msgid "bottom" -msgstr "" diff --git a/tasetup.py b/tasetup.py index ae9aa4f..24de83e 100644 --- a/tasetup.py +++ b/tasetup.py @@ -139,9 +139,11 @@ selectors = ( ('box1','box1','num'), ('storeinbox2','storeinbox2','1arg'), ('box2','box2','num'), - ('storeinbox','storeinbox','1sarg',_('box'),100), + ('storein','storeinbox','1varg',_('box'),100), ('box','box','nfuncs',_('box')), - ('string','','string',_('name'),str,strcheck))), + ('string','','string',_('name'),str,strcheck), + # not selectable, but here for backward compatability + ('storeinbox','storeinbox','1sarg',_('box'),100))), ('templates',55, (('journal','','media','','',''), ('audiooff','','audio','','',''), @@ -203,7 +205,9 @@ dockdetails = { ('flow',False,37,44)), '1sarg': (('flow',True,37,5),('string',False,12,22), \ ('num',False,130,23),('flow',False,37,44)), - 'myfunc': (('num',True,0,23),('string',False,24,22), \ + '1varg': (('flow',True,37,5),('string',False,12,38), \ + ('num',False,130,30),('flow',False,37,59)), + 'myfunc': (('num',True,0,33),('string',False,24,22), \ ('num',False,142,21)), 'media': (('media',True,0,27),('mediaend',False,75,27)), 'text': (('media',True,0,27),('mediaend',False,75,27)), diff --git a/tasprites.py b/tasprites.py index c92fd45..85993bc 100644 --- a/tasprites.py +++ b/tasprites.py @@ -130,13 +130,13 @@ def hit(spr,pos): + str(dy) + " " + str(spr.width) + " " + str(spr.height) return True -def draw_label(spr, label, myscale, center_flag): +def draw_label(spr, label, myscale, center_flag, truncate_flag): fd = pango.FontDescription('Sans') fd.set_size(int(myscale*spr.tw.scale*pango.SCALE)) if type(label) == str or type(label) == unicode: mylabel = label.replace("\0"," ") l = len(mylabel) - if l > 8: + if truncate_flag and l > 8: pl = spr.tw.window.create_pango_layout("..."+mylabel[l-8:]) else: pl = spr.tw.window.create_pango_layout(mylabel) @@ -157,11 +157,11 @@ def draw_label(spr, label, myscale, center_flag): # used for most things def draw_label1(spr, label): - draw_label(spr, label, 7, True) + draw_label(spr, label, 7, True, True) # used for status blocks def draw_label2(spr, label): - draw_label(spr, str(label), 9, False) + draw_label(spr, str(label), 9, False, False) # used to get pixel value from mask for category selector def getpixel(image,x,y): -- cgit v0.9.1