From dfbd5c8397d5c3c1242c22caf51a49ec0cff1610 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Fri, 19 Feb 2010 23:33:37 +0000 Subject: add hoverhelp to non-Sugar toolbar --- diff --git a/taconstants.py b/taconstants.py index 7b591d5..166addf 100644 --- a/taconstants.py +++ b/taconstants.py @@ -635,9 +635,11 @@ HELP_STRINGS = { 'color':_("holds current pen color (can be used in place of a number block)"), 'colors':_("a palette of pen colors"), 'comment':_("places a comment in your code"), + 'debugoff':_("Debug"), 'description':_("Sugar Journal description field"), 'division2':_("divides top numeric input (numerator) by bottom numeric input (denominator)"), 'empty':_("permanently deletes items in trash"), + 'eraseron':_("Clean"), 'equal2':_("logical equal-to operator"), 'extras':_("palette of extra options"), 'fillscreen':_("fills the background with (color, shade)"), @@ -650,8 +652,9 @@ HELP_STRINGS = { 'hat2':_("top of Action 2 stack"), 'hat':_("top of nameable action stack"), 'heading':_("holds current heading value of the turtle (can be used in place of a number block)"), - 'hideblocks':_("declutters canvas by hiding blocks"), 'height':_("the canvas height"), + 'hideblocks':_("declutters canvas by hiding blocks"), + 'hideshowoff':_("Hide blocks"), 'hspace':_("jogs stack right"), 'identity2':_("identity operator used for extending blocks"), 'ifelse':_("if-then-else operator that uses boolean operators from Numbers palette"), @@ -695,6 +698,8 @@ HELP_STRINGS = { 'restoreall':_("restore all blocks from trash"), 'rightpos':_("xcor of right of screen"), 'right':_("turns turtle clockwise (angle in degrees)"), + 'run-fastoff':_("Run"), + 'run-slowoff':_("Step"), 'savepix':_("saves a picture to the Sugar Journal"), 'scale':_("holds current scale value"), 'setcolor':_("sets color of the line drawn by the turtle"), @@ -713,6 +718,7 @@ HELP_STRINGS = { 'stack2':_("invokes Action 2 stack"), 'stack':_("invokes named action stack"), 'start':_("connects action to toolbar run buttons"), + 'stopiton':_("Stop turtle"), 'stopstack':_("stops current action"), 'storeinbox1':_("stores numeric value in Variable 1"), 'storeinbox2':_("stores numeric value in Variable 2"), @@ -737,7 +743,6 @@ HELP_STRINGS = { 'xcor':_("holds current x-coordinate value of the turtle (can be used in place of a number block)"), 'ycor':_("holds current y-coordinate value of the turtle (can be used in place of a number block)")} - # # 'dead key' Unicode dictionaries # diff --git a/tawindow.py b/tawindow.py index c63061c..f252a5d 100644 --- a/tawindow.py +++ b/tawindow.py @@ -1153,7 +1153,8 @@ class TurtleArtWindow(): except: self.timeout_tag[0] = 0 elif spr and hasattr(spr,'type') and (spr.type == 'selector' or\ - spr.type == 'palette'): + spr.type == 'palette' or\ + spr.type == 'toolbar'): if self.timeout_tag[0] == 0: self.timeout_tag[0] = self._do_show_popup(spr.name) self.selected_spr = spr @@ -1180,10 +1181,15 @@ class TurtleArtWindow(): block_name_s = SPECIAL_NAMES[block_name] elif BLOCK_NAMES.has_key(block_name): block_name_s = BLOCK_NAMES[block_name][0] + elif block_name in TOOLBAR_SHAPES: + block_name_s = '' else: block_name_s = _(block_name) if HELP_STRINGS.has_key(block_name): - label = block_name_s + ": " + HELP_STRINGS[block_name] + if block_name_s == '': + label = HELP_STRINGS[block_name] + else: + label = block_name_s + ": " + HELP_STRINGS[block_name] else: label = block_name_s if self.running_sugar: -- cgit v0.9.1