From 02db3c69afcbfa2bcd856435cd34ab29ceb2b808 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Tue, 2 Nov 2010 11:45:49 +0000 Subject: [PATCH] 4122: feature request: have Relationship View optionally show divorces svn: r16108 --- src/gen/lib/eventtype.py | 6 ++++++ src/plugins/view/relview.py | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/gen/lib/eventtype.py b/src/gen/lib/eventtype.py index 402d7b56e..cbdd600e7 100644 --- a/src/gen/lib/eventtype.py +++ b/src/gen/lib/eventtype.py @@ -253,6 +253,12 @@ class EventType(GrampsType): """ return self.value == self.DIVORCE + def is_relationship_event(self): + """ + Returns True is EventType is a relationship type event. + """ + return self.value in [self.DIVORCE, self.MARRIAGE, self.ANNULMENT] + def is_type(self, event_name): """ Returns True if EventType has name EVENT_NAME, False otherwise. diff --git a/src/plugins/view/relview.py b/src/plugins/view/relview.py index 2ae0a8203..22d88a562 100644 --- a/src/plugins/view/relview.py +++ b/src/plugins/view/relview.py @@ -1248,15 +1248,15 @@ class RelationshipView(NavigationView): p = self.dbstate.db.get_place_from_handle(handle) return p.get_title() - def write_marriage(self, vbox, family): + def write_relationship_events(self, vbox, family): value = False for event_ref in family.get_event_ref_list(): handle = event_ref.ref event = self.dbstate.db.get_event_from_handle(handle) - if event and event.get_type() == gen.lib.EventType.MARRIAGE and \ - (event_ref.get_role() == gen.lib.EventRoleType.FAMILY or - event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ): - self.write_event_ref(vbox, _('Marriage'), event) + if (event and event.get_type().is_relationship_event() and + (event_ref.get_role() == gen.lib.EventRoleType.FAMILY or + event_ref.get_role() == gen.lib.EventRoleType.PRIMARY)): + self.write_event_ref(vbox, event.get_type().string, event) value = True return value @@ -1342,7 +1342,7 @@ class RelationshipView(NavigationView): if handle: box = self.write_person(_('Spouse'), handle) - if not self.write_marriage(box, family): + if not self.write_relationship_events(box, family): self.write_relationship(box, family) hbox = gtk.HBox()