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

* src/DataViews/_PersonView.py: Merge module support

Browse Source 
* src/Merge/_MergeSource.py: broken out of MergeData.py
	* src/Merge/__init__.py: support of module
	* src/Merge/Makefile.am: added
	* src/Merge/_MergePlace.py: broken out of MergeData.py
	* src/Merge/_MergePerson.py: renamed


svn: r6778
This commit is contained in:
Don Allingham
2006-05-25 21:02:49 +00:00
parent d5f33362ac
commit 305b3d7bd1
9 changed files with 191 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/DataViews/_PersonView.py
View File

@@ -154,11 +154,11 @@ class PersonView(PageView.PersonNavView):
ErrorDialog(msg,msg2)
else:
from QuestionDialog import ErrorDialog
from Merge import MergePeople
import Merge
p1 = self.db.get_person_from_handle(mlist[0])
p2 = self.db.get_person_from_handle(mlist[1])
if p1 and p2:
merger = MergePeople.Compare(self.dbstate, self.uistate, p1, p2)
Merge.PersonCompare(self.dbstate, self.uistate, p1, p2)
else:
msg = _("Cannot merge people")
msg2 = _("Exactly two people must be selected to perform a merge. "
@@ -176,12 +176,12 @@ class PersonView(PageView.PersonNavView):
"control key while clicking on the desired person.")
ErrorDialog(msg,msg2)
else:
from Merge import MergePeople
import Merge
p1 = self.db.get_person_from_handle(mlist[0])
p2 = self.db.get_person_from_handle(mlist[1])
if p1 and p2:
MergePeople.MergePeopleUI(self.dbstate, self.uistate, p1, p2)
Merge.MergePeopleUI(self.dbstate, self.uistate, p1, p2)
else:
msg = _("Cannot merge people")
msg2 = _("Exactly two people must be selected to perform a merge. "

4
src/DataViews/_PlaceView.py
View File

@@ -221,7 +221,7 @@ class PlaceView(PageView.ListView):
"control key while clicking on the desired place.")
ErrorDialog(msg,msg2)
else:
import MergeData
MergeData.MergePlaces(self.dbstate, self.uistate, mlist[0], mlist[1])
import Merge
Merge.MergePlaces(self.dbstate, self.uistate, mlist[0], mlist[1])

4
src/DataViews/_SourceView.py
View File

@@ -210,6 +210,6 @@ class SourceView(PageView.ListView):
"control key while clicking on the desired source.")
ErrorDialog(msg,msg2)
else:
import MergeData
MergeData.MergeSources(self.dbstate, self.uistate, mlist[0], mlist[1])
import Merge
Merge.MergeSources(self.dbstate, self.uistate, mlist[0], mlist[1])