1 files changed, 54 insertions, 17 deletions

diff --git a/tutorius/properties.py b/tutorius/properties.py
index abf76e5..e3693fc 100644
--- a/tutorius/properties.py
+++ b/tutorius/properties.py
@@ -95,6 +95,25 @@ class TPropContainer(object):
         """
         return object.__getattribute__(self, "_props").keys()
 
+    # Providing the hash methods necessary to use TPropContainers
+    # in a dictionary, according to their properties
+    def __hash__(self):
+        #Return a hash of properties (key, value) sorted by key
+        #We need to transform the list of property key, value lists into 
+        # a tuple of key, value tuples
+        return hash(tuple(map(tuple,sorted(self._props.items(), cmp=lambda x, y: cmp(x[0], y[0])))))
+
+    def __eq__(self, e2):
+        return self._props == e2._props
+
+    # Adding methods for pickling and unpickling an object with
+    # properties
+    def __getstate__(self):
+       return self._props.copy()
+
+    def __setstate__(self, dict):
+       self._props.update(dict)
+
 class TutoriusProperty(object):
     """
     The base class for all actions' properties. The interface is the following :
@@ -145,19 +164,6 @@ class TAddonListProperty(TutoriusProperty):
     """
     pass
 
-    
-    def get_constraints(self):
-        """
-        Returns the list of constraints associated to this property.
-        """
-        if self._constraints is None:
-            self._constraints = []
-            for i in dir(self):
-                typ = getattr(self, i)
-                if isinstance(typ, Constraint):
-                    self._constraints.append(i)
-        return self._constraints
-
 class TIntProperty(TutoriusProperty):
     """
     Represents an integer. Can have an upper value limit and/or a lower value
@@ -207,8 +213,20 @@ class TArrayProperty(TutoriusProperty):
         self.type = "array"
         self.max_size_limit = MaxSizeConstraint(max_size_limit)
         self.min_size_limit = MinSizeConstraint(min_size_limit)
-        self.default = self.validate(value)
+        self.default = tuple(self.validate(value))
     
+    #Make this thing hashable
+    def __setstate__(self, state):
+        self.max_size_limit = MaxSizeConstraint(state["max_size_limit"])
+        self.min_size_limit = MinSizeConstraint(state["min_size_limit"])
+        self.value = state["value"]
+
+    def __getstate__(self):
+        return dict(
+            max_size_limit=self.max_size_limit.limit,
+            min_size_limit=self.min_size_limit.limit,
+            value=self.value,
+            )
 class TColorProperty(TutoriusProperty):
     """
     Represents a RGB color with 3 8-bit integer values.
@@ -287,8 +305,10 @@ class TUAMProperty(TutoriusProperty):
     """
     Represents a widget of the interface by storing its UAM.
     """
-    # TODO : Pending UAM check-in (LP 355199)
-    pass
+    def __init__(self, value=None):
+        TutoriusProperty.__init__(self)
+
+        self.type = "uam"
 
 class TAddonProperty(TutoriusProperty):
     """
@@ -311,14 +331,31 @@ class TAddonProperty(TutoriusProperty):
             return super(TAddonProperty, self).validate(value)
         raise ValueError("Expected TPropContainer instance as TaddonProperty value")
 
+class TGtkSignal(TutoriusProperty):
+    """
+    Represents a gobject signal for a GTK widget.
+    """
+    def __init__(self, value):
+        TutoriusProperty.__init__(self)
+        self.type = "gtk-signal"
+        
+        self.default = self.validate(value)
+
 class TAddonListProperty(TutoriusProperty):
     """
     Reprensents an embedded tutorius Addon List Component.
     See TAddonProperty
     """
     def __init__(self):
-        super(TAddonProperty, self).__init__()
+        TutoriusProperty.__init__(self)
         self.type = "addonlist"
         self.default = []
 
+    def validate(self, value):
+        if isinstance(value, list):
+            for component in value:
+                if not (isinstance(component, TPropContainer)):
+                    raise ValueError("Expected a list of TPropContainer instances inside TAddonListProperty value, got a %s" % (str(type(component))))
+            return value
+        raise ValueError("Value proposed to TAddonListProperty is not a list")