diff options
Diffstat (limited to 'TurtleArt/tawindow.py')
| -rw-r--r-- | TurtleArt/tawindow.py | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index f386b68..2949e49 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -67,7 +67,7 @@ from tapalette import (palette_names, palette_blocks, expandable_blocks, palette_init_on_start) from talogo import (LogoCode, primitive_dictionary, logoerror) from tacanvas import TurtleGraphics -from tablock import (Blocks, Block, media_blocks_dictionary) +from tablock import (Blocks, Block, Media, media_blocks_dictionary) from taturtle import (Turtles, Turtle) from tautils import (magnitude, get_load_name, get_save_name, data_from_file, data_to_file, round_int, get_id, get_pixbuf_from_journal, @@ -4320,8 +4320,11 @@ before making changes to your Turtle Blocks program')) """ Print object n to the bar at the bottom of the screen """ if flag and (self.hide or self.step_time == 0): return + + # list if isinstance(n, list): self.showlabel('print', n) + # color elif isinstance(n, Color): if n.color is None: self.showlabel('print', '%s %d, %s %d' % @@ -4332,27 +4335,33 @@ before making changes to your Turtle Blocks program')) (_('color'), n.color, _('shade'), n.shade, _('gray'), n.gray)) - elif isinstance(n, basestring): - if n[0:6] == 'media_' and \ - n[6:].lower not in media_blocks_dictionary: + # media + elif isinstance(n, Media): + if (n.type == 'media' and + n.value.lower() not in media_blocks_dictionary): try: if self.running_sugar: from sugar.datastore import datastore try: - dsobject = datastore.get(n[6:]) + dsobject = datastore.get(n.value) except: - debug_output("Couldn't open %s" % (n[6:]), + debug_output("Couldn't open %s" % (n.value), self.running_sugar) self.showlabel('print', dsobject.metadata['title']) dsobject.destroy() else: - self.showlabel('print', n[6:]) + self.showlabel('print', n.value) except IOError: - self.showlabel('print', n) + self.showlabel('print', str(n)) else: - self.showlabel('print', n) + self.showlabel('print', str(n)) + # string + elif isinstance(n, basestring): + self.showlabel('print', n) + # integer elif isinstance(n, int): self.showlabel('print', n) + # other number else: self.showlabel( 'print', |