From 8644b710942ce2358ee2345ceb6bf35326dab26b Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Fri, 19 Mar 2010 11:14:51 -0700 Subject: Make the account details pane scrollable, in case the Advanced section is too large to fit on the screen all at once. Fixes Gnome bug #613272. --- libempathy-gtk/empathy-account-widget-jabber.ui | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui index 76f11de12..3e155588d 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.ui +++ b/libempathy-gtk/empathy-account-widget-jabber.ui @@ -115,7 +115,7 @@ <b>Example:</b> user@jabber.org True - + @@ -129,7 +129,7 @@ <b>Example:</b> user@gmail.com True - + @@ -145,7 +145,7 @@ If you are facebook.com/<b>badger</b>, enter <b>badger</b&g Use <a href="http://www.facebook.com/username/">this page</a> to choose a Facebook username if you don't have one. True - + @@ -155,7 +155,7 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho 1 - 2 + 3 1 2 @@ -163,9 +163,6 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho - - - False @@ -468,7 +465,7 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho <b>Example:</b> user@jabber.org True - + @@ -570,7 +567,7 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho <b>Example:</b> user@gmail.com True - + @@ -664,7 +661,7 @@ If you are facebook.com/<b>badger</b>, enter <b>badger</b&g Use <a href="http://www.facebook.com/username/">this page</a> to choose a Facebook username if you don't have one. True - + -- cgit v1.2.3 From 4eb6eb2634f170ac8dc8c44bf6293d05f5b80733 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Wed, 24 Mar 2010 10:29:16 -0700 Subject: Another way to fix Gnome bug #613272. This puts the Advanced expander content for each of the problem protocols in a scrolled window, instead of the entire Details section. --- libempathy-gtk/empathy-account-widget-jabber.ui | 317 +++++----- libempathy-gtk/empathy-account-widget-sip.ui | 734 ++++++++++++------------ 2 files changed, 535 insertions(+), 516 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui index 3e155588d..7e99b3793 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.ui +++ b/libempathy-gtk/empathy-account-widget-jabber.ui @@ -175,163 +175,61 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho True True - + True - vertical - 6 - - - True - 4 - 3 - 12 - 6 - - - True - True - ● - - - 1 - 3 - 2 - 3 - - - - - - True - True - ● - adjustment1 - 1 - - - 1 - 3 - 3 - 4 - - - - - - _Ignore SSL certificate errors - True - True - False - True - True - - - 3 - 1 - 2 - GTK_FILL - - - - - - True - 0 - Pri_ority: - True - spinbutton_priority - - - 3 - 4 - GTK_FILL - - - - - - True - 0 - Reso_urce: - True - entry_resource - - - 2 - 3 - GTK_FILL - - - - - - _Encryption required (TLS/SSL) - True - True - False - True - True - - - 3 - GTK_FILL - - - - - - 0 - - + True + never + automatic - + True - 0 + queue none - + True - 6 - 12 + vertical + 6 - + True - 3 - 2 - 6 + 4 + 3 + 12 6 - + True True ● - adjustment2 - 1 - True 1 - 2 - 1 - 2 + 3 + 2 + 3 - + True True ● + adjustment1 + 1 1 - 2 + 3 + 3 + 4 - - Use old SS_L + + _Ignore SSL certificate errors True True False @@ -339,58 +237,175 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho True - 2 - 2 - 3 + 3 + 1 + 2 GTK_FILL - + True 0 - _Port: + Pri_ority: True - spinbutton_port + spinbutton_priority - 1 - 2 + 3 + 4 GTK_FILL - + True 0 - _Server: + Reso_urce: + True + entry_resource + + + 2 + 3 + GTK_FILL + + + + + + _Encryption required (TLS/SSL) + True + True + False True - entry_server + True + 3 GTK_FILL + + 0 + + + + + True + 0 + none + + + True + 6 + 12 + + + True + 3 + 2 + 6 + 6 + + + True + True + ● + adjustment2 + 1 + True + + + 1 + 2 + 1 + 2 + + + + + + True + True + ● + + + 1 + 2 + + + + + + Use old SS_L + True + True + False + True + True + + + 2 + 2 + 3 + GTK_FILL + + + + + + True + 0 + _Port: + True + spinbutton_port + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + _Server: + True + entry_server + + + GTK_FILL + + + + + + + + + + True + Override server settings + + + + + + + + 1 + - - - - - True - Override server settings - - - - - 1 - @@ -405,8 +420,6 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho - False - False 1 diff --git a/libempathy-gtk/empathy-account-widget-sip.ui b/libempathy-gtk/empathy-account-widget-sip.ui index 13cc2f959..06504252c 100644 --- a/libempathy-gtk/empathy-account-widget-sip.ui +++ b/libempathy-gtk/empathy-account-widget-sip.ui @@ -105,7 +105,7 @@ <b>Example:</b> user@my.sip.server True - + @@ -130,378 +130,386 @@ True True - + True - 0 - 6 - 12 + True + never + automatic - + True - 13 - 4 - 6 - 6 - - - True - True - ● - - - 1 - 2 - 2 - 3 - - - - - True - True - The username for SIP authentication, if different from the SIP URI -username. - • - - - 1 - 4 - 10 - 11 - - - - - True - True - Hostname of the proxy for outbound requests. - • - - - 1 - 2 - 5 - 6 - - - - - True - True - • - adjustment3 - - - 1 - 4 - 8 - 9 - - - - - True - 0 - NAT Traversal Options - - - - - - 4 - - - - - True - 0 - Proxy Options - - - - - - 4 - 4 - 5 - - - - - True - 0 - Miscellaneous Options - - - - - - 4 - 9 - 10 - - - - - True - 24 - - - True - 0 - STUN Server: - entry_stun-server - - - - - 2 - 3 - GTK_FILL - - - - - - True - 12 - - - Discover the STUN server automatically - True - True - False - True - True - Look up the DNS SRV record at the service's domain for the host name of a STUN server. - - - - - 4 - 1 - 2 - GTK_FILL - - - + queue + none - - True - 12 - - - Discover Binding - True - True - False - True - Update the registration binding if the external address for the client is discovered to be different from the local binding. - - - - - 4 - 3 - 4 - - - - - True - 12 - - - True - 0 - Server: - - - - - 5 - 6 - - - - + True 0 - Keep-Alive Options - - - - - - 4 - 6 - 7 - - - - - True - 12 - - - True - 0 - Mechanism: - - - - - 7 - 8 - - - - - True - 12 - - - True - 0 - Interval (seconds) - - - - - 8 - 9 - - - - - True - 12 - - - True - 0 - Authentication username: - - - - - 10 - 11 - - - - - True - 12 - - - True - 0 - Transport: - - - - - 11 - 12 - - - - - True + 6 12 - - Loose Routing + True - True - False - True - Use the loose routing behavior and the Route header as recommended in RFC 3261. + 13 + 4 + 6 + 6 + + + True + True + ● + + + 1 + 2 + 2 + 3 + + + + + True + True + ● + + + 1 + 4 + 10 + 11 + + + + + True + True + ● + + + 1 + 2 + 5 + 6 + + + + + True + True + ● + adjustment3 + + + 1 + 4 + 8 + 9 + + + + + True + 0 + NAT Traversal Options + + + + + + 4 + + + + + True + 0 + Proxy Options + + + + + + 4 + 4 + 5 + + + + + True + 0 + Miscellaneous Options + + + + + + 4 + 9 + 10 + + + + + True + 24 + + + True + 0 + STUN Server: + entry_stun-server + + + + + 2 + 3 + GTK_FILL + + + + + + True + 12 + + + Discover the STUN server automatically + True + True + False + True + True + + + + + 4 + 1 + 2 + GTK_FILL + + + + + + True + 12 + + + Discover Binding + True + True + False + True + + + + + 4 + 3 + 4 + + + + + True + 12 + + + True + 0 + Server: + + + + + 5 + 6 + + + + + True + 0 + Keep-Alive Options + + + + + + 4 + 6 + 7 + + + + + True + 12 + + + True + 0 + Mechanism: + + + + + 7 + 8 + + + + + True + 12 + + + True + 0 + Interval (seconds) + + + + + 8 + 9 + + + + + True + 12 + + + True + 0 + Authentication username: + + + + + 10 + 11 + + + + + True + 12 + + + True + 0 + Transport: + + + + + 11 + 12 + + + + + True + 12 + + + Loose Routing + True + True + False + True + + + + + 4 + 12 + 13 + + + + + True + 0 + Port: + spinbutton_stun-port + + + 2 + 3 + 2 + 3 + + + + + True + True + ● + adjustment1 + 1 + + + 3 + 4 + 2 + 3 + + + + + True + 0 + Port: + + + 2 + 3 + 5 + 6 + + + + + True + True + ● + adjustment2 + 1 + + + 3 + 4 + 5 + 6 + + + + + + + + + + + + + + + + + + + + - - 4 - 12 - 13 - - - - - True - 0 - Port: - spinbutton_stun-port - - - 2 - 3 - 2 - 3 - - - - - True - True - • - adjustment1 - 1 - - - 3 - 4 - 2 - 3 - - - - - True - 0 - Port: - - - 2 - 3 - 5 - 6 - - - - - True - True - • - adjustment2 - 1 - Port of the proxy for outbound requests. - - - 3 - 4 - 5 - 6 - - - - - - - - - - - - - - - - - - - @@ -518,8 +526,6 @@ username. - False - False 1 @@ -569,7 +575,7 @@ username. <b>Example:</b> user@my.sip.server True - + -- cgit v1.2.3