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

* src/EditPlace.py (EditPlace.display_references):

Browse Source 
Fix event and object references.
* src/ImageSelect.py (GlobalMediaProperties.display_refs):
Add references for personal and family events.


svn: r3897
This commit is contained in:
Alex Roitman 2005-01-11 04:17:53 +00:00
parent 7e47d6b026
commit 43bb968621
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps2/ChangeLog
View File

@ -1,5 +1,8 @@
2005-01-10 Martin Hawlisch <Martin.Hawlisch@gmx.de> 2005-01-10 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/EditPlace.py: make reference lists work properly for places * src/EditPlace.py (EditPlace.display_references):
Fix event and object references.
* src/ImageSelect.py (GlobalMediaProperties.display_refs):
Add references for personal and family events.
2005-01-10 Alex Roitman <shura@alex.neuro.umn.edu> 2005-01-10 Alex Roitman <shura@alex.neuro.umn.edu>
* src/plugins/StatisticsChart.py: Misc fixes. * src/plugins/StatisticsChart.py: Misc fixes.

5
gramps2/src/EditPlace.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2000-2004 Donald N. Allingham # Copyright (C) 2000-2005 Donald N. Allingham
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -26,6 +26,7 @@
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import pickle import pickle
from gettext import gettext as _
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -48,8 +49,6 @@ import Sources
import ImageSelect import ImageSelect
import NameDisplay import NameDisplay
from gettext import gettext as _
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# Constants # Constants

26
gramps2/src/ImageSelect.py
View File

@ -1,7 +1,7 @@
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2000-2004 Donald N. Allingham # Copyright (C) 2000-2005 Donald N. Allingham
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -26,7 +26,6 @@
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
import os import os
import string
import urlparse import urlparse
from gettext import gettext as _ from gettext import gettext as _
@ -458,7 +457,7 @@ class Gallery(ImageSelect):
def on_photolist_drag_data_received(self,w, context, x, y, data, info, time): def on_photolist_drag_data_received(self,w, context, x, y, data, info, time):
if data and data.format == 8: if data and data.format == 8:
icon_index = self.get_index(w,x,y) icon_index = self.get_index(w,x,y)
d = string.strip(string.replace(data.data,'\0',' ')) d = data.data.replace('\0',' ').strip()
protocol,site,mfile,j,k,l = urlparse.urlparse(d) protocol,site,mfile,j,k,l = urlparse.urlparse(d)
if protocol == "file": if protocol == "file":
name = mfile name = mfile
@ -1085,6 +1084,16 @@ class GlobalMediaProperties:
p.get_gramps_id(), p.get_gramps_id(),
NameDisplay.displayer.display(p)]) NameDisplay.displayer.display(p)])
any = 1 any = 1
for event_handle in p.get_event_list() + [p.get_birth_handle(),p.get_death_handle()]:
if event_handle:
event = self.db.get_event_from_handle(event_handle)
for o in event.get_media_list():
if o.get_reference_handle() == self.obj.get_handle():
self.refmodel.add([_("Personal event"),
"%s: %s" % (p.get_gramps_id(),event.get_gramps_id()),
"%s: %s" % (NameDisplay.displayer.display(p),
_(event.get_name()))])
any = 1
for key in self.db.get_family_handles(): for key in self.db.get_family_handles():
p = self.db.get_family_from_handle(key) p = self.db.get_family_from_handle(key)
for o in p.get_media_list(): for o in p.get_media_list():
@ -1093,6 +1102,17 @@ class GlobalMediaProperties:
p.get_gramps_id(), p.get_gramps_id(),
Utils.family_name(p,self.db)]) Utils.family_name(p,self.db)])
any = 1 any = 1
for event_handle in p.get_event_list():
if event_handle:
event = self.db.get_event_from_handle(event_handle)
for o in event.get_media_list():
if o.get_reference_handle() == self.obj.get_handle():
self.refmodel.add([_("Family event"),
"%s: %s" % (p.get_gramps_id(),
event.get_gramps_id()),
"%s: %s" % (Utils.family_name(p,self.db),
_(event.get_name()))])
any = 1
for key in self.db.get_source_handles(): for key in self.db.get_source_handles():
p = self.db.get_source_from_handle(key) p = self.db.get_source_from_handle(key)
for o in p.get_media_list(): for o in p.get_media_list():