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

comments and 80 char margin

This commit is contained in:
Nikos Kouremenos 2006-03-13 23:25:00 +00:00
parent bffcec6899
commit 0c6606c514
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/groupchat_control.py
View File

@ -161,32 +161,36 @@ class GroupchatControl(ChatControlBase):
store.set_sort_column_id(C_TEXT, gtk.SORT_ASCENDING) store.set_sort_column_id(C_TEXT, gtk.SORT_ASCENDING)
self.list_treeview.set_model(store) self.list_treeview.set_model(store)
# columns
# this col has 3 cells:
# first one img, second one text, third is sec pixbuf
column = gtk.TreeViewColumn() column = gtk.TreeViewColumn()
renderer_image = cell_renderer_image.CellRendererImage(0, 0) renderer_image = cell_renderer_image.CellRendererImage(0, 0) # status img
column.pack_start(renderer_image, expand = False) column.pack_start(renderer_image, expand = False)
column.add_attribute(renderer_image, 'image', C_IMG) column.add_attribute(renderer_image, 'image', C_IMG)
column.set_cell_data_func(renderer_image, self.tree_cell_data_func, None) column.set_cell_data_func(renderer_image, self.tree_cell_data_func, None)
renderer_text = gtk.CellRendererText() renderer_text = gtk.CellRendererText() # nickname
column.pack_start(renderer_text, expand = True) column.pack_start(renderer_text, expand = True)
column.add_attribute(renderer_text, 'markup', C_TEXT) column.add_attribute(renderer_text, 'markup', C_TEXT)
column.set_cell_data_func(renderer_text, self.tree_cell_data_func, None) column.set_cell_data_func(renderer_text, self.tree_cell_data_func, None)
renderer_pixbuf = gtk.CellRendererPixbuf() # avatar image renderer_pixbuf = gtk.CellRendererPixbuf() # avatar image
column.pack_start(renderer_pixbuf, expand = False) column.pack_start(renderer_pixbuf, expand = True)
column.add_attribute(renderer_pixbuf, 'pixbuf', C_AVATAR) column.add_attribute(renderer_pixbuf, 'pixbuf', C_AVATAR)
column.set_cell_data_func(renderer_pixbuf, self.avatar_cell_data_func, None) column.set_cell_data_func(renderer_pixbuf, self.avatar_cell_data_func, None)
self.list_treeview.append_column(column) self.list_treeview.append_column(column)
# workaround to avoid gtk arrows to be shown # workaround to avoid gtk arrows to be shown
column = gtk.TreeViewColumn() # 2nd COLUMN #column = gtk.TreeViewColumn() # 2nd COLUMN
renderer = gtk.CellRendererPixbuf() #renderer = gtk.CellRendererPixbuf()
column.pack_start(renderer, expand = False) #column.pack_start(renderer, expand = False)
self.list_treeview.append_column(column) #self.list_treeview.append_column(column)
column.set_visible(False) #column.set_visible(False)
self.list_treeview.set_expander_column(column) #self.list_treeview.set_expander_column(column)
# set an empty subject to show the room_jid # set an empty subject to show the room_jid
self.set_subject('') self.set_subject('')
@ -584,7 +588,8 @@ class GroupchatControl(ChatControlBase):
def draw_roster(self): def draw_roster(self):
self.list_treeview.get_model().clear() self.list_treeview.get_model().clear()
for nick in gajim.contacts.get_nick_list(self.account, self.room_jid): for nick in gajim.contacts.get_nick_list(self.account, self.room_jid):
gc_contact = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) gc_contact = gajim.contacts.get_gc_contact(self.account, self.room_jid,
nick)
self.add_contact_to_roster(nick, gc_contact.show, gc_contact.role, self.add_contact_to_roster(nick, gc_contact.show, gc_contact.role,
gc_contact.affiliation, gc_contact.status, gc_contact.affiliation, gc_contact.status,
gc_contact.jid) gc_contact.jid)
@ -728,7 +733,8 @@ class GroupchatControl(ChatControlBase):
st += ' (' + status + ')' st += ' (' + status + ')'
self.print_conversation(st) self.print_conversation(st)
def add_contact_to_roster(self, nick, show, role, affiliation, status, jid = ''): def add_contact_to_roster(self, nick, show, role, affiliation, status,
jid = ''):
model = self.list_treeview.get_model() model = self.list_treeview.get_model()
role_name = helpers.get_uf_role(role, plural = True) role_name = helpers.get_uf_role(role, plural = True)

3
src/roster_window.py
View File

@ -3101,7 +3101,8 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
# columns # columns
# this col has two cells: first one img, second one text # this col has 3 cells:
# first one img, second one text, third is sec pixbuf
col = gtk.TreeViewColumn() col = gtk.TreeViewColumn()
render_image = cell_renderer_image.CellRendererImage(0, 0) # show img or +- render_image = cell_renderer_image.CellRendererImage(0, 0) # show img or +-