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

* src/RelLib.py: fix index for place map

Browse Source 
* src/FamilyView.py: include person ID's


svn: r3212
This commit is contained in:
Don Allingham
2004-06-15 03:43:33 +00:00
parent 310f5b17dd
commit 11aa47c41b
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@@ -1,3 +1,7 @@
2004-06-14 Don Allingham <dallingham@users.sourceforge.net>
* src/RelLib.py: fix index for place map
* src/FamilyView.py: include person ID's
2004-06-14 Alex Roitman <shura@alex.neuro.umn.edu> 2004-06-14 Alex Roitman <shura@alex.neuro.umn.edu>
* NEWS: Update. * NEWS: Update.

4
gramps2/configure.in
View File

@@ -5,8 +5,8 @@ AC_PREREQ(2.57)
AC_INIT(gramps, 1.1.0, gramps-bugs@lists.sourceforge.net) AC_INIT(gramps, 1.1.0, gramps-bugs@lists.sourceforge.net)
AC_CONFIG_SRCDIR(src/gramps.py) AC_CONFIG_SRCDIR(src/gramps.py)
AM_INIT_AUTOMAKE(1.6.3) AM_INIT_AUTOMAKE(1.6.3)
RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-') dnl RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-')
dnl RELEASE=1 RELEASE=1
VERSIONSTRING=$VERSION VERSIONSTRING=$VERSION
if test x"$RELEASE" != "x" if test x"$RELEASE" != "x"

27
gramps2/src/FamilyView.py
View File

@@ -867,14 +867,21 @@ class FamilyView:
dd = self.parent.db.find_event_from_id(self.person.get_death_id()) dd = self.parent.db.find_event_from_id(self.person.get_death_id())
if bd and dd: if bd and dd:
n = "%s\n\t%s %s\n\t%s %s " % (GrampsCfg.nameof(self.person), n = "%s [%s]\n\t%s %s\n\t%s %s " % (GrampsCfg.nameof(self.person),
_BORN,bd.get_date(),_DIED,dd.get_date()) self.person.get_id(),
_BORN,bd.get_date(),
_DIED,dd.get_date())
elif bd: 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: 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: else:
n = GrampsCfg.nameof(self.person) n = "%s [%s]" % (GrampsCfg.nameof(self.person),
self.person.get_id())
self.ap_model.clear() self.ap_model.clear()
self.ap_data.get_selection().set_mode(gtk.SELECTION_NONE) self.ap_data.get_selection().set_mode(gtk.SELECTION_NONE)
@@ -915,9 +922,10 @@ class FamilyView:
mdate = " - %s" % event.get_date() mdate = " - %s" % event.get_date()
else: else:
mdate = "" mdate = ""
v = "%s\n\t%s%s" % (GrampsCfg.nameof(sp), v = "%s [%s]\n\t%s%s" % (GrampsCfg.nameof(sp),
const.display_frel(fm.get_relationship()), sp.get_id(),
mdate) const.display_frel(fm.get_relationship()),
mdate)
self.spouse_model.set(iter,0,v) self.spouse_model.set(iter,0,v)
else: else:
self.spouse_model.set(iter,0,"%s\n" % _("<double click to add spouse>")) self.spouse_model.set(iter,0,"%s\n" % _("<double click to add spouse>"))
@@ -974,7 +982,8 @@ class FamilyView:
def nameof(self,l,p,mode): def nameof(self,l,p,mode):
if p: if p:
n = GrampsCfg.nameof(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: else:
return _("%s: unknown") % (l) return _("%s: unknown") % (l)

2
gramps2/src/RelLib.py
View File

@@ -3351,7 +3351,7 @@ class GrampsDB:
def get_place_display(self,key): def get_place_display(self,key):
# fix this up better # fix this up better
place = Place() place = Place()
place.unserialize(self.place_map[key]) place.unserialize(self.place_map[str(key)])
return place.get_display_info() return place.get_display_info()
def get_source_keys(self): def get_source_keys(self):