diff options
| author | Simon Schampijer <simon@schampijer.de> | 2010-11-03 19:20:31 (GMT) |
|---|---|---|
| committer | Sascha Silbe <silbe@activitycentral.com> | 2011-02-12 17:30:32 (GMT) |
| commit | 5169e7f74a65df3e0c622a620f13088453405423 (patch) | |
| tree | 4855e7225f950c52bb6a46de88136e9ca51a3846 | |
| parent | df126badb7b76e5152c4abfdfec17db02cefa014 (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.
Tested-By: Sascha Silbe <sascha-pgp@silbe.org>
| -rw-r--r-- | src/jarabe/desktop/networkviews.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/jarabe/desktop/networkviews.py b/src/jarabe/desktop/networkviews.py index 5e0a809..99d46b6 100644 --- a/src/jarabe/desktop/networkviews.py +++ b/src/jarabe/desktop/networkviews.py @@ -528,9 +528,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 @@ -560,6 +557,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 @@ -568,12 +566,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 |