* src/DataViews/_PersonView.py: import QuestionDialog
svn: r6941
This commit is contained in:
parent
75457c4650
commit
89d0caec30
@ -1,4 +1,5 @@
|
|||||||
2006-06-21 Don Allingham <don@gramps-project.org>
|
2006-06-21 Don Allingham <don@gramps-project.org>
|
||||||
|
* src/DataViews/_PersonView.py: import QuestionDialog
|
||||||
* src/Editors/_EditFamily.py: re-enable disabled blocks after
|
* src/Editors/_EditFamily.py: re-enable disabled blocks after
|
||||||
the + is clicked
|
the + is clicked
|
||||||
|
|
||||||
|
@ -59,6 +59,7 @@ import TreeTips
|
|||||||
import Errors
|
import Errors
|
||||||
import Config
|
import Config
|
||||||
import const
|
import const
|
||||||
|
from QuestionDialog import ErrorDialog
|
||||||
|
|
||||||
from Editors import EditPerson
|
from Editors import EditPerson
|
||||||
from Filters import SearchBar, GenericFilter, PersonSidebarFilter
|
from Filters import SearchBar, GenericFilter, PersonSidebarFilter
|
||||||
@ -149,15 +150,12 @@ class PersonView(PageView.PersonNavView):
|
|||||||
mlist = self.get_selected_objects()
|
mlist = self.get_selected_objects()
|
||||||
|
|
||||||
if len(mlist) != 2:
|
if len(mlist) != 2:
|
||||||
from QuestionDialog import ErrorDialog
|
|
||||||
|
|
||||||
ErrorDialog(
|
ErrorDialog(
|
||||||
_("Cannot merge people"),
|
_("Cannot merge people"),
|
||||||
_("Exactly two people must be selected to perform a merge. "
|
_("Exactly two people must be selected to perform a merge. "
|
||||||
"A second person can be selected by holding down the "
|
"A second person can be selected by holding down the "
|
||||||
"control key while clicking on the desired person."))
|
"control key while clicking on the desired person."))
|
||||||
else:
|
else:
|
||||||
from QuestionDialog import ErrorDialog
|
|
||||||
import Merge
|
import Merge
|
||||||
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])
|
||||||
|
Loading…
Reference in New Issue
Block a user