From b30874dc60185133c95aaba2ee2055efe84710c0 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Tue, 22 Aug 2006 03:19:37 +0000 Subject: [PATCH] 2006-08-21 Don Allingham * src/DisplayModels/_PeopleModel.py: fix handle column after removal of cause of death * src/GrampsDb/_WriteGedcom.py: handle custome events for people (bug # 368) svn: r7226 --- ChangeLog | 6 ++++++ src/DisplayModels/_PeopleModel.py | 2 +- src/GrampsDb/_WriteGedcom.py | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ddaf93f38..dd6d5ef02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-08-21 Don Allingham + * src/DisplayModels/_PeopleModel.py: fix handle column after removal + of cause of death + * src/GrampsDb/_WriteGedcom.py: handle custome events for people (bug + # 368) + 2006-08-20 Alex Roitman * src/DataViews/_PersonView.py (column_names): Remove cause of death. * src/DisplayModels/_PeopleModel.py (__init__): Update the order diff --git a/src/DisplayModels/_PeopleModel.py b/src/DisplayModels/_PeopleModel.py index 6f4c12e22..ee0116363 100644 --- a/src/DisplayModels/_PeopleModel.py +++ b/src/DisplayModels/_PeopleModel.py @@ -123,7 +123,7 @@ class PeopleModel(gtk.GenericTreeModel): _GENDER = [ _(u'female'), _(u'male'), _(u'unknown') ] # dynamic calculation of column indices, for use by various Views - COLUMN_INT_ID = 13 + COLUMN_INT_ID = 12 # indices into main column definition table COLUMN_DEF_LIST = 0 diff --git a/src/GrampsDb/_WriteGedcom.py b/src/GrampsDb/_WriteGedcom.py index 6a140b74b..7640c9843 100644 --- a/src/GrampsDb/_WriteGedcom.py +++ b/src/GrampsDb/_WriteGedcom.py @@ -980,6 +980,7 @@ class GedcomWriter(UpdateCallback): # Actually, it is against the spec to put anything # after EVEN on the same line, possibly an option is # needed on how to handle this + if event.get_description().strip() != "": self.writeln("1 EVEN %s" % self.cnvtxt(event.get_description())) @@ -987,6 +988,8 @@ class GedcomWriter(UpdateCallback): self.writeln("1 EVEN") if val.strip(): self.writeln("2 TYPE %s" % self.cnvtxt(val)) + else: + self.writeln("2 TYPE %s" % self.cnvtxt(str(event.get_type()))) self.dump_event_stats(event, event_ref)