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

* src/gramps_main.py (on_merge_activate,on_fast_merge_activate): only merge if exactly two persons have been selected

Browse Source 
svn: r4833
This commit is contained in:
Martin Hawlisch 2005-06-16 10:44:25 +00:00
parent 369fcf562e
commit 3b925c2653
2 changed files with 20 additions and 2 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-06-16 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/gramps_main.py (on_merge_activate,on_fast_merge_activate):
only merge if exactly two persons have been selected
2005-06-15 Alex Roitman <shura@gramps-project.org> 2005-06-15 Alex Roitman <shura@gramps-project.org>
* src/WriteGedcom.py (GedcomWriterOptionBox.get_option_box): * src/WriteGedcom.py (GedcomWriterOptionBox.get_option_box):
Build person-centered filters only if a person is selected. Build person-centered filters only if a person is selected.

14
gramps2/src/gramps_main.py
View File

@ -1080,7 +1080,14 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
import MergePeople import MergePeople
p1 = self.db.get_person_from_handle(mlist[0]) p1 = self.db.get_person_from_handle(mlist[0])
p2 = self.db.get_person_from_handle(mlist[1]) p2 = self.db.get_person_from_handle(mlist[1])
if p1 and p2:
merger = MergePeople.MergePeopleUI(self.db,p1,p2,self.merge_update) merger = MergePeople.MergePeopleUI(self.db,p1,p2,self.merge_update)
else:
msg = _("Cannot merge people.")
msg2 = _("Exactly two people must be selected to perform a merge. "
"A second person can be selected by holding down the "
"control key while clicking on the desired person.")
ErrorDialog(msg,msg2)
elif page == PLACE_VIEW: elif page == PLACE_VIEW:
self.place_view.merge() self.place_view.merge()
elif page == SOURCE_VIEW: elif page == SOURCE_VIEW:
@ -1103,7 +1110,14 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
import MergePeople import MergePeople
p1 = self.db.get_person_from_handle(mlist[0]) p1 = self.db.get_person_from_handle(mlist[0])
p2 = self.db.get_person_from_handle(mlist[1]) p2 = self.db.get_person_from_handle(mlist[1])
if p1 and p2:
merger = MergePeople.Compare(self.db,p1,p2,self.merge_update) merger = MergePeople.Compare(self.db,p1,p2,self.merge_update)
else:
msg = _("Cannot merge people.")
msg2 = _("Exactly two people must be selected to perform a merge. "
"A second person can be selected by holding down the "
"control key while clicking on the desired person.")
ErrorDialog(msg,msg2)
elif page == PLACE_VIEW: elif page == PLACE_VIEW:
self.place_view.merge() self.place_view.merge()
elif page == SOURCE_VIEW: elif page == SOURCE_VIEW: