From c14688d67a82b7ec7746beda90da915c98600a3d Mon Sep 17 00:00:00 2001
From: erick <erick@sugar-dev-erick.(none)>
Date: Sat, 05 Dec 2009 21:03:59 +0000
Subject: Merge branch 'frame_integration' into revamped_dragndrop

Conflicts:
	tutorius/actions.py
---
(limited to 'addons')

diff --git a/addons/bubblemessage.py b/addons/bubblemessage.py
index 7c3c0fd..53387bf 100644
--- a/addons/bubblemessage.py
+++ b/addons/bubblemessage.py
@@ -94,7 +94,7 @@ class BubbleMessage(Action):
         self.overlay.put(self._bubble, x, y)
         self._bubble.show()
 
-        self._drag = DragWrapper(self._bubble, self.position, True)
+        self._drag = DragWrapper(self._bubble, self.position, update_action_cb=self.update_property, draggable=True)
 
     def exit_editmode(self, *args):
         if self._drag.moved:
diff --git a/addons/bubblemessagewimg.py b/addons/bubblemessagewimg.py
index 1d5d5d3..514a311 100644
--- a/addons/bubblemessagewimg.py
+++ b/addons/bubblemessagewimg.py
@@ -97,7 +97,7 @@ class BubbleMessageWImg(Action):
         self.overlay.put(self._bubble, x, y)
         self._bubble.show()
 
-        self._drag = DragWrapper(self._bubble, self.position, True)
+        self._drag = DragWrapper(self._bubble, self.position, update_action_cb=self.update_property, draggable=True)
 
     def exit_editmode(self, *args):
         x,y = self._drag.position
diff --git a/addons/changecolor.py b/addons/changecolor.py
index 460da32..eac891a 100644
--- a/addons/changecolor.py
+++ b/addons/changecolor.py
@@ -63,9 +63,14 @@ class ChangeColor(Action):
         
         if not "activity" in kwargs:
             raise TypeError("activity argument is Mandatory")
+        activity = kwargs["activity"]
+
+        if not "probe" in kwargs:
+            raise TypeError("probe argument is Mandatory")
+        probe = kwargs["probe"]
         
         # get widget instance
-        self.wid = find_widget(kwargs["activity"], self.widaddr, ignore_errors=False)
+        self.wid = probe.find_widget(activity, self.widaddr, ignore_errors=False)
     
         if not self.wid:
             raise NameError("widget not found")
diff --git a/addons/gtkwidgeteventfilter.py b/addons/gtkwidgeteventfilter.py
index b5ce9ae..f6ecf86 100644
--- a/addons/gtkwidgeteventfilter.py
+++ b/addons/gtkwidgeteventfilter.py
@@ -45,9 +45,14 @@ class GtkWidgetEventFilter(EventFilter):
         super(GtkWidgetEventFilter, self).install_handlers(callback, **kwargs)
         if not "activity" in kwargs:
             raise TypeError("activity argument is Mandatory")
-        
+        activity = kwargs["activity"]
+
+        if not "probe" in kwargs:
+            raise TypeError("probe argument is Mandatory")
+        probe = kwargs["probe"]
+
         #find the widget and connect to its event
-        self._widget = find_widget(kwargs["activity"], self.object_id)
+        self._widget = probe.find_widget(activity, self.object_id)
         self._handler_id = self._widget.connect( \
                         self.event_name, self.do_callback )
 
@@ -65,6 +70,5 @@ __event__ = {
     "icon" : "player_play",
     "class" : GtkWidgetEventFilter,
     "mandatory_props" : ["object_id", "event_name"],
-    "test" : True
 }
 
diff --git a/addons/gtkwidgettypefilter.py b/addons/gtkwidgettypefilter.py
index 4ffecb5..8faf172 100644
--- a/addons/gtkwidgettypefilter.py
+++ b/addons/gtkwidgettypefilter.py
@@ -96,5 +96,6 @@ __event__ = {
     'display_name' : 'Widget Filter',
     'icon' : '',
     'class' : GtkWidgetTypeFilter,
-    'mandatory_props' : ['next_state', 'object_id']
+    'mandatory_props' : ['next_state', 'object_id'],
+    "test" : True,
 }
--
cgit v0.9.1