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

Get rid of the new message icon entirely

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2006-05-22 15:25:10 -04:00
parent 30f3c73dcb
commit 0c2940d56e
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sugar/chat/chat.py
View File

@ -275,19 +275,14 @@ class Chat(activity.Activity):
def activity_on_got_focus(self): def activity_on_got_focus(self):
print "act %d: in activity_on_got_focus" % self.activity_get_id() print "act %d: in activity_on_got_focus" % self.activity_get_id()
# FIXME self._controller.notify_activate(self)
def _insert_buddy(self, buf, nick): def _insert_buddy(self, buf, nick):
buddy = self._controller.get_group().get_buddy(nick) buddy = self._controller.get_group().get_buddy(nick)
if buddy.get_icon(): icon = buddy.get_icon_pixbuf()
pbl = gtk.gdk.PixbufLoader() if icon:
pbl.write(buddy.get_icon())
pbl.close()
pbuf = pbl.get_pixbuf()
aniter = buf.get_end_iter() aniter = buf.get_end_iter()
buf.insert_pixbuf(aniter, pbuf) buf.insert_pixbuf(aniter, icon)
aniter = buf.get_end_iter() aniter = buf.get_end_iter()
buf.insert(aniter, nick + ": ") buf.insert(aniter, nick + ": ")
@ -539,9 +534,6 @@ class GroupChat(Chat):
self.activity_set_tab_icon_name("stock_help-chat") self.activity_set_tab_icon_name("stock_help-chat")
self.activity_show_icon(True) self.activity_show_icon(True)
aniter = self._buddy_list_model.append(None)
self._buddy_list_model.set(aniter, self._MODEL_COL_NICK, "Group",
self._MODEL_COL_ICON, self._pixbuf_active_chat, self._MODEL_COL_BUDDY, None)
self._start() self._start()
def activity_on_disconnected_from_shell(self): def activity_on_disconnected_from_shell(self):
@ -597,8 +589,10 @@ class GroupChat(Chat):
pass pass
elif action == Group.BUDDY_JOIN: elif action == Group.BUDDY_JOIN:
aniter = self._buddy_list_model.append(None) aniter = self._buddy_list_model.append(None)
self._buddy_list_model.set(aniter, self._MODEL_COL_NICK, buddy.get_nick_name(), self._buddy_list_model.set(aniter,
self._MODEL_COL_ICON, None, self._MODEL_COL_BUDDY, buddy) self._MODEL_COL_NICK, buddy.get_nick_name(),
self._MODEL_COL_ICON, buddy.get_icon_pixbuf(),
self._MODEL_COL_BUDDY, buddy)
elif action == Group.BUDDY_LEAVE: elif action == Group.BUDDY_LEAVE:
aniter = self._get_iter_for_buddy(buddy) aniter = self._get_iter_for_buddy(buddy)
if aniter: if aniter:
@ -612,17 +606,8 @@ class GroupChat(Chat):
return aniter return aniter
aniter = self._buddy_list_model.iter_next(aniter) aniter = self._buddy_list_model.iter_next(aniter)
def notify_new_message(self, chat, buddy):
aniter = self._get_iter_for_buddy(buddy)
self._buddy_list_model.set(aniter, self._MODEL_COL_ICON, self._pixbuf_new_message)
def notify_activate(self, chat, buddy):
aniter = self._get_iter_for_buddy(buddy)
self._buddy_list_model.set(aniter, self._MODEL_COL_ICON, self._pixbuf_active_chat)
def _group_recv_message(self, buddy, msg): def _group_recv_message(self, buddy, msg):
self.recv_message(buddy, msg) self.recv_message(buddy, msg)
self._controller.notify_new_message(self, None)
def _buddy_recv_message(self, buddy, msg): def _buddy_recv_message(self, buddy, msg):
if not self._chats.has_key(buddy): if not self._chats.has_key(buddy):

13
sugar/p2p/Buddy.py
View File

@ -1,6 +1,10 @@
import pwd import pwd
import os import os
import pygtk
pygtk.require('2.0')
import gtk
from Service import Service from Service import Service
from sugar import env from sugar import env
@ -25,6 +29,15 @@ class Buddy(object):
self._address = service.get_address() self._address = service.get_address()
self._icon = None self._icon = None
def get_icon_pixbuf(self):
if self._icon:
pbl = gtk.gdk.PixbufLoader()
pbl.write(self._icon)
pbl.close()
return pbl.get_pixbuf()
else:
return None
def get_icon(self): def get_icon(self):
"""Return the buddies icon, if any.""" """Return the buddies icon, if any."""
return self._icon return self._icon