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

* src/Editors/_EditFamily.py: Add fallback dates for birth and death

Browse Source 
Bug #1785

2008-02-22 Gary Burton <gary.burton@zen.co.uk>


svn: r10097
This commit is contained in:
Gary Burton 2008-02-22 23:53:24 +00:00
parent a58e6fdb60
commit 3171f0f756
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-02-22 Gary Burton <gary.burton@zen.co.uk>
* src/Editors/_EditFamily.py: Add fallback dates for birth and death
Bug #1785
2008-02-22 Gary Burton <gary.burton@zen.co.uk> 2008-02-22 Gary Burton <gary.burton@zen.co.uk>
* src/DataViews/RelationView.py: * src/DataViews/RelationView.py:
* src/Editors/_EditFamily.py: * src/Editors/_EditFamily.py:

42
src/Editors/_EditFamily.py
View File

@ -57,6 +57,7 @@ import Config
from BasicUtils import name_displayer from BasicUtils import name_displayer
import gen.lib import gen.lib
import Errors import Errors
import DateHandler
from Editors import EditPrimary from Editors import EditPrimary
from ReportBase import ReportUtils from ReportBase import ReportUtils
@ -514,9 +515,13 @@ class EditFamily(EditPrimary):
self.fbirth = self.top.get_widget('fbirth') self.fbirth = self.top.get_widget('fbirth')
self.fdeath = self.top.get_widget('fdeath') self.fdeath = self.top.get_widget('fdeath')
self.fbirth_label = self.top.get_widget('label578')
self.fdeath_label = self.top.get_widget('label579')
self.mbirth = self.top.get_widget('mbirth') self.mbirth = self.top.get_widget('mbirth')
self.mdeath = self.top.get_widget('mdeath') self.mdeath = self.top.get_widget('mdeath')
self.mbirth_label = self.top.get_widget('label567')
self.mdeath_label = self.top.get_widget('label568')
self.mbutton = self.top.get_widget('mbutton') self.mbutton = self.top.get_widget('mbutton')
self.mbutton2 = self.top.get_widget('mbutton2') self.mbutton2 = self.top.get_widget('mbutton2')
@ -631,14 +636,16 @@ class EditFamily(EditPrimary):
self.top.get_widget('vbox').pack_start(notebook, True) self.top.get_widget('vbox').pack_start(notebook, True)
def update_father(self, handle): def update_father(self, handle):
self.load_parent(handle, self.fbox, self.fbirth, self.load_parent(handle, self.fbox, self.fbirth, self.fbirth_label,
self.fdeath, self.fbutton, self.fbutton2, self.fdeath, self.fdeath_label, self.fbutton,
self.fbutton2,
_("Select a person as the father"), _("Select a person as the father"),
_("Remove the person as the father")) _("Remove the person as the father"))
def update_mother(self, handle): def update_mother(self, handle):
self.load_parent(handle, self.mbox, self.mbirth, self.load_parent(handle, self.mbox, self.mbirth, self.mbirth_label,
self.mdeath, self.mbutton, self.mbutton2, self.mdeath, self.mdeath_label, self.mbutton,
self.mbutton2,
_("Select a person as the mother"), _("Select a person as the mother"),
_("Remove the person as the mother")) _("Remove the person as the mother"))
@ -792,8 +799,8 @@ class EditFamily(EditPrimary):
except Errors.WindowActiveError: except Errors.WindowActiveError:
pass pass
def load_parent(self, handle, box, birth_obj, death_obj, def load_parent(self, handle, box, birth_obj, birth_label, death_obj,
btn_obj, btn2_obj, add_msg, del_msg): death_label, btn_obj, btn2_obj, add_msg, del_msg):
is_used = handle != None is_used = handle != None
@ -811,9 +818,13 @@ class EditFamily(EditPrimary):
person = db.get_person_from_handle(handle) person = db.get_person_from_handle(handle)
name = "%s [%s]" % (name_displayer.display(person), name = "%s [%s]" % (name_displayer.display(person),
person.gramps_id) person.gramps_id)
data = ReportUtils.get_birth_death_strings(db, person) birth = ReportUtils.get_birth_or_fallback(db, person)
birth = data[0] if birth and birth.get_type() == gen.lib.EventType.BAPTISM:
death = data[4] birth_label.set_label(_("Baptism:"))
death = ReportUtils.get_death_or_fallback(db, person)
if death and death.get_type() == gen.lib.EventType.BURIAL:
death_label.set_label(_("Burial:"))
del_image = gtk.Image() del_image = gtk.Image()
del_image.show() del_image.show()
@ -831,8 +842,8 @@ class EditFamily(EditPrimary):
else: else:
btn2_obj.show() btn2_obj.show()
name = "" name = ""
birth = "" birth = None
death = "" death = None
add_image = gtk.Image() add_image = gtk.Image()
add_image.show() add_image.show()
@ -840,8 +851,13 @@ class EditFamily(EditPrimary):
self.tooltips.set_tip(btn_obj, add_msg) self.tooltips.set_tip(btn_obj, add_msg)
btn_obj.add(add_image) btn_obj.add(add_image)
birth_obj.set_text(birth) if birth:
death_obj.set_text(death) birth_str = DateHandler.displayer.display(birth.get_date_object())
birth_obj.set_text(birth_str)
if death:
death_str = DateHandler.displayer.display(death.get_date_object())
death_obj.set_text(death_str)
def fix_parent_handles(self, orig_handle, new_handle, trans): def fix_parent_handles(self, orig_handle, new_handle, trans):
if orig_handle != new_handle: if orig_handle != new_handle: