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

Improve event type defaults for new events in display tabs

Browse Source 
svn: r13933
This commit is contained in:
Nick Hall 2009-12-28 18:09:40 +00:00
parent 2997016c04
commit 7f2174b225
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/editors/displaytabs/eventembedlist.py
View File

@ -187,8 +187,27 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList):
""" """
return ((1, 0), (1, 1), (1, 2), (1, 3), (1, 4), (1, 5)) return ((1, 0), (1, 1), (1, 2), (1, 3), (1, 4), (1, 5))
def default_types(self):
return [
gen.lib.EventType(gen.lib.EventType.MARRIAGE),
gen.lib.EventType(gen.lib.EventType.DIVORCE),
]
def default_type(self): def default_type(self):
return gen.lib.EventType(gen.lib.EventType.MARRIAGE) type_list = []
# combine return info into a single flat sequence
event = None
for event_ref in self.get_data()[0]:
event = self.dbstate.db.get_event_from_handle(event_ref.ref)
type_list.append(event.get_type())
_std_types = self.default_types()
for etype in _std_types:
if etype not in type_list:
return gen.lib.EventType(etype)
return _std_types[0]
def default_role(self): def default_role(self):
return gen.lib.EventRoleType(gen.lib.EventRoleType.FAMILY) return gen.lib.EventRoleType(gen.lib.EventRoleType.FAMILY)

26
src/gui/editors/displaytabs/personeventembedlist.py
View File

@ -38,12 +38,6 @@ from BasicUtils import name_displayer
from eventembedlist import EventEmbedList from eventembedlist import EventEmbedList
from eventrefmodel import EventRefModel from eventrefmodel import EventRefModel
_std_types = [
gen.lib.EventType(gen.lib.EventType.BIRTH),
gen.lib.EventType(gen.lib.EventType.DEATH),
]
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# PersonEventEmbedList # PersonEventEmbedList
@ -101,20 +95,12 @@ class PersonEventEmbedList(EventEmbedList):
def default_role(self): def default_role(self):
return gen.lib.EventRoleType(gen.lib.EventRoleType.PRIMARY) return gen.lib.EventRoleType(gen.lib.EventRoleType.PRIMARY)
def default_type(self): def default_types(self):
type_list = [] return [
gen.lib.EventType(gen.lib.EventType.BIRTH),
# combine return info into a single flat sequence gen.lib.EventType(gen.lib.EventType.DEATH),
gen.lib.EventType(gen.lib.EventType.BURIAL),
event = None ]
for event_ref in self.get_data()[0]:
event = self.dbstate.db.get_event_from_handle(event_ref.ref)
type_list.append(event.get_type())
for etype in _std_types:
if etype not in type_list:
return gen.lib.EventType(etype)
return gen.lib.EventType(gen.lib.EventType.BIRTH)
def get_ref_editor(self): def get_ref_editor(self):
from gui.editors import EditEventRef from gui.editors import EditEventRef