Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2011-04-14 20:42:21 (GMT)
committer Walter Bender <walter.bender@gmail.com>2011-04-14 20:42:21 (GMT)
commitb6eca78b3b2d697556ef5408003488eca73fd1bd (patch)
tree896c9a53c975dc986b6234aa92fda9459a86bf06
parent8ba5716c20e99d3ff2e92099eb2d7e8642d28de2 (diff)
do_show, do_hide are reserved so changing method names (F15 bug fix)
-rw-r--r--TurtleArt/tawindow.py4
-rw-r--r--TurtleArtActivity.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 3b69175..e77eb93 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -579,7 +579,7 @@ class TurtleArtWindow():
self.hide = False
self.hideshow_button()
if self.running_sugar:
- self.activity.do_hide()
+ self.activity.do_hide_blocks()
def showblocks(self):
""" Callback from 'show blocks' block """
@@ -588,7 +588,7 @@ class TurtleArtWindow():
self.hide = True
self.hideshow_button()
if self.running_sugar:
- self.activity.do_show()
+ self.activity.do_show_blocks()
def resize_blocks(self, blocks=None):
""" Resize blocks or if blocks is None, all of the blocks """
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 636835f..f97e553 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -258,13 +258,13 @@ class TurtleArtActivity(activity.Activity):
else:
self.do_showpalette()
- def do_hide(self):
+ def do_hide_blocks(self):
''' Hide blocks. '''
self.blocks_button.set_icon('hideshowon')
self.blocks_button.set_tooltip(_('Show blocks'))
self.do_hidepalette()
- def do_show(self):
+ def do_show_blocks(self):
''' Show blocks. '''
if not hasattr(self, 'blocks_button'):
return