diff --git a/data/gui/account_creation_wizard_window.ui b/data/gui/account_creation_wizard_window.ui index 0cc21372b..6cfaa4ade 100644 --- a/data/gui/account_creation_wizard_window.ui +++ b/data/gui/account_creation_wizard_window.ui @@ -83,53 +83,46 @@ to the Jabber network. 0 none - + True False - 5 - 12 + 12 + 6 + vertical + 6 - + + I already have an account I want to _use True - False - 6 - vertical - 6 - - - I already have an account I want to _use - True - True - False - True - 0 - True - True - - - False - False - 0 - - - - - I want to _register for a new account - True - True - False - True - 0 - True - use_existing_account_radiobutton - - - False - False - 1 - - + True + False + True + 0 + True + True + + False + False + 0 + + + + + I want to _register for a new account + True + True + False + True + 0 + True + use_existing_account_radiobutton + + + False + False + 1 + diff --git a/data/gui/accounts_window.ui b/data/gui/accounts_window.ui index 97d11cacd..f525f8d3e 100644 --- a/data/gui/accounts_window.ui +++ b/data/gui/accounts_window.ui @@ -664,84 +664,77 @@ 0 none - + True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 12 + 12 + 6 + vertical + 6 - + + _use HTTP__PROXY environment variable + True + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + 0 + True + + + + False + True + 0 + + + + True False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 6 - vertical 6 - - _use HTTP__PROXY environment variable + True - True - False - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - 0.5 - True - + False + liststore1 + + + + + 0 + + - False + True True 0 - + + _Manage... True - False - 6 - - - True - False - liststore1 - - - - - 0 - - - - - True - True - 0 - - - - - _Manage... - True - True - False - True - - - - False - False - 1 - - + True + False + True + False - True + False 1 + + False + True + 1 + @@ -768,28 +761,79 @@ 0 none - + True False - 12 + 12 + 6 + vertical + 6 - + + _Warn before using an insecure connection True + True + False + Check this so Gajim will ask you before sending your password over an insecure connection. + True + 0 + True + + + + False + False + 0 + + + + + Send _keep-alive packets + True + True + False + If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection + True + 0 + True + True + + + + False + False + 1 + + + + + Use cust_om hostname/port + True + True + False + True + 0 + True + + + + False + False + 2 + + + + + True + False False - 6 - vertical 6 - - _Warn before using an insecure connection + True - True - False - Check this so Gajim will ask you before sending your password over an insecure connection. + False + _Hostname: True - 0.5 - True - False @@ -798,34 +842,23 @@ - - Send _keep-alive packets + True True - False - If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection - True - 0.5 - True - True - + - False - False + True + True 1 - - Use cust_om hostname/port + True - True - False + False + _Port: True - 0.5 - True - False @@ -834,71 +867,25 @@ - + True - False - False - 6 - - - True - False - _Hostname: - True - - - False - False - 0 - - - - - True - True - - - - True - True - 1 - - - - - True - False - _Port: - True - - - False - False - 2 - - - - - True - True - 6 - 5222 - - - - False - True - 3 - - + True + 6 + 5222 + - True + False True 3 + + True + True + 3 + @@ -947,90 +934,84 @@ 0 none - + True False - 12 + 12 + 6 + vertical + 6 - + True False - 6 - vertical 6 - + True False - 6 - - - True - True - No key selected - True - - - False - False - 0 - - - - - True - False - True - end - - - True - True - 1 - - - - - Choose _Key... - True - True - False - True - - - - False - False - 2 - - - - - False - True - 0 - - - - - Use G_PG Agent - True - False - True - False - If checked, Gajim will get the password from a GPG agent like seahorse - True - 0.5 - True - + No key selected + True False False + 0 + + + + + True + False + True + end + + + True + True 1 + + + Choose _Key... + True + True + False + True + + + + False + False + 2 + + + + False + True + 0 + + + + + Use G_PG Agent + True + False + True + False + If checked, Gajim will get the password from a GPG agent like seahorse + True + 0 + True + + + + False + False + 1 + @@ -1056,22 +1037,16 @@ 0 none - + + _Edit Personal Information... True - False + True + False + Information about you, as stored in the server + 12 6 - 12 - - - _Edit Personal Information... - True - True - False - Information about you, as stored in the server - True - - - + True + diff --git a/data/gui/advanced_configuration_window.ui b/data/gui/advanced_configuration_window.ui index cc2875450..88cef610f 100644 --- a/data/gui/advanced_configuration_window.ui +++ b/data/gui/advanced_configuration_window.ui @@ -92,19 +92,12 @@ 0 none - + True False - 6 - 12 - - - True - False - 0 - True - - + 12 + 0 + True diff --git a/data/gui/change_status_message_dialog.ui b/data/gui/change_status_message_dialog.ui index 986b26a92..a71e85929 100644 --- a/data/gui/change_status_message_dialog.ui +++ b/data/gui/change_status_message_dialog.ui @@ -68,257 +68,242 @@ 0 none - + True False - 12 + 12 + 6 + vertical + 6 - + True - False - 6 - vertical - 6 + True + in - + True True - in + word + + + + + True + True + 0 + + + + + True + False + end + + + False + True + False + True + True + False + - + True - True - True - word + False + 2 + + + True + False + gtk-save-as + + + False + False + 0 + + + + + True + False + Save as Preset... + True + + + False + False + 1 + + - True - True + False + False 0 + + + False + True + 1 + + + + + True + False + 6 + 6 - + True False - end - - - False - True - False - True - True - False - - - - True - False - 0 - 0 - - - True - False - 2 - - - True - False - gtk-save-as - - - False - False - 0 - - - - - True - False - Save as Preset... - True - - - False - False - 1 - - - - - - - - - False - False - 0 - - + 0 + Preset messages: - False - True - 1 + 0 + 0 - + True False - 6 - 6 + 0 + Activity: + + + 0 + 1 + + + + + True + False + 0 + Mood: + + + 0 + 2 + + + + + True + False + True + + + + 1 + 0 + + + + + False + True + True + True + - + True False - 0 - Preset messages: - - - 0 - 0 - - - - - True - False - 0 - Activity: - - - 0 - 1 - - - - - True - False - 0 - Mood: - - - 0 - 2 - - - - - True - False - True - - - - 1 - 0 - - - - - False - True - True - True - + 6 - + True False - 6 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - 0 - True - - - True - True - 1 - - + gtk-missing-image + + False + True + 0 + - - - 1 - 1 - - - - - False - True - True - True - - + True False - 6 - - - True - False - gtk-missing-image - - - False - True - 0 - - - - - True - False - 0 - True - - - True - True - 1 - - + 0 + True + + True + True + 1 + - - 1 - 2 - - False - True - 2 + 1 + 1 + + + + + False + True + True + True + + + + True + False + 6 + + + True + False + gtk-missing-image + + + False + True + 0 + + + + + True + False + 0 + True + + + True + True + 1 + + + + + + + 1 + 2 + + False + True + 2 + diff --git a/data/gui/chat_control.ui b/data/gui/chat_control.ui index 2e0533689..af1049516 100644 --- a/data/gui/chat_control.ui +++ b/data/gui/chat_control.ui @@ -297,70 +297,60 @@ False vertical - +