Ticket #3588: 0001-Improve-search-in-views-normalizing-the-strings-SL-3.patch

src/jarabe/desktop/Makefile.am

@@ -16 +16 @@
         snowflakelayout.py      \
         transitionbox.py        \
         viewcontainer.py        \
-        viewtoolbar.py
+        viewtoolbar.py          \
+        tools.py

src/jarabe/desktop/activitieslist.py

@@ -36 +36 @@
 from jarabe.model import bundleregistry
 from jarabe.view.palettes import ActivityPalette
 from jarabe.journal import misc
+from jarabe.desktop.tools import normalize_string
 
 
 class ActivitiesTreeView(Gtk.TreeView):
@@ -153 +154 @@
         of matching activities.
 
         """
-        self._query = query.lower()
+        self._query = normalize_string(query.decode('utf-8'))
         self.get_model().refilter()
         matches = self.get_model().iter_n_children(None)
         return matches
 
     def __model_visible_cb(self, model, tree_iter, data):
         title = model[tree_iter][ListModel.COLUMN_TITLE]
-        return title is not None and title.lower().find(self._query) > -1
+        title = normalize_string(title.decode('utf-8'))
+        return title is not None and title.find(self._query) > -1
 
 
 class ListModel(Gtk.TreeModelSort):

src/jarabe/desktop/favoritesview.py

@@ -50 +50 @@
 from jarabe.desktop.schoolserver import RegisterError
 from jarabe.desktop import favoriteslayout
 from jarabe.desktop.viewcontainer import ViewContainer
+from jarabe.desktop.tools import normalize_string
 
 
 _logger = logging.getLogger('FavoritesView')
@@ -312 +313 @@
         query = query.strip()
         for icon in self.get_children():
             if icon not in [self._owner_icon, self._activity_icon]:
-                activity_name = icon.get_activity_name().lower()
-                if activity_name.find(query) > -1:
+                activity_name = icon.get_activity_name().decode('utf-8')
+                normalized_name = normalize_string(activity_name)
+                if normalized_name.find(query) > -1:
                     icon.alpha = 1.0
                 else:
                     icon.alpha = 0.33

src/jarabe/desktop/groupbox.py

@@ -24 +24 @@
 from jarabe.desktop.friendview import FriendView
 from jarabe.desktop.viewcontainer import ViewContainer
 from jarabe.desktop.favoriteslayout import SpreadLayout
+from jarabe.desktop.tools import normalize_string
 
 
 class GroupBox(ViewContainer):
@@ -69 +70 @@
         icon.destroy()
 
     def _toolbar_query_changed_cb(self, toolbar, query):
-        self._query = query.lower()
+        self._query = normalize_string(query.decode('utf-8'))
         for icon in self.get_children():
             if hasattr(icon, 'set_filter'):
                 icon.set_filter(self._query)

src/jarabe/desktop/homebox.py

@@ -27 +27 @@
 
 from jarabe.desktop import favoritesview
 from jarabe.desktop.activitieslist import ActivitiesList
+from jarabe.desktop.tools import normalize_string
 
 _FAVORITES_VIEW = 0
 _LIST_VIEW = 1
@@ -100 +101 @@
             panel.set_section_view_auto_close()
 
     def __toolbar_query_changed_cb(self, toolbar, query):
-        self._query = query.lower()
+        self._query = normalize_string(query.decode('utf-8'))
         self._list_view.set_filter(self._query)
         self._favorites_box.set_filter(self._query)
 

src/jarabe/desktop/meshbox.py

@@ -32 +32 @@
 from sugar3.graphics import palette
 from sugar3.graphics.menuitem import MenuItem
 
-from jarabe.desktop.snowflakelayout import SnowflakeLayout
 from jarabe.model import neighborhood
 from jarabe.model.buddy import get_owner_instance
 from jarabe.view.buddyicon import BuddyIcon
+from jarabe.desktop.snowflakelayout import SnowflakeLayout
 from jarabe.desktop.networkviews import WirelessNetworkView
 from jarabe.desktop.networkviews import OlpcMeshView
 from jarabe.desktop.networkviews import SugarAdhocView
 from jarabe.desktop.viewcontainer import ViewContainer
 from jarabe.desktop.favoriteslayout import SpreadLayout
+from jarabe.desktop.tools import normalize_string
 from jarabe.model import network
 from jarabe.model.network import AccessPoint
 from jarabe.model.olpcmesh import OlpcMeshManager
@@ -588 +589 @@
                 net.props.paused = False
 
     def _toolbar_query_changed_cb(self, toolbar, query):
-        self._query = query.lower()
+        self._query = normalize_string(query.decode('utf-8'))
         for icon in self.get_children():
             if hasattr(icon, 'set_filter'):
                 icon.set_filter(self._query)

src/jarabe/desktop/networkviews.py

@@ -35 +35 @@
 
 from jarabe.view.pulsingicon import EventPulsingIcon
 from jarabe.desktop import keydialog
+from jarabe.desktop.tools import normalize_string
 from jarabe.model import network
 from jarabe.model.network import Settings
 from jarabe.model.network import IP4Config
@@ -369 +370 @@
                                             self.get_first_ap().model)
 
     def set_filter(self, query):
-        self._filtered = self._display_name.lower().find(query) == -1
+        normalized_name = normalize_string(self._display_name.decode('utf-8'))
+        self._filtered = normalized_name.find(query) == -1
         self._update_icon()
         self._update_color()
 

new file src/jarabe/desktop/tools.py

@@ +1 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2012 One Laptop Per Child
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from unicodedata import normalize
+
+def normalize_string(unicode_string):
+    u"""Return unicode_string normalized for searching.
+
+    >>> normalize_string(u'Mónica Viñao')
+    'monica vinao'
+
+    >>> normalize_string(u'Ábaco')
+    'abaco'
+
+    """
+    return normalize('NFKD', unicode_string).encode('ASCII', 'ignore').lower()

src/jarabe/view/buddyicon.py

@@ -19 +19 @@
 from sugar3.graphics.icon import EventIcon
 
 from jarabe.view.buddymenu import BuddyMenu
+from jarabe.desktop.tools import normalize_string
 
 
 _FILTERED_ALPHA = 0.33
@@ -68 +69 @@
                 palette.props.icon.props.xo_color = self._buddy.get_color()
 
     def set_filter(self, query):
-        self._filtered = (self._buddy.get_nick().lower().find(query) == -1) \
+        normalized_name = normalize_string(
+            self._buddy.get_nick().decode('utf-8'))
+        self._filtered = (normalized_name.find(query) == -1) \
                 and not self._buddy.is_owner()
         self._update_color()