* src/DisplayModels.py: Fix sorting

* src/FamilyList.py: Fix sorting
* src/PageView.py: Fix sorting
* src/GrampsDb/_GrampsDbBase.py: set default column sorting order


svn: r5697
This commit is contained in:
Don Allingham
2006-01-09 00:54:04 +00:00
parent 2f1a21fb6e
commit f9e333f696
5 changed files with 27 additions and 28 deletions

View File

@@ -58,6 +58,9 @@ _GENDER = [ _(u'female'), _(u'male'), _(u'unknown') ]
#-------------------------------------------------------------------------
_codeset = GrampsLocale.codeset
def sfunc(a,b):
return locale.strcoll(a[0],b[0])
#-------------------------------------------------------------------------
#
# BaseModel
@@ -86,7 +89,7 @@ class BaseModel(gtk.GenericTreeModel):
sarray.append((self.sort_func(data[1]),data[0]))
data = cursor.next()
cursor.close()
sarray.sort()
sarray.sort(sfunc)
if self.reverse:
sarray.reverse()
return map(lambda x: x[1], sarray)
@@ -460,18 +463,18 @@ class FamilyModel(BaseModel):
self.gen_cursor = db.get_family_cursor
self.map = db.get_raw_family_data
self.fmap = [
self.column_id,
self.column_father,
self.column_mother,
self.column_id,
self.column_type,
self.column_change,
self.column_handle,
self.column_tooltip
]
self.smap = [
self.column_id,
self.sort_father,
self.sort_mother,
self.column_id,
self.column_type,
self.sort_change,
self.column_handle,
@@ -802,7 +805,6 @@ class RepositoryModel(BaseModel):
except:
return u''
def column_email(self,data):
return unicode(data[5])