resync to master

1 files changed, 24 insertions, 3 deletions

diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index e96c8fb..47627ef 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -165,6 +165,21 @@ class TurtleArtActivity(activity.Activity):
 
         self.init_complete = True
 
+    def update_palette_from_metadata(self):
+        if 'palette' in self.metadata:
+            n = int(self.metadata['palette'])
+            if n == -1:
+                self.tw.hideshow_palette(False)
+            else:
+                # Set radio button to active
+                if n < len(self.palette_buttons):
+                    self.palette_buttons[n].set_active(True)
+                if 'orientation' in self.metadata:
+                    self.tw.set_orientation(int(self.metadata['orientation']))
+        else:
+            # Else start on the Turtle palette
+            self.tw.show_palette(n=0)
+
     def check_buttons_for_fit(self):
         ''' Check to see which set of buttons to display '''
         if not self.has_toolbarbox:
@@ -359,7 +374,7 @@ class TurtleArtActivity(activity.Activity):
         if self.tw.palette:
             self.tw.hideshow_palette(False)
             self.do_hidepalette()
-            if self.has_toolbarbox and self.tw.selected_palette is not None:
+            if not self.has_toolbarbox and self.tw.selected_palette is not None:
                 self.palette_buttons[self.tw.selected_palette].set_icon(
                     palette_names[self.tw.selected_palette] + 'off')
         else:
@@ -1297,8 +1312,14 @@ class TurtleArtActivity(activity.Activity):
         data_to_file(self.tw.assemble_data_to_save(), file_path)
         self.metadata['mime_type'] = MIMETYPE[0]
         self.metadata['turtle blocks'] = ''.join(self.tw.used_block_list)
-        self.metadata['public'] = data_to_string(['activity count',
-                                                  'turtle blocks'])
+        # Deprecated
+        # self.metadata['public'] = data_to_string(['activity count',
+        #                                           'turtle blocks'])
+        if self.tw.palette:
+            self.metadata['palette'] = str(self.tw.selected_palette)
+        else:
+            self.metadata['palette'] = '-1'
+        self.metadata['orientation'] = str(self.tw.orientation)
         if len(self.error_list) > 0:
             errors = []
             if 'error_list' in self.metadata: