From 7e25865ae51a5c81dc31eec0ffe818077dd0b777 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 16 Apr 2009 12:28:03 +0000 Subject: Remove toplevel window from ui files if the window is not used. From: Xavier Claessens svn path=/trunk/; revision=2845 --- libempathy-gtk/empathy-account-widget-aim.ui | 274 +++++----- libempathy-gtk/empathy-account-widget-generic.ui | 112 ++-- libempathy-gtk/empathy-account-widget-groupwise.ui | 270 +++++----- libempathy-gtk/empathy-account-widget-icq.ui | 319 ++++++----- libempathy-gtk/empathy-account-widget-irc.ui | 475 +++++++++-------- libempathy-gtk/empathy-account-widget-jabber.ui | 587 +++++++++++---------- libempathy-gtk/empathy-account-widget-msn.ui | 270 +++++----- libempathy-gtk/empathy-account-widget-salut.ui | 294 ++++++----- libempathy-gtk/empathy-account-widget-sip.ui | 325 ++++++------ libempathy-gtk/empathy-account-widget-yahoo.ui | 511 +++++++++--------- libempathy-gtk/empathy-chat.ui | 158 +++--- 11 files changed, 1812 insertions(+), 1783 deletions(-) diff --git a/libempathy-gtk/empathy-account-widget-aim.ui b/libempathy-gtk/empathy-account-widget-aim.ui index 6536b9039..643b26d7d 100644 --- a/libempathy-gtk/empathy-account-widget-aim.ui +++ b/libempathy-gtk/empathy-account-widget-aim.ui @@ -1,193 +1,191 @@ - + + + 5222 65555 - 0 - 10 1 - 0 - 5222 + 10 - + True - ICQ account settings - False + vertical + 6 + + + True + 2 + 3 + 12 + 6 + + + True + 0 + Pass_word: + True + entry_password + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + Screen _Name: + True + entry_screenname + + + GTK_FILL + + + + + + True + True + True + + + True + gtk-clear + 1 + + + + + 2 + 3 + 1 + 2 + + + + + + + True + True + + + + 1 + 3 + + + + + + True + True + False + + + + 1 + 2 + 1 + 2 + + + + + + False + False + 0 + + - + True - 6 + True - + True 2 - 3 + 2 12 6 - + True - 0 - Pass_word: - True - entry_password + True + + adjustment1 + 1 + True + 1 + 2 1 2 - GTK_FILL - + - + True 0 - Screen _Name: + _Port: True - entry_screenname + spinbutton_port - GTK_FILL - - - - - - True - True - Forget password and clear the entry. - - - True - gtk-clear - 1 - - - - - 2 - 3 1 2 - - + GTK_FILL + - + True True + 1 - 3 - + 2 + - + True - True - False + 0 + _Server: + True + entry_server - 1 - 2 - 1 - 2 - + GTK_FILL + - - False - False - - - + + True - True - - - True - 2 - 2 - 12 - 6 - - - True - True - adjustment1 - 1 - True - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - _Port: - True - spinbutton_port - - - 1 - 2 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - 0 - _Server: - True - entry_server - - - GTK_FILL - - - - - - - - True - <b>Advanced</b> - True - - + <b>Advanced</b> + True - - False - False - 1 - + + False + False + 1 + diff --git a/libempathy-gtk/empathy-account-widget-generic.ui b/libempathy-gtk/empathy-account-widget-generic.ui index fd9a609f2..8659d47c1 100644 --- a/libempathy-gtk/empathy-account-widget-generic.ui +++ b/libempathy-gtk/empathy-account-widget-generic.ui @@ -1,85 +1,81 @@ - - + + + True - generic account settings - False + vertical + 6 - + True - 6 + 3 + 12 + 6 - - True - 3 - 12 - 6 - - - - - - - - - - - - False - False - + + + + - + + + + + False + False + 0 + + + + + True + True + + True True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + automatic + automatic - + True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC + queue - + True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - GTK_RESIZE_QUEUE + 3 + 12 + 6 + + + + + + - - True - 3 - 12 - 6 - - - - - - - - - - + - - - True - <b>Advanced</b> - True - - - - 1 - + + + + True + <b>Advanced</b> + True + + + 1 + diff --git a/libempathy-gtk/empathy-account-widget-groupwise.ui b/libempathy-gtk/empathy-account-widget-groupwise.ui index a782250f0..4f2630461 100644 --- a/libempathy-gtk/empathy-account-widget-groupwise.ui +++ b/libempathy-gtk/empathy-account-widget-groupwise.ui @@ -1,195 +1,195 @@ - + + 65535 - 0 - 10 1 - 0 - 0 + 10 - + True - groupwise account settings - False + vertical + 6 - + True - 6 + 2 + 2 + 6 + 6 - + True - 2 - 2 - 6 - 6 + 2 - + True - 2 - - - True - True - False - - + True + False + + + + 0 + + + + + True + True + True - + True - True - Forget password and clear the entry. - - - True - gtk-clear - 1 - - + gtk-clear + 1 - - False - False - 1 - - 1 - 2 - 1 - 2 - + False + False + 1 + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + Pass_word: + True + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + Login I_D: + True + entry_id + + + GTK_FILL + + + + + + True + True + + + + 1 + 2 + + + + + + False + 0 + + + + + True + True + + + True + 2 + 2 + 6 + 6 - + True 0 - Pass_word: + _Port: True + spinbutton_port 1 2 GTK_FILL - + - + True 0 - Login I_D: + _Server: True - entry_id + entry_server GTK_FILL - + - + True True + 1 2 - + - - - False - - - - - True - True - - True - 2 - 2 - 6 - 6 - - - True - 0 - _Port: - True - spinbutton_port - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - _Server: - True - entry_server - - - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - adjustment1 - 1 - True - - - 1 - 2 - 1 - 2 - - - - - - - + True - <b>Advanced</b> - True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + adjustment1 + 1 + True + + 1 + 2 + 1 + 2 + + - - False - False - 1 - + + + + True + <b>Advanced</b> + True + + + False + False + 1 + diff --git a/libempathy-gtk/empathy-account-widget-icq.ui b/libempathy-gtk/empathy-account-widget-icq.ui index 1712466cd..7c6ab42b2 100644 --- a/libempathy-gtk/empathy-account-widget-icq.ui +++ b/libempathy-gtk/empathy-account-widget-icq.ui @@ -1,221 +1,220 @@ - + + + 5222 65555 - 0 - 10 1 - 0 - 5222 + 10 - + True - ICQ account settings - False + vertical + 6 + + + True + 2 + 3 + 12 + 6 + + + True + 0 + Pass_word: + True + entry_password + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + ICQ _UIN: + True + entry_uin + + + GTK_FILL + + + + + + True + True + True + + + True + gtk-clear + 1 + + + + + 2 + 3 + 1 + 2 + + + + + + + True + True + + + + 1 + 3 + + + + + + True + True + False + + + + 1 + 2 + 1 + 2 + + + + + + False + False + 0 + + - + True - 6 + True - + True - 2 - 3 + 3 + 2 12 6 - + True 0 - Pass_word: + _Charset: True - entry_password + entry_charset - 1 - 2 GTK_FILL - + - + True - 0 - ICQ _UIN: - True - entry_uin + True + + adjustment1 + 1 + True - GTK_FILL - + 1 + 2 + 2 + 3 + - + True True - Forget password and clear the entry. - - - True - gtk-clear - 1 - - + - 2 - 3 + 1 + 2 1 2 - - + - + True - True + 0 + _Port: + True + spinbutton_port - 1 - 3 - + 2 + 3 + GTK_FILL + - + True - True - False + 0 + _Server: + True + entry_server - 1 - 2 1 2 - + GTK_FILL + - - - False - False - - - - - True - True - - True - 3 - 2 - 12 - 6 - - - True - 0 - _Charset: - True - entry_charset - - - GTK_FILL - - - - - - True - True - adjustment1 - 1 - True - - - 1 - 2 - 2 - 3 - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - _Port: - True - spinbutton_port - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - _Server: - True - entry_server - - - 1 - 2 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - - + True - <b>Advanced</b> - True + True + + + 1 + 2 + + - - False - False - 1 - + + + + True + <b>Advanced</b> + True + + + False + False + 1 + diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui index a35528524..f499866eb 100644 --- a/libempathy-gtk/empathy-account-widget-irc.ui +++ b/libempathy-gtk/empathy-account-widget-irc.ui @@ -1,216 +1,14 @@ - - - irc account settings - False - - - True - 5 - 2 - 12 - 6 - - - True - True - - - 1 - 2 - 4 - 5 - - - - - - True - 0 - Quit message: - - - 4 - 5 - GTK_FILL - - - - - - True - True - - - 1 - 2 - 3 - 4 - - - - - - True - True - False - - - 1 - 2 - 2 - 3 - - - - - - True - 0 - Password: - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - Real name: - - - 3 - 4 - GTK_FILL - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - Nickname: - True - entry_nick - - - 1 - 2 - GTK_FILL - - - - - - True - 2 - - - True - - - - - True - True - Create a new IRC network - - - True - gtk-add - - - - - False - False - 1 - - - - - True - True - Edit the selected IRC network - - - True - gtk-edit - - - - - False - False - 2 - - - - - True - True - Remove the selected IRC network - - - True - gtk-remove - - - - - False - False - 3 - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - Network: - True - - - GTK_FILL - - - - - - + + True 5 Network - GTK_WIN_POS_CENTER_ON_PARENT + center-on-parent gtk-edit - GDK_WINDOW_TYPE_HINT_DIALOG + dialog True True False @@ -222,7 +20,7 @@ True 0 - GTK_SHADOW_NONE + none True @@ -243,7 +41,7 @@ GTK_FILL - + @@ -256,7 +54,7 @@ 1 2 GTK_FILL - + @@ -267,7 +65,7 @@ 1 2 - + @@ -288,7 +86,7 @@ - + True <b>Network</b> True @@ -303,7 +101,7 @@ True 0 - GTK_SHADOW_NONE + none True @@ -312,7 +110,6 @@ True - 1 2 6 6 @@ -320,9 +117,9 @@ True True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN + never + automatic + in True @@ -339,49 +136,64 @@ True 6 - GTK_BUTTONBOX_START + start + gtk-add True True True - gtk-add + False True + + False + False + 0 + + gtk-remove True True True - gtk-remove + False True + False + False 1 + gtk-go-up True True True - gtk-go-up + False True + False + False 2 + gtk-go-down True True True - gtk-go-down + False True + False + False 3 @@ -411,30 +223,237 @@ True - GTK_BUTTONBOX_END + end + gtk-close True True True - gtk-close + False True + + False + False + 0 + False - GTK_PACK_END + end + 0 - button_add - button_remove - button_up - button_down button_close + + True + 5 + 2 + 12 + 6 + + + True + True + + + + 1 + 2 + 4 + 5 + + + + + + True + 0 + Quit message: + + + 4 + 5 + GTK_FILL + + + + + + True + True + + + + 1 + 2 + 3 + 4 + + + + + + True + True + False + + + + 1 + 2 + 2 + 3 + + + + + + True + 0 + Password: + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + Real name: + + + 3 + 4 + GTK_FILL + + + + + + True + True + + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + Nickname: + True + entry_nick + + + 1 + 2 + GTK_FILL + + + + + + True + 2 + + + True + + + 0 + + + + + True + True + True + + + True + gtk-add + + + + + False + False + 1 + + + + + True + True + True + + + True + gtk-edit + + + + + False + False + 2 + + + + + True + True + True + + + True + gtk-remove + + + + + False + False + 3 + + + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + 0 + Network: + True + + + GTK_FILL + + + + diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui index 9f52f6890..083479c2b 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.ui +++ b/libempathy-gtk/empathy-account-widget-jabber.ui @@ -1,342 +1,347 @@ - + + - 127 -128 - 10 + 127 1 - 0 - 0 + 10 + 5222 65555 - 0 - 10 1 - 0 - 5222 + 10 - + True - jabber account settings - False + vertical + 6 - + True - 6 + 2 + 3 + 12 + 6 - + True - 2 - 3 - 12 - 6 - - - True - True - False - - - 1 - 2 - 1 - 2 - - - - - - True - True - - - 1 - 3 - - - - - - True - 0 - Login I_D: - True - entry_id - - - GTK_FILL - - - - - - True - True - Forget password and clear the entry. - - - True - gtk-clear - 1 - - - - - 2 - 3 - 1 - 2 - GTK_FILL - - - + True + False + + + + 1 + 2 + 1 + 2 + + + + + + True + True + + + + 1 + 3 + + + + + + True + 0 + Login I_D: + True + entry_id + + + GTK_FILL + + + + + + True + True + True - + True - 0 - Pass_word: - True - entry_password + gtk-clear + 1 - - 1 - 2 - GTK_FILL - - - False - False + 2 + 3 + 1 + 2 + GTK_FILL + - + True - True + 0 + Pass_word: + True + entry_password + + + 1 + 2 + GTK_FILL + + + + + + False + False + 0 + + + + + True + True + + + True + vertical - + True + 4 + 3 + 12 + 6 - + True - 4 - 3 - 12 - 6 - - - True - True - - - 1 - 3 - 2 - 3 - - - - - - True - True - adjustment1 - 1 - - - 1 - 3 - 3 - 4 - - - - - - True - True - _Ignore SSL certificate errors - 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 - - - - - - True - True - _Encryption required (TLS/SSL) - True - True - - - 3 - GTK_FILL - - - + 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 - GTK_SHADOW_NONE + 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 + 0 + none + + + True + 12 - + True - 12 + 3 + 2 + 6 + 6 - + True - 3 - 2 - 6 - 6 - - - True - True - adjustment2 - 1 - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - - - 1 - 2 - - - - - - True - True - Use old SS_L - 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 + + 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 - <b>Override server settings</b> - True - - 1 - + + + + True + <b>Override server settings</b> + True + - - - - True - <b>Advanced</b> - True - + + 1 + - - False - False - 1 - + + + + True + <b>Advanced</b> + True + + + False + False + 1 + diff --git a/libempathy-gtk/empathy-account-widget-msn.ui b/libempathy-gtk/empathy-account-widget-msn.ui index c91c33724..c9084ff6e 100644 --- a/libempathy-gtk/empathy-account-widget-msn.ui +++ b/libempathy-gtk/empathy-account-widget-msn.ui @@ -1,195 +1,195 @@ - + + 65535 - 0 - 10 1 - 0 - 0 + 10 - + True - msn account settings - False + vertical + 6 - + True - 6 + 2 + 2 + 6 + 6 - + True - 2 - 2 - 6 - 6 + 2 - + True - 2 - - - True - True - False - - + True + False + + + + 0 + + + + + True + True + True - + True - True - Forget password and clear the entry. - - - True - gtk-clear - 1 - - + gtk-clear + 1 - - False - False - 1 - - 1 - 2 - 1 - 2 - + False + False + 1 + + + 1 + 2 + 1 + 2 + + + + + + True + 0 + Pass_word: + True + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + Login I_D: + True + entry_id + + + GTK_FILL + + + + + + True + True + + + + 1 + 2 + + + + + + False + 0 + + + + + True + True + + + True + 2 + 2 + 6 + 6 - + True 0 - Pass_word: + _Port: True + spinbutton_port 1 2 GTK_FILL - + - + True 0 - Login I_D: + _Server: True - entry_id + entry_server GTK_FILL - + - + True True + 1 2 - + - - - False - - - - - True - True - - True - 2 - 2 - 6 - 6 - - - True - 0 - _Port: - True - spinbutton_port - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - _Server: - True - entry_server - - - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - adjustment1 - 1 - True - - - 1 - 2 - 1 - 2 - - - - - - - + True - <b>Advanced</b> - True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + adjustment1 + 1 + True + + 1 + 2 + 1 + 2 + + - - False - False - 1 - + + + + True + <b>Advanced</b> + True + + + False + False + 1 + diff --git a/libempathy-gtk/empathy-account-widget-salut.ui b/libempathy-gtk/empathy-account-widget-salut.ui index 6766a390b..56626a9b5 100644 --- a/libempathy-gtk/empathy-account-widget-salut.ui +++ b/libempathy-gtk/empathy-account-widget-salut.ui @@ -1,215 +1,217 @@ - - + + + True - salut account settings - False + vertical + 6 - + True - 6 + 3 + 3 + 12 + 6 - + + True + True + + + + 1 + 3 + 2 + 3 + + + + + + True + True + + + + 1 + 3 + 1 + 2 + + + + + + True + True + + + + 1 + 3 + + + + + + True + 0 + _Nickname: + True + entry_nickname + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + _Last Name: + True + entry_last_name + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + _First Name: + True + entry_first_name + + + GTK_FILL + + + + + + False + False + 0 + + + + + True + True + + True 3 3 12 6 - + True True + 1 3 - 2 - 3 - + - + + True + 0 + _Published Name: + True + entry_published + + + GTK_FILL + + + + + True True + 1 3 - 1 - 2 - + 2 + 3 + - + True True + 1 3 - + 1 + 2 + - + True 0 - _Nickname: + _Jabber ID: True - entry_nickname + entry_jid 2 3 GTK_FILL - + - + True 0 - _Last Name: + _Email: True - entry_last_name + entry_email 1 2 GTK_FILL - - - - - - True - 0 - _First Name: - True - entry_first_name - - - GTK_FILL - + - - False - False - - - + + True - True - - - True - 3 - 3 - 12 - 6 - - - True - True - - - 1 - 3 - - - - - - True - 0 - _Published Name: - True - entry_published - - - GTK_FILL - - - - - - True - True - - - 1 - 3 - 2 - 3 - - - - - - True - True - - - 1 - 3 - 1 - 2 - - - - - - True - 0 - _Jabber ID: - True - entry_jid - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - _Email: - True - entry_email - - - 1 - 2 - GTK_FILL - - - - - - - - True - <b>Advanced</b> - True - - + <b>Advanced</b> + True - - False - False - 1 - + + False + False + 1 + diff --git a/libempathy-gtk/empathy-account-widget-sip.ui b/libempathy-gtk/empathy-account-widget-sip.ui index df25b843e..259c9bdab 100644 --- a/libempathy-gtk/empathy-account-widget-sip.ui +++ b/libempathy-gtk/empathy-account-widget-sip.ui @@ -1,210 +1,213 @@ - + + 65535 - 0 - 10 1 - 0 - 0 + 10 - - False + + True + vertical - + True + 2 + 2 + 12 + 6 - + + True + 0 + Pass_word: + True + entry_password + + + 1 + 2 + GTK_FILL + + + + + + True + True + + + + 1 + 2 + + + + + + True + 0 + _Username: + True + entry_password + + + GTK_FILL + + + + + True - 2 - 2 - 12 - 6 - - - True - 0 - Pass_word: - True - entry_password - - - 1 - 2 - GTK_FILL - - - - + True True + - 1 - 2 - + 0 - + True - 0 - _Username: - True - entry_password + True + True + + + True + gtk-clear + 1 + + - GTK_FILL - + False + 1 + + + 1 + 2 + 1 + 2 + + + + + + False + False + 0 + + + + + True + True + + + True + 0 + 12 - + True + 3 + 2 + 6 + 6 - + True True + + + + 1 + 2 + 1 + 2 + + + + + True + 0 + STUN port: + spinbutton_stun-port + + + 2 + 3 + GTK_FILL + + + + + + True + 0 + STUN Server: + entry_stun-server + + 1 + 2 + GTK_FILL + + - + True True - Forget password and clear the entry. - - - True - gtk-clear - 1 - - + + adjustment1 + 1 - False - 1 + 1 + 2 + 2 + 3 - - - 1 - 2 - 1 - 2 - - - - - - False - False - - - - - True - True - - - True - 0 - 12 - + + Discover STUN True - 3 - 2 - 6 - 6 - - - True - True - - - 1 - 2 - 1 - 2 - - - - - True - 0 - STUN port: - spinbutton_stun-port - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - STUN Server: - entry_stun-server - - - 1 - 2 - GTK_FILL - - - - - - True - True - adjustment1 - 1 - - - 1 - 2 - 2 - 3 - - - - - True - True - Discover STUN - True - True - - - 2 - GTK_FILL - - - + True + False + True + True + + 2 + GTK_FILL + + - - - True - <b>Advanced</b> - True - - - - False - False - 1 - + + + + True + <b>Advanced</b> + True + + + False + False + 1 + diff --git a/libempathy-gtk/empathy-account-widget-yahoo.ui b/libempathy-gtk/empathy-account-widget-yahoo.ui index 439ff91db..ed91bc7f8 100644 --- a/libempathy-gtk/empathy-account-widget-yahoo.ui +++ b/libempathy-gtk/empathy-account-widget-yahoo.ui @@ -1,288 +1,295 @@ - + + - 65555 + 5050 1 - 10 + 65555 1 - 0 - 5050 + 10 - + True - Yahoo! account settings - False + vertical + 6 - + True - 6 + 2 + 3 + 12 + 6 - + True - 2 - 3 - 12 - 6 - - - True - 0 - Pass_word: - True - entry_password - - - 1 - 2 - GTK_FILL - - - - - - True - True - Forget password and clear the entry. - - - True - gtk-clear - 1 - - - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - 0 - Yahoo I_D: - True - entry_id - - - GTK_FILL - - - - - - True - True - - - 1 - 3 - - - + 0 + Pass_word: + True + entry_password + + + 1 + 2 + GTK_FILL + + + + + + True + True + True - + True - True - False + gtk-clear + 1 - - 1 - 2 - 1 - 2 - - - False - False + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + 0 + Yahoo I_D: + True + entry_id + + + GTK_FILL + + + + + + True + True + + + + 1 + 3 + - + True True + False + + + + 1 + 2 + 1 + 2 + + + + + + False + False + 0 + + + + + True + True + + + True + vertical - + True + 6 + 2 + 12 + 6 - + + _Ignore conference and chatroom invitations True - 6 - 2 - 12 - 6 - - - True - True - _Ignore conference and chatroom invitations - True - True - - - 2 - GTK_FILL - - - - - - True - 0 - _Room List locale: - True - entry_locale - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - _Charset: - True - entry_charset - - - 2 - 3 - GTK_FILL - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - - - 1 - 2 - 2 - 3 - - - - - - True - 0 - _Server: - True - entry_server - - - 3 - 4 - GTK_FILL - - - - - - True - 0 - _Port: - True - spinbutton_port - - - 4 - 5 - GTK_FILL - - - - - - True - True - - - 1 - 2 - 3 - 4 - - - - - - True - True - adjustment1 - 1 - True - - - 1 - 2 - 4 - 5 - - - - - - True - True - Use _Yahoo Japan - True - True - - - 2 - 5 - 6 - GTK_FILL - - - + True + False + True + True + + 2 + GTK_FILL + + + + + + True + 0 + _Room List locale: + True + entry_locale + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + _Charset: + True + entry_charset + + + 2 + 3 + GTK_FILL + + + + + + True + True + + + + 1 + 2 + 1 + 2 + + + + + + True + True + + + + 1 + 2 + 2 + 3 + + + + + + True + 0 + _Server: + True + entry_server + + + 3 + 4 + GTK_FILL + + + + + + True + 0 + _Port: + True + spinbutton_port + + + 4 + 5 + GTK_FILL + + + + + + True + True + + + + 1 + 2 + 3 + 4 + + + + + + True + True + + adjustment1 + 1 + True + + + 1 + 2 + 4 + 5 + + + + + + Use _Yahoo Japan + True + True + False + True + True + + + 2 + 5 + 6 + GTK_FILL + + - - - - True - <b>Advanced</b> - True - + + 0 + - - False - False - 1 - + + + + True + <b>Advanced</b> + True + + + False + False + 1 + diff --git a/libempathy-gtk/empathy-chat.ui b/libempathy-gtk/empathy-chat.ui index 6a5fc4659..3a9f49c34 100644 --- a/libempathy-gtk/empathy-chat.ui +++ b/libempathy-gtk/empathy-chat.ui @@ -1,119 +1,119 @@ - - + + + True - 6 - Group Chat - system-users + 4 + vertical + 6 - + True - 4 - 6 + True - + True + vertical 6 - + True - 0 - 0 - <b>Topic:</b> - True + True + automatic + in + + + - False - False + 0 - + True True - 0 - True - True - True - PANGO_ELLIPSIZE_END - True + never + never + in + + + + False 1 - False - False - 2 + True + True - + + 200 True True + never + automatic + in - - True - 6 - - - True - True - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - - - - - - True - True - GTK_POLICY_NEVER - GTK_POLICY_NEVER - GTK_SHADOW_IN - - - - - - False - 1 - - - - - True - True - - - - - 200 - True - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - - - - - - False - True - + + + False + True + + + + + 0 + + + + + True + 6 + + + True + 0 + 0 + <b>Topic:</b> + True + + + False + False + 0 + + + + + True + True + 0 + True + True + True + end + True + 1 + + False + False + 2 + 0 + -- cgit v1.2.3