From 6eae84a71bde69863e11b7202c300e1ea5885e9c Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Fri, 18 Oct 2013 13:42:01 +0000
Subject: dismiss samples store

---
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 5612595..5072ab2 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -1340,7 +1340,7 @@ class TurtleArtWindow():
             for g in find_group(blk):
                 g.spr.move_relative((int(dx), int(dy)))
                 g.spr.save_xy = g.spr.get_xy()
-                if self.running_sugar:  # and not self.hw in [XO1]:
+                if self.running_sugar and not self.hw in [XO1]:
                     g.spr.move_relative((self.activity.hadj_value,
                                          self.activity.vadj_value))
             y += int(h + 3)
@@ -1378,7 +1378,7 @@ class TurtleArtWindow():
             for g in find_group(blk):
                 g.spr.move_relative((dx, dy))
                 g.spr.save_xy = g.spr.get_xy()
-                if self.running_sugar:  # and not self.hw in [XO1]:
+                if self.running_sugar and not self.hw in [XO1]:
                     g.spr.move_relative((self.activity.hadj_value,
                                          self.activity.vadj_value))
             x += int(w + 4)
@@ -1432,7 +1432,7 @@ class TurtleArtWindow():
             if show:
                 self.palette_button[2].save_xy = \
                     self.palette_button[2].get_xy()
-                if self.running_sugar:  # and not self.hw in [XO1]:
+                if self.running_sugar and not self.hw in [XO1]:
                     self.palette_button[2].move_relative(
                         (self.activity.hadj_value, self.activity.vadj_value))
                 self.palette_sprs[n][self.orientation].set_layer(
@@ -1450,7 +1450,7 @@ class TurtleArtWindow():
                 Sprite(self.sprite_list, x, y, svg_str_to_pixbuf(
                     svg.palette(w, h)))
             self.palette_sprs[n][self.orientation].save_xy = (x, y)
-            if self.running_sugar:  # and not self.hw in [XO1]:
+            if self.running_sugar and not self.hw in [XO1]:
                 self.palette_sprs[n][self.orientation].move_relative(
                     (self.activity.hadj_value, self.activity.vadj_value))
             if self.orientation == 0 and w > self.width:
@@ -1481,6 +1481,8 @@ class TurtleArtWindow():
         if self.running_sugar:
             self._show_unfullscreen_button()
 
+        self.activity.hide_store()
+
         # Find out what was clicked
         spr = self.sprite_list.find_sprite((x, y))
 
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 8b4b5a0..23cecce 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -1647,7 +1647,7 @@ in order to use the plugin.'))
         ''' Anything that needs restoring after a clear screen can go here '''
         pass
 
-    def _hide_store(self, widget=None):
+    def hide_store(self, widget=None):
         if self._sample_window is not None:
             self._sample_box.hide()
 
diff --git a/turtleblocks.py b/turtleblocks.py
index d982307..94c0fb7 100755
--- a/turtleblocks.py
+++ b/turtleblocks.py
@@ -397,8 +397,6 @@ return %s(self)" % (p, P, P)
         MenuBuilder.make_menu_item(menu, _('New'), self._do_new_cb)
         MenuBuilder.make_menu_item(menu, _('Show sample projects'),
                                    self._create_store)
-        MenuBuilder.make_menu_item(menu, _('Hide sample projects'),
-                                   self._hide_store) 
         MenuBuilder.make_menu_item(menu, _('Open'), self._do_open_cb)
         MenuBuilder.make_menu_item(menu, _('Load project'), self._do_load_cb)
         MenuBuilder.make_menu_item(menu, _('Save'), self._do_save_cb)
@@ -787,7 +785,7 @@ Would you like to save before quitting?'))
         ''' Anything that needs restoring after a clear screen can go here '''
         pass
 
-    def _hide_store(self, widget=None):
+    def hide_store(self, widget=None):
         if self._sample_window is not None:
             self._sample_box.hide()
 
--
cgit v0.9.1