* src/AutoComp.py: remove double display of data

* src/FamilyView.py: remove unused check
* src/GrampsBSDDB.py: search by gramps_id
* src/GrampsDbBase.py: search by gramps_id, unicode/str conversions
* src/Marriage.py: handle gramps_id editing
* src/ReadXML.py: fix handle/gramps_id on import
* src/plugins/RelCalc.py: display date instead of event handle
* src/Relationship.py: family handles working
* src/PeopleModel.py: comment out unused functions
* src/PeopleModel.py: simplify model interface
* src/AddSpouse.py: get_family_from_handle fixes
* src/EditPerson.py: get_family_from_handle fixes
* src/EditSource.py: get_family_from_handle fixes
* src/GraphLayout.py: get_family_from_handle fixes
* src/ImageSelect.py: get_family_from_handle fixes
* src/MediaView.py: get_family_from_handle fixes
* src/MergeData.py: get_family_from_handle fixes
* src/PlaceView.py: get_family_from_handle fixes
* src/ReadXML.py: get_family_from_handle fixes
* src/RelLib.py: get_family_from_handle fixes
* src/Relationship.py: get_family_from_handle fixes
* src/SelectChild.py: get_family_from_handle fixes
* src/SourceView.py: get_family_from_handle fixes
* src/SubstKeywords.py: get_family_from_handle fixes
* src/WriteXML.py: get_family_from_handle fixes
* src/gramps_main.py: get_family_from_handle fixes


svn: r3446
This commit is contained in:
Don Allingham
2004-08-20 02:20:06 +00:00
parent 9b427a6f64
commit e50e33cba6
11 changed files with 219 additions and 166 deletions

View File

@ -199,7 +199,7 @@ class Marriage:
frel = family.get_relationship()
self.type_field.set_active(frel)
self.gid.set_text(family.get_handle())
self.gid.set_text(family.get_gramps_id())
self.gid.set_editable(1)
AutoComp.fill_combo(self.lds_temple,_temple_names)
@ -556,6 +556,9 @@ class Marriage:
else:
self.close(0)
def save(self):
self.on_close_marriage_editor(None)
def on_delete_event(self,obj,b):
self.on_cancel_edit(obj)
@ -565,11 +568,9 @@ class Marriage:
idval = unicode(self.gid.get_text())
family = self.family
if idval != family.get_handle():
if not self.db.has_family_handle(idval):
if self.db.has_family_handle(family.get_handle()):
self.db.remove_family_handle(family.get_handle(),trans)
family.set_handle(idval)
if idval != family.get_gramps_id():
if not self.db.get_family_from_gramps_id(idval):
family.set_gramps_id(idval)
else:
WarningDialog(_("GRAMPS ID value was not changed."),
_('The GRAMPS ID that you chose for this '