From 476e32af493fe9814b9dfea98fe74a4bac39ee19 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Wed, 02 May 2012 09:24:15 +0000 Subject: add new showhide behavior to showblocks and hideblocks --- diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index b694749..a0d3df2 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -314,15 +314,6 @@ class TurtleArtActivity(activity.Activity): self.palette_button.set_icon('paletteoff') self.palette_button.set_tooltip(_('Hide palette')) - def do_hideshow_cb(self, button): - ''' Toggle visibility. ''' - self.tw.hideshow_button() - # Update palette buttons too. - if not self.tw.palette: - self.do_hidepalette() - else: - self.do_showpalette() - def do_hide_blocks(self): ''' Hide blocks. ''' self.do_hidepalette() diff --git a/plugins/turtle_blocks_extras/turtle_blocks_extras.py b/plugins/turtle_blocks_extras/turtle_blocks_extras.py index 8052e3a..bb38b51 100644 --- a/plugins/turtle_blocks_extras/turtle_blocks_extras.py +++ b/plugins/turtle_blocks_extras/turtle_blocks_extras.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -#Copyright (c) 2011, Walter Bender +#Copyright (c) 2012, Walter Bender # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -653,19 +653,23 @@ click to open')) templates'), position=9) + primitive_dictionary['hideblocks'] = self._prim_hideblocks palette.add_block('hideblocks', style='basic-style-extended-vertical', label=_('hide blocks'), prim_name='hideblocks', help_string=_('declutters canvas by hiding blocks')) - self.tw.lc.def_prim('hideblocks', 0, lambda self: self.tw.hideblocks()) + self.tw.lc.def_prim('hideblocks', 0, + lambda self: primitive_dictionary['hideblocks']()) + primitive_dictionary['showblocks'] = self._prim_showblocks palette.add_block('showblocks', style='basic-style-extended-vertical', label=_('show blocks'), prim_name='showblocks', help_string=_('restores hidden blocks')) - self.tw.lc.def_prim('showblocks', 0, lambda self: self.tw.showblocks()) + self.tw.lc.def_prim('showblocks', 0, + lambda self: primitive_dictionary['showblocks']()) palette.add_block('fullscreen', style='basic-style-extended-vertical', @@ -1295,6 +1299,20 @@ bullets')) self.tw.lc.update_label_value('time', elapsed_time) return elapsed_time + def _prim_hideblocks(self): + """ hide blocks and show showblocks button """ + self.tw.hideblocks() + if self.tw.running_sugar: + self.tw.activity.stop_turtle_button.set_icon("hideshowoff") + self.tw.activity.stop_turtle_button.set_tooltip(_('Show blocks')) + + def _prim_showblocks(self): + """ show blocks and show stop turtle button """ + self.tw.showblocks() + if self.tw.running_sugar: + self.tw.activity.stop_turtle_button.set_icon("stopiton") + self.tw.activity.stop_turtle_button.set_tooltip(_('Stop turtle')) + # Deprecated blocks def _prim_t1x1(self, title, media): -- cgit v0.9.1