diff --git a/src/common/config.py b/src/common/config.py index a71b64863..8e8187047 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -160,6 +160,7 @@ class Config: 'priority': [ opt_int, 5 ], 'autoconnect': [ opt_bool, False ], 'autoreconnect': [ opt_bool, True ], + 'active': [ opt_bool, True], 'proxy': [ opt_str, '' ], 'keyid': [ opt_str, '' ], 'keyname': [ opt_str, '' ], diff --git a/src/config.py b/src/config.py index 116444e25..068ab8383 100644 --- a/src/config.py +++ b/src/config.py @@ -1442,7 +1442,7 @@ _('To change the account name, you must be disconnected.')).get_response() self.xml.get_widget('password_entry').set_text(new_password) def account_is_ok(self, acct): - '''When the account has been created with sucess''' + '''When the account has been created with success''' self.xml.get_widget('new_account_checkbutton').set_active(False) self.modify = True self.account = acct diff --git a/src/gtkgui.glade b/src/gtkgui.glade index 91e48bf67..c5049ca0a 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -701,7 +701,7 @@ 6 True 5 - 4 + 3 False 6 6 @@ -845,27 +845,6 @@ - - - True - True - True - True - 0 - - True - * - True - - - 1 - 4 - 1 - 2 - - - - True @@ -936,27 +915,6 @@ - - - True - Click to change account's password - True - Chan_ge - True - GTK_RELIEF_NORMAL - True - - - - 3 - 4 - 2 - 3 - fill - - - - True @@ -973,13 +931,55 @@ 0 - 4 + 3 0 1 fill + + + + True + Click to change account's password + True + Chan_ge Password + True + GTK_RELIEF_NORMAL + True + + + + 2 + 3 + 3 + 4 + fill + + + + + + + True + True + True + True + 0 + + True + * + True + + + 1 + 3 + 1 + 2 + + + False @@ -1095,199 +1095,21 @@ - + True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - 6 - True - False - 6 - - - - True - False - 6 - - - - True - True - No key selected - False - False - GTK_JUSTIFY_LEFT - False - True - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - - False - False - GTK_JUSTIFY_LEFT - False - True - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - True - True - Choose _Key... - True - GTK_RELIEF_NORMAL - True - - - - 0 - False - False - - - - - 0 - False - True - - - - - - True - False - 6 - - - - True - False - If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for only you and of course the administrator - True - Save _passphrase (insecure) - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - False - True - True - False - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - False - True - - - - - - - - - - True - <b>OpenPGP</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - + True + Inactivate account + True + GTK_RELIEF_NORMAL + True + False + False + True - 6 + 0 False - True + False @@ -1661,44 +1483,268 @@ 6 - + True - Information about you are stored on the server as vCard - False - False - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + 6 + True + False + 6 + + + + True + False + 6 + + + + True + True + No key selected + False + False + GTK_JUSTIFY_LEFT + False + True + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + True + + False + False + GTK_JUSTIFY_LEFT + False + True + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + True + True + + + + + + True + True + Choose _Key... + True + GTK_RELIEF_NORMAL + True + + + + 0 + False + False + + + + + 0 + False + True + + + + + + True + False + 6 + + + + True + False + If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for only you + True + Save _passphrase (insecure) + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + + + + + True + False + True + True + False + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + False + True + + + + + + + + + + True + <b>OpenPGP</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + 0 False - False + True - + + + + + True - True - Edit Personal Information... - True - GTK_RELIEF_NORMAL - True - + 0 + 0.5 + GTK_SHADOW_NONE + + + + 6 + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + Information about you, as stored in the server + True + Edit Personal Information... + True + GTK_RELIEF_NORMAL + True + + + + + + + + + True + <b>Personal Information</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + 0 False - False + True @@ -1711,7 +1757,7 @@ True - Personal Details + Personal Information False False GTK_JUSTIFY_LEFT @@ -1773,8 +1819,8 @@ 6 - True - True + False + False @@ -14270,6 +14316,7 @@ the Jabber network. 0.5 0 0 + pass_entry PANGO_ELLIPSIZE_NONE -1 False @@ -14343,6 +14390,7 @@ the Jabber network. 0.5 0 0 + nick_entry PANGO_ELLIPSIZE_NONE -1 False