* src/revision.glade: removed unused call (on_help_dbopen_clicked)
* src/gramps_main.py: don't add places twice after an edit of a person * src/AddSpouse.py: don't add places twice after an edit of a person * src/ChooseParents.py: don't add places twice after an edit of a person * src/EditPerson.py: don't add places twice after an edit of a person * src/FamilyView.py: don't add places twice after an edit of a person svn: r2538
This commit is contained in:
parent
67736d2f3d
commit
18b411eed3
@ -154,7 +154,7 @@ class AddSpouse:
|
|||||||
person.setGender(gen)
|
person.setGender(gen)
|
||||||
EditPerson.EditPerson(person,self.db,self.update_list)
|
EditPerson.EditPerson(person,self.db,self.update_list)
|
||||||
|
|
||||||
def update_list(self,epo,list):
|
def update_list(self,epo):
|
||||||
"""
|
"""
|
||||||
Updates the potential spouse list after a person has been added
|
Updates the potential spouse list after a person has been added
|
||||||
to database. Called by the QuickAdd class when the dialog has
|
to database. Called by the QuickAdd class when the dialog has
|
||||||
|
@ -424,7 +424,7 @@ class ChooseParents:
|
|||||||
self.change_family_type(self.family,mother_rel,father_rel)
|
self.change_family_type(self.family,mother_rel,father_rel)
|
||||||
self.family_update(None)
|
self.family_update(None)
|
||||||
|
|
||||||
def add_new_parent(self,epo,plist):
|
def add_new_parent(self,epo):
|
||||||
"""Adds a new person to either the father list or the mother list,
|
"""Adds a new person to either the father list or the mother list,
|
||||||
depending on the gender of the person."""
|
depending on the gender of the person."""
|
||||||
|
|
||||||
|
@ -1529,7 +1529,7 @@ class EditPerson:
|
|||||||
|
|
||||||
self.update_lists()
|
self.update_lists()
|
||||||
if self.callback:
|
if self.callback:
|
||||||
self.callback(self,self.add_places)
|
self.callback(self)
|
||||||
|
|
||||||
self.gallery.close()
|
self.gallery.close()
|
||||||
self.window.destroy()
|
self.window.destroy()
|
||||||
|
@ -548,19 +548,17 @@ class FamilyView:
|
|||||||
except:
|
except:
|
||||||
DisplayTrace.DisplayTrace()
|
DisplayTrace.DisplayTrace()
|
||||||
|
|
||||||
def spouse_after_edit(self,epo,plist):
|
def spouse_after_edit(self,epo):
|
||||||
ap = self.parent.active_person
|
ap = self.parent.active_person
|
||||||
if epo:
|
if epo:
|
||||||
self.parent.db.buildPersonDisplay(epo.person.getId(),epo.original_id)
|
self.parent.db.buildPersonDisplay(epo.person.getId(),epo.original_id)
|
||||||
self.parent.people_view.remove_from_person_list(epo.person,epo.original_id)
|
self.parent.people_view.remove_from_person_list(epo.person,epo.original_id)
|
||||||
self.parent.people_view.redisplay_person_list(epo.person)
|
self.parent.people_view.redisplay_person_list(epo.person)
|
||||||
for p in plist:
|
|
||||||
self.parent.place_view.new_place_after_edit(p)
|
|
||||||
|
|
||||||
self.parent.active_person = ap
|
self.parent.active_person = ap
|
||||||
self.load_family(self.family)
|
self.load_family(self.family)
|
||||||
|
|
||||||
def new_spouse_after_edit(self,epo,plist):
|
def new_spouse_after_edit(self,epo):
|
||||||
if epo.person.getId() == "":
|
if epo.person.getId() == "":
|
||||||
self.parent.db.addPerson(epo.person)
|
self.parent.db.addPerson(epo.person)
|
||||||
else:
|
else:
|
||||||
@ -622,7 +620,7 @@ class FamilyView:
|
|||||||
self.parent.update_person_list(person)
|
self.parent.update_person_list(person)
|
||||||
self.load_family(self.family)
|
self.load_family(self.family)
|
||||||
|
|
||||||
def new_child_after_edit(self,epo,plist):
|
def new_child_after_edit(self,epo):
|
||||||
|
|
||||||
if epo.person.getId() == "":
|
if epo.person.getId() == "":
|
||||||
self.parent.db.addPerson(epo.person)
|
self.parent.db.addPerson(epo.person)
|
||||||
|
@ -1580,7 +1580,7 @@ class Gramps:
|
|||||||
filter.hide()
|
filter.hide()
|
||||||
filter.set_sensitive(qual)
|
filter.set_sensitive(qual)
|
||||||
|
|
||||||
def new_after_edit(self,epo,plist):
|
def new_after_edit(self,epo):
|
||||||
if epo:
|
if epo:
|
||||||
if epo.person.getId() == "":
|
if epo.person.getId() == "":
|
||||||
self.db.addPerson(epo.person)
|
self.db.addPerson(epo.person)
|
||||||
@ -1591,8 +1591,6 @@ class Gramps:
|
|||||||
self.people_view.redisplay_person_list(epo.person)
|
self.people_view.redisplay_person_list(epo.person)
|
||||||
if self.views.get_current_page() in [FAMILY_VIEW1,FAMILY_VIEW2]:
|
if self.views.get_current_page() in [FAMILY_VIEW1,FAMILY_VIEW2]:
|
||||||
self.family_view.load_family()
|
self.family_view.load_family()
|
||||||
for p in plist:
|
|
||||||
self.place_view.new_place_after_edit(p)
|
|
||||||
|
|
||||||
def update_after_newchild(self,family,person,plist):
|
def update_after_newchild(self,family,person,plist):
|
||||||
self.family_view.load_family(family)
|
self.family_view.load_family(family)
|
||||||
@ -1600,13 +1598,11 @@ class Gramps:
|
|||||||
for p in plist:
|
for p in plist:
|
||||||
self.place_view.new_place_after_edit(p)
|
self.place_view.new_place_after_edit(p)
|
||||||
|
|
||||||
def update_after_edit(self,epo,plist):
|
def update_after_edit(self,epo):
|
||||||
if epo:
|
if epo:
|
||||||
self.db.buildPersonDisplay(epo.person.getId(),epo.original_id)
|
self.db.buildPersonDisplay(epo.person.getId(),epo.original_id)
|
||||||
self.people_view.remove_from_person_list(epo.person,epo.original_id)
|
self.people_view.remove_from_person_list(epo.person,epo.original_id)
|
||||||
self.people_view.redisplay_person_list(epo.person)
|
self.people_view.redisplay_person_list(epo.person)
|
||||||
for p in plist:
|
|
||||||
self.place_view.new_place_after_edit(p)
|
|
||||||
self.update_display(0)
|
self.update_display(0)
|
||||||
|
|
||||||
def update_after_merge(self,person,old_id):
|
def update_after_merge(self,person,old_id):
|
||||||
|
@ -62,7 +62,6 @@
|
|||||||
<property name="use_stock">True</property>
|
<property name="use_stock">True</property>
|
||||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||||
<property name="response_id">-11</property>
|
<property name="response_id">-11</property>
|
||||||
<signal name="clicked" handler="on_help_dbopen_clicked" last_modification_time="Tue, 02 Dec 2003 01:34:45 GMT"/>
|
|
||||||
</widget>
|
</widget>
|
||||||
</child>
|
</child>
|
||||||
</widget>
|
</widget>
|
||||||
|
Loading…
Reference in New Issue
Block a user