From a34a20409a1ee700f59ec1e20426f8d5d597e480 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Tue, 25 Jul 2006 19:11:24 +0000 Subject: [PATCH] 2006-07-25 Alex Roitman * src/Filters/_SearchBar.py (get_value,apply_filter): Force unicode. * src/Filters/_PersonSidebarFilter.py (get_filter): Force unicode. * src/Filters/_FamilySidebarFilter.py (get_filter): Force unicode. svn: r7074 --- ChangeLog | 5 +++++ src/Filters/_FamilySidebarFilter.py | 28 +++++++++++++++++++++--- src/Filters/_PersonSidebarFilter.py | 34 ++++++++++++++++++++++++----- src/Filters/_SearchBar.py | 4 ++-- src/Filters/_SidebarFilter.py | 2 +- 5 files changed, 61 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb0eb820f..f2750f079 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-07-25 Alex Roitman + * src/Filters/_SearchBar.py (get_value,apply_filter): Force unicode. + * src/Filters/_PersonSidebarFilter.py (get_filter): Force unicode. + * src/Filters/_FamilySidebarFilter.py (get_filter): Force unicode. + 2006-07-24 Alex Roitman * configure.in: Bump up the version number. * src/GrampsDb/_GrampsBSDDB.py (find_fidmap): Remove unused method. diff --git a/src/Filters/_FamilySidebarFilter.py b/src/Filters/_FamilySidebarFilter.py index a5b28486d..8cda09074 100644 --- a/src/Filters/_FamilySidebarFilter.py +++ b/src/Filters/_FamilySidebarFilter.py @@ -18,10 +18,27 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# $Id: _FilterList.py 6529 2006-05-03 06:29:07Z rshura $ +# $Id$ +#------------------------------------------------------------------------- +# +# Python modules +# +#------------------------------------------------------------------------- from gettext import gettext as _ + +#------------------------------------------------------------------------- +# +# gtk +# +#------------------------------------------------------------------------- import gtk + +#------------------------------------------------------------------------- +# +# GRAMPS modules +# +#------------------------------------------------------------------------- import GrampsWidgets import RelLib @@ -29,6 +46,11 @@ from _SidebarFilter import SidebarFilter from Filters import GenericFamilyFilter, build_filter_model, Rules from Filters.Rules.Family import * +#------------------------------------------------------------------------- +# +# PersonSidebarFilter class +# +#------------------------------------------------------------------------- class FamilySidebarFilter(SidebarFilter): def __init__(self, clicked): @@ -88,8 +110,8 @@ class FamilySidebarFilter(SidebarFilter): self.clicked_func() def get_filter(self): - gid = self.filter_id.get_text().strip() - note = self.filter_note.get_text().strip() + gid = unicode(self.filter_id.get_text()).strip() + note = unicode(self.filter_note.get_text()).strip() regex = self.filter_regex.get_active() gen = self.generic.get_active() > 0 diff --git a/src/Filters/_PersonSidebarFilter.py b/src/Filters/_PersonSidebarFilter.py index fa95cdd3b..935c37aa5 100644 --- a/src/Filters/_PersonSidebarFilter.py +++ b/src/Filters/_PersonSidebarFilter.py @@ -18,10 +18,27 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# $Id: _FilterList.py 6529 2006-05-03 06:29:07Z rshura $ +# $Id$ +#------------------------------------------------------------------------- +# +# Python modules +# +#------------------------------------------------------------------------- from gettext import gettext as _ + +#------------------------------------------------------------------------- +# +# gtk +# +#------------------------------------------------------------------------- import gtk + +#------------------------------------------------------------------------- +# +# GRAMPS modules +# +#------------------------------------------------------------------------- import GrampsWidgets import RelLib @@ -29,6 +46,11 @@ from _SidebarFilter import SidebarFilter from Filters.Rules.Person import * from Filters import GenericFilter, build_filter_model, Rules +#------------------------------------------------------------------------- +# +# PersonSidebarFilter class +# +#------------------------------------------------------------------------- class PersonSidebarFilter(SidebarFilter): def __init__(self, clicked): @@ -92,11 +114,11 @@ class PersonSidebarFilter(SidebarFilter): self.clicked_func() def get_filter(self): - name = self.filter_name.get_text().strip() - gid = self.filter_id.get_text().strip() - birth = self.filter_birth.get_text().strip() - death = self.filter_death.get_text().strip() - note = self.filter_note.get_text().strip() + name = unicode(self.filter_name.get_text()).strip() + gid = unicode(self.filter_id.get_text()).strip() + birth = unicode(self.filter_birth.get_text()).strip() + death = unicode(self.filter_death.get_text()).strip() + note = unicode(self.filter_note.get_text()).strip() gender = self.filter_gender.get_active() regex = self.filter_regex.get_active() gen = self.generic.get_active() > 0 diff --git a/src/Filters/_SearchBar.py b/src/Filters/_SearchBar.py index 978b613ba..056cd992a 100644 --- a/src/Filters/_SearchBar.py +++ b/src/Filters/_SearchBar.py @@ -127,14 +127,14 @@ class SearchBar: self.apply_filter() def get_value(self): - text = self.filter_text.get_text().strip() + text = unicode(self.filter_text.get_text()).strip() node = self.filter_list.get_active_iter() index = self.filter_model.get_value(node,1) inv = self.filter_model.get_value(node,2) return (index, text, inv) def apply_filter(self,current_model=None): - self.apply_text = self.filter_text.get_text() + self.apply_text = unicode(self.filter_text.get_text()) self.filter_button.set_sensitive(False) self.uistate.status_text(_('Updating display...')) self.on_apply_callback() diff --git a/src/Filters/_SidebarFilter.py b/src/Filters/_SidebarFilter.py index 168077124..d6e63d345 100644 --- a/src/Filters/_SidebarFilter.py +++ b/src/Filters/_SidebarFilter.py @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# $Id: _FilterList.py 6529 2006-05-03 06:29:07Z rshura $ +# $Id$ from gettext import gettext as _ import gtk