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

* src/ReadXML.py (start_witness): Properly use handle of witness.

Browse Source 
* src/Witness.py (WitnessTab.redraw): Use gramps ID for display;
(WitnessEditor.remove_itself_from_menu): Typo;
(WitnessEditor.ok_clicked): Catch exception and add error dialog.


svn: r3526
This commit is contained in:
Alex Roitman
2004-09-01 04:57:44 +00:00
parent 10161013ea
commit 466aaebfd6
3 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -10,6 +10,10 @@
Use gramps ID instead of handle for display. Use gramps ID instead of handle for display.
* src/ImageSelect.py (GlobalMediaProperties.display_refs): * src/ImageSelect.py (GlobalMediaProperties.display_refs):
Use gramps ID instead of handle for display. Use gramps ID instead of handle for display.
* src/ReadXML.py (start_witness): Properly use handle of witness.
* src/Witness.py (WitnessTab.redraw): Use gramps ID for display;
(WitnessEditor.remove_itself_from_menu): Typo;
(WitnessEditor.ok_clicked): Catch exception and add error dialog.
2004-08-30 Don Allingham <dallingham@users.sourceforge.net> 2004-08-30 Don Allingham <dallingham@users.sourceforge.net>
* src/AddMedia.py: use new MediaList update routine * src/AddMedia.py: use new MediaList update routine

9
src/ReadXML.py
View File

@ -637,9 +637,12 @@ class GrampsParser:
def start_witness(self,attrs): def start_witness(self,attrs):
self.in_witness = 1 self.in_witness = 1
if attrs.has_key('ref'): if attrs.has_key('hlink'):
self.witness = RelLib.Witness(RelLib.Event.ID,self.map_gid(attrs['ref'])) self.witness = RelLib.Witness(RelLib.Event.ID,attrs['hlink'])
if attrs.has_key('name'): elif attrs.has_key('ref'):
person = self.find_person_by_gramps_id(self.map_gid(attrs["ref"]))
self.witness = RelLib.Witness(RelLib.Event.ID,person.get_handle())
elif attrs.has_key('name'):
self.witness = RelLib.Witness(RelLib.Event.NAME,attrs['name']) self.witness = RelLib.Witness(RelLib.Event.NAME,attrs['name'])
def start_coord(self,attrs): def start_coord(self,attrs):

23
src/Witness.py
View File

@ -68,12 +68,15 @@ class WitnessTab:
self.model.clear() self.model.clear()
for s in self.list: for s in self.list:
if s.get_type() == RelLib.Event.ID: if s.get_type() == RelLib.Event.ID:
id = s.get_value() handle = s.get_value()
if self.db.has_person_handle(id): if self.db.has_person_handle(handle):
n = self.db.get_person_from_handle(id).get_primary_name().get_name() person = self.db.get_person_from_handle(handle)
n = person.get_primary_name().get_name()
the_id = person.get_gramps_id()
else: else:
n = _('Unknown') n = _('Unknown')
self.model.add([n,s.get_value()],s) the_id = ''
self.model.add([n,the_id],s)
else: else:
self.model.add([s.get_value(),''],s) self.model.add([s.get_value(),''],s)
if self.list: if self.list:
@ -181,7 +184,7 @@ class WitnessEditor:
self.parent.parent.winsmenu.append(self.parent_menu_item) self.parent.parent.winsmenu.append(self.parent_menu_item)
def remove_itself_from_menu(self): def remove_itself_from_menu(self):
self.parent.parent.child_windows[self.win_key] del self.parent.parent.child_windows[self.win_key]
self.parent_menu_item.destroy() self.parent_menu_item.destroy()
def present(self,obj): def present(self,obj):
@ -221,8 +224,18 @@ class WitnessEditor:
self.parent.list.append(self.ref) self.parent.list.append(self.ref)
if self.in_db.get_active(): if self.in_db.get_active():
try:
self.ref.set_value(self.idval) self.ref.set_value(self.idval)
self.ref.set_type(RelLib.Event.ID) self.ref.set_type(RelLib.Event.ID)
except AttributeError:
import QuestionDialog
QuestionDialog.ErrorDialog(
_("Witness selection error"),
_("Since you have indicated that the person is "
"in the database, you need to actually select "
"the person by pressing the Select button.\n\n"
"Please try again. The witness has not been changed."),
self.window)
else: else:
self.ref.set_value(unicode(self.name.get_text())) self.ref.set_value(unicode(self.name.get_text()))
self.ref.set_type(RelLib.Event.NAME) self.ref.set_type(RelLib.Event.NAME)