Move from object references to IDs

svn: r2822
This commit is contained in:
Don Allingham
2004-02-14 05:40:30 +00:00
parent 0192477335
commit 7ed2f0551e
110 changed files with 5349 additions and 5292 deletions

View File

@@ -75,7 +75,7 @@ class RelCalc:
glade_file = "%s/relcalc.glade" % base
self.glade = gtk.glade.XML(glade_file,"relcalc","gramps")
name = self.person.getPrimaryName().getRegularName()
name = self.person.get_primary_name().get_regular_name()
Utils.set_titles(self.glade.get_widget('relcalc'),
self.glade.get_widget('title'),
@@ -89,12 +89,12 @@ class RelCalc:
('',-1,0),('',-1,0)],
self.on_apply_clicked)
self.clist.new_model()
for key in self.db.getPersonKeys():
p = self.db.getPerson(key)
for key in self.db.get_person_keys():
p = self.db.get_person(key)
if p == self.person:
continue
val = self.db.getPersonDisplay(key)
self.clist.add([val[0],val[1],val[3],val[5],val[6]],p.getId())
val = self.db.get_person_display(key)
self.clist.add([val[0],val[1],val[3],val[5],val[6]],p.get_id())
self.clist.connect_model()
@@ -109,28 +109,28 @@ class RelCalc:
return
id = self.clist.get_object(iter)
other_person = self.db.getPerson(id)
other_person = self.db.get_person(id)
(rel_string,common) = self.relationship(self.person,other_person)
length = len(common)
if length == 1:
person = common[0]
name = person.getPrimaryName().getRegularName()
name = person.get_primary_name().get_regular_name()
commontext = " " + _("Their common ancestor is %s.") % name
elif length == 2:
p1 = common[0]
p2 = common[1]
commontext = " " + _("Their common ancestors are %s and %s.") % \
(p1.getPrimaryName().getRegularName(),\
p2.getPrimaryName().getRegularName())
(p1.get_primary_name().get_regular_name(),\
p2.get_primary_name().get_regular_name())
elif length > 2:
index = 0
commontext = " " + _("Their common ancestors are : ")
for person in common:
if index != 0:
commontext = commontext + ", "
commontext = commontext + person.getPrimaryName().getRegularName()
commontext = commontext + person.get_primary_name().get_regular_name()
index = index + 1
commontext = commontext + "."
else: