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

4122: feature request: have Relationship View optionally show divorces

Browse Source 
svn: r16108
This commit is contained in:
Doug Blank 2010-11-02 11:45:49 +00:00
parent 185718f44c
commit 02db3c69af
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gen/lib/eventtype.py
View File

@ -253,6 +253,12 @@ class EventType(GrampsType):
""" """
return self.value == self.DIVORCE 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): def is_type(self, event_name):
""" """
Returns True if EventType has name EVENT_NAME, False otherwise. Returns True if EventType has name EVENT_NAME, False otherwise.

12
src/plugins/view/relview.py
View File

@ -1248,15 +1248,15 @@ class RelationshipView(NavigationView):
p = self.dbstate.db.get_place_from_handle(handle) p = self.dbstate.db.get_place_from_handle(handle)
return p.get_title() return p.get_title()
def write_marriage(self, vbox, family): def write_relationship_events(self, vbox, family):
value = False value = False
for event_ref in family.get_event_ref_list(): for event_ref in family.get_event_ref_list():
handle = event_ref.ref handle = event_ref.ref
event = self.dbstate.db.get_event_from_handle(handle) event = self.dbstate.db.get_event_from_handle(handle)
if event and event.get_type() == gen.lib.EventType.MARRIAGE and \ 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.FAMILY or
event_ref.get_role() == gen.lib.EventRoleType.PRIMARY ): event_ref.get_role() == gen.lib.EventRoleType.PRIMARY)):
self.write_event_ref(vbox, _('Marriage'), event) self.write_event_ref(vbox, event.get_type().string, event)
value = True value = True
return value return value
@ -1342,7 +1342,7 @@ class RelationshipView(NavigationView):
if handle: if handle:
box = self.write_person(_('Spouse'), 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) self.write_relationship(box, family)
hbox = gtk.HBox() hbox = gtk.HBox()