* 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. svn: r7091
This commit is contained in:
		@@ -1,4 +1,9 @@
 | 
			
		||||
2006-07-29  Alex Roitman  <shura@gramps-project.org>
 | 
			
		||||
	* 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
 | 
			
		||||
 
 | 
			
		||||
@@ -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 = []
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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")
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user