From f5bb2a4c0dc86e614b679e977684c5ae8f4907f1 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sun, 18 Jan 2009 12:50:27 +0000 Subject: [PATCH] [Niklas and I] improved mnemonic shortcut in accounts and proxy windows. --- data/glade/accounts_window.glade | 37 +- data/glade/manage_proxies_window.glade | 1182 +++++++++--------------- 2 files changed, 463 insertions(+), 756 deletions(-) diff --git a/data/glade/accounts_window.glade b/data/glade/accounts_window.glade index df32f8cdc..6905226fc 100644 --- a/data/glade/accounts_window.glade +++ b/data/glade/accounts_window.glade @@ -151,7 +151,6 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - False False @@ -183,6 +182,7 @@ 0 _Jabber ID: True + jid_entry1 GTK_FILL @@ -195,6 +195,7 @@ 0 _Password: True + password_entry1 1 @@ -248,6 +249,7 @@ 0 Resour_ce: True + resource_entry1 2 @@ -262,6 +264,7 @@ 0 Priori_ty: True + priority_spinbutton1 3 @@ -275,7 +278,7 @@ True True Priority will change automatically according to your status. - _Adjust to status + A_djust to status True 0 True @@ -541,7 +544,8 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - use HTTP_PROXY environment variable + _use HTTP__PROXY environment variable + True 0 True @@ -565,7 +569,7 @@ True True - Manage... + _Manage... True 0 @@ -634,7 +638,7 @@ True True If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection - Send keep-alive packets + Send _keep-alive packets True 0 True @@ -651,7 +655,7 @@ True True - Use custom hostname/port + Use cust_om hostname/port True 0 True @@ -671,7 +675,8 @@ True - Hostname: + _Hostname: + True False @@ -691,7 +696,8 @@ True - Port: + _Port: + True False @@ -824,7 +830,7 @@ False True If checked, Gajim will get the password from a GPG agent like seahorse - Use GPG _Agent + Use G_PG Agent True 0 True @@ -870,7 +876,7 @@ True True Information about you, as stored in the server - Edit Personal Information... + _Edit Personal Information... True 0 @@ -930,7 +936,8 @@ True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - Enable + _Enable + True 0 True @@ -953,7 +960,7 @@ True True If checked, Gajim, when launched, will automatically connect to jabber using this account - C_onnect on Gajim startup + Co_nnect on Gajim startup True 0 True @@ -985,7 +992,7 @@ True True If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly - Synch_ronize account status with global status + Synchroni_ze account status with global status True 0 True @@ -1006,7 +1013,7 @@ True If the default port that is used for incoming messages is unfitting for your setup you can select another one here. You might consider to change possible firewall settings. - Use custom port: + Use cust_om port: True 0 True @@ -1121,7 +1128,7 @@ You might consider to change possible firewall settings. True True If checked, Gajim will get the password from a GPG agent like seahorse - Use GPG _Agent + Use G_PG Agent True 0 True diff --git a/data/glade/manage_proxies_window.glade b/data/glade/manage_proxies_window.glade index 9580b12e3..81e5b6799 100644 --- a/data/glade/manage_proxies_window.glade +++ b/data/glade/manage_proxies_window.glade @@ -1,745 +1,445 @@ - - - + + + - - - 12 - Manage Proxy Profiles - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - - True - False - 12 - - - - True - False - 12 - - - - True - False - 6 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - False - True - False - False - False - - - - - - - 0 - True - True - - - - - - True - GTK_BUTTONBOX_END - 6 - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - False - True - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - 6 - True - 2 - 2 - False - 6 - 12 - - - - True - Name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Type: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - HTTP Connect + + 12 + Manage Proxy Profiles + + + + True + 12 + + + True + 12 + + + True + 6 + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + False + + + + + + + + + True + 6 + GTK_BUTTONBOX_END + + + True + True + True + gtk-add + True + 0 + + + + + + True + True + True + gtk-remove + True + 0 + + + + 1 + + + + + False + 1 + + + + + + + True + + + True + 0 + GTK_SHADOW_NONE + + + True + 12 + + + True + 6 + 2 + 2 + 12 + 6 + + + True + True + + + + 1 + 2 + + + + + + True + HTTP Connect SOCKS5 BOSH - False - True - - - - 1 - 2 - 1 - 2 - fill - - - - - - True - True - True - True - 0 - - True - ● - False - - - - 1 - 2 - 0 - 1 - - - - - - - - - - - True - <b>Properties</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - 6 - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 8 - 2 - False - 6 - 12 - - - - True - Proxy _Port: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - proxyport_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - True - True - True - 0 - - True - ● - False - - - - 1 - 2 - 3 - 4 - - - - - - - True - True - True - True - 0 - - True - ● - False - - - - 1 - 2 - 4 - 5 - - - - - - - True - Proxy _Host: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - proxyhost_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - Pass_word: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - proxypass_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 7 - 8 - fill - - - - - - - True - _Username: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - proxyuser_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 6 - 7 - fill - - - - - - - True - True - True - False - 0 - - True - ● - False - - - - 1 - 2 - 7 - 8 - - - - - - - True - True - True - True - 0 - - True - ● - False - - - - 1 - 2 - 6 - 7 - - - - - - - True - True - Use proxy authentication - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - 2 - 5 - 6 - fill - - - - - - - True - _BOSH URL: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - proxyhost_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - ● - False - - - - 1 - 2 - 0 - 1 - - - - - - - True - True - Use HTTP proxy - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - 2 - 2 - 3 - fill - - - - - - - True - B_OSH Port: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - proxyhost_entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - ● - False - - - - 1 - 2 - 1 - 2 - - - - - - - - - - - True - <b>Settings</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - 7 - True - GTK_BUTTONBOX_END - 12 - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - True - True - - - - - - + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + 0 + _Type: + True + proxytype_combobox + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + _Name: + True + proxyname_entry + + + GTK_FILL + + + + + + + + + + True + <b>Properties</b> + True + + + label_item + + + + + + + True + 6 + 0 + GTK_SHADOW_NONE + + + True + 12 + + + True + False + 8 + 2 + 12 + 6 + + + True + True + + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + B_OSH Port: + True + boshport_entry + + + 1 + 2 + GTK_FILL + + + + + + True + True + Use HTTP prox_y + True + 0 + True + + + + 2 + 2 + 3 + GTK_FILL + + + + + + True + True + + + + 1 + 2 + + + + + + True + 0 + _BOSH URL: + True + boshuri_entry + + + GTK_FILL + + + + + + True + True + Use proxy auth_entication + True + 0 + True + + + + 2 + 5 + 6 + GTK_FILL + + + + + + True + True + + + + 1 + 2 + 6 + 7 + + + + + + True + True + False + + + + 1 + 2 + 7 + 8 + + + + + + True + 0 + _Username: + True + proxyuser_entry + + + 6 + 7 + GTK_FILL + + + + + + True + 0 + Pass_word: + True + proxypass_entry + + + 7 + 8 + GTK_FILL + + + + + + True + 0 + Proxy _Host: + True + proxyhost_entry + + + 3 + 4 + GTK_FILL + + + + + + True + True + + + + 1 + 2 + 4 + 5 + + + + + + True + True + + + + 1 + 2 + 3 + 4 + + + + + + True + 0 + Proxy _Port: + True + proxyport_entry + + + 4 + 5 + GTK_FILL + + + + + + + + + + True + <b>Settings</b> + True + + + label_item + + + + + 1 + + + + + 1 + + + + + + + True + 7 + 12 + GTK_BUTTONBOX_END + + + True + True + True + gtk-close + True + 0 + + + + + + 1 + + + + +