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

when we use merge and we collapse/expand a group, we collapse/expand this group in every accounts (fix #295)

This commit is contained in:
Yann Leboulanger 2005-06-20 22:51:42 +00:00
parent a4263d3515
commit 5d44204264
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/roster_window.py
View File

@ -1440,15 +1440,21 @@ _('If "%s" accepts this request you will know his status.') %jid).get_response()
def on_roster_treeview_row_expanded(self, widget, iter, path): def on_roster_treeview_row_expanded(self, widget, iter, path):
'''When a row is expanded change the icon of the arrow''' '''When a row is expanded change the icon of the arrow'''
model = self.tree.get_model() model = self.tree.get_model()
account = model.get_value(iter, 4) if gajim.config.get('mergeaccounts'):
accounts = gajim.connections.keys()
else:
accounts = [model.get_value(iter, 4)]
type = model.get_value(iter, 2) type = model.get_value(iter, 2)
if type == 'group': if type == 'group':
model.set_value(iter, 0, self.jabber_state_images['opened']) model.set_value(iter, 0, self.jabber_state_images['opened'])
jid = model.get_value(iter, 3) jid = model.get_value(iter, 3)
self.groups[account][jid]['expand'] = True for account in accounts:
if account + jid in self.collapsed_rows: if self.groups[account].has_key(jid): # This account has this group
self.collapsed_rows.remove(account + jid) self.groups[account][jid]['expand'] = True
if account + jid in self.collapsed_rows:
self.collapsed_rows.remove(account + jid)
elif type == 'account': elif type == 'account':
account = accounts[0] # There is only one cause we don't use merge
if account in self.collapsed_rows: if account in self.collapsed_rows:
self.collapsed_rows.remove(account) self.collapsed_rows.remove(account)
for g in self.groups[account]: for g in self.groups[account]:
@ -1462,15 +1468,21 @@ _('If "%s" accepts this request you will know his status.') %jid).get_response()
'''When a row is collapsed : '''When a row is collapsed :
change the icon of the arrow''' change the icon of the arrow'''
model = self.tree.get_model() model = self.tree.get_model()
account = model.get_value(iter, 4) if gajim.config.get('mergeaccounts'):
accounts = gajim.connections.keys()
else:
accounts = [model.get_value(iter, 4)]
type = model.get_value(iter, 2) type = model.get_value(iter, 2)
if type == 'group': if type == 'group':
model.set_value(iter, 0, self.jabber_state_images['closed']) model.set_value(iter, 0, self.jabber_state_images['closed'])
jid = model.get_value(iter, 3) jid = model.get_value(iter, 3)
self.groups[account][jid]['expand'] = False for account in accounts:
if not account + jid in self.collapsed_rows: if self.groups[account].has_key(jid): # This account has this group
self.collapsed_rows.append(account + jid) self.groups[account][jid]['expand'] = False
if not account + jid in self.collapsed_rows:
self.collapsed_rows.append(account + jid)
elif type == 'account': elif type == 'account':
account = accounts[0] # There is only one cause we don't use merge
if not account in self.collapsed_rows: if not account in self.collapsed_rows:
self.collapsed_rows.append(account) self.collapsed_rows.append(account)