* src/EditPerson.py: Corrections.
* src/EditSource.py: Use parent class. Use windows menu. * src/ImageSelect.py: Corrections. * src/Sources.py: Corrections. * src/gramps.glade: Add handlers. * src/NoteEdit.py: Corrections. * src/dialog.glade: Add handler. * src/Witness.py: Corrections. * src/RelLib.py: Include witnesses in comparing events. * src/FamilyView.py: Pass parent on to child classes. * src/AddSpouse.py: Pass parent on to EditPerson. * src/ChooseParents.py: Pass parent on to EditPerson. * src/gramps_main.py: Pass Gramps class to child classes. * src/MergeData.py: Pass parent on to EditPerson. svn: r2885
This commit is contained in:
@@ -51,7 +51,8 @@ from gettext import gettext as _
|
||||
#-------------------------------------------------------------------------
|
||||
class MergePeople:
|
||||
|
||||
def __init__(self,db,person1,person2,update,ep_update=None):
|
||||
def __init__(self,parent,db,person1,person2,update,ep_update=None):
|
||||
self.parent = parent
|
||||
self.db = db
|
||||
self.p1 = person1
|
||||
self.p2 = person2
|
||||
@@ -213,7 +214,7 @@ class MergePeople:
|
||||
import EditPerson
|
||||
self.on_merge_clicked(obj)
|
||||
# This needs to be fixed to provide an update call
|
||||
EditPerson.EditPerson(self.p1,self.db,self.ep_update)
|
||||
EditPerson.EditPerson(self.parent,self.p1,self.db,self.ep_update)
|
||||
|
||||
def copy_note(self,one,two):
|
||||
if one.get_note() != two.get_note():
|
||||
|
Reference in New Issue
Block a user