Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2010-11-03 17:24:07 (GMT)
committer Simon Schampijer <simon@schampijer.de>2010-11-03 17:24:07 (GMT)
commit6dd112a6e9c56294fd70b9cf68e9fc8cd83042a1 (patch)
tree01a59b5cbe8561526298352a1e857ea4c608d685
parent77cc7a534f9c1fda8856917e5765f4cf0284795e (diff)
Sugar Ad-hoc icons show in search results when connect/disconnect to AP OLPC #10412
When searching for an AP the Sugar ad-hoc networks are greyed out (if their name does not contain the search string). When then trying to connect to an AP the Sugar ad-hoc networks get colored again. The patch does make sure that the color is not set by each update and that the member change does not trigger setting the color of the icon.
-rw-r--r--src/jarabe/desktop/meshbox.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index 9499abb..41ffcc6 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -557,9 +557,6 @@ class SugarAdhocView(CanvasPulsingIcon):
else:
icon_name = self._ICON_NAME + str(self._channel)
- self.props.base_color = self._state_color
- self._palette_icon.props.xo_color = self._state_color
-
if icon_name is not None:
self.props.icon_name = icon_name
icon = self._palette.props.icon
@@ -589,6 +586,7 @@ class SugarAdhocView(CanvasPulsingIcon):
def _update_color(self):
if self._greyed_out:
+ self.props.pulsing = False
self.props.base_color = XoColor('#D5D5D5,#D5D5D5')
else:
self.props.base_color = self._state_color
@@ -597,12 +595,12 @@ class SugarAdhocView(CanvasPulsingIcon):
if channel == self._channel:
if has_members == True:
self._state_color = profile.get_color()
- self.props.base_color = self._state_color
- self._palette_icon.props.xo_color = self._state_color
else:
color = '%s,%s' % (profile.get_color().get_stroke_color(),
style.COLOR_TRANSPARENT.get_svg())
self._state_color = XoColor(color)
+
+ if not self._greyed_out:
self.props.base_color = self._state_color
self._palette_icon.props.xo_color = self._state_color