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

Source Reference fixes

Browse Source 
svn: r1117
This commit is contained in:
Don Allingham 2002-08-07 04:12:13 +00:00
parent 6c4b57ae1b
commit 099fabc4c0
7 changed files with 356 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

248
gramps/src/EditPerson.py
View File

@ -280,9 +280,9 @@ class EditPerson:
self.get_widget("user_colon").hide() self.get_widget("user_colon").hide()
self.get_widget("user_data").hide() self.get_widget("user_data").hide()
self.lds_baptism = self.person.getLdsBaptism() self.lds_baptism = LdsOrd(self.person.getLdsBaptism())
self.lds_endowment = self.person.getLdsEndowment() self.lds_endowment = LdsOrd(self.person.getLdsEndowment())
self.lds_sealing = self.person.getLdsSeal() self.lds_sealing = LdsOrd(self.person.getLdsSeal())
if GrampsCfg.uselds or self.lds_baptism or self.lds_endowment or self.lds_sealing: if GrampsCfg.uselds or self.lds_baptism or self.lds_endowment or self.lds_sealing:
self.get_widget("lds_tab").show() self.get_widget("lds_tab").show()
@ -382,23 +382,22 @@ class EditPerson:
self.ldssealplace = self.get_widget("lds_seal_place") self.ldssealplace = self.get_widget("lds_seal_place")
self.ldsendowplace = self.get_widget("lds_end_place") self.ldsendowplace = self.get_widget("lds_end_place")
self.bstat = self.lds_field(self.person.getLdsBaptism(), self.bstat = self.lds_field(self.lds_baptism,
self.ldsbap_temple, self.ldsbap_temple,
self.ldsbap_date, self.ldsbap_date,
self.ldsbapplace) self.ldsbapplace)
self.estat = self.lds_field(self.person.getLdsEndowment(), self.estat = self.lds_field(self.lds_endowment,
self.ldsend_temple, self.ldsend_temple,
self.ldsend_date, self.ldsend_date,
self.ldsendowplace) self.ldsendowplace)
ord = self.person.getLdsSeal() self.seal_stat = self.lds_field(self.lds_sealing,
self.seal_stat = self.lds_field(self.person.getLdsSeal(),
self.ldsseal_temple, self.ldsseal_temple,
self.ldsseal_date, self.ldsseal_date,
self.ldssealplace) self.ldssealplace)
if ord: if self.lds_sealing:
self.ldsfam = ord.getFamily() self.ldsfam = self.lds_sealing.getFamily()
else: else:
self.ldsfam = None self.ldsfam = None
@ -834,75 +833,43 @@ class EditPerson:
if text != self.person.getNote() or self.lists_changed: if text != self.person.getNote() or self.lists_changed:
changed = 1 changed = 1
if self.lds_not_loaded == 0:
if not self.lds_baptism.are_equal(self.person.getLdsBaptism()):
changed= 1
if not self.lds_endowment.are_equal(self.person.getLdsEndowment()):
changed = 1
if not self.lds_sealing.are_equal(self.person.getLdsSeal()):
changed = 1
return changed return changed
def check_lds(self): def check_lds(self):
date = self.ldsbap_date.get_text() self.lds_baptism.setDate(self.ldsbap_date.get_text())
temple = self.ldsbap_temple.entry.get_text() temple = self.ldsbap_temple.entry.get_text()
place = self.get_place(self.ldsbapplace)
if const.lds_temple_codes.has_key(temple): if const.lds_temple_codes.has_key(temple):
temple = const.lds_temple_codes[temple] self.lds_baptism.setTemple(const.lds_temple_codes[temple])
else: else:
temple = "" self.lds_baptism.setTemple("")
ord = self.person.getLdsBaptism() self.lds_baptism.setPlace(self.get_place(self.ldsbapplace,1))
if not ord: self.lds_endowment.setDate(self.ldsend_date.get_text())
if date or temple or place or self.bstat:
return 1
else:
d = Date()
d.set(date)
if compare_dates(d,ord.getDateObj()) != 0 or \
ord.getPlace() != place or \
ord.getStatus() != self.bstat or \
ord.getTemple() != temple:
return 1
date = self.ldsend_date.get_text()
temple = self.ldsend_temple.entry.get_text() temple = self.ldsend_temple.entry.get_text()
place = self.get_place(self.ldsendowplace)
if const.lds_temple_codes.has_key(temple): if const.lds_temple_codes.has_key(temple):
temple = const.lds_temple_codes[temple] self.lds_endowment.setTemple(const.lds_temple_codes[temple])
else: else:
temple = "" self.lds_endowment.setTemple("")
ord = self.person.getLdsEndowment() self.lds_endowment.setPlace(self.get_place(self.ldsendowplace,1))
if not ord: self.lds_sealing.setDate(self.ldsseal_date.get_text())
if date or temple or place or self.estat:
return 1
else:
d = Date()
d.set(date)
if compare_dates(d,ord.getDateObj()) != 0 or \
ord.getPlace() != place or \
ord.getStatus() != self.estat or \
ord.getTemple() != temple:
return 1
date = self.ldsseal_date.get_text()
temple = self.ldsseal_temple.entry.get_text() temple = self.ldsseal_temple.entry.get_text()
place = self.get_place(self.ldssealplace)
if const.lds_temple_codes.has_key(temple): if const.lds_temple_codes.has_key(temple):
temple = const.lds_temple_codes[temple] self.lds_sealing.setTemple(const.lds_temple_codes[temple])
else: else:
temple = "" self.lds_sealing.setTemple("")
self.lds_sealing.setFamily(self.ldsfam)
ord = self.person.getLdsSeal() self.lds_sealing.setPlace(self.get_place(self.ldssealplace,1))
if not ord:
if date or temple or self.ldsfam or self.seal_stat:
return 1
else:
d = Date()
d.set(date)
if compare_dates(d,ord.getDateObj()) != 0 or \
ord.getPlace() != place or \
ord.getTemple() != temple or \
ord.getStatus() != self.seal_stat or \
ord.getFamily() != self.ldsfam:
return 1
return 0
def on_event_delete_clicked(self,obj): def on_event_delete_clicked(self,obj):
"""Delete the selected event""" """Delete the selected event"""
@ -1170,6 +1137,8 @@ class EditPerson:
if title != name.getTitle(): if title != name.getTitle():
name.setTitle(title) name.setTitle(title)
name.setSourceRefList(self.pname.getSourceRefList())
if not name.are_equal(self.person.getPrimaryName()): if not name.are_equal(self.person.getPrimaryName()):
self.person.setPrimaryName(name) self.person.setPrimaryName(name)
Utils.modified() Utils.modified()
@ -1258,63 +1227,21 @@ class EditPerson:
Utils.modified() Utils.modified()
if self.lds_not_loaded == 0: if self.lds_not_loaded == 0:
date = self.ldsbap_date.get_text() self.check_lds()
temple = self.ldsbap_temple.entry.get_text() ord = LdsOrd(self.person.getLdsBaptism())
if const.lds_temple_codes.has_key(temple): if not self.lds_baptism.are_equal(ord):
temple = const.lds_temple_codes[temple] self.person.setLdsBaptism(self.lds_baptism)
else: Utils.modified()
temple = ""
ord = self.person.getLdsBaptism()
place = self.get_place(self.ldsbapplace,1)
update_ord(self.person.setLdsBaptism,ord,date,
temple,self.bstat,place)
date = self.ldsend_date.get_text() ord = LdsOrd(self.person.getLdsEndowment())
temple = self.ldsend_temple.entry.get_text() if not self.lds_endowment.are_equal(ord):
if const.lds_temple_codes.has_key(temple): self.person.setLdsEndowment(self.lds_endowment)
temple = const.lds_temple_codes[temple] Utils.modified()
else:
temple = ""
ord = self.person.getLdsEndowment()
place = self.get_place(self.ldsendowplace,1)
update_ord(self.person.setLdsEndowment,ord,date,
temple,self.estat,place)
date = self.ldsseal_date.get_text() ord = LdsOrd(self.person.getLdsSeal())
temple = self.ldsseal_temple.entry.get_text() if not self.lds_sealing.are_equal(ord):
if const.lds_temple_codes.has_key(temple): self.person.setLdsSeal(self.lds_sealing)
temple = const.lds_temple_codes[temple] Utils.modified()
else:
temple = ""
ord = self.person.getLdsSeal()
place = self.get_place(self.ldssealplace,1)
if not ord:
if self.ldsfam or date or temple:
ord = LdsOrd()
ord.setDate(date)
ord.setTemple(temple)
ord.setFamily(self.ldsfam)
ord.setPlace(place)
self.person.setLdsSeal(ord)
Utils.modified()
else:
d = Date()
d.set(date)
if compare_dates(d,ord.getDateObj()) != 0:
ord.setDateObj(d)
Utils.modified()
if ord.getPlace() != place:
ord.setPlace(place)
Utils.modified()
if ord.getTemple() != temple:
ord.setTemple(temple)
Utils.modified()
if ord.getStatus() != self.seal_stat:
ord.setStatus(self.seal_stat)
Utils.modified()
if ord.getFamily() != self.ldsfam:
ord.setFamily(self.ldsfam)
Utils.modified()
self.update_lists() self.update_lists()
if self.callback: if self.callback:
@ -1341,7 +1268,11 @@ class EditPerson:
def on_primary_name_source_clicked(self,obj): def on_primary_name_source_clicked(self,obj):
import Sources import Sources
Sources.SourceSelector(self.pname.getSourceRefList(),self) Sources.SourceSelector(self.pname.getSourceRefList(),self,self.update_primary_name)
def update_primary_name(self,list):
self.pname.setSourceRefList(list)
self.lists_changed = 1
def on_name_note_clicked(self,obj): def on_name_note_clicked(self,obj):
import NoteEdit import NoteEdit
@ -1349,51 +1280,40 @@ class EditPerson:
def on_ldsbap_source_clicked(self,obj): def on_ldsbap_source_clicked(self,obj):
import Sources import Sources
ord = self.person.getLdsBaptism() Sources.SourceSelector(self.lds_baptism.getSourceRefList(),self,self.update_ldsbap_list)
if ord == None:
ord = LdsOrd() def update_ldsbap_list(self,list):
self.person.setLdsBaptism(ord) self.lds_baptism.setSourceRefList(list)
Sources.SourceSelector(self.pname.getSourceRefList(),self) self.lists_changed = 1
def on_ldsbap_note_clicked(self,obj): def on_ldsbap_note_clicked(self,obj):
import NoteEdit import NoteEdit
ord = self.person.getLdsBaptism() NoteEdit.NoteEditor(self.lds_baptism)
if ord == None:
ord = LdsOrd()
self.person.setLdsBaptism(ord)
NoteEdit.NoteEditor(ord)
def on_ldsendow_source_clicked(self,obj): def on_ldsendow_source_clicked(self,obj):
import Sources import Sources
ord = self.person.getLdsEndowment() Sources.SourceSelector(self.lds_endowment.getSourceRefList(),self,self.set_ldsendow_list)
if ord == None:
ord = LdsOrd() def set_ldsendow_list(self,list):
self.person.setLdsEndowment(ord) self.lds_endowment.setSourceRefList(list)
Sources.SourceSelector(self.pname.getSourceRefList(),self) self.lists_changed = 1
def on_ldsendow_note_clicked(self,obj): def on_ldsendow_note_clicked(self,obj):
import NoteEdit import NoteEdit
ord = self.person.getLdsEndowment() NoteEdit.NoteEditor(self.lds_endowment)
if ord == None:
ord = LdsOrd()
self.person.setLdsEndowment(ord)
NoteEdit.NoteEditor(ord)
def on_ldsseal_source_clicked(self,obj): def on_ldsseal_source_clicked(self,obj):
import Sources import Sources
ord = self.person.getLdsSeal() ord = self.person.getLdsSeal()
if ord == None: Sources.SourceSelector(self.lds_sealing.getSourceRefList(),self,self.lds_seal_list)
ord = LdsOrd()
self.person.setLdsSeal(ord) def lds_seal_list(self,list):
Sources.SourceSelector(self.pname.getSourceRefList(),self) self.lds_sealing.setSourceRefList(list)
self.lists_changed = 1
def on_ldsseal_note_clicked(self,obj): def on_ldsseal_note_clicked(self,obj):
import NoteEdit import NoteEdit
ord = self.person.getLdsSeal() NoteEdit.NoteEditor(self.lds_sealing)
if ord == None:
ord = LdsOrd()
self.person.setLdsSeal(ord)
NoteEdit.NoteEditor(ord)
def load_person_image(self): def load_person_image(self):
photo_list = self.person.getPhotoList() photo_list = self.person.getPhotoList()
@ -1454,36 +1374,6 @@ class EditPerson:
self.ntype_field.entry.set_text(_(self.pname.getType())) self.ntype_field.entry.set_text(_(self.pname.getType()))
self.title.set_text(self.pname.getTitle()) self.title.set_text(self.pname.getTitle())
#-------------------------------------------------------------------------
#
# update_ord
#
#-------------------------------------------------------------------------
def update_ord(func,ord,date,temple,stat,place):
if not ord:
if (date or temple or place):
ord = LdsOrd()
ord.setDate(date)
ord.setTemple(temple)
ord.setPlace(place)
func(ord)
Utils.modified()
else:
d = Date()
d.set(date)
if compare_dates(d,ord.getDateObj()) != 0:
ord.setDateObj(d)
Utils.modified()
elif ord.getTemple() != temple:
ord.setTemple(temple)
Utils.modified()
elif ord.getPlace() != place:
ord.setPlace(place)
Utils.modified()
elif ord.getStatus() != stat:
ord.setStatus(stat)
Utils.modified()
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# disp_name # disp_name

17
gramps/src/EditPlace.py
View File

@ -63,11 +63,12 @@ pycode_tgts = [('url', 0, 0)]
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class EditPlace: class EditPlace:
def __init__(self,place,db,func=None): def __init__(self,parent,place,func=None):
self.place = place self.place = place
self.db = db self.db = parent.db
self.parent = parent
self.callback = func self.callback = func
self.path = db.getSavePath() self.path = parent.db.getSavePath()
self.not_loaded = 1 self.not_loaded = 1
self.ref_not_loaded = 1 self.ref_not_loaded = 1
self.lists_changed = 0 self.lists_changed = 0
@ -78,7 +79,7 @@ class EditPlace:
self.top_window = libglade.GladeXML(const.placesFile,"placeEditor") self.top_window = libglade.GladeXML(const.placesFile,"placeEditor")
plwidget = self.top_window.get_widget("photolist") plwidget = self.top_window.get_widget("photolist")
self.glry = ImageSelect.Gallery(place, self.path, plwidget, db, self) self.glry = ImageSelect.Gallery(place, self.path, plwidget, self.db, self)
self.title = self.top_window.get_widget("place_title") self.title = self.top_window.get_widget("place_title")
self.city = self.top_window.get_widget("city") self.city = self.top_window.get_widget("city")
self.parish = self.top_window.get_widget("parish") self.parish = self.top_window.get_widget("parish")
@ -101,7 +102,6 @@ class EditPlace:
self.loc_parish = self.top_window.get_widget("loc_parish") self.loc_parish = self.top_window.get_widget("loc_parish")
self.loc_country = self.top_window.get_widget("loc_country") self.loc_country = self.top_window.get_widget("loc_country")
self.lists_changed = 0
self.ulist = place.getUrlList()[:] self.ulist = place.getUrlList()[:]
self.llist = place.get_alternate_locations()[:] self.llist = place.get_alternate_locations()[:]
@ -115,6 +115,7 @@ class EditPlace:
self.longitude.set_text(place.get_longitude()) self.longitude.set_text(place.get_longitude())
self.latitude.set_text(place.get_latitude()) self.latitude.set_text(place.get_latitude())
self.refinfo = self.top_window.get_widget("refinfo") self.refinfo = self.top_window.get_widget("refinfo")
self.slist = self.top_window.get_widget("slist")
self.note.set_point(0) self.note.set_point(0)
self.note.insert_defaults(place.getNote()) self.note.insert_defaults(place.getNote())
@ -122,7 +123,6 @@ class EditPlace:
self.top_window.signal_autoconnect({ self.top_window.signal_autoconnect({
"destroy_passed_object" : Utils.destroy_passed_object, "destroy_passed_object" : Utils.destroy_passed_object,
"on_source_clicked" : self.on_source_clicked,
"on_photolist_select_icon" : self.glry.on_photo_select_icon, "on_photolist_select_icon" : self.glry.on_photo_select_icon,
"on_photolist_button_press" : self.glry.on_button_press_event, "on_photolist_button_press" : self.glry.on_button_press_event,
"on_switch_page" : self.on_switch_page, "on_switch_page" : self.on_switch_page,
@ -153,6 +153,8 @@ class EditPlace:
self.top.editable_enters(self.longitude); self.top.editable_enters(self.longitude);
self.top.editable_enters(self.latitude); self.top.editable_enters(self.latitude);
self.sourcetab = Sources.SourceTab(self.srcreflist,self,self.top_window,self.slist)
if self.place.getId() == "": if self.place.getId() == "":
self.top_window.get_widget("add_photo").set_sensitive(0) self.top_window.get_widget("add_photo").set_sensitive(0)
self.top_window.get_widget("delete_photo").set_sensitive(0) self.top_window.get_widget("delete_photo").set_sensitive(0)
@ -297,9 +299,6 @@ class EditPlace:
import LocEdit import LocEdit
LocEdit.LocationEditor(self,None) LocEdit.LocationEditor(self,None)
def on_source_clicked(self,obj):
Sources.SourceSelector(self.srcreflist,self)
def on_web_list_select_row(self,obj,row,b,c): def on_web_list_select_row(self,obj,row,b,c):
url = obj.get_row_data(row) url = obj.get_row_data(row)
if url == None: if url == None:

2
gramps/src/EventEdit.py
View File

@ -222,5 +222,3 @@ class EventEditor:
if self.event.getPrivacy() != priv: if self.event.getPrivacy() != priv:
self.event.setPrivacy(priv) self.event.setPrivacy(priv)
self.parent.lists_changed = 1 self.parent.lists_changed = 1

12
gramps/src/ImageSelect.py
View File

@ -34,7 +34,6 @@ import string
import GDK import GDK
import GTK import GTK
import gtk import gtk
import GdkImlib
import gnome.ui import gnome.ui
import libglade import libglade
@ -340,7 +339,7 @@ class Gallery(ImageSelect):
self.add_thumbnail(oref) self.add_thumbnail(oref)
self.parent.lists_changed = 1 self.parent.lists_changed = 1
if GrampsCfg.globalprop: if GrampsCfg.globalprop:
LocalMediaProperties(oref,self.path) LocalMediaProperties(oref,self.path,self)
Utils.modified() Utils.modified()
w.drag_finish(context, 1, 0, time) w.drag_finish(context, 1, 0, time)
else: else:
@ -428,7 +427,7 @@ class Gallery(ImageSelect):
of a picture.""" of a picture."""
if self.selectedIcon >=0: if self.selectedIcon >=0:
photo = self.dataobj.getPhotoList()[self.selectedIcon] photo = self.dataobj.getPhotoList()[self.selectedIcon]
LocalMediaProperties(photo,self.path) LocalMediaProperties(photo,self.path,self)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -437,11 +436,12 @@ class Gallery(ImageSelect):
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class LocalMediaProperties: class LocalMediaProperties:
def __init__(self,photo,path): def __init__(self,photo,path,parent):
self.photo = photo self.photo = photo
self.object = photo.getReference() self.object = photo.getReference()
self.alist = photo.getAttributeList()[:] self.alist = photo.getAttributeList()[:]
self.lists_changed = 0 self.lists_changed = 0
self.parent = parent
fname = self.object.getPath() fname = self.object.getPath()
self.change_dialog = libglade.GladeXML(const.imageselFile, self.change_dialog = libglade.GladeXML(const.imageselFile,
@ -682,11 +682,9 @@ class GlobalMediaProperties:
if text != note or desc != self.object.getDescription(): if text != note or desc != self.object.getDescription():
self.object.setNote(text) self.object.setNote(text)
self.object.setDescription(desc) self.object.setDescription(desc)
self.parent.lists_changed = 1
Utils.modified() Utils.modified()
if self.lists_changed: if self.lists_changed:
self.object.setAttributeList(self.alist) self.object.setAttributeList(self.alist)
self.parent.lists_changed = 1
Utils.modified() Utils.modified()
if self.update != None: if self.update != None:
self.update() self.update()
@ -742,7 +740,7 @@ class DeleteMediaQuery:
Utils.modified() Utils.modified()
for key in self.db.getPersonKeys(): for key in self.db.getPersonKeys():
key = self.db.getPerson(key) p = self.db.getPerson(key)
nl = [] nl = []
change = 0 change = 0
for photo in p.getPhotoList(): for photo in p.getPhotoList():

6
gramps/src/PlaceView.py
View File

@ -135,7 +135,7 @@ class PlaceView:
def on_button_press_event(self,obj,event): def on_button_press_event(self,obj,event):
if event.button == 1 and event.type == GDK._2BUTTON_PRESS: if event.button == 1 and event.type == GDK._2BUTTON_PRESS:
if self.active: if self.active:
EditPlace.EditPlace(self.active,self.db, EditPlace.EditPlace(self,self.active,
self.update_display_after_edit) self.update_display_after_edit)
def insert_place(self,place): def insert_place(self,place):
@ -164,7 +164,7 @@ class PlaceView:
self.place_list.thaw() self.place_list.thaw()
def on_add_place_clicked(self,obj): def on_add_place_clicked(self,obj):
EditPlace.EditPlace(Place(),self.db,self.new_place_after_edit) EditPlace.EditPlace(self,Place(),self.new_place_after_edit)
def moveto(self,row): def moveto(self,row):
self.place_list.unselect_all() self.place_list.unselect_all()
@ -223,7 +223,7 @@ class PlaceView:
else: else:
for p in obj.selection: for p in obj.selection:
place = self.db.getPlace(obj.get_row_data(p)) place = self.db.getPlace(obj.get_row_data(p))
EditPlace.EditPlace(place,self.db, EditPlace.EditPlace(self,place,
self.update_display_after_edit) self.update_display_after_edit)

33
gramps/src/Sources.py
View File

@ -84,7 +84,7 @@ class SourceSelector:
for s in self.list: for s in self.list:
self.orig.append(s) self.orig.append(s)
if self.update: if self.update:
self.update(self.parent) self.update(self.orig)
Utils.destroy_passed_object(self.sourcesel) Utils.destroy_passed_object(self.sourcesel)
def on_edit_src_clicked(self,obj): def on_edit_src_clicked(self,obj):
@ -92,11 +92,14 @@ class SourceSelector:
if len(sel) > 0: if len(sel) > 0:
row = sel[0] row = sel[0]
src = obj.get_row_data(row) src = obj.get_row_data(row)
SourceEditor(src,self.db,update_clist,self) SourceEditor(src,self.db,self.update_clist,self)
def update_clist(self,inst,ref):
inst.redraw()
def on_add_src_clicked(self,obj): def on_add_src_clicked(self,obj):
src = SourceRef() src = SourceRef()
SourceEditor(src,self.db,add_ref,self) SourceEditor(src,self.db,self.add_ref,self)
def on_del_src_clicked(self,obj): def on_del_src_clicked(self,obj):
sel = obj.selection sel = obj.selection
@ -105,6 +108,11 @@ class SourceSelector:
del self.list[row] del self.list[row]
self.redraw() self.redraw()
def add_ref(self,inst,ref):
self.parent.lists_changed = 1
inst.list.append(ref)
inst.redraw()
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# SourceTab # SourceTab
@ -140,16 +148,25 @@ class SourceTab:
index = index + 1 index = index + 1
self.slist.thaw() self.slist.thaw()
def update_clist(self,inst,ref):
inst.redraw()
self.parent.lists_changed = 1
def on_edit_src_clicked(self,obj): def on_edit_src_clicked(self,obj):
sel = obj.selection sel = obj.selection
if len(sel) > 0: if len(sel) > 0:
row = sel[0] row = sel[0]
src = obj.get_row_data(row) src = obj.get_row_data(row)
SourceEditor(src,self.db,update_clist,self) SourceEditor(src,self.db,self.update_clist,self)
def on_add_src_clicked(self,obj): def on_add_src_clicked(self,obj):
src = SourceRef() src = SourceRef()
SourceEditor(src,self.db,add_ref,self) SourceEditor(src,self.db,self.add_ref,self)
def add_ref(self,inst,ref):
self.parent.lists_changed = 1
inst.list.append(ref)
inst.redraw()
def on_del_src_clicked(self,obj): def on_del_src_clicked(self,obj):
sel = obj.selection sel = obj.selection
@ -290,11 +307,5 @@ class SourceEditor:
def by_title(a,b): def by_title(a,b):
return cmp(a.getTitle(),b.getTitle()) return cmp(a.getTitle(),b.getTitle())
def update_clist(inst,ref):
inst.redraw()
def add_ref(inst,ref):
inst.list.append(ref)
inst.redraw()

328
gramps/src/places.glade
View File

@ -156,7 +156,7 @@
<widget> <widget>
<class>GtkTable</class> <class>GtkTable</class>
<name>table19</name> <name>table19</name>
<rows>9</rows> <rows>8</rows>
<columns>3</columns> <columns>3</columns>
<homogeneous>False</homogeneous> <homogeneous>False</homogeneous>
<row_spacing>0</row_spacing> <row_spacing>0</row_spacing>
@ -344,56 +344,6 @@
</child> </child>
</widget> </widget>
<widget>
<class>GtkLabel</class>
<name>label251</name>
<label>Source</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>1</xalign>
<yalign>0.5</yalign>
<xpad>5</xpad>
<ypad>0</ypad>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>8</top_attach>
<bottom_attach>9</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>source_field</name>
<can_focus>True</can_focus>
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text></text>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>8</top_attach>
<bottom_attach>9</bottom_attach>
<xpad>5</xpad>
<ypad>5</ypad>
<xexpand>True</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget> <widget>
<class>GtkEntry</class> <class>GtkEntry</class>
<name>place_title</name> <name>place_title</name>
@ -563,34 +513,6 @@
</child> </child>
</widget> </widget>
<widget>
<class>GtkButton</class>
<name>button119</name>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_source_clicked</handler>
<object>placeEditor</object>
<last_modification_time>Tue, 21 Aug 2001 14:02:25 GMT</last_modification_time>
</signal>
<label>Select</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<left_attach>2</left_attach>
<right_attach>3</right_attach>
<top_attach>8</top_attach>
<bottom_attach>9</bottom_attach>
<xpad>5</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget> <widget>
<class>GtkLabel</class> <class>GtkLabel</class>
<name>label279</name> <name>label279</name>
@ -1262,6 +1184,254 @@
<ypad>0</ypad> <ypad>0</ypad>
</widget> </widget>
<widget>
<class>GtkVBox</class>
<name>vbox40</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkScrolledWindow</class>
<name>scrolledwindow32</name>
<width>400</width>
<height>150</height>
<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkCList</class>
<name>slist</name>
<can_focus>True</can_focus>
<columns>2</columns>
<column_widths>80,80</column_widths>
<selection_mode>GTK_SELECTION_SINGLE</selection_mode>
<show_titles>True</show_titles>
<shadow_type>GTK_SHADOW_IN</shadow_type>
<widget>
<class>GtkHBox</class>
<child_name>CList:title</child_name>
<name>hbox3</name>
<homogeneous>True</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkHBox</class>
<child_name>CList:title</child_name>
<name>hbox4</name>
<homogeneous>True</homogeneous>
<spacing>0</spacing>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<widget>
<class>GtkHBox</class>
<name>hbox5</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<widget>
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>label283</name>
<label>ID</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkArrow</class>
<name>arrow1</name>
<width>10</width>
<height>10</height>
<visible>False</visible>
<arrow_type>GTK_ARROW_DOWN</arrow_type>
<shadow_type>GTK_SHADOW_OUT</shadow_type>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>5</padding>
<expand>False</expand>
<fill>True</fill>
</child>
</widget>
</widget>
</widget>
</widget>
<widget>
<class>GtkHBox</class>
<child_name>CList:title</child_name>
<name>hbox6</name>
<homogeneous>True</homogeneous>
<spacing>0</spacing>
<widget>
<class>GtkHBox</class>
<child_name>CList:title</child_name>
<name>hbox7</name>
<homogeneous>True</homogeneous>
<spacing>0</spacing>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<widget>
<class>GtkHBox</class>
<name>hbox8</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
<widget>
<class>GtkLabel</class>
<child_name>CList:title</child_name>
<name>label284</name>
<label>Title</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkArrow</class>
<name>arrow2</name>
<width>10</width>
<height>10</height>
<visible>False</visible>
<arrow_type>GTK_ARROW_DOWN</arrow_type>
<shadow_type>GTK_SHADOW_OUT</shadow_type>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>5</padding>
<expand>False</expand>
<fill>True</fill>
</child>
</widget>
</widget>
</widget>
</widget>
</widget>
</widget>
<widget>
<class>GtkHButtonBox</class>
<name>hbuttonbox27</name>
<layout_style>GTK_BUTTONBOX_SPREAD</layout_style>
<spacing>30</spacing>
<child_min_width>85</child_min_width>
<child_min_height>27</child_min_height>
<child_ipad_x>7</child_ipad_x>
<child_ipad_y>0</child_ipad_y>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkButton</class>
<name>button133</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_add_src_clicked</handler>
<object>slist</object>
<last_modification_time>Sat, 06 Oct 2001 15:47:16 GMT</last_modification_time>
</signal>
<label>Add</label>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button134</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_edit_src_clicked</handler>
<object>slist</object>
<last_modification_time>Fri, 05 Oct 2001 02:49:15 GMT</last_modification_time>
</signal>
<label>Edit</label>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
<widget>
<class>GtkButton</class>
<name>button135</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<signal>
<name>clicked</name>
<handler>on_del_src_clicked</handler>
<object>slist</object>
<last_modification_time>Sat, 06 Oct 2001 15:39:54 GMT</last_modification_time>
</signal>
<label>Delete</label>
<relief>GTK_RELIEF_NORMAL</relief>
</widget>
</widget>
</widget>
<widget>
<class>GtkLabel</class>
<child_name>Notebook:tab</child_name>
<name>label282</name>
<label>Sources</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
</widget>
<widget> <widget>
<class>GtkScrolledWindow</class> <class>GtkScrolledWindow</class>
<name>scrolledwindow28</name> <name>scrolledwindow28</name>