From 7a2cb8052c88fd3a2b0015c351a4b17bb7c63fe2 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Tue, 1 Mar 2005 14:59:46 +0000 Subject: [PATCH] change callback, widget and variable names for agent browser window in glade and in the code --- plugins/gtkgui/config.py | 53 +++++++++++++++---------------------- plugins/gtkgui/gtkgui.glade | 24 ++++++++--------- plugins/gtkgui/gtkgui.py | 2 +- 3 files changed, 35 insertions(+), 44 deletions(-) diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py index e63feb6c3..7f3f13a7b 100644 --- a/plugins/gtkgui/config.py +++ b/plugins/gtkgui/config.py @@ -1286,18 +1286,14 @@ class agentRegistration_Window: self.xml.signal_connect('on_button_ok_clicked', self.on_ok) -class browseAgent_Window: +class agent_browser_window: """Class for bowser agent window : to know the agents on the selected server""" - def delete_event(self, widget): + def on_agent_browser_window_destroy(self, widget): """close window""" del self.plugin.windows[self.account]['browser'] - def on_cancel(self, widget): - """When Cancel button is clicked""" - widget.get_toplevel().destroy() - - def on_close(self, widget): + def on_close_button_clicked(self, widget): """When Close button is clicked""" widget.get_toplevel().destroy() @@ -1308,14 +1304,14 @@ class browseAgent_Window: def agents(self, agents): """When list of available agent arrive : Fill the treeview with it""" - model = self.treeview.get_model() + model = self.agents_treeview.get_model() for agent in agents: iter = model.append(None, (agent['name'], agent['jid'])) self.agent_infos[agent['jid']] = {'features' : []} def agent_info(self, agent, identities, features, items): """When we recieve informations about an agent""" - model = self.treeview.get_model() + model = self.agents_treeview.get_model() iter = model.get_iter_root() expand = 0 while (iter): @@ -1340,23 +1336,24 @@ class browseAgent_Window: model.append(iter, (item['name'], item['jid'])) self.agent_infos[item['jid']] = {'identities': [item]} if expand: - self.treeview.expand_row((model.get_path(iter)), False) + self.agents_treeview.expand_row((model.get_path(iter)), False) - def on_refresh(self, widget): + def on_refresh_button_clicked(self, widget): """When refresh button is clicked : refresh list : clear and rerequest it""" - self.treeview.get_model().clear() + self.agents_treeview.get_model().clear() self.browse() - def on_row_activated(self, widget, path, col=0): + def on_agents_treeview_row_activated(self, widget, path, col=0): """When a row is activated : Register or join the selected agent""" + #TODO pass def on_join_button_clicked(self, widget): """When we want to join a conference : Ask specific informations about the selected agent and close the window""" - model, iter = self.treeview.get_selection().get_selected() + model, iter = self.agents_treeview.get_selection().get_selected() if not iter: return service = model.get_value(iter, 1) @@ -1371,17 +1368,17 @@ class browseAgent_Window: def on_register_button_clicked(self, widget): """When we want to register an agent : Ask specific informations about the selected agent and close the window""" - model, iter = self.treeview.get_selection().get_selected() + model, iter = self.agents_treeview.get_selection().get_selected() if not iter : return service = model.get_value(iter, 1) self.plugin.send('REG_AGENT_INFO', self.account, service) widget.get_toplevel().destroy() - def on_cursor_changed(self, widget): + def on_agents_treeview_cursor_changed(self, widget): """When we select a row : activate buttons if needed""" - model, iter = self.treeview.get_selection().get_selected() + model, iter = self.agents_treeview.get_selection().get_selected() jid = model.get_value(iter, 1) self.register_button.set_sensitive(False) if self.agent_infos[jid].has_key('features'): @@ -1398,35 +1395,29 @@ class browseAgent_Window: if not plugin.connected[account]: warning_Window(_("You must be connected to view Agents")) return - xml = gtk.glade.XML(GTKGUI_GLADE, 'browser', APP) - self.window = xml.get_widget('browser') - self.treeview = xml.get_widget('treeview') + xml = gtk.glade.XML(GTKGUI_GLADE, 'agent_browser_window', APP) + self.window = xml.get_widget('agent_browser_window') + self.agents_treeview = xml.get_widget('agents_treeview') self.plugin = plugin self.account = account self.agent_infos = {} model = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING) - self.treeview.set_model(model) + self.agents_treeview.set_model(model) #columns renderer = gtk.CellRendererText() renderer.set_data('column', 0) - self.treeview.insert_column_with_attributes(-1, 'Name', renderer, text=0) + self.agents_treeview.insert_column_with_attributes(-1, 'Name', \ + renderer, text=0) renderer = gtk.CellRendererText() renderer.set_data('column', 1) - self.treeview.insert_column_with_attributes(-1, 'Service', \ + self.agents_treeview.insert_column_with_attributes(-1, 'Service', \ renderer, text=1) self.register_button = xml.get_widget('register_button') self.register_button.set_sensitive(False) self.join_button = xml.get_widget('join_button') self.join_button.set_sensitive(False) - - xml.signal_connect('gtk_widget_destroy', self.delete_event) - xml.signal_connect('on_refresh_clicked', self.on_refresh) - xml.signal_connect('on_row_activated', self.on_row_activated) - xml.signal_connect('on_join_button_clicked', self.on_join_button_clicked) - xml.signal_connect('on_register_button_clicked', self.on_register_button_clicked) - xml.signal_connect('on_cursor_changed', self.on_cursor_changed) - xml.signal_connect('on_close_clicked', self.on_close) + xml.signal_autoconnect(self) self.browse() class join_gc: diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade index e78f3729a..9f88517ae 100644 --- a/plugins/gtkgui/gtkgui.glade +++ b/plugins/gtkgui/gtkgui.glade @@ -2742,7 +2742,7 @@ on the server as a vCard True GTK_RELIEF_NORMAL True - + @@ -2753,7 +2753,7 @@ on the server as a vCard True GTK_RELIEF_NORMAL True - + @@ -2824,7 +2824,7 @@ on the server as a vCard True GTK_RELIEF_NORMAL True - + @@ -2898,7 +2898,7 @@ on the server as a vCard - + True Agents browser GTK_WINDOW_TOPLEVEL @@ -2913,7 +2913,7 @@ on the server as a vCard False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST - + @@ -2972,15 +2972,15 @@ on the server as a vCard GTK_CORNER_TOP_LEFT - + True True True False False True - - + + @@ -3009,13 +3009,13 @@ on the server as a vCard 0 - + True True True GTK_RELIEF_NORMAL True - + @@ -3080,13 +3080,13 @@ on the server as a vCard - + True True True GTK_RELIEF_NORMAL True - + diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py index 7af2ed61a..1af2009ae 100644 --- a/plugins/gtkgui/gtkgui.py +++ b/plugins/gtkgui/gtkgui.py @@ -2166,7 +2166,7 @@ class roster_Window: Call browse class""" if not self.plugin.windows[account].has_key('browser'): self.plugin.windows[account]['browser'] = \ - browseAgent_Window(self.plugin, account) + agent_browser_window(self.plugin, account) def image_is_ok(self, image): if not os.path.exists(image):