Merge branch 'master' of git://git.sugarlabs.org/tutorius/mainline into tutorialADT

13 files changed, 32 insertions, 32 deletions

diff --git a/addons/bubblemessage.py b/addons/bubblemessage.py
index 2bd2d31..6572a6a 100644
--- a/addons/bubblemessage.py
+++ b/addons/bubblemessage.py
@@ -13,10 +13,10 @@
 # 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 Action, DragWrapper
-from sugar.tutorius.properties import TStringProperty, TArrayProperty
-from sugar.tutorius import overlayer
-from sugar.tutorius.services import ObjectStore
+from ..actions import Action, DragWrapper
+from ..properties import TStringProperty, TArrayProperty
+from .. import overlayer
+from ..services import ObjectStore
 
 class BubbleMessage(Action):
     message = TStringProperty("Message")
diff --git a/addons/chainaction.py b/addons/chainaction.py
index 43c4fa4..8df7ac8 100644
--- a/addons/chainaction.py
+++ b/addons/chainaction.py
@@ -14,7 +14,7 @@
 # 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 ..actions import *
 
 class ChainAction(Action):
     actions = TAddonListProperty()
diff --git a/addons/clickaction.py b/addons/clickaction.py
index 828dd75..88c5519 100644
--- a/addons/clickaction.py
+++ b/addons/clickaction.py
@@ -14,8 +14,8 @@
 # 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 import gtkutils
-from sugar.tutorius.actions import *
+from .. import gtkutils
+from ..actions import *
 
 class ClickAction(Action):
     """                
diff --git a/addons/dialogmessage.py b/addons/dialogmessage.py
index f15f256..9250693 100644
--- a/addons/dialogmessage.py
+++ b/addons/dialogmessage.py
@@ -16,7 +16,7 @@
 # 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 ..actions import *
 
 class DialogMessage(Action):
     message = TStringProperty("Message")
diff --git a/addons/disablewidget.py b/addons/disablewidget.py
index ce3f235..fd88303 100644
--- a/addons/disablewidget.py
+++ b/addons/disablewidget.py
@@ -14,9 +14,9 @@
 # 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 import gtkutils
-from sugar.tutorius.services import ObjectStore
+from ..actions import *
+from .. import gtkutils
+from ..services import ObjectStore
 
 class DisableWidgetAction(Action):
     target = TStringProperty("0")
diff --git a/addons/gtkwidgeteventfilter.py b/addons/gtkwidgeteventfilter.py
index 5497af4..65aa744 100644
--- a/addons/gtkwidgeteventfilter.py
+++ b/addons/gtkwidgeteventfilter.py
@@ -13,16 +13,16 @@
 # 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.filters import EventFilter
-from sugar.tutorius.properties import TUAMProperty, TStringProperty
-from sugar.tutorius.gtkutils import find_widget
+from ..filters import EventFilter
+from ..properties import TUAMProperty, TEventType
+from ..gtkutils import find_widget
 
 class GtkWidgetEventFilter(EventFilter):
     """
     Basic Event filter for Gtk widget events
     """
     object_id = TUAMProperty()
-    event_name = TStringProperty("clicked")
+    event_name = TEventType('clicked')
 
     def __init__(self, object_id=None, event_name=None):
         """Constructor
@@ -64,6 +64,6 @@ __event__ = {
     "display_name" : "GTK Event catcher",
     "icon" : "player_play",
     "class" : GtkWidgetEventFilter,
-    "mandatory_props" : ["object_id"]
+    "mandatory_props" : ["object_id", "event_name"]
 }
 
diff --git a/addons/gtkwidgettypefilter.py b/addons/gtkwidgettypefilter.py
index 816a754..4ffecb5 100644
--- a/addons/gtkwidgettypefilter.py
+++ b/addons/gtkwidgettypefilter.py
@@ -14,10 +14,10 @@
 # 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.filters import *
-from sugar.tutorius.properties import *
-from sugar.tutorius.services import ObjectStore
-from sugar.tutorius.gtkutils import find_widget
+from ..filters import *
+from ..properties import *
+from ..services import ObjectStore
+from ..gtkutils import find_widget
 
 import logging
 logger = logging.getLogger("GtkWidgetTypeFilter")
diff --git a/addons/oncewrapper.py b/addons/oncewrapper.py
index 97f4752..5db3b60 100644
--- a/addons/oncewrapper.py
+++ b/addons/oncewrapper.py
@@ -14,7 +14,7 @@
 # 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 ..actions import *
 
 class OnceWrapper(Action):
     """
diff --git a/addons/readfile.py b/addons/readfile.py
index 0d276b9..9fe2f81 100644
--- a/addons/readfile.py
+++ b/addons/readfile.py
@@ -16,9 +16,9 @@
 
 import os
 
-from sugar.tutorius.actions import Action
-from sugar.tutorius.properties import TFileProperty
-from sugar.tutorius.services import ObjectStore
+from ..actions import Action
+from ..properties import TFileProperty
+from ..services import ObjectStore
 
 class ReadFile(Action):
     filename = TFileProperty(None)
diff --git a/addons/timerevent.py b/addons/timerevent.py
index c7374d0..752a865 100644
--- a/addons/timerevent.py
+++ b/addons/timerevent.py
@@ -16,8 +16,8 @@
 
 import gobject
 
-from sugar.tutorius.filters import EventFilter
-from sugar.tutorius.properties import TIntProperty
+from ..filters import EventFilter
+from ..properties import TIntProperty
 
 class TimerEvent(EventFilter):
     """
diff --git a/addons/triggereventfilter.py b/addons/triggereventfilter.py
index 6a0c2c9..19544b0 100644
--- a/addons/triggereventfilter.py
+++ b/addons/triggereventfilter.py
@@ -14,8 +14,8 @@
 # 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.filters import *
-from sugar.tutorius.properties import *
+from ..filters import *
+from ..properties import *
 
 class TriggerEventFilter(EventFilter):
     """
diff --git a/addons/typetextaction.py b/addons/typetextaction.py
index fee66e5..8b746e6 100644
--- a/addons/typetextaction.py
+++ b/addons/typetextaction.py
@@ -14,8 +14,8 @@
 # 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 import gtkutils
+from ..actions import *
+from .. import gtkutils
 
 class TypeTextAction(Action):
     """                
diff --git a/addons/widgetidentifyaction.py b/addons/widgetidentifyaction.py
index 3c66211..3df244b 100644
--- a/addons/widgetidentifyaction.py
+++ b/addons/widgetidentifyaction.py
@@ -14,9 +14,9 @@
 # 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 ..actions import *
 
-from sugar.tutorius.editor import WidgetIdentifier
+from ..editor import WidgetIdentifier
 
 class WidgetIdentifyAction(Action):
     def __init__(self):