diff options
| author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-17 12:35:17 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-17 12:35:17 (GMT) |
| commit | 329f171cdab85e76d2eac2824703a82bc43000cb (patch) | |
| tree | dd52b9782ea3fda182b6af23d6e5cf0d87f19c32 | |
| parent | 499e8fa15e629155e4ee9fd0f219bbf0258f7dc9 (diff) | |
| parent | 6f3032fcfb294e7c61bcb212df70c693b3581de7 (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
| -rw-r--r-- | extensions/deviceicon/wireless.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/extensions/deviceicon/wireless.py b/extensions/deviceicon/wireless.py index 9929735..2902f42 100644 --- a/extensions/deviceicon/wireless.py +++ b/extensions/deviceicon/wireless.py @@ -65,25 +65,25 @@ class WirelessDeviceView(TrayIcon): self.set_palette(self.palette) self.palette.props.invoker = FrameWidgetInvoker(self) self.palette.set_group_id('frame') - self.palette.set_frequency(self._model.props.frequency) + self.palette.set_frequency(self.model.props.frequency) - self._model.connect('notify::name', self._name_changed_cb) - self._model.connect('notify::strength', self._strength_changed_cb) - self._model.connect('notify::state', self._state_changed_cb) + self.model.connect('notify::name', self._name_changed_cb) + self.model.connect('notify::strength', self._strength_changed_cb) + self.model.connect('notify::state', self._state_changed_cb) self._update_icon() self._update_state() def _get_palette_primary_text(self): - if self._model.props.state == STATE_INACTIVE: + if self.model.props.state == STATE_INACTIVE: return _("Disconnected") - return self._model.props.name + return self.model.props.name def _strength_changed_cb(self, model, pspec): self._update_icon() # Only update frequency periodically if self._counter % 4 == 0: - self.palette.set_frequency(self._model.props.frequency) + self.palette.set_frequency(self.model.props.frequency) self._counter += 1 def _name_changed_cb(self, model, pspec): @@ -96,10 +96,10 @@ class WirelessDeviceView(TrayIcon): def _update_icon(self): # keep this code in sync with view/home/MeshBox.py - strength = self._model.props.strength - if self._model.props.state == STATE_INACTIVE: + strength = self.model.props.strength + if self.model.props.state == STATE_INACTIVE: strength = 0 - if self._model.props.state == STATE_ACTIVATED: + if self.model.props.state == STATE_ACTIVATED: icon_name = '%s-connected' % _ICON_NAME else: icon_name = _ICON_NAME @@ -109,12 +109,12 @@ class WirelessDeviceView(TrayIcon): def _update_state(self): # FIXME Change icon colors once we have real icons - state = self._model.props.state + state = self.model.props.state if state == STATE_ACTIVATING: self.icon.props.fill_color = style.COLOR_INACTIVE_FILL.get_svg() self.icon.props.stroke_color = style.COLOR_INACTIVE_STROKE.get_svg() elif state == STATE_ACTIVATED: - (stroke, fill) = self._model.get_active_network_colors() + (stroke, fill) = self.model.get_active_network_colors() self.icon.props.stroke_color = stroke self.icon.props.fill_color = fill elif state == STATE_INACTIVE: |