diff options
author | Aleksey Lim <alsroot@member.fsf.org> | 2009-09-18 10:39:39 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@member.fsf.org> | 2009-09-18 10:39:39 (GMT) |
commit | c3619ae5a1fb0950edd2876700cee93f6d702f1f (patch) | |
tree | 7601b160ae415d1e850d29da10c03351742049dc /src/jarabe/journal | |
parent | d8872c7095b9b73b0c48d21d07cc4793fcc3b626 (diff) |
favoritesview.py: icon-color KeyError #976
Diffstat (limited to 'src/jarabe/journal')
-rw-r--r-- | src/jarabe/journal/expandedentry.py | 10 | ||||
-rw-r--r-- | src/jarabe/journal/listmodel.py | 5 | ||||
-rw-r--r-- | src/jarabe/journal/misc.py | 8 | ||||
-rw-r--r-- | src/jarabe/journal/palettes.py | 9 |
4 files changed, 14 insertions, 18 deletions
diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py index fdf3478..94d90ed 100644 --- a/src/jarabe/journal/expandedentry.py +++ b/src/jarabe/journal/expandedentry.py @@ -180,13 +180,11 @@ class ExpandedEntry(hippo.CanvasBox): self._icon_button_release_event_cb) if misc.is_activity_bundle(self._metadata): - icon.props.fill_color = style.COLOR_TRANSPARENT.get_svg() - icon.props.stroke_color = style.COLOR_BUTTON_GREY.get_svg() + xo_color = XoColor('%s,%s' % (style.COLOR_BUTTON_GREY.get_svg(), + style.COLOR_TRANSPARENT.get_svg())) else: - if self._metadata.has_key('icon-color') and \ - self._metadata['icon-color']: - icon.props.xo_color = XoColor( \ - self._metadata['icon-color']) + xo_color = misc.get_icon_color(self._metadata) + icon.props.xo_color = xo_color icon.set_palette(ObjectPalette(self._metadata)) diff --git a/src/jarabe/journal/listmodel.py b/src/jarabe/journal/listmodel.py index 917fbb1..32df853 100644 --- a/src/jarabe/journal/listmodel.py +++ b/src/jarabe/journal/listmodel.py @@ -132,10 +132,7 @@ class ListModel(gtk.GenericTreeModel, gtk.TreeDragSource): xo_color = XoColor('%s,%s' % (style.COLOR_BUTTON_GREY.get_svg(), style.COLOR_TRANSPARENT.get_svg())) else: - if metadata.get('icon-color', ''): - xo_color = XoColor(metadata['icon-color']) - else: - xo_color = None + xo_color = misc.get_icon_color(metadata) self._cached_row.append(xo_color) title = gobject.markup_escape_text(metadata.get('title', None)) diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py index 5ea1d24..a9baec8 100644 --- a/src/jarabe/journal/misc.py +++ b/src/jarabe/journal/misc.py @@ -20,10 +20,12 @@ import os from gettext import gettext as _ import gio +import gconf from sugar.activity import activityfactory from sugar.activity.activityhandle import ActivityHandle from sugar.graphics.icon import get_icon_file_name +from sugar.graphics.xocolor import XoColor from sugar import mime from sugar.bundle.activitybundle import ActivityBundle from sugar.bundle.contentbundle import ContentBundle @@ -229,3 +231,9 @@ def is_bundle(metadata): return is_activity_bundle(metadata) or is_content_bundle(metadata) or \ is_journal_bundle(metadata) +def get_icon_color(metadata): + if metadata is None or not 'icon-color' in metadata: + client = gconf.client_get_default() + return XoColor(client.get_string('/desktop/sugar/user/color')) + else: + return XoColor(metadata['icon-color']) diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py index cd4985a..e0dfbf4 100644 --- a/src/jarabe/journal/palettes.py +++ b/src/jarabe/journal/palettes.py @@ -51,14 +51,7 @@ class ObjectPalette(Palette): activity_icon = Icon(icon_size=gtk.ICON_SIZE_LARGE_TOOLBAR) activity_icon.props.file = misc.get_icon_name(metadata) - if metadata.has_key('icon-color') and \ - metadata['icon-color']: - activity_icon.props.xo_color = \ - XoColor(metadata['icon-color']) - else: - activity_icon.props.xo_color = \ - XoColor('%s,%s' % (style.COLOR_BUTTON_GREY.get_svg(), - style.COLOR_TRANSPARENT.get_svg())) + activity_icon.props.xo_color = misc.get_icon_color(metadata) if metadata.has_key('title'): title = gobject.markup_escape_text(metadata['title']) |