sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Color of sugar.activity.widgets.ActivityButton is owners all time despite of 'icon-color' metadata property #1368

Browse Source
This commit is contained in:
Aleksey Lim 2009-09-18 15:09:03 +00:00
parent 93d65bcb2f
commit 9f981bb5dc
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sugar/activity/widgets.py
View File

@ -33,13 +33,17 @@ from sugar.bundle.activitybundle import ActivityBundle
_ = lambda msg: gettext.dgettext('sugar-toolkit', msg) _ = lambda msg: gettext.dgettext('sugar-toolkit', msg)
def _create_activity_icon(): def _create_activity_icon(metadata):
if 'icon-color' in metadata:
color = XoColor(metadata['icon-color'])
else:
client = gconf.client_get_default()
color = XoColor(client.get_string('/desktop/sugar/user/color'))
from sugar.activity.activity import get_bundle_path from sugar.activity.activity import get_bundle_path
bundle = ActivityBundle(get_bundle_path()) bundle = ActivityBundle(get_bundle_path())
client = gconf.client_get_default()
color = XoColor(client.get_string('/desktop/sugar/user/color'))
icon = Icon(file=bundle.get_icon(), xo_color=color) icon = Icon(file=bundle.get_icon(), xo_color=color)
return icon return icon
@ -48,7 +52,7 @@ class ActivityButton(ToolButton):
def __init__(self, activity, **kwargs): def __init__(self, activity, **kwargs):
ToolButton.__init__(self, **kwargs) ToolButton.__init__(self, **kwargs)
icon = _create_activity_icon() icon = _create_activity_icon(activity.metadata)
self.set_icon_widget(icon) self.set_icon_widget(icon)
icon.show() icon.show()
@ -67,7 +71,7 @@ class ActivityToolbarButton(ToolbarButton):
ToolbarButton.__init__(self, page=toolbar, **kwargs) ToolbarButton.__init__(self, page=toolbar, **kwargs)
icon = _create_activity_icon() icon = _create_activity_icon(activity.metadata)
self.set_icon_widget(icon) self.set_icon_widget(icon)
icon.show() icon.show()