From 11aa47c41ba1686b8729d6346dc894df7fce5559 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Tue, 15 Jun 2004 03:43:33 +0000 Subject: [PATCH] * src/RelLib.py: fix index for place map * src/FamilyView.py: include person ID's svn: r3212 --- gramps2/ChangeLog | 4 ++++ gramps2/configure.in | 4 ++-- gramps2/src/FamilyView.py | 27 ++++++++++++++++++--------- gramps2/src/RelLib.py | 2 +- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 2cc5b1687..90769919b 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2004-06-14 Don Allingham + * src/RelLib.py: fix index for place map + * src/FamilyView.py: include person ID's + 2004-06-14 Alex Roitman * NEWS: Update. diff --git a/gramps2/configure.in b/gramps2/configure.in index f64423552..432784e2c 100644 --- a/gramps2/configure.in +++ b/gramps2/configure.in @@ -5,8 +5,8 @@ AC_PREREQ(2.57) AC_INIT(gramps, 1.1.0, gramps-bugs@lists.sourceforge.net) AC_CONFIG_SRCDIR(src/gramps.py) AM_INIT_AUTOMAKE(1.6.3) -RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') -dnl RELEASE=1 +dnl RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') +RELEASE=1 VERSIONSTRING=$VERSION if test x"$RELEASE" != "x" diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py index 9dd94427d..49d3a27b9 100644 --- a/gramps2/src/FamilyView.py +++ b/gramps2/src/FamilyView.py @@ -867,14 +867,21 @@ class FamilyView: dd = self.parent.db.find_event_from_id(self.person.get_death_id()) if bd and dd: - n = "%s\n\t%s %s\n\t%s %s " % (GrampsCfg.nameof(self.person), - _BORN,bd.get_date(),_DIED,dd.get_date()) + n = "%s [%s]\n\t%s %s\n\t%s %s " % (GrampsCfg.nameof(self.person), + self.person.get_id(), + _BORN,bd.get_date(), + _DIED,dd.get_date()) elif bd: - n = "%s\n\t%s %s" % (GrampsCfg.nameof(self.person),_BORN,bd.get_date()) + n = "%s [%s]\n\t%s %s" % (GrampsCfg.nameof(self.person), + self.person.get_id(), + _BORN,bd.get_date()) elif dd: - n = "%s\n\t%s %s" % (GrampsCfg.nameof(self.person),_DIED,dd.get_date()) + n = "%s [%s]\n\t%s %s" % (GrampsCfg.nameof(self.person), + self.person.get_id(), + _DIED,dd.get_date()) else: - n = GrampsCfg.nameof(self.person) + n = "%s [%s]" % (GrampsCfg.nameof(self.person), + self.person.get_id()) self.ap_model.clear() self.ap_data.get_selection().set_mode(gtk.SELECTION_NONE) @@ -915,9 +922,10 @@ class FamilyView: mdate = " - %s" % event.get_date() else: mdate = "" - v = "%s\n\t%s%s" % (GrampsCfg.nameof(sp), - const.display_frel(fm.get_relationship()), - mdate) + v = "%s [%s]\n\t%s%s" % (GrampsCfg.nameof(sp), + sp.get_id(), + const.display_frel(fm.get_relationship()), + mdate) self.spouse_model.set(iter,0,v) else: self.spouse_model.set(iter,0,"%s\n" % _("")) @@ -974,7 +982,8 @@ class FamilyView: def nameof(self,l,p,mode): if p: n = GrampsCfg.nameof(p) - return _("%s: %s\n\tRelationship: %s") % (l,n,_(mode)) + pid = p.get_id() + return _("%s: %s [%s]\n\tRelationship: %s") % (l,n,pid,_(mode)) else: return _("%s: unknown") % (l) diff --git a/gramps2/src/RelLib.py b/gramps2/src/RelLib.py index 067605ae0..00dbc3436 100644 --- a/gramps2/src/RelLib.py +++ b/gramps2/src/RelLib.py @@ -3351,7 +3351,7 @@ class GrampsDB: def get_place_display(self,key): # fix this up better place = Place() - place.unserialize(self.place_map[key]) + place.unserialize(self.place_map[str(key)]) return place.get_display_info() def get_source_keys(self):