Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/PeopleModel.py: enhanced column_spouse

Browse Source 
* src/RelLib.py: enhance probably_alive to check for "Cause
of Death", "Burial", and "Cremation" events to indicate that
a person is not alive.
* src/const.py.in: add support for "Marriage Banns"

* src/ReadXML.py: set last change time, support handles


svn: r3499
This commit is contained in:
Don Allingham 2004-08-24 04:14:08 +00:00
parent fd8e92eae6
commit f987964322
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gramps2/ChangeLog
View File

@ -1,3 +1,10 @@
2004-08-23 Jim Smart <jim@jimsmart.org>
* src/PeopleModel.py: enhanced column_spouse
* src/RelLib.py: enhance probably_alive to check for "Cause
of Death", "Burial", and "Cremation" events to indicate that
a person is not alive.
* src/const.py.in: add support for "Marriage Banns"
2004-08-23 Don Allingham <dallingham@users.sourceforge.net> 2004-08-23 Don Allingham <dallingham@users.sourceforge.net>
* src/Utils.py: produce less line noise when generating * src/Utils.py: produce less line noise when generating
handles handles
@ -13,7 +20,7 @@
* src/EditPerson.py: display last change timestamps * src/EditPerson.py: display last change timestamps
* src/EditPlace.py: display last change timestamps * src/EditPlace.py: display last change timestamps
* src/Marriage.py: display last change timestamps * src/Marriage.py: display last change timestamps
* src/ReadXML.py: set last change time * src/ReadXML.py: set last change time, support handles
* src/gramps.glade: updates for last change display * src/gramps.glade: updates for last change display
2004-08-23 Alex Roitman <shura@alex.neuro.umn.edu> 2004-08-23 Alex Roitman <shura@alex.neuro.umn.edu>

27
gramps2/src/PeopleModel.py
View File

@ -273,19 +273,20 @@ class PeopleModel(gtk.GenericTreeModel):
return data[_NAME_COL].get_sort_name() return data[_NAME_COL].get_sort_name()
def column_spouse(self,data): def column_spouse(self,data):
id = data[0] spouses_names = u""
if data[_FAMILY_COL]: handle = data[0]
fid = data[_FAMILY_COL][0] for family_handle in data[_FAMILY_COL]:
else: family = self.db.get_family_from_handle(family_handle)
return u"" for spouse_id in [family.get_father_handle(), family.get_mother_handle()]:
d2 = self.db.family_map.get(str(fid)) if not spouse_id:
if fid and d2 : continue
if d2[1] == id: if spouse_id == handle:
return self.db.person_map.get(str(d2[2]))[_NAME_COL].get_name() continue
else: spouse = self.db.get_person_from_handle(spouse_id)
return self.db.person_map.get(str(d2[1]))[_NAME_COL].get_name() if len(spouses_names) > 0:
else: spouses_names += ", "
return u"" spouses_names += spouse.get_primary_name().get_regular_name()
return spouses_names
def column_name(self,data): def column_name(self,data):
return data[_NAME_COL].get_name() return data[_NAME_COL].get_name()

2
gramps2/src/const.py.in
View File

@ -234,6 +234,7 @@ familyConstantEvents = {
"Divorce Filing" : "DIVF", "Divorce Filing" : "DIVF",
"Divorce" : "DIV", "Divorce" : "DIV",
"Engagement" : "ENGA", "Engagement" : "ENGA",
"Marriage Banns" : "MARB",
"Marriage Contract" : "MARC", "Marriage Contract" : "MARC",
"Marriage License" : "MARL", "Marriage License" : "MARL",
"Marriage Settlement" : "MARS", "Marriage Settlement" : "MARS",
@ -252,6 +253,7 @@ family_events = TransTable( {
"Divorce Filing" : _("Divorce Filing"), "Divorce Filing" : _("Divorce Filing"),
"Divorce" : _("Divorce"), "Divorce" : _("Divorce"),
"Engagement" : _("Engagement"), "Engagement" : _("Engagement"),
"Marriage Banns" : _("Marriage Banns"),
"Marriage Contract" : _("Marriage Contract"), "Marriage Contract" : _("Marriage Contract"),
"Marriage License" : _("Marriage License"), "Marriage License" : _("Marriage License"),
"Marriage Settlement" : _("Marriage Settlement"), "Marriage Settlement" : _("Marriage Settlement"),