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 /src/jarabe/view | |
parent | 38cb73f56dd83c58252a27ace7b067109cefa311 (diff) |
Use gconf for the profile
Diffstat (limited to 'src/jarabe/view')
-rw-r--r-- | src/jarabe/view/keyhandler.py | 10 | ||||
-rw-r--r-- | src/jarabe/view/palettes.py | 9 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py index 1c33f44..1e9a890 100644 --- a/src/jarabe/view/keyhandler.py +++ b/src/jarabe/view/keyhandler.py @@ -22,13 +22,13 @@ import errno import tempfile import time from gettext import gettext as _ +import gconf import dbus import gtk import wnck from sugar._sugarext import KeyGrabber -from sugar import profile from sugar.datastore import datastore from jarabe.model import screen @@ -211,13 +211,17 @@ class KeyHandler(object): screenshot.get_from_drawable(window, window.get_colormap(), x_orig, y_orig, 0, 0, width, height) screenshot.save(file_path, "png") + + client = gconf.client_get_default() + color = client.get_string('/desktop/sugar/user/color') + jobject = datastore.create() try: jobject.metadata['title'] = _('Screenshot') jobject.metadata['keep'] = '0' jobject.metadata['buddies'] = '' - jobject.metadata['preview'] = '' - jobject.metadata['icon-color'] = profile.get_color().to_string() + jobject.metadata['preview'] = '' + jobject.metadata['icon-color'] = color jobject.metadata['mime_type'] = 'image/png' jobject.file_path = file_path datastore.write(jobject, transfer_ownership=True) diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py index 72326c4..fc383c8 100644 --- a/src/jarabe/view/palettes.py +++ b/src/jarabe/view/palettes.py @@ -17,12 +17,12 @@ import os import statvfs from gettext import gettext as _ +import gconf import gobject import gtk from sugar import env -from sugar import profile from sugar.graphics.palette import Palette from sugar.graphics.menuitem import MenuItem from sugar.graphics.icon import Icon @@ -90,8 +90,10 @@ class ActivityPalette(Palette): } def __init__(self, activity_info): + client = gconf.client_get_default() + color = XoColor(client.get_string("/desktop/sugar/user/color")) activity_icon = Icon(file=activity_info.get_icon(), - xo_color=profile.get_color(), + xo_color=color, icon_size=gtk.ICON_SIZE_LARGE_TOOLBAR) Palette.__init__(self, primary_text=activity_info.get_name(), @@ -144,7 +146,8 @@ class ActivityPalette(Palette): style.COLOR_TRANSPARENT.get_svg())) else: label.set_text(_('Make favorite')) - xo_color = profile.get_color() + client = gconf.client_get_default() + xo_color = XoColor(client.get_string("/desktop/sugar/user/color")) self._favorite_icon.props.xo_color = xo_color |