diff options
| author | Simon Schampijer <simon@schampijer.de> | 2011-09-14 13:56:47 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2011-09-20 06:18:15 (GMT) |
| commit | cc64af8187b26a5aafa0c43d84c794ab071d8312 (patch) | |
| tree | 3768d279d0541f7d5454a9525af9d4254297dcf4 | |
| parent | 29ebe9ad1d8af765c25d046a29d2466af9f5fb7b (diff) | |
Color the favorite/star icon in the activities list and Journal in owners color SL #3090
As discussed with Gary C. Martin hovering over the icon should
reflect the visual change that will occur once you click on the
icon: the icon will be colored in the owners color when the
item is favored, therefore we need to color it in the owners
color as well when we hover over the icon.
Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-By: Sascha Silbe <silbe@activitycentral.com>
| -rw-r--r-- | src/jarabe/desktop/activitieslist.py | 6 | ||||
| -rw-r--r-- | src/jarabe/journal/keepicon.py | 6 | ||||
| -rw-r--r-- | src/jarabe/journal/listview.py | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py index 05d760e..b3b1f9d 100644 --- a/src/jarabe/desktop/activitieslist.py +++ b/src/jarabe/desktop/activitieslist.py @@ -249,8 +249,10 @@ class CellRendererFavorite(CellRendererIcon): self.props.size = style.SMALL_ICON_SIZE self.props.icon_name = 'emblem-favorite' self.props.mode = gtk.CELL_RENDERER_MODE_ACTIVATABLE - self.props.prelit_stroke_color = style.COLOR_BUTTON_GREY.get_svg() - self.props.prelit_fill_color = style.COLOR_BUTTON_GREY.get_svg() + client = gconf.client_get_default() + prelit_color = XoColor(client.get_string('/desktop/sugar/user/color')) + self.props.prelit_stroke_color = prelit_color.get_stroke_color() + self.props.prelit_fill_color = prelit_color.get_fill_color() class CellRendererActivityIcon(CellRendererIcon): diff --git a/src/jarabe/journal/keepicon.py b/src/jarabe/journal/keepicon.py index 1253afc..5bc299b 100644 --- a/src/jarabe/journal/keepicon.py +++ b/src/jarabe/journal/keepicon.py @@ -55,6 +55,10 @@ class KeepIcon(CanvasIcon): def __motion_notify_event_cb(self, icon, event): if not self._keep: if event.detail == hippo.MOTION_DETAIL_ENTER: - icon.props.fill_color = style.COLOR_BUTTON_GREY.get_svg() + client = gconf.client_get_default() + prelit_color = XoColor(client.get_string('/desktop/sugar/user/color')) + icon.props.stroke_color = prelit_color.get_stroke_color() + icon.props.fill_color = prelit_color.get_fill_color() elif event.detail == hippo.MOTION_DETAIL_LEAVE: + icon.props.stroke_color = style.COLOR_BUTTON_GREY.get_svg() icon.props.fill_color = style.COLOR_TRANSPARENT.get_svg() diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py index 0d7e112..a0ceccc 100644 --- a/src/jarabe/journal/listview.py +++ b/src/jarabe/journal/listview.py @@ -562,8 +562,10 @@ class CellRendererFavorite(CellRendererIcon): self.props.size = style.SMALL_ICON_SIZE self.props.icon_name = 'emblem-favorite' self.props.mode = gtk.CELL_RENDERER_MODE_ACTIVATABLE - self.props.prelit_stroke_color = style.COLOR_BUTTON_GREY.get_svg() - self.props.prelit_fill_color = style.COLOR_BUTTON_GREY.get_svg() + client = gconf.client_get_default() + prelit_color = XoColor(client.get_string('/desktop/sugar/user/color')) + self.props.prelit_stroke_color = prelit_color.get_stroke_color() + self.props.prelit_fill_color = prelit_color.get_fill_color() class CellRendererDetail(CellRendererIcon): |