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

* src/AddMedia.py: signal_autoconnect changes

Browse Source 
* src/AddSpouse.py: signal_autoconnect changes
* src/AttrEdit.py: signal_autoconnect changes
* src/Bookmarks.py: signal_autoconnect changes
* src/ChooseParents.py: signal_autoconnect changes
* src/DateEdit.py: signal_autoconnect changes
* src/EventEdit.py: signal_autoconnect changes
* src/Exporter.py: signal_autoconnect changes
* src/GenericFilter.py: signal_autoconnect changes
* src/ImageSelect.py: signal_autoconnect changes
* src/LocEdit.py: signal_autoconnect changes
* src/Marriage.py: signal_autoconnect changes
* src/MediaView.py: signal_autoconnect changes
* src/NameEdit.py: signal_autoconnect changes
* src/SelectChild.py: signal_autoconnect changes
* src/Sources.py: signal_autoconnect changes
* src/TransUtils.py: signal_autoconnect changes
* src/UrlEdit.py: signal_autoconnect changes
* src/Utils.py: signal_autoconnect changes
* src/Witness.py: signal_autoconnect changes
* src/gramps.glade: signal_autoconnect changes


svn: r5343
This commit is contained in:
Don Allingham 2005-10-23 04:06:36 +00:00
parent e6159b281e
commit b3dae93c12
22 changed files with 187 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gramps2/ChangeLog
View File

@ -1,3 +1,26 @@
2005-10-22 Don Allingham <don@gramps-project.org>
* src/AddMedia.py: signal_autoconnect changes
* src/AddSpouse.py: signal_autoconnect changes
* src/AttrEdit.py: signal_autoconnect changes
* src/Bookmarks.py: signal_autoconnect changes
* src/ChooseParents.py: signal_autoconnect changes
* src/DateEdit.py: signal_autoconnect changes
* src/EventEdit.py: signal_autoconnect changes
* src/Exporter.py: signal_autoconnect changes
* src/GenericFilter.py: signal_autoconnect changes
* src/ImageSelect.py: signal_autoconnect changes
* src/LocEdit.py: signal_autoconnect changes
* src/Marriage.py: signal_autoconnect changes
* src/MediaView.py: signal_autoconnect changes
* src/NameEdit.py: signal_autoconnect changes
* src/SelectChild.py: signal_autoconnect changes
* src/Sources.py: signal_autoconnect changes
* src/TransUtils.py: signal_autoconnect changes
* src/UrlEdit.py: signal_autoconnect changes
* src/Utils.py: signal_autoconnect changes
* src/Witness.py: signal_autoconnect changes
* src/gramps.glade: signal_autoconnect changes
2005-10-22 Julio Sanchez <jsanchez@users.sourceforge.net>
* src/WriteGedcom.py: Media objects for families, preparation for
media objects for other entities

10
gramps2/src/AddMedia.py
View File

@ -46,6 +46,7 @@ from gettext import gettext as _
#
#-------------------------------------------------------------------------
from QuestionDialog import ErrorDialog
from WindowUtils import GladeIf
import gtk.glade
#-------------------------------------------------------------------------
@ -90,12 +91,9 @@ class AddMediaObject:
Utils.set_titles(self.window,self.glade.get_widget('title'),
_('Select a media object'))
self.glade.signal_autoconnect({
"on_fname_update_preview" : self.on_name_changed,
"on_help_imagesel_clicked" : self.on_help_imagesel_clicked,
})
self.gladeif = GladeIf(self.glade)
self.gladeif.connect('fname', 'update_preview', self.on_name_changed)
self.window.show()
def internal_toggled(self, obj):

52
gramps2/src/AddSpouse.py
View File

@ -55,7 +55,6 @@ import const
import Utils
import PeopleModel
import Date
import DateHandler
import Marriage
import NameDisplay
import GenericFilter
@ -311,57 +310,6 @@ class AddSpouse:
def relation_type_changed(self,obj):
gobject.idle_add(self.update_data)
def all_filter(self, person):
return person.get_gender() != self.sgender
def likely_filter(self, person):
if person.get_gender() == self.sgender:
return False
pd_id = person.get_death_handle()
pb_id = person.get_birth_handle()
if pd_id:
pdday = self.db.get_event_from_handle(pd_id).get_date_object()
else:
pdday = Date.Date()
if pb_id:
pbday = self.db.get_event_from_handle(pb_id).get_date_object()
else:
pbday = Date.Date()
if self.bday.get_year_valid():
if pbday.get_year_valid():
# reject if person birthdate differs more than
# 100 years from spouse birthdate
if abs(pbday.get_year() - self.bday.get_year()) > 100:
return 0
if pdday.get_year_valid():
# reject if person birthdate is after the spouse deathdate
if self.bday.get_year() + 10 > pdday.get_high_year():
return 0
# reject if person birthdate is more than 100 years
# before the spouse deathdate
if self.bday.get_high_year() + 100 < pdday.get_year():
return 0
if self.dday.get_year_valid():
if pbday.get_year_valid():
# reject if person deathdate was prior to
# the spouse birthdate
if self.dday.get_high_year() < pbday.get_year() + 10:
return 0
if pdday.get_year_valid():
# reject if person deathdate differs more than
# 100 years from spouse deathdate
if abs(pdday.get_year() - self.dday.get_year()) > 100:
return 0
return 1
def set_gender(self):
if self.rel_combo.get_active() == RelLib.Family.CIVIL_UNION:
if self.gender == RelLib.Person.MALE:

16
gramps2/src/AttrEdit.py
View File

@ -58,6 +58,7 @@ import Spell
import GrampsDisplay
from QuestionDialog import WarningDialog
from WindowUtils import GladeIf
#-------------------------------------------------------------------------
#
@ -142,13 +143,12 @@ class AttributeEditor:
else:
self.flowed.set_active(1)
self.top.signal_autoconnect({
"on_help_attr_clicked" : self.on_help_clicked,
"on_ok_attr_clicked" : self.on_ok_clicked,
"on_cancel_attr_clicked" : self.close,
"on_attr_edit_delete_event" : self.on_delete_event,
"on_switch_page" : self.on_switch_page
})
self.gladeif = GladeIf(self.top)
self.gladeif.connect('attr_edit','delete_event', self.on_delete_event)
self.gladeif.connect('button116', 'clicked', self.close)
self.gladeif.connect('button115', 'clicked', self.on_ok_clicked)
self.gladeif.connect('button127', 'clicked', self.on_help_clicked)
self.gladeif.connect('notebook', 'on_switch_page', self.on_switch_page)
if parent_window:
self.window.set_transient_for(parent_window)
@ -158,11 +158,13 @@ class AttributeEditor:
def on_delete_event(self,obj,b):
self.close_child_windows()
self.remove_itself_from_menu()
self.gladeif.close()
gc.collect()
def close(self,obj):
self.close_child_windows()
self.remove_itself_from_menu()
self.gladeif.close()
self.window.destroy()
gc.collect()

2
gramps2/src/Bookmarks.py
View File

@ -168,7 +168,7 @@ class Bookmarks :
if person:
name = NameDisplay.displayer.display(person)
gramps_id = person.get_gramps_id()
new_iter = self.namemodel.add([name,gramps_id,person_handle])
self.namemodel.add([name,gramps_id,person_handle])
self.namemodel.connect_model()
self.response = self.top.run()

29
gramps2/src/ChooseParents.py
View File

@ -60,6 +60,7 @@ import NameDisplay
import DateHandler
import GenericFilter
from QuestionDialog import ErrorDialog, WarningDialog
from WindowUtils import GladeIf
#-------------------------------------------------------------------------
#
@ -124,6 +125,7 @@ class ChooseParents:
self.father = None
self.glade = gtk.glade.XML(const.gladeFile,"familyDialog","gramps")
self.gladeif = GladeIf(self.glade)
self.window = self.glade.get_widget("familyDialog")
self.flabel = self.glade.get_widget("flabel")
self.mlabel = self.glade.get_widget("mlabel")
@ -167,18 +169,15 @@ class ChooseParents:
self.type = RelLib.Family.MARRIED
self.prel.set_active(self.type)
self.glade.signal_autoconnect({
"on_add_parent_clicked" : self.add_parent_clicked,
"on_prel_changed" : self.parent_relation_changed,
"destroy_passed_object" : self.close,
"on_showallf_toggled" : self.showallf_toggled,
"on_showallm_toggled" : self.showallm_toggled,
"on_save_parents_clicked" : self.save_parents_clicked,
"on_help_familyDialog_clicked" : self.on_help_clicked,
"on_familyDialog_delete_event" : self.on_delete_event,
})
self.gladeif.connect('familyDialog','delete_event', self.on_delete_event)
self.gladeif.connect('button44','clicked', self.close)
self.gladeif.connect('button42','clicked', self.save_parents_clicked)
self.gladeif.connect('button167','clicked', self.on_help_clicked)
self.gladeif.connect('button123','clicked', self.add_parent_clicked)
self.gladeif.connect('showallf','toggled', self.showallf_toggled)
self.gladeif.connect('prel_combo','changed', self.parent_relation_changed)
self.keys = const.child_rel_list
self.build_list(self.mcombo,mrel)
self.build_list(self.fcombo,frel)
@ -279,11 +278,13 @@ class ChooseParents:
tree.append_column(column)
def on_delete_event(self,obj,b):
self.gladeif.close()
self.remove_itself_from_menu()
self.close_child_windows()
gc.collect()
def close(self,obj):
self.gladeif.close()
self.remove_itself_from_menu()
self.close_child_windows()
self.window.destroy()
@ -680,6 +681,7 @@ class ModifyParents:
self.mother = self.db.get_person_from_handle(mid)
self.glade = gtk.glade.XML(const.gladeFile,"modparents","gramps")
self.gladeif = GladeIf(self.glade)
self.window = self.glade.get_widget("modparents")
self.title = self.glade.get_widget("title")
@ -701,9 +703,7 @@ class ModifyParents:
self.orig_mrel = mr
self.orig_frel = fr
self.glade.signal_autoconnect({
"on_parents_help_clicked" : self.on_help_clicked,
})
self.gladeif.connect('button165','clicked', self.on_help_clicked)
self.title.set_use_markup(True)
@ -751,6 +751,7 @@ class ModifyParents:
self.val = self.window.run()
if self.val == gtk.RESPONSE_OK:
self.save_parents_clicked()
self.gladeif.close()
self.window.destroy()
gc.collect()

2
gramps2/src/DateEdit.py
View File

@ -52,7 +52,6 @@ import gc
import gtk
import gtk.gdk
import gtk.glade
import gobject
#-------------------------------------------------------------------------
#
@ -63,7 +62,6 @@ import Date
import DateHandler
import const
import Utils
import QuestionDialog
import GrampsDisplay
#-------------------------------------------------------------------------

25
gramps2/src/EventEdit.py
View File

@ -57,6 +57,7 @@ import Spell
import GrampsDisplay
from QuestionDialog import WarningDialog, ErrorDialog
from WindowUtils import GladeIf
#-------------------------------------------------------------------------
#
@ -111,6 +112,7 @@ class EventEditor:
self.date = Date.Date(None)
self.top = gtk.glade.XML(const.dialogFile, "event_edit","gramps")
self.gladeif = GladeIf(self.top)
self.window = self.top.get_widget("event_edit")
title_label = self.top.get_widget('title')
@ -223,18 +225,15 @@ class EventEditor:
self.path, self.icon_list,
self.db,self,self.window)
self.top.signal_autoconnect({
"on_switch_page" : self.on_switch_page,
"on_help_event_clicked" : self.on_help_clicked,
"on_ok_event_clicked" : self.on_event_edit_ok_clicked,
"on_cancel_event_clicked" : self.close,
"on_event_edit_delete_event": self.on_delete_event,
"on_addphoto_clicked" : self.gallery.on_add_media_clicked,
"on_selectphoto_clicked" : self.gallery.on_select_media_clicked,
"on_deletephoto_clicked" : self.gallery.on_delete_media_clicked,
"on_edit_properties_clicked": self.gallery.popup_change_description,
"on_editphoto_clicked" : self.gallery.on_edit_media_clicked,
})
self.gladeif.connect('event_edit','delete_event',self.on_delete_event)
self.gladeif.connect('button111','clicked',self.close)
self.gladeif.connect('ok','clicked',self.on_event_edit_ok_clicked)
self.gladeif.connect('button126','clicked',self.on_help_clicked)
self.gladeif.connect('notebook','on_switch_page',self.on_switch_page)
self.gladeif.connect('add_obj','clicked',self.gallery.on_add_media_clicked)
self.gladeif.connect('sel_obj','clicked',self.gallery.on_select_media_clicked)
self.gladeif.connect('button172','clicked',self.gallery.on_edit_media_clicked)
self.gladeif.connect('del_obj','clicked',self.gallery.on_delete_media_clicked)
self.top.get_widget('del_obj').set_sensitive(not noedit)
self.top.get_widget('sel_obj').set_sensitive(not noedit)
@ -248,12 +247,14 @@ class EventEditor:
self.window.show()
def on_delete_event(self,obj,b):
self.gladeif.close()
self.gallery.close()
self.close_child_windows()
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.gladeif.close()
self.gallery.close()
self.close_child_windows()
self.remove_itself_from_menu()

1
gramps2/src/Exporter.py
View File

@ -28,7 +28,6 @@
#
#-------------------------------------------------------------------------
import os
import shutil
from gettext import gettext as _
#-------------------------------------------------------------------------

4
gramps2/src/GenericFilter.py
View File

@ -612,7 +612,7 @@ class IsSiblingOfFilterMatch(Rule):
fam = self.db.get_family_from_handle(fam_id)
if fam:
for child_handle in fam.get_child_handle_list():
if child_handle != handle:
if child_handle != person.handle:
self.map[child_handle] = 1
#-------------------------------------------------------------------------
@ -1981,7 +1981,7 @@ class GenericFilter:
def xor_test(self,db,person):
test = False
for rule in self.flist:
test = test ^ rule.apply(db,handle)
test = test ^ rule.apply(db,person)
return test
def one_test(self,db,person):

64
gramps2/src/ImageSelect.py
View File

@ -69,6 +69,7 @@ import GrampsDisplay
from QuestionDialog import ErrorDialog
from DdTargets import DdTargets
from WindowUtils import GladeIf
_IMAGEX = 140
_IMAGEY = 150
@ -77,6 +78,12 @@ _PAD = 5
_last_path = ""
_iconlist_refs = []
_drag_targets = [
('STRING', 0, 0),
('text/plain',0,0),
('text/uri-list',0,2),
('application/x-rootwin-drop',0,1)]
#-------------------------------------------------------------------------
#
# ImageSelect class
@ -225,12 +232,6 @@ class ImageSelect:
"""Save the photo in the dataobj object - must be overridden"""
pass
_drag_targets = [
('STRING', 0, 0),
('text/plain',0,0),
('text/uri-list',0,2),
('application/x-rootwin-drop',0,1)]
#-------------------------------------------------------------------------
#
# Gallery class - This class handles all the logic underlying a
@ -766,17 +767,16 @@ class LocalMediaProperties:
else:
self.flowed.set_active(1)
self.change_dialog.signal_autoconnect({
"on_add_attr_clicked": self.on_add_attr_clicked,
"on_notebook_switch_page": self.on_notebook_switch_page,
"on_update_attr_clicked": self.on_update_attr_clicked,
"on_delete_attr_clicked" : self.on_delete_attr_clicked,
"on_help_clicked" : self.on_help_clicked,
"on_ok_clicked" : self.on_ok_clicked,
"on_cancel_clicked" : self.close,
"on_local_delete_event" : self.on_delete_event,
})
self.gladeif = GladeIf(self.change_dialog)
self.gladeif.connect('change_description','delete_event',self.on_delete_event)
self.gladeif.connect('button84','clicked',self.close)
self.gladeif.connect('ok','clicked',self.on_ok_clicked)
self.gladeif.connect('button104','clicked',self.on_help_clicked)
self.gladeif.connect('notebook1','switch_page',self.on_notebook_switch_page)
self.gladeif.connect('button86','clicked',self.on_add_attr_clicked)
self.gladeif.connect('button100','clicked',self.on_update_attr_clicked)
self.gladeif.connect('button88','clicked',self.on_delete_attr_clicked)
media_obj = self.db.get_object_from_handle(self.photo.get_reference_handle())
gnote = self.change_dialog.get_widget('global_notes')
spell = Spell.Spell(gnote)
@ -790,11 +790,13 @@ class LocalMediaProperties:
self.window.show()
def on_delete_event(self,obj,b):
self.gladeif.close()
self.close_child_windows()
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.gladeif.close()
self.close_child_windows()
self.remove_itself_from_menu()
self.window.destroy()
@ -946,6 +948,7 @@ class GlobalMediaProperties:
self.win_key = obj.get_handle()
else:
self.win_key = self
self.pdmap = {}
self.child_windows = {}
self.obj = obj
self.lists_changed = 0
@ -962,6 +965,7 @@ class GlobalMediaProperties:
self.path = self.db.get_save_path()
self.change_dialog = gtk.glade.XML(const.imageselFile,
"change_global","gramps")
self.gladeif = GladeIf(self.change_dialog)
mode = not self.db.readonly
@ -1033,7 +1037,8 @@ class GlobalMediaProperties:
pb = ImgManip.get_thumbnail_image(self.obj.get_path(),mtype)
self.pixmap.set_from_pixbuf(pb)
descr = Utils.get_mime_description(mtype)
self.change_dialog.get_widget("type").set_text(descr)
if descr:
self.change_dialog.get_widget("type").set_text(descr)
else:
self.change_dialog.get_widget("type").set_text(_('Note'))
self.pixmap.hide()
@ -1050,20 +1055,14 @@ class GlobalMediaProperties:
else:
self.flowed.set_active(1)
self.change_dialog.signal_autoconnect({
"on_cancel_clicked" : self.close,
"on_up_clicked" : self.on_up_clicked,
"on_down_clicked" : self.on_down_clicked,
"on_ok_clicked" : self.on_ok_clicked,
"on_apply_clicked" : self.on_apply_clicked,
"on_add_attr_clicked" : self.on_add_attr_clicked,
"on_notebook_switch_page": self.on_notebook_switch_page,
"on_delete_attr_clicked" : self.on_delete_attr_clicked,
"on_update_attr_clicked" : self.on_update_attr_clicked,
"on_help_clicked" : self.on_help_clicked,
"on_global_delete_event" : self.on_delete_event,
})
self.gladeif.connect('change_global','delete_event',self.on_delete_event)
self.gladeif.connect('button91','clicked',self.close)
self.gladeif.connect('ok','clicked',self.on_ok_clicked)
self.gladeif.connect('button102','clicked',self.on_help_clicked)
self.gladeif.connect('notebook2','switch_page',self.on_notebook_switch_page)
self.gladeif.connect('add_attr','clicked',self.on_add_attr_clicked)
self.gladeif.connect('button101','clicked',self.on_update_attr_clicked)
self.gladeif.connect('del_attr','clicked',self.on_delete_attr_clicked)
for name in ['gl_del_src','gl_add_src','add_attr','del_attr','ok']:
self.change_dialog.get_widget(name).set_sensitive(mode)
@ -1221,7 +1220,6 @@ class GlobalMediaProperties:
self.db.add_place(place,trans)
self.db.transaction_commit(trans,_('Add Place (%s)' % text))
self.pdmap[text] = place.get_handle()
self.add_places.append(place)
return place.get_handle()
else:
return None

18
gramps2/src/LocEdit.py
View File

@ -37,6 +37,7 @@ import const
import Utils
import RelLib
import GrampsDisplay
from WindowUtils import GladeIf
from gettext import gettext as _
@ -59,6 +60,8 @@ class LocationEditor:
self.win_key = self
self.location = location
self.top = gtk.glade.XML(const.dialogFile, "loc_edit","gramps")
self.gladeif = GladeIf(self.top)
self.window = self.top.get_widget("loc_edit")
self.city = self.top.get_widget("city")
self.state = self.top.get_widget("state")
@ -81,22 +84,23 @@ class LocationEditor:
self.parish.set_text(location.get_parish())
self.window.set_data("o",self)
self.top.signal_autoconnect({
"on_help_loc_clicked" : self.on_help_clicked,
"on_ok_loc_clicked" : self.on_location_edit_ok_clicked,
"on_cancel_loc_clicked" : self.close,
"on_loc_delete_event" : self.on_delete_event,
})
self.gladeif.connect('loc_edit','delete_event',self.on_delete_event)
self.gladeif.connect('button119','clicked',self.close)
self.gladeif.connect('button118','clicked',self.on_ok_clicked)
self.gladeif.connect('button128','clicked',self.on_help_clicked)
if parent_window:
self.window.set_transient_for(parent_window)
self.add_itself_to_menu()
self.window.show()
def on_delete_event(self,obj,b):
self.gladeif.close()
self.remove_itself_from_menu()
def close(self,obj):
self.gladeif.close()
self.remove_itself_from_menu()
self.window.destroy()
@ -118,7 +122,7 @@ class LocationEditor:
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('gramps-edit-complete')
def on_location_edit_ok_clicked(self,obj):
def on_ok_clicked(self,obj):
city = unicode(self.city.get_text())
county = unicode(self.county.get_text())
country = unicode(self.country.get_text())

46
gramps2/src/Marriage.py
View File

@ -62,6 +62,7 @@ import GrampsDisplay
from QuestionDialog import QuestionDialog, WarningDialog, SaveDialog
from DdTargets import DdTargets
from WindowUtils import GladeIf
#-------------------------------------------------------------------------
#
@ -109,6 +110,8 @@ class Marriage:
self.pmap[p[0]] = key
self.top = gtk.glade.XML(const.marriageFile,"marriageEditor","gramps")
self.gladeif = GladeIf(self.top)
self.window = self.get_widget("marriageEditor")
Utils.set_titles(self.window, self.top.get_widget('title'),
@ -118,27 +121,23 @@ class Marriage:
self.gallery = ImageSelect.Gallery(family, self.db.commit_family,
self.path, self.icon_list, db, self)
self.top.signal_autoconnect({
"destroy_passed_object" : self.on_cancel_edit,
"on_help_marriage_editor" : self.on_help_clicked,
"on_add_attr_clicked" : self.on_add_attr_clicked,
"on_delete_attr_clicked" : self.on_delete_attr_clicked,
"on_addphoto_clicked" : self.gallery.on_add_media_clicked,
"on_selectphoto_clicked" : self.gallery.on_select_media_clicked,
"on_close_marriage_editor" : self.on_close_marriage_editor,
"on_delete_event" : self.on_delete_event,
"on_lds_src_clicked" : self.lds_src_clicked,
"on_lds_note_clicked" : self.lds_note_clicked,
"on_deletephoto_clicked" : self.gallery.on_delete_media_clicked,
"on_edit_photo_clicked" : self.gallery.on_edit_media_clicked,
"on_edit_properties_clicked": self.gallery.popup_change_description,
"on_marriageAddBtn_clicked" : self.on_add_clicked,
"on_event_update_clicked" : self.on_event_update_clicked,
"on_attr_update_clicked" : self.on_update_attr_clicked,
"on_marriageDeleteBtn_clicked" : self.on_delete_clicked,
"on_switch_page" : self.on_switch_page
})
self.gladeif.connect('marriageEditor','delete_event',self.on_delete_event)
self.gladeif.connect('button108','clicked',self.on_cancel_edit)
self.gladeif.connect('ok','clicked',self.on_close)
self.gladeif.connect('button119','clicked',self.on_help_clicked)
self.gladeif.connect('notebook4','switch_page',self.on_switch_page)
self.gladeif.connect('marriage_add','clicked',self.on_add_clicked)
self.gladeif.connect('button116','clicked',self.on_event_update_clicked)
self.gladeif.connect('marriage_del','clicked',self.on_delete_clicked)
self.gladeif.connect('attr_add','clicked',self.on_add_attr_clicked)
self.gladeif.connect('button118','clicked',self.on_update_attr_clicked)
self.gladeif.connect('attr_del','clicked',self.on_delete_attr_clicked)
self.gladeif.connect('media_add','clicked',self.gallery.on_add_media_clicked)
self.gladeif.connect('media_sel','clicked',self.gallery.on_select_media_clicked)
self.gladeif.connect('button117','clicked',self.gallery.on_edit_media_clicked)
self.gladeif.connect('media_del','clicked',self.gallery.on_delete_media_clicked)
self.gladeif.connect('button114','clicked',self.lds_src_clicked)
self.gladeif.connect('button115','clicked',self.lds_note_clicked)
mode = not self.db.readonly
@ -355,6 +354,7 @@ class Marriage:
self.child_windows = {}
def close(self):
self.gladeif.close()
self.gallery.close()
self.close_child_windows()
self.remove_itself_from_winsmenu()
@ -606,7 +606,7 @@ class Marriage:
self.close()
def save(self):
self.on_close_marriage_editor(None)
self.on_close(None)
def on_delete_event(self,obj,b):
if self.did_data_change() and not GrampsKeys.get_dont_ask():
@ -620,7 +620,7 @@ class Marriage:
self.close()
return False
def on_close_marriage_editor(self,*obj):
def on_close(self,*obj):
trans = self.db.transaction_begin()

5
gramps2/src/MediaView.py
View File

@ -244,7 +244,10 @@ class MediaView:
gc.collect()
self.mid.set_text(mobj.get_gramps_id())
self.mtype.set_text(type_name)
if type_name:
self.mtype.set_text(type_name)
else:
self.mtype.set_text(_('unknown'))
self.mdesc.set_text(mobj.get_description())
if type_name == _('Note'):
self.mpath.set_text('')

19
gramps2/src/NameEdit.py
View File

@ -53,6 +53,8 @@ import DateHandler
import Spell
import GrampsDisplay
from WindowUtils import GladeIf
#-------------------------------------------------------------------------
#
# NameEditor class
@ -76,6 +78,7 @@ class NameEditor:
self.callback = callback
self.child_windows = {}
self.top = gtk.glade.XML(const.dialogFile, "name_edit","gramps")
self.gladeif = GladeIf(self.top)
self.window = self.top.get_widget("name_edit")
self.given_field = self.top.get_widget("alt_given")
self.sort_as = self.top.get_widget("sort_as")
@ -139,14 +142,12 @@ class NameEditor:
self.note_buffer = self.note_field.get_buffer()
self.top.signal_autoconnect({
"on_help_name_clicked" : self.on_help_clicked,
"on_name_edit_ok_clicked" : self.on_name_edit_ok_clicked,
"on_name_edit_cancel_clicked" : self.close,
"on_name_edit_delete_event" : self.on_delete_event,
"on_group_over_toggled" : self.on_group_over_toggled,
"on_switch_page" : self.on_switch_page
})
self.gladeif.connect('name_edit','delete_event',self.on_delete_event)
self.gladeif.connect('button119','clicked',self.close)
self.gladeif.connect('button118','clicked',self.on_name_edit_ok_clicked)
self.gladeif.connect('button131','clicked',self.on_help_clicked)
self.gladeif.connect('notebook3','switch_page',self.on_switch_page)
self.gladeif.connect('group_over','toggled',self.on_group_over_toggled)
if name != None:
self.given_field.set_text(name.get_first_name())
@ -202,11 +203,13 @@ class NameEditor:
self.group_as.set_editable(False)
def on_delete_event(self,*obj):
self.gladeif.close()
self.close_child_windows()
self.remove_itself_from_menu()
gc.collect()
def close(self,*obj):
self.gladeif.close()
self.close_child_windows()
self.remove_itself_from_menu()
self.window.destroy()

16
gramps2/src/SelectChild.py
View File

@ -52,6 +52,7 @@ import Date
import GrampsDisplay
from QuestionDialog import ErrorDialog
from WindowUtils import GladeIf
#-------------------------------------------------------------------------
#
@ -68,19 +69,18 @@ class SelectChild:
self.family = family
self.renderer = gtk.CellRendererText()
self.xml = gtk.glade.XML(const.gladeFile,"select_child","gramps")
self.gladeif = Gladeif(self.xml)
if person:
self.default_name = person.get_primary_name().get_surname().upper()
else:
self.default_name = ""
self.xml.signal_autoconnect({
"on_save_child_clicked" : self.on_save_child_clicked,
"on_child_help_clicked" : self.on_child_help_clicked,
"on_show_toggled" : self.on_show_toggled,
"destroy_passed_object" : self.close,
"on_select_child_delete_event" : self.on_delete_event,
})
self.gladeif.connect('select_child','delete_event', self.on_delete_event)
self.gladeif.connect('button49','clicked', self.close)
self.gladeif.connect('button48','clicked', self.on_save_child_clicked)
self.gladeif.connect('button163','clicked',self.on_child_help_clicked)
self.gladeif.connect('checkbutton1','toggled',self.on_show_toggled)
self.select_child_list = {}
self.top = self.xml.get_widget("select_child")
@ -143,10 +143,12 @@ class SelectChild:
tree.append_column(column)
def on_delete_event(self,obj,b):
self.gladeif.close()
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.gladeif.close()
self.remove_itself_from_menu()
self.top.destroy()
gc.collect()

16
gramps2/src/Sources.py
View File

@ -383,14 +383,14 @@ class SourceEditor:
Utils.set_titles(self.sourceDisplay,
self.showSource.get_widget('title'),
_('Source Information'))
self.gladeif = GladeIf(self.showSource)
self.gladeif.connect('sourceDisplay','delete_event', self.on_delete_event)
self.gladeif.connect('button95','clicked',self.close)
self.gladeif.connect('ok','clicked',self.on_sourceok_clicked)
self.gladeif.connect('button144','clicked', self.on_help_clicked)
self.gladeif.connect('button143','clicked',self.add_src_clicked)
self.showSource.signal_autoconnect({
"on_add_src_clicked" : self.add_src_clicked,
"on_help_srcDisplay_clicked" : self.on_help_clicked,
"on_ok_srcDisplay_clicked" : self.on_sourceok_clicked,
"on_cancel_srcDisplay_clicked" : self.close,
"on_sourceDisplay_delete_event" : self.on_delete_event,
})
self.source_field = self.get_widget("sourceList")
# setup menu
@ -445,11 +445,13 @@ class SourceEditor:
def on_delete_event(self,obj,b):
self.close_child_windows()
self.remove_itself_from_menu()
self.gladeif.close()
gc.collect()
def close(self,obj):
self.close_child_windows()
self.remove_itself_from_menu()
self.gladeif.close()
self.sourceDisplay.destroy()
gc.collect()

2
gramps2/src/TransUtils.py
View File

@ -18,6 +18,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
from gettext import gettext as _
def strip_context(msgid,sep='|'):
"""
Strip the context used for resolving translation ambiguities.

15
gramps2/src/UrlEdit.py
View File

@ -45,6 +45,7 @@ import const
import Utils
import RelLib
import GrampsDisplay
from WindowUtils import GladeIf
#-------------------------------------------------------------------------
#
@ -66,6 +67,8 @@ class UrlEditor:
self.url = url
self.callback = callback
self.top = gtk.glade.XML(const.dialogFile, "url_edit","gramps")
self.gladeif = GladeIf(self.top)
self.window = self.top.get_widget("url_edit")
self.des = self.top.get_widget("url_des")
self.addr = self.top.get_widget("url_addr")
@ -85,12 +88,10 @@ class UrlEditor:
self.addr.set_text(url.get_path())
self.priv.set_active(url.get_privacy())
self.top.signal_autoconnect({
"on_help_url_clicked" : self.on_help_clicked,
"on_ok_url_clicked" : self.on_url_edit_ok_clicked,
"on_cancel_url_clicked" : self.close,
"on_url_edit_delete_event" : self.on_delete_event,
})
self.gladeif.connect('url_edit','delete_event', self.on_delete_event)
self.gladeif.connect('button125','clicked', self.close)
self.gladeif.connect('button124','clicked', self.on_url_edit_ok_clicked)
self.gladeif.connect('button130','clicked', self.on_help_clicked)
if parent_window:
self.window.set_transient_for(parent_window)
@ -98,10 +99,12 @@ class UrlEditor:
self.window.show()
def on_delete_event(self,*obj):
self.gladeif.close()
self.remove_itself_from_menu()
gc.collect()
def close(self,*obj):
self.gladeif.close()
self.remove_itself_from_menu()
self.window.destroy()
gc.collect()

5
gramps2/src/Utils.py
View File

@ -504,13 +504,10 @@ def probably_alive(person,db,current_year=None,limit=0):
# for descendants that were born more than a lifespan ago.
min_generation = 13
max_generation = 60
max_age_difference = 60
def descendants_too_old (person, years):
for family_handle in person.get_family_handle_list():
family = db.get_family_from_handle(family_handle)
family_list = family.get_child_handle_list()
for child_handle in family.get_child_handle_list():
child = db.get_person_from_handle(child_handle)
@ -543,7 +540,7 @@ def probably_alive(person,db,current_year=None,limit=0):
try:
if descendants_too_old (person, min_generation):
return False
except RuntimeError,msg:
except RuntimeError:
raise Errors.DatabaseError(
_("Database error: %s is defined as his or her own ancestor") %
NameDisplay.displayer.display(person))

17
gramps2/src/Witness.py
View File

@ -47,6 +47,7 @@ import RelLib
import ListModel
import NameDisplay
import GrampsDisplay
from WindowUtils import GladeIf
#-------------------------------------------------------------------------
#
@ -139,14 +140,14 @@ class WitnessEditor:
self.update = update
self.ref = ref
self.show_witness = gtk.glade.XML(const.dialogFile, "witness_edit","gramps")
self.show_witness.signal_autoconnect({
"on_toggled" : self.on_toggled,
"on_witness_edit_delete_event" : self.on_delete_event,
"on_cancel_witness_clicked" : self.close,
"on_help_witness_clicked" : self.on_help_clicked,
"on_ok_witness_clicked" : self.ok_clicked,
})
self.gladeif = GladeIf(self.show_witness)
self.gladeif.connect('name_edit','delete_event',self.on_delete_event)
self.gladeif.connect('cancelbutton1','clicked',self.close)
self.gladeif.connect('ok','clicked',self.ok_clicked)
self.gladeif.connect('button132','clicked',self.on_help_clicked)
self.gladeif.connect('in_db','toggled',self.on_toggled)
self.window = self.show_witness.get_widget('witness_edit')
self.name = self.show_witness.get_widget("name")
self.private = self.show_witness.get_widget("priv")
@ -184,10 +185,12 @@ class WitnessEditor:
self.window.show()
def on_delete_event(self,obj,b):
self.gladeif.close()
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.gladeif.close()
self.remove_itself_from_menu()
self.window.destroy()
gc.collect()

83
gramps2/src/gramps.glade
View File

@ -3908,7 +3908,6 @@ Other</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<signal name="delete_event" handler="on_familyDialog_delete_event" last_modification_time="Wed, 25 Feb 2004 01:24:37 GMT"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox3">
@ -3931,7 +3930,6 @@ Other</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-6</property>
<signal name="clicked" handler="destroy_passed_object" object="familyDialog"/>
</widget>
</child>
@ -3946,7 +3944,6 @@ Other</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-5</property>
<signal name="clicked" handler="on_save_parents_clicked" object="familyDialog"/>
</widget>
</child>
@ -3960,7 +3957,6 @@ Other</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_familyDialog_clicked" last_modification_time="Tue, 18 Nov 2003 03:52:23 GMT"/>
</widget>
</child>
</widget>
@ -4124,7 +4120,6 @@ Other</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_add_parent_clicked" object="prel"/>
<child>
<widget class="GtkImage" id="image2310">
@ -4159,7 +4154,6 @@ Other</property>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">Show all</atkproperty>
</accessibility>
<signal name="toggled" handler="on_showallf_toggled" last_modification_time="Mon, 20 Jan 2003 02:45:10 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
@ -4311,7 +4305,6 @@ Other</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_showallm_toggled" last_modification_time="Mon, 20 Jan 2003 02:45:10 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
@ -4338,7 +4331,6 @@ Other</property>
<widget class="GtkComboBox" id="prel_combo">
<property name="visible">True</property>
<property name="items" translatable="yes">Married</property>
<signal name="changed" handler="on_prel_changed" last_modification_time="Fri, 30 Jul 2004 15:32:53 GMT"/>
</widget>
<packing>
<property name="left_attach">2</property>
@ -4419,7 +4411,6 @@ Other</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<signal name="delete_event" handler="on_select_child_delete_event" last_modification_time="Wed, 25 Feb 2004 03:36:55 GMT"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox15">
@ -4442,7 +4433,6 @@ Other</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="destroy_passed_object" object="selectChild"/>
</widget>
</child>
@ -4457,7 +4447,6 @@ Other</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_save_child_clicked" object="selectChild"/>
</widget>
</child>
@ -4471,7 +4460,6 @@ Other</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_child_help_clicked" last_modification_time="Tue, 18 Nov 2003 03:40:31 GMT"/>
</widget>
</child>
</widget>
@ -4574,7 +4562,6 @@ Other</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_show_toggled"/>
</widget>
<packing>
<property name="padding">0</property>
@ -11773,7 +11760,6 @@ Other</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<signal name="delete_event" handler="on_delete_event"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox6">
@ -11797,7 +11783,6 @@ Other</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="destroy_passed_object" object="marriageEditor"/>
</widget>
</child>
@ -11813,7 +11798,6 @@ Other</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_close_marriage_editor" object="marriageEditor"/>
</widget>
</child>
@ -11827,7 +11811,6 @@ Other</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_marriage_editor" last_modification_time="Tue, 18 Nov 2003 03:53:36 GMT"/>
</widget>
</child>
</widget>
@ -11876,7 +11859,6 @@ Other</property>
<property name="tab_pos">GTK_POS_TOP</property>
<property name="scrollable">False</property>
<property name="enable_popup">False</property>
<signal name="switch_page" handler="on_switch_page" last_modification_time="Wed, 12 Nov 2003 18:22:42 GMT"/>
<child>
<widget class="GtkHBox" id="hbox16">
@ -12533,7 +12515,6 @@ Other</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_marriageAddBtn_clicked" object="marriageEventList"/>
<child>
<widget class="GtkImage" id="image2296">
@ -12560,7 +12541,6 @@ Other</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_event_update_clicked" last_modification_time="Thu, 08 May 2003 17:11:05 GMT"/>
<child>
<widget class="GtkImage" id="image2297">
@ -12587,7 +12567,6 @@ Other</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_marriageDeleteBtn_clicked" object="marriageEventList"/>
<child>
<widget class="GtkImage" id="image2298">
@ -12958,7 +12937,6 @@ Other</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_add_attr_clicked" object="attr_list"/>
<child>
<widget class="GtkImage" id="image2299">
@ -12985,7 +12963,6 @@ Other</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_attr_update_clicked" last_modification_time="Thu, 08 May 2003 17:12:07 GMT"/>
<child>
<widget class="GtkImage" id="image2300">
@ -13012,7 +12989,6 @@ Other</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_delete_attr_clicked" object="attr_list"/>
<child>
<widget class="GtkImage" id="image2301">
@ -13431,7 +13407,6 @@ Other</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_addphoto_clicked" object="marriageEditor"/>
<child>
<widget class="GtkImage" id="image2305">
@ -13459,7 +13434,6 @@ Other</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_selectphoto_clicked" object="marriageEditor" last_modification_time="Fri, 12 Dec 2003 04:57:01 GMT"/>
<child>
<widget class="GtkImage" id="image2306">
@ -13487,7 +13461,6 @@ Other</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_edit_photo_clicked" last_modification_time="Thu, 08 May 2003 17:13:52 GMT"/>
<child>
<widget class="GtkImage" id="image2307">
@ -13514,7 +13487,6 @@ Other</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_deletephoto_clicked" object="marriageEditor"/>
<child>
<widget class="GtkImage" id="image2308">
@ -13687,7 +13659,6 @@ Other</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_lds_src_clicked"/>
</widget>
<packing>
<property name="left_attach">3</property>
@ -13707,7 +13678,6 @@ Other</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_lds_note_clicked"/>
</widget>
<packing>
<property name="left_attach">3</property>
@ -17820,7 +17790,6 @@ Text Beside Icons</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<signal name="delete_event" handler="on_sourceDisplay_delete_event" last_modification_time="Thu, 19 Feb 2004 23:20:28 GMT"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox27">
@ -17843,7 +17812,6 @@ Text Beside Icons</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-6</property>
<signal name="clicked" handler="on_cancel_srcDisplay_clicked" last_modification_time="Thu, 19 Feb 2004 23:19:53 GMT"/>
</widget>
</child>
@ -17858,7 +17826,6 @@ Text Beside Icons</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-5</property>
<signal name="clicked" handler="on_ok_srcDisplay_clicked" last_modification_time="Thu, 19 Feb 2004 23:20:09 GMT"/>
</widget>
</child>
@ -17872,7 +17839,6 @@ Text Beside Icons</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_srcDisplay_clicked" last_modification_time="Wed, 19 Nov 2003 04:19:32 GMT"/>
</widget>
</child>
</widget>
@ -20984,7 +20950,6 @@ Very High</property>
<property name="local_only">True</property>
<property name="select_multiple">False</property>
<property name="show_hidden">False</property>
<signal name="update_preview" handler="on_fname_update_preview" last_modification_time="Thu, 06 May 2004 03:53:53 GMT"/>
</widget>
<packing>
<property name="left_attach">0</property>
@ -21161,7 +21126,6 @@ Very High</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<signal name="delete_event" handler="on_local_delete_event" last_modification_time="Fri, 20 Feb 2004 03:22:20 GMT"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox10">
@ -21184,7 +21148,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-6</property>
<signal name="clicked" handler="on_cancel_clicked" object="change_description"/>
</widget>
</child>
@ -21199,7 +21162,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-5</property>
<signal name="clicked" handler="on_ok_clicked" object="change_description"/>
</widget>
</child>
@ -21213,7 +21175,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_clicked" last_modification_time="Tue, 16 Dec 2003 00:18:57 GMT"/>
</widget>
</child>
</widget>
@ -21530,7 +21491,6 @@ Very High</property>
<property name="tab_pos">GTK_POS_TOP</property>
<property name="scrollable">False</property>
<property name="enable_popup">False</property>
<signal name="switch_page" handler="on_notebook_switch_page" last_modification_time="Tue, 16 Dec 2003 00:18:17 GMT"/>
<child>
<widget class="GtkTable" id="table50">
@ -22215,7 +22175,6 @@ Very High</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_add_attr_clicked" object="attr_list"/>
<child>
<widget class="GtkImage" id="image2331">
@ -22242,7 +22201,6 @@ Very High</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_update_attr_clicked" last_modification_time="Sat, 01 Mar 2003 22:46:32 GMT"/>
<child>
<widget class="GtkImage" id="image2332">
@ -22269,7 +22227,6 @@ Very High</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_delete_attr_clicked" object="attr_list"/>
<child>
<widget class="GtkImage" id="image2333">
@ -22558,7 +22515,6 @@ Very High</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<signal name="delete_event" handler="on_global_delete_event" last_modification_time="Thu, 03 Jun 2004 05:16:21 GMT"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox25">
@ -22581,7 +22537,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_cancel_clicked" object="change_global"/>
</widget>
</child>
@ -22596,7 +22551,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">0</property>
<signal name="clicked" handler="on_ok_clicked" object="change_global"/>
</widget>
</child>
@ -22610,7 +22564,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_clicked" last_modification_time="Tue, 02 Dec 2003 03:38:43 GMT"/>
</widget>
</child>
</widget>
@ -22829,7 +22782,6 @@ Very High</property>
<property name="tab_pos">GTK_POS_TOP</property>
<property name="scrollable">False</property>
<property name="enable_popup">False</property>
<signal name="switch_page" handler="on_notebook_switch_page"/>
<child>
<widget class="GtkVBox" id="vbox27">
@ -23242,7 +23194,6 @@ Very High</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_add_attr_clicked" object="attr_list"/>
<child>
<widget class="GtkImage" id="image2337">
@ -23269,7 +23220,6 @@ Very High</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_update_attr_clicked" last_modification_time="Sat, 01 Mar 2003 23:08:06 GMT"/>
<child>
<widget class="GtkImage" id="image2338">
@ -23297,7 +23247,6 @@ Very High</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_delete_attr_clicked" object="attr_list"/>
<child>
<widget class="GtkImage" id="image2339">
@ -24968,7 +24917,6 @@ Very High</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<signal name="delete_event" handler="on_event_edit_delete_event" last_modification_time="Fri, 20 Feb 2004 02:26:11 GMT"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
@ -24994,7 +24942,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-6</property>
<signal name="clicked" handler="on_cancel_event_clicked" last_modification_time="Fri, 20 Feb 2004 02:27:16 GMT"/>
</widget>
</child>
@ -25009,7 +24956,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-5</property>
<signal name="clicked" handler="on_ok_event_clicked" last_modification_time="Fri, 20 Feb 2004 02:27:29 GMT"/>
</widget>
</child>
@ -25023,7 +24969,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_event_clicked" last_modification_time="Tue, 18 Nov 2003 04:02:48 GMT"/>
</widget>
</child>
</widget>
@ -25071,7 +25016,6 @@ Very High</property>
<property name="tab_pos">GTK_POS_TOP</property>
<property name="scrollable">False</property>
<property name="enable_popup">False</property>
<signal name="switch_page" handler="on_switch_page" last_modification_time="Wed, 12 Nov 2003 17:45:51 GMT"/>
<child>
<widget class="GtkTable" id="table21">
@ -25960,7 +25904,6 @@ Very High</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_addphoto_clicked" object="sourceEditor"/>
<child>
<widget class="GtkImage" id="image2349">
@ -25988,7 +25931,6 @@ Very High</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_selectphoto_clicked" object="sourceEditor" last_modification_time="Fri, 12 Dec 2003 05:21:39 GMT"/>
<child>
<widget class="GtkImage" id="image2350">
@ -26016,7 +25958,6 @@ Very High</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_editphoto_clicked" object="sourceEditor" last_modification_time="Fri, 06 Feb 2004 20:06:09 GMT"/>
<child>
<widget class="GtkImage" id="image2351">
@ -26043,7 +25984,6 @@ Very High</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<signal name="clicked" handler="on_deletephoto_clicked" object="sourceEditor"/>
<child>
<widget class="GtkImage" id="image2352">
@ -26149,7 +26089,6 @@ Very High</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<signal name="delete_event" handler="on_attr_edit_delete_event" last_modification_time="Fri, 20 Feb 2004 01:07:01 GMT"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox30">
@ -26172,7 +26111,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-6</property>
<signal name="clicked" handler="on_cancel_attr_clicked" last_modification_time="Fri, 20 Feb 2004 01:07:39 GMT"/>
</widget>
</child>
@ -26187,7 +26125,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-5</property>
<signal name="clicked" handler="on_ok_attr_clicked" last_modification_time="Fri, 20 Feb 2004 01:07:57 GMT"/>
</widget>
</child>
@ -26201,7 +26138,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_attr_clicked" last_modification_time="Tue, 18 Nov 2003 04:03:19 GMT"/>
</widget>
</child>
</widget>
@ -26761,7 +26697,6 @@ Very High</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<signal name="delete_event" handler="on_loc_delete_event" last_modification_time="Thu, 26 Feb 2004 03:27:11 GMT"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox32">
@ -26784,7 +26719,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-6</property>
<signal name="clicked" handler="on_cancel_loc_clicked" last_modification_time="Thu, 26 Feb 2004 03:27:35 GMT"/>
</widget>
</child>
@ -26799,7 +26733,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-5</property>
<signal name="clicked" handler="on_ok_loc_clicked" last_modification_time="Thu, 26 Feb 2004 03:27:51 GMT"/>
</widget>
</child>
@ -26813,7 +26746,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_loc_clicked" last_modification_time="Tue, 18 Nov 2003 04:04:09 GMT"/>
</widget>
</child>
</widget>
@ -28124,7 +28056,6 @@ Very High</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<signal name="delete_event" handler="on_url_edit_delete_event" last_modification_time="Fri, 20 Feb 2004 01:28:44 GMT"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox36">
@ -28147,7 +28078,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-6</property>
<signal name="clicked" handler="on_cancel_url_clicked" last_modification_time="Fri, 20 Feb 2004 01:29:27 GMT"/>
</widget>
</child>
@ -28163,7 +28093,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-5</property>
<signal name="clicked" handler="on_ok_url_clicked" last_modification_time="Fri, 20 Feb 2004 01:29:41 GMT"/>
</widget>
</child>
@ -28177,7 +28106,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_url_clicked" last_modification_time="Tue, 18 Nov 2003 04:05:22 GMT"/>
</widget>
</child>
</widget>
@ -28393,7 +28321,6 @@ Very High</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">True</property>
<signal name="delete_event" handler="on_name_edit_delete_event" last_modification_time="Thu, 19 Feb 2004 18:07:08 GMT"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox32">
@ -28417,7 +28344,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-6</property>
<signal name="clicked" handler="on_name_edit_cancel_clicked" last_modification_time="Thu, 19 Feb 2004 18:07:59 GMT"/>
</widget>
</child>
@ -28433,7 +28359,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-5</property>
<signal name="clicked" handler="on_name_edit_ok_clicked" object="name_edit"/>
</widget>
</child>
@ -28447,7 +28372,6 @@ Very High</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_name_clicked" last_modification_time="Tue, 18 Nov 2003 04:05:50 GMT"/>
</widget>
</child>
</widget>
@ -28495,7 +28419,6 @@ Very High</property>
<property name="tab_pos">GTK_POS_TOP</property>
<property name="scrollable">False</property>
<property name="enable_popup">False</property>
<signal name="switch_page" handler="on_switch_page" last_modification_time="Wed, 12 Nov 2003 18:00:13 GMT"/>
<child>
<widget class="GtkTable" id="table23">
@ -29124,7 +29047,6 @@ Given name</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_group_over_toggled" last_modification_time="Tue, 28 Sep 2004 20:16:42 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
@ -29556,7 +29478,6 @@ Given name
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<signal name="delete_event" handler="on_witness_edit_delete_event" last_modification_time="Sat, 21 Feb 2004 04:10:13 GMT"/>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox2">
@ -29579,7 +29500,6 @@ Given name
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-6</property>
<signal name="clicked" handler="on_cancel_witness_clicked" last_modification_time="Sat, 21 Feb 2004 04:10:38 GMT"/>
</widget>
</child>
@ -29593,7 +29513,6 @@ Given name
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-5</property>
<signal name="clicked" handler="on_ok_witness_clicked" last_modification_time="Sat, 21 Feb 2004 04:11:00 GMT"/>
</widget>
</child>
@ -29607,7 +29526,6 @@ Given name
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">-11</property>
<signal name="clicked" handler="on_help_witness_clicked" last_modification_time="Tue, 18 Nov 2003 04:06:19 GMT"/>
</widget>
</child>
</widget>
@ -29746,7 +29664,6 @@ Given name
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_toggled" last_modification_time="Thu, 20 Feb 2003 03:30:27 GMT"/>
</widget>
<packing>
<property name="left_attach">1</property>