From 33a3a1a755abdbdb923a06c9e7bd36d352b95758 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 3 Jul 2006 02:28:44 +0000 Subject: [PATCH] 2006-07-02 Don Allingham * src/DataViews/_PedigreeView.py: add filter editor support * src/DataViews/_Relationship.py: add filter editor support * src/DataViews/_PersonView.py: move filter editor support to PageView * src/PageView.py: add filter editor support svn: r6981 --- gramps2/ChangeLog | 6 ++++++ gramps2/src/DataViews/_PedigreeView.py | 3 +++ gramps2/src/DataViews/_PersonView.py | 12 ------------ gramps2/src/DataViews/_RelationView.py | 3 +++ gramps2/src/PageView.py | 11 +++++++++++ 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index cd9786760..d192fe915 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,9 @@ +2006-07-02 Don Allingham + * src/DataViews/_PedigreeView.py: add filter editor support + * src/DataViews/_Relationship.py: add filter editor support + * src/DataViews/_PersonView.py: move filter editor support to PageView + * src/PageView.py: add filter editor support + 2006-07-01 Don Allingham * src/DisplayState.py: fix spacing * src/DisplayTabs/_SourceEmbedList.py: check for empty reference diff --git a/gramps2/src/DataViews/_PedigreeView.py b/gramps2/src/DataViews/_PedigreeView.py index b1bef3ce5..1ccee3916 100644 --- a/gramps2/src/DataViews/_PedigreeView.py +++ b/gramps2/src/DataViews/_PedigreeView.py @@ -493,6 +493,9 @@ class PedigreeView(PageView.PersonNavView): + + + diff --git a/gramps2/src/DataViews/_PersonView.py b/gramps2/src/DataViews/_PersonView.py index 848df6f90..9e940140c 100644 --- a/gramps2/src/DataViews/_PersonView.py +++ b/gramps2/src/DataViews/_PersonView.py @@ -138,9 +138,6 @@ class PersonView(PageView.PersonNavView): self.add_action('ColumnEdit', gtk.STOCK_PROPERTIES, _('_Column Editor'), callback=self.column_editor,) - self.add_action('FilterEdit', None, - _('Filter Editor'), callback=self.filter_editor,) - self.add_action('CmpMerge', None, _('_Compare and merge'), callback=self.cmp_merge) self.add_action('FastMerge', None, _('_Fast merge'), @@ -202,15 +199,6 @@ class PersonView(PageView.PersonNavView): column_names, self.set_column_order) - def filter_editor(self,obj): - from FilterEditor import FilterEditor - - FilterEditor( - 'Person', - const.custom_filters, - self.dbstate, - self.uistate) - def set_column_order(self, column_list): self.dbstate.db.set_person_column_order(column_list) self.build_columns() diff --git a/gramps2/src/DataViews/_RelationView.py b/gramps2/src/DataViews/_RelationView.py index ebe2e6598..96ee387cd 100644 --- a/gramps2/src/DataViews/_RelationView.py +++ b/gramps2/src/DataViews/_RelationView.py @@ -195,6 +195,9 @@ class RelationshipView(PageView.PersonNavView): + + + diff --git a/gramps2/src/PageView.py b/gramps2/src/PageView.py index cf5e624ba..29fc9c2c9 100644 --- a/gramps2/src/PageView.py +++ b/gramps2/src/PageView.py @@ -293,6 +293,8 @@ class PersonNavView(BookMarkView): tip=_("Go to the default person"), callback=self.home) self.add_action('SetActive', gtk.STOCK_HOME, _("Set _Home Person"), callback=self.set_default_person) + self.add_action('FilterEdit', None, + _('Filter Editor'), callback=self.filter_editor,) self.add_action_group(self.back_action) self.add_action_group(self.fwd_action) @@ -362,6 +364,15 @@ class PersonNavView(BookMarkView): _("Error: %s is not a valid GRAMPS ID") % gid) dialog.destroy() + def filter_editor(self,obj): + from FilterEditor import FilterEditor + + FilterEditor( + 'Person', + const.custom_filters, + self.dbstate, + self.uistate) + def fwd_clicked(self,obj,step=1): hobj = self.uistate.phistory hobj.lock = True