diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index e6e600f8e..af70153ae 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,4 +1,9 @@ 2006-07-29 Alex Roitman + * src/PageView.py (PersonNavView.filter_editor): Catch exception. + * src/DataViews/_FamilyList.py (FamilyListView.filter_editor): + Catch exception. + * src/plugins/EventCmp.py (EventComparison.filter_editor_clicked): + Catch exception. * src/ManagedWindow.py (ManagedWindow.show): Set opened flag; (ManagedWindow.close): Unset opened flag. * src/ViewManager.py (undo_history_close): Only close undo history diff --git a/gramps2/src/DataViews/_FamilyList.py b/gramps2/src/DataViews/_FamilyList.py index 1d92c062d..4a8804fb9 100644 --- a/gramps2/src/DataViews/_FamilyList.py +++ b/gramps2/src/DataViews/_FamilyList.py @@ -100,11 +100,11 @@ class FamilyListView(PageView.ListView): def filter_editor(self,obj): from FilterEditor import FilterEditor - FilterEditor( - 'Family', - const.custom_filters, - self.dbstate, - self.uistate) + try: + FilterEditor('Family',const.custom_filters, + self.dbstate,self.uistate) + except Errors.WindowActiveError: + pass def add_bookmark(self, obj): mlist = [] diff --git a/gramps2/src/PageView.py b/gramps2/src/PageView.py index 3f8b9b65f..61ecba794 100644 --- a/gramps2/src/PageView.py +++ b/gramps2/src/PageView.py @@ -45,6 +45,7 @@ from gtk.gdk import ACTION_COPY, BUTTON1_MASK import Config import TreeTips import Bookmarks +import Errors from Filters import SearchBar import const @@ -367,11 +368,11 @@ class PersonNavView(BookMarkView): def filter_editor(self,obj): from FilterEditor import FilterEditor - FilterEditor( - 'Person', - const.custom_filters, - self.dbstate, - self.uistate) + try: + FilterEditor('Person',const.custom_filters, + self.dbstate,self.uistate) + except Errors.WindowActiveError: + pass def fwd_clicked(self,obj,step=1): hobj = self.uistate.phistory diff --git a/gramps2/src/plugins/EventCmp.py b/gramps2/src/plugins/EventCmp.py index 219470472..56b334b8f 100644 --- a/gramps2/src/plugins/EventCmp.py +++ b/gramps2/src/plugins/EventCmp.py @@ -50,6 +50,7 @@ import Utils import BaseDoc import ODSDoc import const +import Errors import DateHandler from QuestionDialog import WarningDialog from PluginUtils import Tool, register_tool @@ -177,8 +178,11 @@ class EventComparison(Tool.Tool,ManagedWindow.ManagedWindow): def filter_editor_clicked(self,obj): import FilterEditor - FilterEditor.FilterEditor('Person',const.custom_filters, - self.dbstate,self.uistate) + try: + FilterEditor.FilterEditor('Person',const.custom_filters, + self.dbstate,self.uistate) + except Errors.WindowActiveError: + pass def on_apply_clicked(self,obj): cfilter = self.filter_menu.get_active().get_data("filter")