copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

avatar is now set in draw_contact; we need a better place though

Browse source
This commit is contained in:
Nikos Kouremenos 2005-11-08 15:47:27 +00:00
parent 3492272881
commit 3d7dee624e
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/roster_window.py
View file

@ -54,7 +54,7 @@ C_TYPE, # account, group or contact?
C_JID, # the jid of the row C_JID, # the jid of the row
C_ACCOUNT, # cellrenderer text that holds account name C_ACCOUNT, # cellrenderer text that holds account name
C_EDITABLE, # cellrenderer text that holds name editable or not? C_EDITABLE, # cellrenderer text that holds name editable or not?
C_SECPIXBUF, # econdary_pixbuf C_SECPIXBUF, # secondary_pixbuf (holds avatar or padlock)
) = range(7) ) = range(7)
@ -183,17 +183,9 @@ class RosterWindow:
if g == _('Transports'): if g == _('Transports'):
typestr = 'agent' typestr = 'agent'
if gajim.config.get('show_avatars_in_roster'): # we add some values here. see draw_contact for more
pixbuf = gajim.interface.get_avatar_pixbuf_from_cache(jid) model.append(iterG, (None, user.name,
if pixbuf in ('ask', None): typestr, user.jid, account, False, None))
scaled_pixbuf = None
else:
scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster')
else:
scaled_pixbuf = None
model.append(iterG, [self.jabber_state_images[user.show], user.name,
typestr, user.jid, account, False, scaled_pixbuf])
if gajim.groups[account][g]['expand']: if gajim.groups[account][g]['expand']:
self.tree.expand_row(model.get_path(iterG), False) self.tree.expand_row(model.get_path(iterG), False)
@ -238,7 +230,7 @@ class RosterWindow:
return self.jabber_state_images return self.jabber_state_images
def draw_contact(self, jid, account, selected=False, focus=False): def draw_contact(self, jid, account, selected=False, focus=False):
'''draw the correct state image and name''' '''draw the correct state image, name and avatar'''
model = self.tree.get_model() model = self.tree.get_model()
iters = self.get_contact_iter(jid, account) iters = self.get_contact_iter(jid, account)
if len(iters) == 0: if len(iters) == 0:
@ -279,10 +271,22 @@ class RosterWindow:
img = state_images[contact.show] img = state_images[contact.show]
else: else:
img = state_images['not in the roster'] img = state_images['not in the roster']
#FIXME: here it gets called to often
# for example if we recv a message we also reset the avatar!
if gajim.config.get('show_avatars_in_roster'):
pixbuf = gajim.interface.get_avatar_pixbuf_from_cache(jid)
if pixbuf in ('ask', None):
scaled_pixbuf = None
else:
scaled_pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'roster')
else:
scaled_pixbuf = None
for iter in iters: for iter in iters:
model[iter][C_IMG] = img model[iter][C_IMG] = img
model[iter][C_NAME] = name model[iter][C_NAME] = name
#FIXME: add avatar model[iter][C_SECPIXBUF] = scaled_pixbuf
def join_gc_room(self, account, room_jid, nick, password): def join_gc_room(self, account, room_jid, nick, password):
if room_jid in gajim.interface.windows[account]['gc'] and \ if room_jid in gajim.interface.windows[account]['gc'] and \