Start of new type classes

svn: r6340

src/Editors/_EditFamily.py

@@ -155,15 +155,22 @@ class ChildEmbedList(EmbeddedList):
             if not pair[0]:
                 continue
             name = self._column_names[pair[1]][0]
-            if pair[1] == 4 or pair[1] == 5:
-                render = TypeCellRenderer(Utils.child_relations)
+            if pair[1] == 4:
+                render = TypeCellRenderer(RelLib.ChildRefType().get_map())
+                render.connect('edited',self.frel_edited)
                 column = gtk.TreeViewColumn(name, render, text=pair[1])
+                column.set_min_width(100)
+            elif pair[1] == 5:
+                render = TypeCellRenderer(RelLib.ChildRefType().get_map())
+                render.connect('edited',self.mrel_edited)
+                column = gtk.TreeViewColumn(name, render, text=pair[1])
+                column.set_min_width(100)
             else:
                 render = gtk.CellRendererText()
                 column = gtk.TreeViewColumn(name, render, text=pair[1])
+                column.set_min_width(50)
 
             column.set_resizable(True)
-            column.set_min_width(40)
             column.set_sort_column_id(self._column_names[pair[1]][1])
             self.columns.append(column)
             self.tree.append_column(column)
@@ -177,6 +184,17 @@ class ChildEmbedList(EmbeddedList):
         """
         return len(self.family.get_child_ref_list()) == 0
 
+    def mrel_edited(self, renderer, index, value):
+        ref = self.family.get_child_ref_list()[int(index)]
+        new_type = RelLib.ChildRefType(value)
+        print "Before", str(new_type)
+        ref.set_mother_relation(new_type)
+        print "After", str(ref.get_mother_relation())
+
+    def frel_edited(self, renderer, index, value):
+        ref = self.family.get_child_ref_list()[int(index)]
+        ref.set_father_relation(RelLib.ChildRefType(value))
+
     def get_data(self):
         """
         Normally, get_data returns a list. However, we return family
@@ -848,8 +866,8 @@ class EditFamily(EditPrimary):
                 person = self.db.get_person_from_handle(handle)
                 person.add_parent_family_handle(
                     self.obj.handle,
-                    (RelLib.ChildRef.CHILD_BIRTH,''),
-                    (RelLib.ChildRef.CHILD_BIRTH,''),
+                    RelLib.ChildRefType(),
+                    RelLib.ChildRefType(),
                     )
                 self.db.commit_person(person,trans)
 

src/Editors/_EditName.py

@@ -144,9 +144,10 @@ class EditName(EditSecondary):
                                   self.top.get_widget("date_stat"), 
                                   self.obj.get_date_object(),self.window)
 
-        self.obj_combo = MonitoredType(
-            self.top.get_widget("name_type"), self.obj.set_type,
-            self.obj.get_type, dict(Utils.name_types), RelLib.Name.CUSTOM)
+        self.obj_combo = MonitoredDataType(
+            self.top.get_widget("name_type"),
+            self.obj.set_type,
+            self.obj.get_type)
         
         self.privacy = PrivacyButton(
             self.top.get_widget("priv"), self.obj)

src/Editors/_EditPerson.py

@@ -169,12 +169,10 @@ class EditPerson(EditPrimary):
             ), 
             self.db.readonly)
 
-        self.ntype_field = GrampsWidgets.MonitoredType(
+        self.ntype_field = GrampsWidgets.MonitoredDataType(
             self.top.get_widget("ntype"), 
             self.pname.set_type, 
             self.pname.get_type, 
-            dict(Utils.name_types), 
-            RelLib.Name.CUSTOM, 
             self.db.readonly)
 
         self.marker = GrampsWidgets.MonitoredType(