Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/PageView.py (PersonNavView.filter_editor): Catch exception.

Browse Source 
* 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:
Alex Roitman 2006-07-30 03:34:10 +00:00
parent 946558405d
commit 5569f78767
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,4 +1,9 @@
2006-07-29 Alex Roitman <shura@gramps-project.org> 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; * src/ManagedWindow.py (ManagedWindow.show): Set opened flag;
(ManagedWindow.close): Unset opened flag. (ManagedWindow.close): Unset opened flag.
* src/ViewManager.py (undo_history_close): Only close undo history * src/ViewManager.py (undo_history_close): Only close undo history

10
src/DataViews/_FamilyList.py
View File

@ -100,11 +100,11 @@ class FamilyListView(PageView.ListView):
def filter_editor(self,obj): def filter_editor(self,obj):
from FilterEditor import FilterEditor from FilterEditor import FilterEditor
FilterEditor( try:
'Family', FilterEditor('Family',const.custom_filters,
const.custom_filters, self.dbstate,self.uistate)
self.dbstate, except Errors.WindowActiveError:
self.uistate) pass
def add_bookmark(self, obj): def add_bookmark(self, obj):
mlist = [] mlist = []

11
src/PageView.py
View File

@ -45,6 +45,7 @@ from gtk.gdk import ACTION_COPY, BUTTON1_MASK
import Config import Config
import TreeTips import TreeTips
import Bookmarks import Bookmarks
import Errors
from Filters import SearchBar from Filters import SearchBar
import const import const
@ -367,11 +368,11 @@ class PersonNavView(BookMarkView):
def filter_editor(self,obj): def filter_editor(self,obj):
from FilterEditor import FilterEditor from FilterEditor import FilterEditor
FilterEditor( try:
'Person', FilterEditor('Person',const.custom_filters,
const.custom_filters, self.dbstate,self.uistate)
self.dbstate, except Errors.WindowActiveError:
self.uistate) pass
def fwd_clicked(self,obj,step=1): def fwd_clicked(self,obj,step=1):
hobj = self.uistate.phistory hobj = self.uistate.phistory

8
src/plugins/EventCmp.py
View File

@ -50,6 +50,7 @@ import Utils
import BaseDoc import BaseDoc
import ODSDoc import ODSDoc
import const import const
import Errors
import DateHandler import DateHandler
from QuestionDialog import WarningDialog from QuestionDialog import WarningDialog
from PluginUtils import Tool, register_tool from PluginUtils import Tool, register_tool
@ -177,8 +178,11 @@ class EventComparison(Tool.Tool,ManagedWindow.ManagedWindow):
def filter_editor_clicked(self,obj): def filter_editor_clicked(self,obj):
import FilterEditor import FilterEditor
FilterEditor.FilterEditor('Person',const.custom_filters, try:
self.dbstate,self.uistate) FilterEditor.FilterEditor('Person',const.custom_filters,
self.dbstate,self.uistate)
except Errors.WindowActiveError:
pass
def on_apply_clicked(self,obj): def on_apply_clicked(self,obj):
cfilter = self.filter_menu.get_active().get_data("filter") cfilter = self.filter_menu.get_active().get_data("filter")