diff options
author | C. Scott Ananian <cscott@laptop.org> | 2008-09-18 22:28:11 (GMT) |
---|---|---|
committer | C. Scott Ananian <cscott@laptop.org> | 2008-09-19 14:27:13 (GMT) |
commit | f43dbc3d331a8b060f3292c67fb8bfc49c7f7ecf (patch) | |
tree | d492060f4eb086ec1619f33f188677b88752c222 /src | |
parent | be96fe552671748b595fd1075524e46730c1a00e (diff) |
Trac #8554: Change access point icon shape after we've connected.
Diffstat (limited to 'src')
-rw-r--r-- | src/view/devices/network/wireless.py | 8 | ||||
-rw-r--r-- | src/view/home/MeshBox.py | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/view/devices/network/wireless.py b/src/view/devices/network/wireless.py index a339928..8cf0ac9 100644 --- a/src/view/devices/network/wireless.py +++ b/src/view/devices/network/wireless.py @@ -78,14 +78,20 @@ class DeviceView(TrayIcon): self.palette.set_primary_text(self._get_palette_primary_text()) def _state_changed_cb(self, model, pspec): + self._update_icon() self._update_state() self.palette.set_primary_text(self._get_palette_primary_text()) def _update_icon(self): + # keep this code in sync with view/home/MeshBox.py strength = self._model.props.strength if self._model.props.state == device.STATE_INACTIVE: strength = 0 - icon_name = get_icon_state(_ICON_NAME, strength) + if self._model.props.state == device.STATE_ACTIVATED: + icon_name = '%s-connected' % _ICON_NAME + else: + icon_name = _ICON_NAME + icon_name = get_icon_state(icon_name, strength) if icon_name: self.icon.props.icon_name = icon_name diff --git a/src/view/home/MeshBox.py b/src/view/home/MeshBox.py index 684ae13..c850145 100644 --- a/src/view/home/MeshBox.py +++ b/src/view/home/MeshBox.py @@ -125,6 +125,7 @@ class AccessPointView(CanvasPulsingIcon): self._update_name() def _state_changed_cb(self, model, pspec): + self._update_icon() self._update_state() def _activate_cb(self, icon): @@ -138,7 +139,13 @@ class AccessPointView(CanvasPulsingIcon): self._palette.props.primary_text = self._model.props.name def _update_icon(self): - icon_name = get_icon_state(_ICON_NAME, self._model.props.strength) + # keep this code in sync with view/devices/network/wireless.py + strength = self._model.props.strength + if self._model.props.state == accesspointmodel.STATE_CONNECTED: + icon_name = '%s-connected' % _ICON_NAME + else: + icon_name = _ICON_NAME + icon_name = get_icon_state(icon_name, strength) if icon_name: self.props.icon_name = icon_name icon = self._palette.props.icon |