tls gui hack ready [this has to be rdy before 0.7 coz we use by default tls now and that may break idiotic servers that say tls is there but is not
This commit is contained in:
Nikos Kouremenos
parent
c741fbef11
commit
c707636421
|
|
@ -1290,9 +1290,13 @@ class Account_modification_window:
|
|||
if not widget.get_active():
|
||||
w.set_text('')
|
||||
|
||||
def on_use_tls_checkbutton_toggled(self, widget):
|
||||
pass # FIXME: yann add your code here :)
|
||||
|
||||
def on_gpg_save_password_checkbutton_toggled(self, widget):
|
||||
self.on_checkbutton_toggled_and_clear(widget, [\
|
||||
self.xml.get_widget('gpg_password_entry')])
|
||||
#FIXME: so it doesn't save it??
|
||||
|
||||
def on_save_password_checkbutton_toggled(self, widget):
|
||||
if self.xml.get_widget('new_account_checkbutton').get_active():
|
||||
|
|
|
|||
123
src/gtkgui.glade
123
src/gtkgui.glade
|
|
@ -570,8 +570,8 @@
|
|||
<child>
|
||||
<widget class="GtkLabel" id="name_label">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Name: </property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="label" translatable="yes">_Name: </property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
|
|
@ -580,6 +580,7 @@
|
|||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="mnemonic_widget">name_entry</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
|
|
@ -638,8 +639,8 @@
|
|||
<child>
|
||||
<widget class="GtkLabel" id="label9">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Jabber ID:</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="label" translatable="yes">_Jabber ID:</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
|
|
@ -648,6 +649,7 @@
|
|||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="mnemonic_widget">jid_entry</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
|
|
@ -662,8 +664,8 @@
|
|||
<child>
|
||||
<widget class="GtkLabel" id="label202">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Password:</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="label" translatable="yes">_Password:</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
|
|
@ -672,6 +674,7 @@
|
|||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="mnemonic_widget">password_entry</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
|
|
@ -686,8 +689,8 @@
|
|||
<child>
|
||||
<widget class="GtkLabel" id="label11">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Resource: </property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="label" translatable="yes">Resour_ce: </property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
|
|
@ -696,6 +699,7 @@
|
|||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="mnemonic_widget">resource_entry</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
|
|
@ -710,8 +714,8 @@
|
|||
<child>
|
||||
<widget class="GtkLabel" id="label220">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Priority:</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="label" translatable="yes">Priori_ty:</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
|
|
@ -720,6 +724,7 @@
|
|||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="mnemonic_widget">priority_spinbutton</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
|
|
@ -736,7 +741,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Enable if you want to register for a new jabber account</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Register new account</property>
|
||||
<property name="label" translatable="yes">_Register new account</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
|
|
@ -760,7 +765,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Click to change account's password</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Change</property>
|
||||
<property name="label" translatable="yes">Chan_ge</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
|
|
@ -781,7 +786,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">If enabled, Gajim will remember the password for this account</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Save password</property>
|
||||
<property name="label" translatable="yes">Save pass_word</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">False</property>
|
||||
|
|
@ -955,7 +960,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">If enabled, Gajim, when launched, will automatically connect to jabber using this account</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Connect at startup</property>
|
||||
<property name="label" translatable="yes">C_onnect at startup</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
|
|
@ -974,7 +979,7 @@
|
|||
<widget class="GtkCheckButton" id="log_history_checkbutton">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Log history for all contacts in this account</property>
|
||||
<property name="label" translatable="yes">_Log history for all contacts in this account</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
|
|
@ -993,7 +998,7 @@
|
|||
<widget class="GtkCheckButton" id="sync_with_global_status_checkbutton">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Synchronize account status with global status</property>
|
||||
<property name="label" translatable="yes">Synch_ronize account status with global status</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
|
|
@ -1047,6 +1052,68 @@
|
|||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkFrame" id="frame33">
|
||||
<property name="visible">True</property>
|
||||
<property name="label_xalign">0</property>
|
||||
<property name="label_yalign">0.5</property>
|
||||
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment66">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">1</property>
|
||||
<property name="yscale">1</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">12</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkCheckButton" id="use_tls_checkbutton">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Use _TLS</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="active">False</property>
|
||||
<property name="inconsistent">False</property>
|
||||
<property name="draw_indicator">True</property>
|
||||
<signal name="toggled" handler="on_use_tls_checkbutton_toggled" last_modification_time="Sun, 08 May 2005 21:50:57 GMT"/>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label252">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes"><b>TLS</b></property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">True</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="type">label_item</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkFrame" id="frame14">
|
||||
<property name="visible">True</property>
|
||||
|
|
@ -1124,7 +1191,7 @@
|
|||
<widget class="GtkButton" id="gpg_choose_button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Choose key</property>
|
||||
<property name="label" translatable="yes">Choose _key</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
|
|
@ -1155,7 +1222,7 @@
|
|||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">If checked Gajim will store the password in ~/.gajim/config with 'read' permission only for only you and of course the superuser</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Save passphrase (insecure)</property>
|
||||
<property name="label" translatable="yes">Save _passphrase (insecure)</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
|
|
@ -1222,14 +1289,10 @@
|
|||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="tab_expand">False</property>
|
||||
|
|
@ -1295,8 +1358,8 @@
|
|||
<child>
|
||||
<widget class="GtkLabel" id="label136">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Port:</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="label" translatable="yes">_Port:</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
|
|
@ -1305,6 +1368,7 @@
|
|||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="mnemonic_widget">proxyport_entry</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
|
|
@ -1340,8 +1404,8 @@
|
|||
<child>
|
||||
<widget class="GtkLabel" id="label135">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Host:</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="label" translatable="yes">_Host:</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
|
|
@ -1350,6 +1414,7 @@
|
|||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<property name="mnemonic_widget">proxyhost_entry</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
|
|
@ -1365,7 +1430,7 @@
|
|||
<widget class="GtkCheckButton" id="use_proxy_checkbutton">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Use proxy</property>
|
||||
<property name="label" translatable="yes">_Use proxy</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
|
|
@ -1492,7 +1557,7 @@
|
|||
<widget class="GtkButton" id="edit_details_button">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label" translatable="yes">Edit personal details...</property>
|
||||
<property name="label" translatable="yes">_Edit personal details...</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
|
|
|
|||
Loading…
Reference in New Issue