* src/SelectChild.py: use PersonModel

* src/plugins/FilterEditor.py: use new SelectPerson


svn: r3052

src/PeopleModel.py

@@ -24,6 +24,9 @@ import gtk.glade
 import gnome
 import gnome.ui
 
+COLUMN_NAME      = 0
+COLUMN_NAME_SORT = 7
+
 from RelLib import *
 
 class PeopleModel(gtk.GenericTreeModel):
@@ -47,6 +50,7 @@ class PeopleModel(gtk.GenericTreeModel):
             self.column_birth_place,
             self.column_death_day,
             self.column_death_place,
+            self.sort_name,
             ]
 
     def rebuild_data(self):
@@ -68,23 +72,30 @@ class PeopleModel(gtk.GenericTreeModel):
             surname = unicode(person.get_primary_name().get_surname())
 
             if self.sname_sub.has_key(surname):
-                val = len(self.sname_sub[surname])
                 self.sname_sub[surname].append(person_id)
             else:
                 self.sname_sub[surname] = [person_id]
-                val = 0
 
-            tpl = (surname,val)
-            self.iter2path[person_id] = tpl
-            self.path2iter[tpl] = person_id
-
-        val = 0
+        sval = 0
         name_list = self.db.get_surnames()
         for name in name_list:
             if self.sname_sub.has_key(name):
-                self.top_iter2path[unicode(name)] = (val,)
-                self.top_path2iter[val] = unicode(name)
-                val += 1
+                self.top_iter2path[name] = (sval,)
+                self.top_path2iter[sval] = name
+                val = 0
+                entries = self.sname_sub[name]
+                entries.sort(self.byname)
+                for person_id in entries:
+                    tpl = (name,val)
+                    self.iter2path[person_id] = tpl
+                    self.path2iter[tpl] = person_id
+                    val += 1
+                sval += 1
+
+    def byname(self,f,s):
+        n1 = self.db.person_map.get(str(f))[2].get_sort_name()
+        n2 = self.db.person_map.get(str(s))[2].get_sort_name()
+        return cmp(n1,n2)
 
     def on_row_inserted(self,obj,path,iter):
         self.rebuild_data()
@@ -92,29 +103,16 @@ class PeopleModel(gtk.GenericTreeModel):
     def on_row_deleted(self,obj,path):
         self.rebuild_data()
 
-    def find_path(self,iter):
-        if self.top_iter2path.has_key(iter):
-            return self.top_iter2path[iter]
-        else:
-            path = self.iter2path.get(iter)
-            if path:
-                return (self.top_iter2path[path[0]][0],path[1]);
-            else:
-                return None
-
     def on_get_flags(self):
 	'''returns the GtkTreeModelFlags for this particular type of model'''
-        #print "on_get_flags"
 	return 1
 
     def on_get_n_columns(self):
-        #print "on_get_columns"
-        return 5
+        return 8
 
     def on_get_path(self, node):
 	'''returns the tree path (a tuple of indices at the various
 	levels) for a particular node.'''
-        #print "on_get_path"
         if self.top_iter2path.has_key(node):
             return self.top_iter2path[node]
         else:
@@ -125,7 +123,6 @@ class PeopleModel(gtk.GenericTreeModel):
         return gobject.TYPE_STRING
 
     def on_get_iter(self, path):
-        #print "on_get_iter"
         try:
             if len(path)==1:
                 return self.top_path2iter[path[0]]
@@ -136,10 +133,11 @@ class PeopleModel(gtk.GenericTreeModel):
             return None
 
     def on_get_value(self,iter,col):
-        #print "on_get_value", iter, col
         if self.top_iter2path.has_key(iter):
             if col == 0:
                 return iter
+            elif col == COLUMN_NAME_SORT:
+                return iter.upper()
             else:
                 return u''            
         else:
@@ -147,7 +145,6 @@ class PeopleModel(gtk.GenericTreeModel):
 
     def on_iter_next(self, node):
 	'''returns the next node at this level of the tree'''
-        #print "on_iter_next"
         if self.top_iter2path.has_key(node):
             path = self.top_iter2path[node]
             return self.top_path2iter.get(path[0]+1)
@@ -157,14 +154,12 @@ class PeopleModel(gtk.GenericTreeModel):
 
     def on_iter_children(self,node):
         """Return the first child of the node"""
-        #print "on_iter_children"
         if node == None:
             return self.top_path2iter[0]
         return self.path2iter.get((node,0))
 
     def on_iter_has_child(self, node):
 	'''returns true if this node has children'''
-        #print "on_iter_has_child"
         if node == None:
             return len(top_iter2path) > 0
         if self.sname_sub.has_key(node) and len(self.sname_sub[node]) > 0:
@@ -172,7 +167,6 @@ class PeopleModel(gtk.GenericTreeModel):
         return 0
 
     def on_iter_n_children(self,node):
-        #print "on_iter_n_children",node
         if node == None:
             return len(self.top_iter2path)
         if self.top_iter2path.has_key(node):
@@ -180,7 +174,6 @@ class PeopleModel(gtk.GenericTreeModel):
         return 0
 
     def on_iter_nth_child(self,node,n):
-        #print "on_iter_nth_child"
         path = self.top_iter2path.get(node)
         if path:
             return self.path2iter.get((node,n))
@@ -189,17 +182,19 @@ class PeopleModel(gtk.GenericTreeModel):
 
     def on_iter_parent(self, node):
 	'''returns the parent of this node'''
-        #print "on_iter_parent"
         path = self.iter2path.get(node)
         if path:
             return path[0]
         return None
 
+    def sort_name(self,data):
+        return data[2].get_sort_name()
+
     def column_name(self,data):
-        return unicode(data[2].get_name())
+        return data[2].get_name()
 
     def column_id(self,data):
-        return unicode(data[0])
+        return data[0]
 
     def column_gender(self,data):
         return _GENDER[data[1]]