diff options
author | Vincent Vinet <vince.vinet@gmail.com> | 2009-10-19 20:15:41 (GMT) |
---|---|---|
committer | Vincent Vinet <vince.vinet@gmail.com> | 2009-10-19 20:15:41 (GMT) |
commit | 912528253fcf1fc43c1a2d02ffe6e540fe60d8e7 (patch) | |
tree | 1d5c075046d260580c9eeb27d0d7d09045a7d4b5 /addons/bubblemessage.py | |
parent | 6584510d390a37153c20974da6704a907058fea0 (diff) |
Merge the TProbe Integration and fix merging induced bugs
Diffstat (limited to 'addons/bubblemessage.py')
-rw-r--r-- | addons/bubblemessage.py | 11 |
1 files changed, 7 insertions, 4 deletions
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 |