diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-06 22:46:19 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-06 22:46:19 (GMT) |
commit | 5bad36b1e1f75536a06b1e7638171cf48f266e0c (patch) | |
tree | 02b73d7353893f774df9b095f87d8270cf8207f3 | |
parent | 0f32a1e193a0064e5d5313cdc205d15cea71f1e7 (diff) | |
parent | 7f8b000a92af8f5b44bc84653c63fbe647d79737 (diff) |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | shell/view/home/FriendsBox.py | 10 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,5 @@ +* #3085: Fixed XO icon in group view (erikos) + Snapshot d9a30c23ff * #2960: Gray bottom border for Toolbox. (marco) diff --git a/shell/view/home/FriendsBox.py b/shell/view/home/FriendsBox.py index 473cd64..2d83207 100644 --- a/shell/view/home/FriendsBox.py +++ b/shell/view/home/FriendsBox.py @@ -22,9 +22,9 @@ import gobject from sugar import profile from sugar.graphics.spreadlayout import SpreadLayout from sugar.graphics import style +from sugar.graphics.icon import CanvasIcon +from sugar.graphics.palette import Palette -from model.BuddyModel import BuddyModel -from view.BuddyIcon import BuddyIcon from view.home.FriendView import FriendView class FriendsBox(hippo.CanvasBox): @@ -38,9 +38,11 @@ class FriendsBox(hippo.CanvasBox): self._layout = SpreadLayout() self.set_layout(self._layout) - buddy_model = BuddyModel(key=profile.get_pubkey()) - self._owner_icon = BuddyIcon(shell, buddy_model) + self._owner_icon = CanvasIcon(icon_name='computer-xo', + xo_color=profile.get_color()) self._owner_icon.props.size = style.LARGE_ICON_SIZE + palette = Palette(profile.get_nick_name()) + self._owner_icon.set_palette(palette) self._layout.add_center(self._owner_icon) friends = self._shell.get_model().get_friends() |