diff --git a/plugins/gtkgui/config.py b/plugins/gtkgui/config.py index d884f7b90..c6b422800 100644 --- a/plugins/gtkgui/config.py +++ b/plugins/gtkgui/config.py @@ -1267,6 +1267,7 @@ class Account_modification_window: return self.on_checkbutton_toggled_and_clear(widget, \ [self.xml.get_widget('password_entry')]) + self.xml.get_widget('password_entry').grab_focus() def on_new_account_checkbutton_toggled(self, widget): password_entry = self.xml.get_widget('password_entry') @@ -1318,8 +1319,8 @@ class Accounts_window: if self.plugin.accounts[account].has_key('active'): activ = self.plugin.accounts[account]['active'] iter = model.append() - model.set(iter, 0, account, 1, \ - self.plugin.accounts[account]['hostname'], 2, activ) + model.set(iter, 0, account, 1,\ + self.plugin.accounts[account]['hostname']) def on_accounts_treeview_cursor_changed(self, widget): """Activate delete and modify buttons when a row is selected""" @@ -1357,7 +1358,6 @@ class Accounts_window: """When modify button is clicked : open the account information window for this account""" if not self.plugin.windows.has_key('account_modification_window'): -# infos = {} sel = self.accounts_treeview.get_selection() (model, iter) = sel.get_selected() account = model.get_value(iter, 0) @@ -1368,11 +1368,8 @@ class Accounts_window: self.plugin.windows['account_modification_window'] = \ Account_modification_window(self.plugin, infos) - def on_toggled(self, cell, path, model=None): - iter = model.get_iter(path) - model.set_value(iter, 2, not cell.get_active()) - account = model.get_value(iter, 0) - if cell.get_active(): + def on_sync_with_global_status_checkbutton_toggled(self, widget): + if widget.get_active(): self.plugin.accounts[account]['active'] = 0 else: self.plugin.accounts[account]['active'] = 1 @@ -1392,11 +1389,6 @@ class Accounts_window: renderer = gtk.CellRendererText() self.accounts_treeview.insert_column_with_attributes(-1, _('Server'), \ renderer, text=1) - renderer = gtk.CellRendererToggle() - renderer.set_property('activatable', True) - renderer.connect('toggled', self.on_toggled, model) - self.accounts_treeview.insert_column_with_attributes(-1, _('Sync with global status'), \ - renderer, active=2) self.xml.signal_autoconnect(self) self.init_accounts() diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade index 61a793fd2..c40930d89 100644 --- a/plugins/gtkgui/gtkgui.glade +++ b/plugins/gtkgui/gtkgui.glade @@ -316,7 +316,7 @@ 4 - 500 + 450 200 True Accounts @@ -515,138 +515,10 @@ - - 4 - True - About - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - - - - - True - False - 0 - - - - True - False - 0 - - - - True - 0.5 - 0.5 - 0 - 0 - - - 10 - False - True - - - - - - True - <b>Gajim</b> (http://www.gajim.org) -Version 0.5.1 - -Copyright © 2003-2005 Gajim Team - -<b>Gajim Team</b> -Vincent Hanquez (tab@snarc.org) -Yann Le Boulanger (asterix@lagaule.org) -Nikos Kouremenos (kourem@gmail.com) -Alex Podaras (bigpod@gmail.com) - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 10 - True - True - - - - - 0 - True - True - - - - - - True - - - 10 - False - True - - - - - - 10 - True - 0.5 - 0.5 - 0.20000000298 - 1 - 0 - 0 - 0 - 0 - - - - True - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - False - False - - - - - - 4 - 539 - 332 + 440 + 290 True Account Modification GTK_WINDOW_TOPLEVEL @@ -669,15 +541,14 @@ Alex Podaras (bigpod@gmail.com) - 5 True False - 7 + 5 True - Name : + Name: False False GTK_JUSTIFY_LEFT @@ -723,7 +594,6 @@ Alex Podaras (bigpod@gmail.com) - 5 True True True @@ -733,104 +603,10 @@ Alex Podaras (bigpod@gmail.com) False - - 5 + True - 5 - 2 False - 5 - 5 - - - - True - Resource: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - Jabber ID: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - Gajim - True - * - False - - - 1 - 2 - 3 - 4 - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - + 2 @@ -846,45 +622,91 @@ Alex Podaras (bigpod@gmail.com) - 0 - 2 - 0 - 1 - 26 - fill - + 0 + False + False - - True - Priority: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - + True False - 5 + 3 + + + + True + Jabber ID: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + True + True + + + + + + True + False + 3 + + + + True + Password: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + @@ -913,7 +735,7 @@ Alex Podaras (bigpod@gmail.com) Save password True GTK_RELIEF_NORMAL - True + False False False True @@ -945,82 +767,57 @@ Alex Podaras (bigpod@gmail.com) - 1 - 2 - 2 - 3 - fill - fill + 0 + True + True - + True - Password: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 2 - 3 - fill - - - + False + 3 - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 5 - - - 1 - 2 - 4 - 5 - - - - - - False - True - - + + + True + Resource: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + - - - 5 - True - False - 0 - - - - True - gtk-home - 2 - 0.5 - 0.5 - 0 - 0 + + + True + True + True + True + 0 + Gajim + True + * + False + + + 0 + True + True + + 0 @@ -1030,110 +827,17 @@ Alex Podaras (bigpod@gmail.com) - + True - Account - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - tab - - - - - - True - False - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE + False + 3 - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 2 - - - - True - True - Connect at startup - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Log history for all contacts in this account - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - - - - - True - <b>Startup</b> + Priority False - True + False GTK_JUSTIFY_LEFT False False @@ -1143,7 +847,28 @@ Alex Podaras (bigpod@gmail.com) 0 - label_item + 0 + False + False + + + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 5 0 100 1 10 5 + + + 0 + True + True @@ -1161,21 +886,94 @@ Alex Podaras (bigpod@gmail.com) - - 5 + + True + Account + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + True False 0 - + True - gtk-preferences - 2 - 0.5 - 0.5 - 0 - 0 + False + 2 + + + + True + If enabled, Gajim, when launched, will automatically connect to jabber using this account + True + Connect at startup + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Log history for all contacts in this account + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + False + False + + + + + + True + True + Synchronize account status with global status + True + GTK_RELIEF_NORMAL + True + True + False + True + + + + 0 + False + False + + 0 @@ -1183,27 +981,26 @@ Alex Podaras (bigpod@gmail.com) True + + + False + True + + - - - True - Preferences - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + + + True + Preferences + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 tab @@ -1453,49 +1250,18 @@ Alex Podaras (bigpod@gmail.com) - - 5 + True - False - 0 - - - - True - gtk-dialog-error - 2 - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Security - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + Security + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 tab @@ -1686,39 +1452,40 @@ Alex Podaras (bigpod@gmail.com) - - 5 + + True + Connection + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + True False 0 - + True - gtk-refresh - 2 - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Connection + Information about you are stored on the server as vCard False False GTK_JUSTIFY_LEFT - False + True False - 0.5 + 0 0.5 0 0 @@ -1729,48 +1496,6 @@ Alex Podaras (bigpod@gmail.com) False - - - tab - - - - - - 2 - True - 1 - 2 - False - 3 - 3 - - - - True - Information about you are stored -on the server as a vCard - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - 5 - 5 - fill - - - @@ -1783,14 +1508,9 @@ on the server as a vCard - 1 - 2 - 0 - 1 - 5 - 5 - fill - + 0 + False + False @@ -1801,49 +1521,18 @@ on the server as a vCard - - 5 + True - False - 0 - - - - True - gtk-justify-center - 2 - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - Details - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + Details + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 tab @@ -1857,23 +1546,11 @@ on the server as a vCard - - - True - - - 10 - False - True - - - - 7 True GTK_BUTTONBOX_END - 20 + 10 @@ -5729,12 +5406,13 @@ Custom True + True False False GTK_JUSTIFY_LEFT False - False + True 0 0.5 5