From 89d0caec3061e5b1ce95b6f3c22764798982ea43 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 21 Jun 2006 19:46:27 +0000 Subject: [PATCH] * src/DataViews/_PersonView.py: import QuestionDialog svn: r6941 --- gramps2/ChangeLog | 1 + gramps2/src/DataViews/_PersonView.py | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index c3f83bcba..fe33a270e 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,5 @@ 2006-06-21 Don Allingham + * src/DataViews/_PersonView.py: import QuestionDialog * src/Editors/_EditFamily.py: re-enable disabled blocks after the + is clicked diff --git a/gramps2/src/DataViews/_PersonView.py b/gramps2/src/DataViews/_PersonView.py index b25cf2112..848df6f90 100644 --- a/gramps2/src/DataViews/_PersonView.py +++ b/gramps2/src/DataViews/_PersonView.py @@ -59,6 +59,7 @@ import TreeTips import Errors import Config import const +from QuestionDialog import ErrorDialog from Editors import EditPerson from Filters import SearchBar, GenericFilter, PersonSidebarFilter @@ -149,15 +150,12 @@ class PersonView(PageView.PersonNavView): mlist = self.get_selected_objects() if len(mlist) != 2: - from QuestionDialog import ErrorDialog - ErrorDialog( _("Cannot merge people"), _("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.")) else: - from QuestionDialog import ErrorDialog import Merge p1 = self.db.get_person_from_handle(mlist[0]) p2 = self.db.get_person_from_handle(mlist[1])