diff --git a/ChangeLog b/ChangeLog index 07d8f3a74..d11dd4fa0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2007-05-07 Don Allingham + * src/DataViews/_PersonView.py: + * src/PageView.py: + * src/Filters/SideBar/_MediaSidebarFilter.py: + * src/Filters/SideBar/_SidebarFilter.py: + * src/Filters/SideBar/_SourceSidebarFilter.py: + * src/Filters/SideBar/_EventSidebarFilter.py: + * src/Filters/SideBar/_FamilySidebarFilter.py: + * src/Filters/SideBar/_PlaceSidebarFilter.py: + * src/Filters/SideBar/_RepoSidebarFilter.py: + * src/Filters/SideBar/_NoteSidebarFilter.py: + * src/Filters/SideBar/_PersonSidebarFilter.py: Pass dbstate to SidebarFilters + 2007-05-07 Don Allingham * src/ReportBase/_SimpleDoc.py: add support for tabs * src/BaseDoc.py: add support for tabs diff --git a/src/DataViews/_PersonView.py b/src/DataViews/_PersonView.py index 8f99e2682..b8f5617e6 100644 --- a/src/DataViews/_PersonView.py +++ b/src/DataViews/_PersonView.py @@ -310,7 +310,7 @@ class PersonView(PageView.PersonNavView): self.selection.set_mode(gtk.SELECTION_MULTIPLE) self.selection.connect('changed', self.row_changed) - self.filter_sidebar = PersonSidebarFilter(self.uistate, + self.filter_sidebar = PersonSidebarFilter(self.dbstate, self.uistate, self.filter_clicked) self.filter_pane = self.filter_sidebar.get_widget() diff --git a/src/Filters/SideBar/_EventSidebarFilter.py b/src/Filters/SideBar/_EventSidebarFilter.py index 5266b8af6..c612818d3 100644 --- a/src/Filters/SideBar/_EventSidebarFilter.py +++ b/src/Filters/SideBar/_EventSidebarFilter.py @@ -54,8 +54,8 @@ GenericEventFilter = GenericFilterFactory('Event') #------------------------------------------------------------------------- class EventSidebarFilter(SidebarFilter): - def __init__(self,uistate, clicked): - SidebarFilter.__init__(self,uistate) + def __init__(self, dbstate, uistate, clicked): + SidebarFilter.__init__(self, dbstate, uistate) self.clicked_func = clicked def create_widget(self): diff --git a/src/Filters/SideBar/_FamilySidebarFilter.py b/src/Filters/SideBar/_FamilySidebarFilter.py index 4310aa782..3e6266eaf 100644 --- a/src/Filters/SideBar/_FamilySidebarFilter.py +++ b/src/Filters/SideBar/_FamilySidebarFilter.py @@ -54,8 +54,8 @@ GenericFamilyFilter = GenericFilterFactory('Family') #------------------------------------------------------------------------- class FamilySidebarFilter(SidebarFilter): - def __init__(self,uistate, clicked): - SidebarFilter.__init__(self,uistate) + def __init__(self, dbstate, uistate, clicked): + SidebarFilter.__init__(self, dbstate, uistate) self.clicked_func = clicked def create_widget(self): diff --git a/src/Filters/SideBar/_MediaSidebarFilter.py b/src/Filters/SideBar/_MediaSidebarFilter.py index d61e35b60..7e7bf6150 100644 --- a/src/Filters/SideBar/_MediaSidebarFilter.py +++ b/src/Filters/SideBar/_MediaSidebarFilter.py @@ -54,8 +54,8 @@ GenericMediaFilter = GenericFilterFactory('MediaObject') #------------------------------------------------------------------------- class MediaSidebarFilter(SidebarFilter): - def __init__(self,uistate, clicked): - SidebarFilter.__init__(self,uistate) + def __init__(self, dbstate, uistate, clicked): + SidebarFilter.__init__(self, dbstate, uistate) self.clicked_func = clicked def create_widget(self): diff --git a/src/Filters/SideBar/_NoteSidebarFilter.py b/src/Filters/SideBar/_NoteSidebarFilter.py index 6de440b46..5a76e6c2e 100644 --- a/src/Filters/SideBar/_NoteSidebarFilter.py +++ b/src/Filters/SideBar/_NoteSidebarFilter.py @@ -54,8 +54,8 @@ GenericNoteFilter = GenericFilterFactory('Note') #------------------------------------------------------------------------- class NoteSidebarFilter(SidebarFilter): - def __init__(self,uistate, clicked): - SidebarFilter.__init__(self,uistate) + def __init__(self, dbstate, uistate, clicked): + SidebarFilter.__init__(self, dbstate, uistate) self.clicked_func = clicked def create_widget(self): diff --git a/src/Filters/SideBar/_PersonSidebarFilter.py b/src/Filters/SideBar/_PersonSidebarFilter.py index e55ab8d7c..4f8f553f1 100644 --- a/src/Filters/SideBar/_PersonSidebarFilter.py +++ b/src/Filters/SideBar/_PersonSidebarFilter.py @@ -54,8 +54,8 @@ from Filters import GenericFilter, build_filter_model, Rules #------------------------------------------------------------------------- class PersonSidebarFilter(SidebarFilter): - def __init__(self, uistate, clicked): - SidebarFilter.__init__(self, uistate) + def __init__(self, dbstate, uistate, clicked): + SidebarFilter.__init__(self, dbstate, uistate) self.clicked_func = clicked def create_widget(self): diff --git a/src/Filters/SideBar/_PlaceSidebarFilter.py b/src/Filters/SideBar/_PlaceSidebarFilter.py index 95955e069..3381da088 100644 --- a/src/Filters/SideBar/_PlaceSidebarFilter.py +++ b/src/Filters/SideBar/_PlaceSidebarFilter.py @@ -54,8 +54,8 @@ GenericPlaceFilter = GenericFilterFactory('Place') #------------------------------------------------------------------------- class PlaceSidebarFilter(SidebarFilter): - def __init__(self,uistate, clicked): - SidebarFilter.__init__(self,uistate) + def __init__(self, dbstate, uistate, clicked): + SidebarFilter.__init__(self, dbstate, uistate) self.clicked_func = clicked def create_widget(self): diff --git a/src/Filters/SideBar/_RepoSidebarFilter.py b/src/Filters/SideBar/_RepoSidebarFilter.py index 04f341291..ceac288fe 100644 --- a/src/Filters/SideBar/_RepoSidebarFilter.py +++ b/src/Filters/SideBar/_RepoSidebarFilter.py @@ -54,8 +54,8 @@ GenericRepoFilter = GenericFilterFactory('Repository') #------------------------------------------------------------------------- class RepoSidebarFilter(SidebarFilter): - def __init__(self,uistate, clicked): - SidebarFilter.__init__(self,uistate) + def __init__(self, dbstate, uistate, clicked): + SidebarFilter.__init__(self, dbstate, uistate) self.clicked_func = clicked def create_widget(self): diff --git a/src/Filters/SideBar/_SidebarFilter.py b/src/Filters/SideBar/_SidebarFilter.py index 032c4c3bc..96da3c50f 100644 --- a/src/Filters/SideBar/_SidebarFilter.py +++ b/src/Filters/SideBar/_SidebarFilter.py @@ -30,7 +30,7 @@ _KP_ENTER = gtk.gdk.keyval_from_name("KP_Enter") class SidebarFilter: - def __init__(self, uistate): + def __init__(self, dbstate, uistate): self.position = 1 self.table = gtk.Table(4,11) self.table.set_border_width(6) @@ -41,6 +41,7 @@ class SidebarFilter: self._init_interface() uistate.connect('filters-changed',self.on_filters_changed) self.uistate = uistate + self.dbstate = dbstate def _init_interface(self): self.table.attach(GrampsWidgets.MarkupLabel(_('Filter')), diff --git a/src/Filters/SideBar/_SourceSidebarFilter.py b/src/Filters/SideBar/_SourceSidebarFilter.py index 8d854835a..7af589c96 100644 --- a/src/Filters/SideBar/_SourceSidebarFilter.py +++ b/src/Filters/SideBar/_SourceSidebarFilter.py @@ -54,8 +54,8 @@ GenericSourceFilter = GenericFilterFactory('Source') #------------------------------------------------------------------------- class SourceSidebarFilter(SidebarFilter): - def __init__(self,uistate, clicked): - SidebarFilter.__init__(self,uistate) + def __init__(self, dbstate, uistate, clicked): + SidebarFilter.__init__(self, dbstate, uistate) self.clicked_func = clicked def create_widget(self): diff --git a/src/PageView.py b/src/PageView.py index f9ab31db7..ca59301db 100644 --- a/src/PageView.py +++ b/src/PageView.py @@ -61,7 +61,7 @@ EMPTY_SEARCH = (0, '', False) #---------------------------------------------------------------- class PageView: - def __init__(self,title,dbstate,uistate): + def __init__(self, title, dbstate, uistate): self.title = title self.dbstate = dbstate self.uistate = uistate @@ -469,7 +469,8 @@ class ListView(BookMarkView): dbstate.connect('database-changed',self.change_db) def build_filter_container(self, box, filter_class): - self.filter_sidebar = filter_class(self.uistate,self.filter_clicked) + self.filter_sidebar = filter_class(self.dbstate, self.uistate, + self.filter_clicked) self.filter_pane = self.filter_sidebar.get_widget() hpaned = gtk.HBox()