* src/AutoComp.py: remove double display of data
* src/FamilyView.py: remove unused check * src/GrampsBSDDB.py: search by gramps_id * src/GrampsDbBase.py: search by gramps_id, unicode/str conversions * src/Marriage.py: handle gramps_id editing * src/ReadXML.py: fix handle/gramps_id on import * src/plugins/RelCalc.py: display date instead of event handle * src/Relationship.py: family handles working * src/PeopleModel.py: comment out unused functions * src/PeopleModel.py: simplify model interface * src/AddSpouse.py: get_family_from_handle fixes * src/EditPerson.py: get_family_from_handle fixes * src/EditSource.py: get_family_from_handle fixes * src/GraphLayout.py: get_family_from_handle fixes * src/ImageSelect.py: get_family_from_handle fixes * src/MediaView.py: get_family_from_handle fixes * src/MergeData.py: get_family_from_handle fixes * src/PlaceView.py: get_family_from_handle fixes * src/ReadXML.py: get_family_from_handle fixes * src/RelLib.py: get_family_from_handle fixes * src/Relationship.py: get_family_from_handle fixes * src/SelectChild.py: get_family_from_handle fixes * src/SourceView.py: get_family_from_handle fixes * src/SubstKeywords.py: get_family_from_handle fixes * src/WriteXML.py: get_family_from_handle fixes * src/gramps_main.py: get_family_from_handle fixes svn: r3446
This commit is contained in:
Don Allingham
@@ -97,31 +97,8 @@ class PeopleModel(gtk.GenericTreeModel):
|
||||
else:
|
||||
self.rebuild_data()
|
||||
|
||||
self.connect('row-deleted',self.on_row_deleted)
|
||||
self.connect('row-inserted',self.on_row_inserted)
|
||||
|
||||
def on_row_inserted(self,model,path,iter):
|
||||
pass
|
||||
|
||||
def on_row_deleted(self,model,path):
|
||||
surname = self.top_path2iter[path[0]]
|
||||
pid = self.path2iter[(surname,path[1])]
|
||||
|
||||
for idval in self.sname_sub[surname]:
|
||||
key = self.iter2path[idval]
|
||||
del self.iter2path[idval]
|
||||
del self.path2iter[key]
|
||||
self.sname_sub[surname].remove(pid)
|
||||
|
||||
val = 0
|
||||
entries = self.sname_sub[surname]
|
||||
entries.sort(self.byname)
|
||||
for person_handle in entries:
|
||||
tpl = (surname,val)
|
||||
self.iter2path[person_handle] = tpl
|
||||
self.path2iter[tpl] = person_handle
|
||||
val += 1
|
||||
return 0
|
||||
# self.connect('row-deleted',self.on_row_deleted)
|
||||
# self.connect('row-inserted',self.on_row_inserted)
|
||||
|
||||
def rebuild_data(self):
|
||||
self.top_path2iter = []
|
||||
@@ -165,44 +142,6 @@ class PeopleModel(gtk.GenericTreeModel):
|
||||
self.path2iter,
|
||||
self.sname_sub)
|
||||
|
||||
def add_person(self,person):
|
||||
pid = person.get_handle()
|
||||
need = 0
|
||||
surname = person.get_primary_name().get_surname()
|
||||
if self.sname_sub.has_key(surname):
|
||||
self.sname_sub[surname].append(pid)
|
||||
else:
|
||||
self.sname_sub[surname] = [pid]
|
||||
|
||||
inscol = 0
|
||||
sval = 0
|
||||
name_list = self.db.get_surname_list()
|
||||
for name in name_list:
|
||||
if self.sname_sub.has_key(name):
|
||||
self.top_path2iter[sval] = name
|
||||
if name == surname:
|
||||
inscol = (sval,)
|
||||
need = 1
|
||||
sval += 1
|
||||
|
||||
column = 0
|
||||
val = 0
|
||||
entries = self.sname_sub[surname]
|
||||
entries.sort(self.byname)
|
||||
for person_handle in entries:
|
||||
tpl = (surname,val)
|
||||
self.iter2path[person_handle] = tpl
|
||||
self.path2iter[tpl] = person_handle
|
||||
if person_handle == pid:
|
||||
column = val
|
||||
val += 1
|
||||
|
||||
col = self.top_path2iter.index(surname)
|
||||
mypath = (col[0],column)
|
||||
if need:
|
||||
self.row_inserted(inscol,self.get_iter(inscol))
|
||||
self.row_inserted(mypath,self.get_iter(mypath))
|
||||
|
||||
def byname(self,f,s):
|
||||
n1 = self.db.person_map.get(str(f))[_NAME_COL].get_sort_name()
|
||||
n2 = self.db.person_map.get(str(s))[_NAME_COL].get_sort_name()
|
||||
@@ -384,4 +323,65 @@ class PeopleModel(gtk.GenericTreeModel):
|
||||
return self.db.get_place_from_handle(place_handle).get_title()
|
||||
return u""
|
||||
|
||||
# def add_person(self,person):
|
||||
# pid = person.get_handle()
|
||||
# need = 0
|
||||
# surname = person.get_primary_name().get_surname()
|
||||
# if self.sname_sub.has_key(surname):
|
||||
# self.sname_sub[surname].append(pid)
|
||||
# else:
|
||||
# self.sname_sub[surname] = [pid]
|
||||
|
||||
# inscol = 0
|
||||
# sval = 0
|
||||
# name_list = self.db.get_surname_list()
|
||||
# for name in name_list:
|
||||
# if self.sname_sub.has_key(name):
|
||||
# self.top_path2iter[sval] = name
|
||||
# if name == surname:
|
||||
# inscol = (sval,)
|
||||
# need = 1
|
||||
# sval += 1
|
||||
|
||||
# column = 0
|
||||
# val = 0
|
||||
# entries = self.sname_sub[surname]
|
||||
# entries.sort(self.byname)
|
||||
# for person_handle in entries:
|
||||
# tpl = (surname,val)
|
||||
# self.iter2path[person_handle] = tpl
|
||||
# self.path2iter[tpl] = person_handle
|
||||
# if person_handle == pid:
|
||||
# column = val
|
||||
# val += 1
|
||||
|
||||
# col = self.top_path2iter.index(surname)
|
||||
# mypath = (col[0],column)
|
||||
# if need:
|
||||
# self.row_inserted(inscol,self.get_iter(inscol))
|
||||
# self.row_inserted(mypath,self.get_iter(mypath))
|
||||
|
||||
# def on_row_inserted(self,model,path,iter):
|
||||
# pass
|
||||
|
||||
# def on_row_deleted(self,model,path):
|
||||
# surname = self.top_path2iter[path[0]]
|
||||
# pid = self.path2iter[(surname,path[1])]
|
||||
|
||||
# for idval in self.sname_sub[surname]:
|
||||
# key = self.iter2path[idval]
|
||||
# del self.iter2path[idval]
|
||||
# del self.path2iter[key]
|
||||
# self.sname_sub[surname].remove(pid)
|
||||
|
||||
# val = 0
|
||||
# entries = self.sname_sub[surname]
|
||||
# entries.sort(self.byname)
|
||||
# for person_handle in entries:
|
||||
# tpl = (surname,val)
|
||||
# self.iter2path[person_handle] = tpl
|
||||
# self.path2iter[tpl] = person_handle
|
||||
# val += 1
|
||||
# return 0
|
||||
|
||||
_GENDER = [ _(u'female'), _(u'male'), _(u'unknown') ]
|
||||
|
||||
Reference in New Issue
Block a user