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

* src/ChooseParents.py: disconnect signals on close, do fewer

Browse Source 
commits


svn: r5096
This commit is contained in:
Don Allingham 2005-08-17 16:53:21 +00:00
parent 63a66789a8
commit b2e194b8ec
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2005-08-17 Don Allingham <don@gramps-project.org>
* src/ChooseParents.py: disconnect signals on close, do fewer
commits
2005-08-17 Richard Taylor <rjt-gramps@thegrindstone.me.uk>
* src/plugins/ExportVCalendar.py: fixed import for localtime,
corrected type of Utils and params to Until.family_name

44
gramps2/src/ChooseParents.py
View File

@ -91,10 +91,11 @@ class ChooseParents:
self.parent_selected = 0
self.renderer = gtk.CellRendererText()
db.connect('person-add', self.person_added)
db.connect('person-update', self.redraw)
db.connect('person-delete', self.redraw)
db.connect('person-rebuild', self.redraw_all)
self.sig_keys = [
db.connect('person-add', self.person_added),
db.connect('person-update', self.redraw),
db.connect('person-delete', self.redraw),
db.connect('person-rebuild', self.redraw_all)]
# set default filters
self.all_males_filter = GenericFilter.GenericFilter()
@ -400,7 +401,7 @@ class ChooseParents:
self.mother_filter = self.likely_females_filter
self.redrawm()
def find_family(self,father_handle,mother_handle,trans):
def find_family(self,father_handle,mother_handle):
"""
Finds the family associated with the father and mother.
If one does not exist, it is created.
@ -413,30 +414,25 @@ class ChooseParents:
if (family.get_father_handle() == father_handle and
family.get_mother_handle() == mother_handle):
family.add_child_handle(self.person.get_handle())
self.db.commit_family(family,trans)
return family
elif (family.get_father_handle() == mother_handle and
family.get_mother_handle() == father_handle):
family.add_child_handle(self.person.get_handle())
self.db.commit_family(family,trans)
return family
family = RelLib.Family()
family.set_father_handle(father_handle)
family.set_mother_handle(mother_handle)
family.add_child_handle(self.person.get_handle())
self.db.add_family(family,trans)
family.set_handle(self.db.create_id())
family.set_gramps_id(self.db.find_next_family_gramps_id())
if father_handle:
self.father = self.db.get_person_from_handle(father_handle)
self.father.add_family_handle(family.get_handle())
self.db.commit_person(self.father,trans)
if mother_handle:
self.mother = self.db.get_person_from_handle(mother_handle)
self.mother.add_family_handle(family.get_handle())
self.db.commit_person(self.mother,trans)
self.db.commit_family(family,trans)
return family
def father_select_function(self,store,path,iter,id_list):
@ -514,6 +510,10 @@ class ChooseParents:
Called with the OK button is pressed. Saves the selected people
as parents of the main person.
"""
for key in self.sig_keys:
self.db.disconnect(key)
try:
mother_rel = self.mcombo.get_active()
except KeyError:
@ -563,10 +563,15 @@ class ChooseParents:
return
if father_handle or mother_handle:
self.family = self.find_family(father_handle,mother_handle,trans)
self.family = self.find_family(father_handle,mother_handle)
self.family.add_child_handle(self.person.get_handle())
self.family.set_relationship(self.type)
self.change_family_type(self.family,mother_rel,father_rel)
self.change_family_type(self.family,mother_rel,father_rel,trans)
self.db.commit_person(self.person,trans)
if self.father:
self.db.commit_person(self.father,trans)
if self.mother:
self.db.commit_person(self.mother,trans)
self.db.commit_family(self.family,trans)
else:
self.family = None
@ -629,7 +634,7 @@ class ChooseParents:
import DisplayTrace
DisplayTrace.DisplayTrace()
def change_family_type(self,family,mother_rel,father_rel):
def change_family_type(self,family,mother_rel,father_rel,trans):
"""
Changes the family type of the specified family. If the family
is None, the the relationship type shoud be deleted.
@ -650,15 +655,6 @@ class ChooseParents:
self.person.add_parent_family_handle(family_handle,
mother_rel,father_rel)
trans = self.db.transaction_begin()
self.db.commit_person(self.person,trans)
self.db.commit_family(family,trans)
if self.father:
self.db.commit_person(self.father,trans)
if self.mother:
self.db.commit_person(self.mother,trans)
self.db.transaction_commit(trans,_("Choose Parents"))
#-------------------------------------------------------------------------
#
# ModifyParents

2
gramps2/src/GrampsDbBase.py
View File

@ -281,7 +281,7 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
as part of the transaction.
"""
if self.readonly or not person or not person.get_handle():
return
return
if change_time:
person.change = int(change_time)
else: