more changes for v192

2 files changed, 18 insertions, 6 deletions

diff --git a/TurtleArt/tacollaboration.py b/TurtleArt/tacollaboration.py
index 4f4406b..7021e9a 100644
--- a/TurtleArt/tacollaboration.py
+++ b/TurtleArt/tacollaboration.py
@@ -1,4 +1,4 @@
-#Copyright (c) 2011-12 Walter Bender
+#Copyright (c) 2011-13 Walter Bender
 #Copyright (c) 2011 Collabora Ltd. <http://www.collabora.co.uk/>
 
 #Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -401,9 +401,16 @@ class Collaboration():
             [nick, poly_points] = data_from_string(payload)
             shared_poly_points = []
             for i in range(len(poly_points)):
-                shared_poly_points.append(
-                    (self._tw.turtles.turtle_to_screen_coordinates
-                     (poly_points[i][0], poly_points[i][1])))
+                if poly_points[i][0] == 'move':
+                    shared_poly_points.append(
+                        (self._tw.turtles.turtle_to_screen_coordinates
+                         (poly_points[i][1], poly_points[i][2])))
+                elif poly_points[i][0] in ['rarc', 'larc']:
+                    shared_poly_points.append(
+                        (self._tw.turtles.turtle_to_screen_coordinates
+                         (poly_points[i][1], poly_points[i][2]),
+                         poly_points[i][3], poly_points[i][4],
+                         poly_points[i][5]))
             if nick != self._tw.nick:
                 self._tw.turtles.set_turtle(nick)
                 self._tw.turtles.get_active_turtle().set_poly_points(
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index a03240b..5072ab2 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -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))
 
@@ -1596,7 +1598,10 @@ before making changes to your program'))
                 elif blk.name == 'restore':
                     self.restore_latest_from_trash()
                 elif blk.name == 'empty':
-                    self._empty_trash()
+                    if self.running_sugar:
+                        self.activity.empty_trash_alert()
+                    else:
+                        self.empty_trash()
                 elif blk.name == 'trashall':
                     for b in self.just_blocks():
                         if b.type != 'trash':
@@ -2150,7 +2155,7 @@ before making changes to your program'))
 
         self.trash_stack.remove(blk)
 
-    def _empty_trash(self):
+    def empty_trash(self):
         ''' Permanently remove all blocks presently in the trash can. '''
         for blk in self.block_list.list:
             if blk.type == 'trash':