From 443f233856bd33cad8ed77591478bf6e1b80e53d Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Fri, 26 Oct 2012 18:16:02 +0000 Subject: set_icon -> set_icon_name --- diff --git a/TurtleArt/tacollaboration.py b/TurtleArt/tacollaboration.py index 03c3ead..093218f 100644 --- a/TurtleArt/tacollaboration.py +++ b/TurtleArt/tacollaboration.py @@ -149,7 +149,7 @@ class Collaboration(): self._enable_share_button() def _enable_share_button(self): - self._activity.share_button.set_icon('shareon') + self._activity.share_button.set_icon_name('shareon') self._activity.share_button.set_tooltip(_('Share selected blocks')) def _list_tubes_reply_cb(self, tubes): diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py index 03d2645..e3d284d 100644 --- a/TurtleArt/talogo.py +++ b/TurtleArt/talogo.py @@ -354,7 +354,7 @@ class LogoCode: def _start_eval(self, blklist): """ Step through the list. """ if self.tw.running_sugar: - self.tw.activity.stop_turtle_button.set_icon("stopiton") + self.tw.activity.stop_turtle_button.set_icon_name("stopiton") self.tw.activity.stop_turtle_button.set_tooltip( _('Stop turtle')) elif self.tw.interactive_mode: @@ -363,13 +363,13 @@ class LogoCode: self.icall(self.evline, blklist) yield True if self.tw.running_sugar: - # self.tw.activity.stop_turtle_button.set_icon("stopitoff") + # self.tw.activity.stop_turtle_button.set_icon_name("stopitoff") if self.tw.step_time == 0 and self.tw.selected_blk is None: - self.tw.activity.stop_turtle_button.set_icon("hideshowon") + self.tw.activity.stop_turtle_button.set_icon_name("hideshowon") self.tw.activity.stop_turtle_button.set_tooltip( _('Show blocks')) else: - self.tw.activity.stop_turtle_button.set_icon("hideshowoff") + self.tw.activity.stop_turtle_button.set_icon_name("hideshowoff") self.tw.activity.stop_turtle_button.set_tooltip( _('Hide blocks')) elif self.tw.interactive_mode: diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index b5c3b2a..027ccca 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -111,7 +111,7 @@ class TurtleArtActivity(activity.Activity): # Activity toolbar callbacks def do_save_as_logo_cb(self, button): ''' Write UCB logo code to datastore. ''' - self.save_as_logo.set_icon('logo-saveon') + self.save_as_logo.set_icon_name('logo-saveon') logo_code_path = self._dump_logo_code() if logo_code_path is None: return @@ -152,13 +152,13 @@ class TurtleArtActivity(activity.Activity): def do_load_python_cb(self, button): ''' Load Python code from the Journal. ''' - self.load_python.set_icon('pippy-openon') + self.load_python.set_icon_name('pippy-openon') self.tw.load_python_code_from_file(fname=None, add_new_block=True) GObject.timeout_add(250, self.load_python.set_icon, 'pippy-openoff') def do_save_as_image_cb(self, button): ''' Save the canvas to the Journal. ''' - self.save_as_image.set_icon('image-saveon') + self.save_as_image.set_icon_name('image-saveon') _logger.debug('saving image to journal') self.tw.save_as_image() @@ -189,12 +189,12 @@ class TurtleArtActivity(activity.Activity): self.tw.hideshow_palette(False) self.do_hidepalette() if self.tw.selected_palette is not None: - self.palette_buttons[self.tw.selected_palette].set_icon( + self.palette_buttons[self.tw.selected_palette].set_icon_name( palette_names[self.tw.selected_palette] + 'off') else: self.tw.hideshow_palette(True) self.do_showpalette() - self.palette_buttons[0].set_icon(palette_names[0] + 'on') + self.palette_buttons[0].set_icon_name(palette_names[0] + 'on') def do_palette_buttons_cb(self, button, i): ''' Palette selector buttons ''' @@ -213,13 +213,13 @@ class TurtleArtActivity(activity.Activity): ''' Toggle hover help ''' if self.tw.no_help: self.tw.no_help = False - self._hover_help_toggle.set_icon('help-off') + self._hover_help_toggle.set_icon_name('help-off') self._hover_help_toggle.set_tooltip(_('Turn off hover help')) else: self.tw.no_help = True self.tw.last_label = None self.tw.status_spr.hide() - self._hover_help_toggle.set_icon('help-on') + self._hover_help_toggle.set_icon_name('help-on') self._hover_help_toggle.set_tooltip(_('Turn on hover help')) # These methods are called both from toolbar buttons and blocks. @@ -227,13 +227,13 @@ class TurtleArtActivity(activity.Activity): def do_hidepalette(self): ''' Hide the palette. ''' if hasattr(self, 'palette_button'): - self.palette_button.set_icon('paletteon') + self.palette_button.set_icon_name('paletteon') self.palette_button.set_tooltip(_('Show palette')) def do_showpalette(self): ''' Show the palette. ''' if hasattr(self, 'palette_button'): - self.palette_button.set_icon('paletteoff') + self.palette_button.set_icon_name('paletteoff') self.palette_button.set_tooltip(_('Hide palette')) def do_hide_blocks(self): @@ -246,15 +246,15 @@ class TurtleArtActivity(activity.Activity): def do_eraser_cb(self, button): ''' Clear the screen and recenter. ''' - self.eraser_button.set_icon('eraseroff') + self.eraser_button.set_icon_name('eraseroff') self.recenter() self.tw.eraser_button() GObject.timeout_add(250, self.eraser_button.set_icon, 'eraseron') def do_run_cb(self, button): ''' Callback for run button (rabbit) ''' - self.run_button.set_icon('run-faston') - self.step_button.set_icon('run-slowoff') + self.run_button.set_icon_name('run-faston') + self.step_button.set_icon_name('run-slowoff') self.tw.lc.trace = 0 self.tw.step_time = 0 # Autohide blocks and palettes on run @@ -264,8 +264,8 @@ class TurtleArtActivity(activity.Activity): def do_step_cb(self, button): ''' Callback for step button (turtle) ''' - self.step_button.set_icon('run-slowon') - self.run_button.set_icon('run-fastoff') + self.step_button.set_icon_name('run-slowon') + self.run_button.set_icon_name('run-fastoff') self.tw.lc.trace = 1 self.tw.step_time = 3 self.tw.run_button(self.tw.step_time, running_from_button_push=True) @@ -275,11 +275,11 @@ class TurtleArtActivity(activity.Activity): # Auto show blocks after stop if not self.tw.hide and not self.tw.running_blocks: self.tw.hideblocks() - self.stop_turtle_button.set_icon('hideshowon') + self.stop_turtle_button.set_icon_name('hideshowon') self.stop_turtle_button.set_tooltip(_('Show blocks')) else: self.tw.showblocks() - self.stop_turtle_button.set_icon('hideshowoff') + self.stop_turtle_button.set_icon_name('hideshowoff') self.stop_turtle_button.set_tooltip(_('Hide blocks')) self.tw.stop_button() self.tw.display_coordinates() @@ -387,11 +387,11 @@ class TurtleArtActivity(activity.Activity): ''' Rescale coordinate system (100==height/2 or 100 pixels). ''' if self.tw.coord_scale == 1: self.tw.coord_scale = self.tw.height / 200 - self.rescale_button.set_icon('contract-coordinates') + self.rescale_button.set_icon_name('contract-coordinates') self.rescale_button.set_tooltip(_('Rescale coordinates down')) else: self.tw.coord_scale = 1 - self.rescale_button.set_icon('expand-coordinates') + self.rescale_button.set_icon_name('expand-coordinates') self.rescale_button.set_tooltip(_('Rescale coordinates up')) self.tw.eraser_button() # Given the change in how overlays are handled (v123), there is no way -- cgit v0.9.1