From 912528253fcf1fc43c1a2d02ffe6e540fe60d8e7 Mon Sep 17 00:00:00 2001
From: Vincent Vinet <vince.vinet@gmail.com>
Date: Mon, 19 Oct 2009 20:15:41 +0000
Subject: Merge the TProbe Integration and fix merging induced bugs

---
(limited to 'addons/bubblemessage.py')

diff --git a/addons/bubblemessage.py b/addons/bubblemessage.py
index c499bdb..2bd2d31 100644
--- a/addons/bubblemessage.py
+++ b/addons/bubblemessage.py
@@ -13,14 +13,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-from sugar.tutorius.actions import *
+from sugar.tutorius.actions import Action, DragWrapper
+from sugar.tutorius.properties import TStringProperty, TArrayProperty
+from sugar.tutorius import overlayer
+from sugar.tutorius.services import ObjectStore
 
 class BubbleMessage(Action):
     message = TStringProperty("Message")
     # Create the position as an array of fixed-size 2
-    position = TArrayProperty([0,0], 2, 2)
+    position = TArrayProperty((0,0), 2, 2)
     # Do the same for the tail position
-    tail_pos = TArrayProperty([0,0], 2, 2)
+    tail_pos = TArrayProperty((0,0), 2, 2)
 
     def __init__(self, message=None, position=None, speaker=None, tail_pos=None):
         """
@@ -94,7 +97,7 @@ class BubbleMessage(Action):
 
     def exit_editmode(self, *args):
         x,y = self._drag.position
-        self.position = [int(x), int(y)]
+        self.position = (int(x), int(y))
         if self._drag:
             self._drag.draggable = False
             self._drag = None
--
cgit v0.9.1