From 0f2a398a48cfe1b21f4c915f82ac0acf5adc3709 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Thu, 10 Oct 2013 00:16:26 +0000
Subject: resync with v192

---
(limited to 'TurtleArtActivity.py')

diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 0c1ec3d..7019a2b 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -41,8 +41,10 @@ except ImportError:
     HAS_TOOLBARBOX = False
 from sugar.graphics.toolbutton import ToolButton
 from sugar.graphics.radiotoolbutton import RadioToolButton
-from sugar.graphics.alert import (ConfirmationAlert, NotifyAlert)
+from sugar.graphics.alert import (ConfirmationAlert, NotifyAlert, Alert)
 from sugar.graphics import style
+from sugar.graphics.icon import Icon
+from sugar.graphics.xocolor import XoColor
 from sugar.datastore import datastore
 from sugar import profile
 
@@ -114,6 +116,21 @@ class TurtleArtActivity(activity.Activity):
         self._setup_extra_controls()
 
         _logger.debug('_setup_sharing')
+        if self.shared_activity:
+            # We're joining
+            if not self.get_shared():
+                xocolors = XoColor(profile.get_color().to_string())
+                share_icon = Icon(icon_name='zoom-neighborhood',
+                                  xo_color=xocolors)
+                self._joined_alert = Alert()
+                self._joined_alert.props.icon = share_icon
+                self._joined_alert.props.title = _('Please wait')
+                self._joined_alert.props.msg = _('Starting connection...')
+                self.add_alert(self._joined_alert)
+
+                # Wait for joined signal
+                self.connect("joined", self._joined_cb)
+
         self._setup_sharing()
 
         # Activity count is the number of times this instance has been
@@ -615,6 +632,7 @@ class TurtleArtActivity(activity.Activity):
         ''' Setup toolbar according to Sugar version. '''
         if self.has_toolbarbox:
             self.max_participants = 4
+
             self._setup_toolbar_help()
             self._toolbox = ToolbarBox()
 
@@ -1185,6 +1203,12 @@ class TurtleArtActivity(activity.Activity):
         self._collaboration = Collaboration(self.tw, self)
         self._collaboration.setup()
 
+    def _joined_cb(self, widget):
+        if self._joined_alert is not None:
+            self.remove_alert(self._joined_alert)
+            self._joined_alert = None
+        self.set_canvas(self.fixed)
+
     def send_xy(self):
         ''' Resync xy position (and orientation) of my turtle. '''
         self._collaboration.send_my_xy()
--
cgit v0.9.1