Use alpha to visualize the filter in the neighborhood view

Apply an alpha value of 0.33 to non-matching items to have consistency
with the filter in the favorites view.

Signed-of-by: Gonzalo Odiard <gonzalo@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>

3 files changed, 36 insertions, 26 deletions

diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index 756c303..6d5bb48 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -61,6 +61,7 @@ _AP_ICON_NAME = 'network-wireless'
 _OLPC_MESH_ICON_NAME = 'network-mesh'
 
 _AUTOSEARCH_TIMEOUT = 1000
+_FILTERED_ALPHA = 0.33
 
 
 class _ActivityIcon(CanvasIcon):
@@ -152,12 +153,11 @@ class ActivityView(hippo.CanvasBox):
     def set_filter(self, query):
         text_to_check = self._model.bundle.get_name().lower() + \
                 self._model.bundle.get_bundle_id().lower()
+        self._icon.props.xo_color = self._model.get_color()
         if text_to_check.find(query) == -1:
-            self._icon.props.stroke_color = '#D5D5D5'
-            self._icon.props.fill_color = style.COLOR_TRANSPARENT.get_svg()
+            self._icon.alpha = _FILTERED_ALPHA
         else:
-            self._icon.props.xo_color = self._model.get_color()
-
+            self._icon.alpha = 1.0
         for icon in self._icons.itervalues():
             if hasattr(icon, 'set_filter'):
                 icon.set_filter(query)
diff --git a/src/jarabe/desktop/networkviews.py b/src/jarabe/desktop/networkviews.py
index 99d46b6..9948d3b 100644
--- a/src/jarabe/desktop/networkviews.py
+++ b/src/jarabe/desktop/networkviews.py
@@ -54,6 +54,8 @@ _NM_ACTIVE_CONN_IFACE = 'org.freedesktop.NetworkManager.Connection.Active'
 _AP_ICON_NAME = 'network-wireless'
 _OLPC_MESH_ICON_NAME = 'network-mesh'
 
+_FILTERED_ALPHA = 0.33
+
 
 class WirelessNetworkView(CanvasPulsingIcon):
     def __init__(self, initial_ap):
@@ -66,7 +68,7 @@ class WirelessNetworkView(CanvasPulsingIcon):
         self._palette_icon = None
         self._disconnect_item = None
         self._connect_item = None
-        self._greyed_out = False
+        self._filtered = False
         self._name = initial_ap.name
         self._mode = initial_ap.mode
         self._strength = initial_ap.strength
@@ -258,11 +260,12 @@ class WirelessNetworkView(CanvasPulsingIcon):
             self.props.pulsing = False
 
     def _update_color(self):
-        if self._greyed_out:
+        self.props.base_color = self._color
+        if self._filtered:
             self.props.pulsing = False
-            self.props.base_color = XoColor('#D5D5D5,#D5D5D5')
+            self.alpha = _FILTERED_ALPHA
         else:
-            self.props.base_color = self._color
+            self.alpha = 1.0
 
     def _disconnect_activate_cb(self, item):
         if self._mode == network.NM_802_11_MODE_INFRA:
@@ -383,7 +386,7 @@ class WirelessNetworkView(CanvasPulsingIcon):
         logging.error('Failed to activate connection: %s', err)
 
     def set_filter(self, query):
-        self._greyed_out = self._name.lower().find(query) == -1
+        self._filtered = self._name.lower().find(query) == -1
         self._update_icon()
         self._update_color()
 
@@ -469,7 +472,7 @@ class SugarAdhocView(CanvasPulsingIcon):
         self._disconnect_item = None
         self._connect_item = None
         self._palette_icon = None
-        self._greyed_out = False
+        self._filtered = False
 
         get_adhoc_manager_instance().connect('members-changed',
                                              self.__members_changed_cb)
@@ -556,11 +559,12 @@ class SugarAdhocView(CanvasPulsingIcon):
             self.props.pulsing = False
 
     def _update_color(self):
-        if self._greyed_out:
+        self.props.base_color = self._state_color
+        if self._filtered:
             self.props.pulsing = False
-            self.props.base_color = XoColor('#D5D5D5,#D5D5D5')
+            self.alpha = _FILTERED_ALPHA
         else:
-            self.props.base_color = self._state_color
+            self.alpha = 1.0
 
     def __members_changed_cb(self, adhoc_manager, channel, has_members):
         if channel == self._channel:
@@ -571,13 +575,16 @@ class SugarAdhocView(CanvasPulsingIcon):
                                    style.COLOR_TRANSPARENT.get_svg())
                 self._state_color = XoColor(color)
 
-            if not self._greyed_out:
+            if not self._filtered:
                 self.props.base_color = self._state_color
                 self._palette_icon.props.xo_color = self._state_color
+                self.alpha = 1.0
+            else:
+                self.alpha = _FILTERED_ALPHA
 
     def set_filter(self, query):
         name = self._NAME + str(self._channel)
-        self._greyed_out = name.lower().find(query) == -1
+        self._filtered = name.lower().find(query) == -1
         self._update_color()
 
 
@@ -590,7 +597,7 @@ class OlpcMeshView(CanvasPulsingIcon):
         self._mesh_mgr = mesh_mgr
         self._disconnect_item = None
         self._connect_item = None
-        self._greyed_out = False
+        self._filtered = False
         self._name = ''
         self._device_state = None
         self._active = False
@@ -684,10 +691,11 @@ class OlpcMeshView(CanvasPulsingIcon):
             self.props.pulsing = False
 
     def _update_color(self):
-        if self._greyed_out:
-            self.props.base_color = XoColor('#D5D5D5,#D5D5D5')
+        self.props.base_color = profile.get_color()
+        if self._filtered:
+            self.alpha = _FILTERED_ALPHA
         else:
-            self.props.base_color = profile.get_color()
+            self.alpha = 1.0
 
     def __connect_activate_cb(self, icon):
         self._connect()
@@ -705,7 +713,7 @@ class OlpcMeshView(CanvasPulsingIcon):
         logging.error('Failed to activate connection: %s', err)
 
     def set_filter(self, query):
-        self._greyed_out = (query != '')
+        self._filtered = (query != '')
         self._update_color()
 
     def disconnect(self):
diff --git a/src/jarabe/view/buddyicon.py b/src/jarabe/view/buddyicon.py
index a274605..e0e8b3f 100644
--- a/src/jarabe/view/buddyicon.py
+++ b/src/jarabe/view/buddyicon.py
@@ -19,12 +19,14 @@ from sugar.graphics import style
 
 from jarabe.view.buddymenu import BuddyMenu
 
+_FILTERED_ALPHA = 0.33
+
 
 class BuddyIcon(CanvasIcon):
     def __init__(self, buddy, size=style.STANDARD_ICON_SIZE):
         CanvasIcon.__init__(self, icon_name='computer-xo', size=size)
 
-        self._greyed_out = False
+        self._filtered = False
         self._buddy = buddy
         self._buddy.connect('notify::present', self.__buddy_notify_present_cb)
         self._buddy.connect('notify::color', self.__buddy_notify_color_cb)
@@ -46,18 +48,18 @@ class BuddyIcon(CanvasIcon):
     def _update_color(self):
         # keep the icon in the palette in sync with the view
         palette = self.get_palette()
-        if self._greyed_out:
-            self.props.stroke_color = '#D5D5D5'
-            self.props.fill_color = style.COLOR_TRANSPARENT.get_svg()
+        self.props.xo_color = self._buddy.get_color()
+        if self._filtered:
+            self.alpha = _FILTERED_ALPHA
             if palette is not None:
                 palette.props.icon.props.stroke_color = self.props.stroke_color
                 palette.props.icon.props.fill_color = self.props.fill_color
         else:
-            self.props.xo_color = self._buddy.get_color()
+            self.alpha = 1.0
             if palette is not None:
                 palette.props.icon.props.xo_color = self._buddy.get_color()
 
     def set_filter(self, query):
-        self._greyed_out = (self._buddy.get_nick().lower().find(query) == -1) \
+        self._filtered = (self._buddy.get_nick().lower().find(query) == -1) \
                 and not self._buddy.is_owner()
         self._update_color()