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

2004-11-05 Tim Waugh <twaugh@redhat.com>

Browse Source 
* src/plugins/Ancestors.py: Include non-marriage relationships.


svn: r3706
This commit is contained in:
Tim Waugh 2004-11-05 11:30:00 +00:00
parent 892129970b
commit 02c1c5c99a
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gramps2/ChangeLog
View File

@ -1,9 +1,7 @@
2004-11-05 Tim Waugh <twaugh@redhat.com> 2004-11-05 Tim Waugh <twaugh@redhat.com>
* src/StartupDialog.py: Fixed typo (gtk.quit -> gtk.main_quit). * src/plugins/Ancestors.py: Include non-marriage relationships.
* src/plugins/Ancestors.py: Fixed "relationship"/"marriage" * src/StartupDialog.py: Fixed typo (gtk.quit -> gtk.main_quit).
confusion when the relationship type is "Married" but there is no
marriage event (i.e. no other details are known).
2004-11-02 Don Allingham <dallingham@users.sourceforge.net> 2004-11-02 Don Allingham <dallingham@users.sourceforge.net>
* src/gramps_main.py (Gramps.redraw_histmenu): use GRAMPS * src/gramps_main.py (Gramps.redraw_histmenu): use GRAMPS

25
gramps2/src/plugins/Ancestors.py
View File

@ -720,16 +720,16 @@ class ComprehensiveAncestorsReport (Report.Report):
count += 1 count += 1
for event_handle in family.get_event_list(): relationship = family.get_relationship ()
if event_handle: if const.save_frel(relationship) == "Married":
event = self.database.get_event_from_handle(event_handle) marriage = None
if event.get_name() == "Marriage": for event_handle in family.get_event_list():
marriage = event if event_handle:
break event = self.database.get_event_from_handle(event_handle)
else: if event.get_name() == "Marriage":
continue marriage = event
break
if marriage:
if not first_rel: if not first_rel:
if gender == RelLib.Person.female: if gender == RelLib.Person.female:
ret += _(' She later married %(name)s') % \ ret += _(' She later married %(name)s') % \
@ -748,7 +748,8 @@ class ComprehensiveAncestorsReport (Report.Report):
ret += _(' He married %(name)s') % \ ret += _(' He married %(name)s') % \
{'name': self.person_name (spouse_handle)} {'name': self.person_name (spouse_handle)}
ret += self.event_info (marriage) if marriage:
ret += self.event_info (marriage)
else: # Not a marriage else: # Not a marriage
if not first_rel: if not first_rel:
if gender == RelLib.Person.female: if gender == RelLib.Person.female:
@ -765,7 +766,9 @@ class ComprehensiveAncestorsReport (Report.Report):
ret += _(' He had a relationship with %(name)s') % \ ret += _(' He had a relationship with %(name)s') % \
{'name': self.person_name (spouse_handle)} {'name': self.person_name (spouse_handle)}
ret += children + '.' ret += children
if ret and not ret.endswith ("."):
ret += '.'
first_rel = 0 first_rel = 0