diff options
author | Simon Schampijer <erikos@localhost.localdomain> | 2008-10-11 16:19:59 (GMT) |
---|---|---|
committer | Simon Schampijer <erikos@localhost.localdomain> | 2008-10-11 16:19:59 (GMT) |
commit | 8361ca82ae89ce8b038a4faa8274b2b88cfe81a6 (patch) | |
tree | d89a24023f019235a88c104b10fa6a2291bd82c8 /extensions/deviceicon | |
parent | 38cb73f56dd83c58252a27ace7b067109cefa311 (diff) |
Use gconf for the profile
Diffstat (limited to 'extensions/deviceicon')
-rw-r--r-- | extensions/deviceicon/battery.py | 10 | ||||
-rw-r--r-- | extensions/deviceicon/speaker.py | 11 | ||||
-rw-r--r-- | extensions/deviceicon/wireless.py | 9 |
3 files changed, 19 insertions, 11 deletions
diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py index 37691b4..c9d621e 100644 --- a/extensions/deviceicon/battery.py +++ b/extensions/deviceicon/battery.py @@ -16,12 +16,12 @@ import logging from gettext import gettext as _ +import gconf import gobject import gtk import dbus -from sugar import profile from sugar.graphics import style from sugar.graphics.icon import get_icon_state from sugar.graphics.tray import TrayIcon @@ -45,8 +45,10 @@ class DeviceView(TrayIcon): FRAME_POSITION_RELATIVE = 1000 def __init__(self, udi): - TrayIcon.__init__(self, icon_name=_ICON_NAME, - xo_color=profile.get_color()) + client = gconf.client_get_default() + self._color = XoColor(client.get_string('/desktop/sugar/user/color')) + + TrayIcon.__init__(self, icon_name=_ICON_NAME, xo_color=self._color) self._model = DeviceModel(udi) self.palette = BatteryPalette(_('My Battery')) @@ -65,7 +67,7 @@ class DeviceView(TrayIcon): def _update_info(self): name = _ICON_NAME current_level = self._model.props.level - xo_color = profile.get_color() + xo_color = self._color badge_name = None if self._model.props.charging: diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py index b62ae65..5497873 100644 --- a/extensions/deviceicon/speaker.py +++ b/extensions/deviceicon/speaker.py @@ -15,11 +15,11 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA from gettext import gettext as _ +import gconf import gobject import gtk -from sugar import profile from sugar.graphics import style from sugar.graphics.icon import get_icon_state, Icon from sugar.graphics.menuitem import MenuItem @@ -37,9 +37,10 @@ class DeviceView(TrayIcon): FRAME_POSITION_RELATIVE = 800 def __init__(self): - TrayIcon.__init__(self, - icon_name=_ICON_NAME, - xo_color=profile.get_color()) + client = gconf.client_get_default() + self._color = XoColor(client.get_string('/desktop/sugar/user/color')) + + TrayIcon.__init__(self, icon_name=_ICON_NAME, xo_color=self._color) self._model = DeviceModel() self.palette = SpeakerPalette(_('My Speakers'), model=self._model) @@ -59,7 +60,7 @@ class DeviceView(TrayIcon): def _update_info(self): name = _ICON_NAME current_level = self._model.props.level - xo_color = profile.get_color() + xo_color = self._color if self._model.props.muted: name += '-muted' diff --git a/extensions/deviceicon/wireless.py b/extensions/deviceicon/wireless.py index 1544526..dcaffd3 100644 --- a/extensions/deviceicon/wireless.py +++ b/extensions/deviceicon/wireless.py @@ -17,15 +17,16 @@ import logging from gettext import gettext as _ +import gconf import gobject import gtk from sugar.graphics.icon import get_icon_state +from sugar.graphics.xocolor import XoColor from sugar.graphics.tray import TrayIcon from sugar.graphics import style from sugar.graphics.palette import Palette -from sugar import profile from jarabe.model import network from jarabe.frame.frameinvoker import FrameWidgetInvoker @@ -169,6 +170,10 @@ class MeshDeviceView(TrayIcon): self.model.connect('notify::state', self._state_changed_cb) self.model.connect('notify::activation-stage', self._state_changed_cb) + + client = gconf.client_get_default() + self._color = XoColor(client.get_string('/desktop/sugar/user/color')) + self._update_state() def _state_changed_cb(self, model, pspec): @@ -183,7 +188,7 @@ class MeshDeviceView(TrayIcon): 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: - self.icon.props.xo_color = profile.get_color() + self.icon.props.xo_color = self._color elif state == STATE_INACTIVE: self.icon.props.fill_color = style.COLOR_INACTIVE_FILL.get_svg() self.icon.props.stroke_color = style.COLOR_INACTIVE_STROKE.get_svg() |