* src/DataViews/_SourceView.py: source merge support

svn: r6777
This commit is contained in:
Don Allingham
2006-05-25 20:35:04 +00:00
parent 081f5079d5
commit d5f33362ac
9 changed files with 113 additions and 36 deletions

View File

@@ -217,12 +217,11 @@ class PlaceView(PageView.ListView):
if len(mlist) != 2:
msg = _("Cannot merge places.")
msg2 = _("Exactly two places must be selected to perform a merge. "
"A second place can be selected by holding down the "
"control key while clicking on the desired place.")
"A second place can be selected by holding down the "
"control key while clicking on the desired place.")
ErrorDialog(msg,msg2)
else:
import MergeData
MergeData.MergePlaces(self.dbstate, self.uistate, mlist[0],
mlist[1], self.build_tree)
MergeData.MergePlaces(self.dbstate, self.uistate, mlist[0], mlist[1])