From 79c5b5d0e230beaeadde75e7f5f29f9d24d903b6 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Wed, 18 May 2005 16:30:59 +0000 Subject: [PATCH] hidden_rows ==> collapsed_rows --- src/common/config.py | 2 +- src/roster_window.py | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/common/config.py b/src/common/config.py index a344263ff..24aaa55aa 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -56,7 +56,7 @@ class Config: 'inmsgcolor': [ opt_color, '#ff0000' ], 'outmsgcolor': [ opt_color, '#0000ff' ], 'statusmsgcolor': [ opt_color, '#1eaa1e' ], - 'hidden_rows': [ opt_str, '' ], + 'collapsed_rows': [ opt_str, '' ], 'roster_theme': [ opt_str, 'green' ], 'accounttextcolor': [ opt_color, '#ffffff' ], 'accountbgcolor': [ opt_color, '#94aa8c' ], diff --git a/src/roster_window.py b/src/roster_window.py index 66a3a04bd..2a02d6481 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -127,12 +127,12 @@ class Roster_window: iterG = model.append(IterAcct, (self.jabber_state_images['closed'], g, 'group', g, account, False)) if not self.groups[account].has_key(g): #It can probably never append - if account + g in self.hidden_rows: + if account + g in self.collapsed_rows: ishidden = False else: ishidden = True self.groups[account][g] = { 'expand': ishidden } - if not account in self.hidden_rows and \ + if not account in self.collapsed_rows and \ not gajim.config.get('mergeaccounts'): self.tree.expand_row((model.get_path(iterG)[0]), False) @@ -386,7 +386,7 @@ class Roster_window: if g in self.groups[account].keys(): continue - if account + g in self.hidden_rows: + if account + g in self.collapsed_rows: ishidden = False else: ishidden = True @@ -1020,7 +1020,7 @@ class Roster_window: gajim.config.set('width', width) gajim.config.set('height', height) - gajim.config.set('hidden_rows', '\t'.join(self.hidden_rows)) + gajim.config.set('collapsed_rows', '\t'.join(self.collapsed_rows)) self.plugin.save_config() for account in gajim.connections: gajim.connections[account].quit(True) @@ -1104,11 +1104,11 @@ class Roster_window: model.set_value(iter, 0, self.jabber_state_images['opened']) jid = model.get_value(iter, 3) self.groups[account][jid]['expand'] = True - if account + jid in self.hidden_rows: - self.hidden_rows.remove(account + jid) + if account + jid in self.collapsed_rows: + self.collapsed_rows.remove(account + jid) elif type == 'account': - if account in self.hidden_rows: - self.hidden_rows.remove(account) + if account in self.collapsed_rows: + self.collapsed_rows.remove(account) for g in self.groups[account]: groupIter = self.get_group_iter(g, account) if groupIter and self.groups[account][g]['expand']: @@ -1126,11 +1126,11 @@ class Roster_window: model.set_value(iter, 0, self.jabber_state_images['closed']) jid = model.get_value(iter, 3) self.groups[account][jid]['expand'] = False - if not account + jid in self.hidden_rows: - self.hidden_rows.append(account + jid) + if not account + jid in self.collapsed_rows: + self.collapsed_rows.append(account + jid) elif type == 'account': - if not account in self.hidden_rows: - self.hidden_rows.append(account) + if not account in self.collapsed_rows: + self.collapsed_rows.append(account) def on_editing_canceled (self, cell): '''editing has been canceled''' @@ -1518,7 +1518,7 @@ class Roster_window: self.id_signal_cb = self.status_combobox.connect('changed', self.on_status_combobox_changed) - self.hidden_rows = gajim.config.get('hidden_rows').split('\t') + self.collapsed_rows = gajim.config.get('collapsed_rows').split('\t') self.draw_roster() if len(gajim.connections) == 0: # if no account self.plugin.windows['account_modification'] = \