From 0d23632135a29af2cf7165388aacfa89dbd5db4b Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Sat, 04 Feb 2012 15:36:10 +0000
Subject: restore selected palette after hide/show cycle

---
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 45bbcc0..82bac8e 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -606,8 +606,13 @@ class TurtleArtWindow():
                 self.activity.recenter()
             self.show_palette()
 
-    def show_palette(self, n=0):
+    def show_palette(self, n=None):
         """ Show palette  """
+        if n is None:
+            if self.selected_palette is None:
+                n = 0
+            else:
+                n = self.selected_palette
         self.show_toolbar_palette(n)
         self.palette_button[self.orientation].set_layer(TAB_LAYER)
         self.palette_button[2].set_layer(TAB_LAYER)
@@ -879,14 +884,12 @@ class TurtleArtWindow():
              not self.activity.has_toolbarbox:
             self.activity.palette_buttons[self.selected_palette].set_icon(
                 palette_names[self.selected_palette] + 'off')
-        self.selected_palette = None
-        self.previous_palette = None
 
     def _hide_previous_palette(self, palette=None):
         """ Hide just the previously viewed toolbar palette """
         if palette is None:
             palette = self.previous_palette
-        # Hide previous palette
+        # Hide previously selected palette
         if palette is not None:
             for proto in self.palettes[palette]:
                 proto.spr.hide()
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 19ea0b7..21058ac 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -508,8 +508,8 @@ class TurtleArtActivity(activity.Activity):
             self._toolbox = activity.ActivityToolbox(self)
             self.set_toolbox(self._toolbox)
 
-            project_toolbar = gtk.Toolbar()
-            self._toolbox.add_toolbar(_('Project'), project_toolbar)
+            self._project_toolbar = gtk.Toolbar()
+            self._toolbox.add_toolbar(_('Project'), self._project_toolbar)
             view_toolbar = gtk.Toolbar()
             self._toolbox.add_toolbar(_('View'), view_toolbar)
             edit_toolbar = gtk.Toolbar()
@@ -519,11 +519,10 @@ class TurtleArtActivity(activity.Activity):
             self._help_toolbar = gtk.Toolbar()
             self._toolbox.add_toolbar(_('Help'), self._help_toolbar)
 
-            self._make_palette_buttons(project_toolbar, palette_button=True)
+            self._make_palette_buttons(self._project_toolbar,
+                                       palette_button=True)
 
-            self._add_separator(project_toolbar)
-
-            self._make_project_buttons(project_toolbar)
+            self._add_separator(self._project_toolbar)
             self._make_load_save_buttons(journal_toolbar)
 
         self._add_button('edit-copy', _('Copy'), self._copy_cb,
@@ -562,8 +561,11 @@ class TurtleArtActivity(activity.Activity):
 
     def _setup_extra_controls(self):
         ''' Add the rest of the buttons to the main toolbar '''
-        if self.has_toolbarbox:
-            self._make_project_buttons(self._toolbox.toolbar)
+        if not self.has_toolbarbox:
+            self._make_project_buttons(self._project_toolbar)
+            return
+
+        self._make_project_buttons(self._toolbox.toolbar)
 
         if self.tw.hw in [XO1, XO15, XO175]:
             self._add_separator(self._toolbox.toolbar, expand=True,
--
cgit v0.9.1