diff options
| author | mike <michael.jmontcalm@gmail.com> | 2009-12-04 02:21:14 (GMT) |
|---|---|---|
| committer | mike <michael.jmontcalm@gmail.com> | 2009-12-04 02:21:14 (GMT) |
| commit | 49ab39870266196f6267f83dd6951f839ebde773 (patch) | |
| tree | 116fb1552882edf5b4e42bbcc293c5ec918abca4 /addons | |
| parent | b8c9419f0381c1864035af76853ed1c02ad434cc (diff) | |
| parent | 243d29608df4816f791c98407c10fa8a702574e1 (diff) | |
Merge ../../simpoirs-clone into remote_integration
Conflicts:
src/extensions/tutoriusremote.py
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/bubblemessage.py | 2 | ||||
| -rw-r--r-- | addons/bubblemessagewimg.py | 2 | ||||
| -rw-r--r-- | addons/gtkwidgeteventfilter.py | 1 | ||||
| -rw-r--r-- | addons/gtkwidgettypefilter.py | 3 |
4 files changed, 4 insertions, 4 deletions
diff --git a/addons/bubblemessage.py b/addons/bubblemessage.py index aaf086c..7e91d00 100644 --- a/addons/bubblemessage.py +++ b/addons/bubblemessage.py @@ -93,7 +93,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 9c3dfc1..0ad444f 100644 --- a/addons/bubblemessagewimg.py +++ b/addons/bubblemessagewimg.py @@ -96,7 +96,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/gtkwidgeteventfilter.py b/addons/gtkwidgeteventfilter.py index b5ce9ae..ac14399 100644 --- a/addons/gtkwidgeteventfilter.py +++ b/addons/gtkwidgeteventfilter.py @@ -65,6 +65,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, } |