diff --git a/data/gui/account_context_menu.ui b/data/gui/account_context_menu.ui
index 7b57e2884..91257c213 100644
--- a/data/gui/account_context_menu.ui
+++ b/data/gui/account_context_menu.ui
@@ -1,7 +1,7 @@
-
+
+ True
+ True
1
@@ -477,15 +496,15 @@
- 3
+ 0
5
- 6
- GTK_FILL
+ 3
@@ -493,6 +512,7 @@
@@ -500,8 +520,9 @@
-
False
@@ -545,9 +568,10 @@
True
False
True
+ 0.5
True
True
-
+
False
@@ -563,8 +587,9 @@
False
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
True
+ 0.5
True
-
+
False
@@ -579,8 +604,9 @@
True
False
True
+ 0.5
True
-
+
False
@@ -596,8 +622,9 @@
False
If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working.
True
+ 0.5
True
-
+
False
@@ -613,6 +640,7 @@
True
+ False
General
True
@@ -622,25 +650,29 @@
-
+
True
+ False
6
vertical
12
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
none
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
12
-
+
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
6
vertical
@@ -653,23 +685,27 @@
False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
True
+ 0.5
True
-
+
False
+ True
0
-
+
True
+ False
6
True
+ False
liststore1
-
+
@@ -678,6 +714,8 @@
+ True
+ True
0
@@ -688,7 +726,7 @@
True
False
True
-
+
False
@@ -699,6 +737,7 @@
False
+ True
1
@@ -709,6 +748,7 @@
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
<b>Proxy</b>
True
@@ -717,21 +757,25 @@
False
+ True
0
True
+ False
0
none
True
+ False
12
-
+
True
+ False
6
vertical
6
@@ -743,8 +787,9 @@
False
Check this so Gajim will ask you before sending your password over an insecure connection.
True
+ 0.5
True
-
+
False
@@ -760,9 +805,10 @@
False
If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection
True
+ 0.5
True
True
-
+
False
@@ -777,8 +823,9 @@
True
False
True
+ 0.5
True
-
+
False
@@ -787,13 +834,15 @@
-
+
True
False
+ False
6
True
+ False
_Hostname:
True
@@ -807,15 +856,18 @@
True
True
-
+
+ True
+ True
1
True
+ False
_Port:
True
@@ -831,15 +883,18 @@
True
6
5222
-
+
False
+ True
3
+ True
+ True
3
@@ -850,6 +905,7 @@
True
+ False
<b>Miscellaneous</b>
True
@@ -857,6 +913,7 @@
False
+ True
1
@@ -868,6 +925,7 @@
True
+ False
Connection
@@ -876,29 +934,34 @@
-
+
True
+ False
5
vertical
6
True
+ False
0
none
True
+ False
12
-
+
True
+ False
6
vertical
6
-
+
True
+ False
6
@@ -916,10 +979,13 @@
True
+ False
True
end
+ True
+ True
1
@@ -930,7 +996,7 @@
True
False
True
-
+
False
@@ -941,6 +1007,7 @@
False
+ True
0
@@ -953,8 +1020,9 @@
False
If checked, Gajim will get the password from a GPG agent like seahorse
True
+ 0.5
True
-
+
False
@@ -969,6 +1037,7 @@
True
+ False
<b>OpenPGP</b>
True
@@ -976,17 +1045,20 @@
False
+ True
0
True
+ False
0
none
True
+ False
6
12
@@ -997,7 +1069,7 @@
False
Information about you, as stored in the server
True
-
+
@@ -1005,6 +1077,7 @@
True
+ False
<b>Personal Information</b>
True
@@ -1012,6 +1085,7 @@
False
+ True
1
@@ -1023,6 +1097,7 @@
True
+ False
Personal Information
@@ -1032,6 +1107,8 @@
+ True
+ True
1
@@ -1044,8 +1121,9 @@
-
+
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
vertical
@@ -1056,11 +1134,13 @@
False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
True
+ 0.5
True
-
+
False
+ True
0
@@ -1069,8 +1149,9 @@
True
True
-
+
True
+ False
6
vertical
6
@@ -1082,8 +1163,9 @@
False
If checked, Gajim, when launched, will automatically connect to jabber using this account
True
+ 0.5
True
-
+
False
@@ -1098,8 +1180,9 @@
True
False
True
+ 0.5
True
-
+
False
@@ -1115,8 +1198,9 @@
False
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
True
+ 0.5
True
-
+
False
@@ -1125,8 +1209,9 @@
-
+
True
+ False
Use cust_om port:
@@ -1136,8 +1221,9 @@
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.
True
+ 0.5
True
-
+
False
@@ -1150,7 +1236,7 @@ You might consider to change possible firewall settings.
True
True
6
-
+
False
@@ -1161,6 +1247,7 @@ You might consider to change possible firewall settings.
False
+ True
10
3
@@ -1170,6 +1257,7 @@ You might consider to change possible firewall settings.
True
+ False
General
True
@@ -1178,21 +1266,19 @@ You might consider to change possible firewall settings.
-
+
True
- 6
- 6
- 2
- 2
- 5
+ False
-
+
True
+ False
vertical
5
True
+ False
0
<b>OpenPGP</b>
True
@@ -1204,12 +1290,14 @@ You might consider to change possible firewall settings.
-
+
True
+ False
6
True
+ False
No key selected
@@ -1221,10 +1309,13 @@ You might consider to change possible firewall settings.
True
+ False
True
end
+ True
+ True
1
@@ -1235,7 +1326,7 @@ You might consider to change possible firewall settings.
True
False
True
-
+
False
@@ -1246,6 +1337,7 @@ You might consider to change possible firewall settings.
False
+ True
1
@@ -1257,8 +1349,9 @@ You might consider to change possible firewall settings.
False
If checked, Gajim will get the password from a GPG agent like seahorse
True
+ 0.5
True
-
+
False
@@ -1268,127 +1361,115 @@ You might consider to change possible firewall settings.
- 2
- GTK_FILL
+ 0
+ 0
+ 2
True
+ False
0
<b>Personal Information</b>
True
- 2
+ 0
1
- 2
- GTK_FILL
-
+ 2
+
+
+
+
+ True
+ False
+ First Name:
+
+
+ 0
+ 2
+
+
+
+
+ True
+ False
+ Last Name:
+
+
+ 0
+ 3
+
+
+
+
+ True
+ False
+ Jabber ID:
+
+
+ 0
+ 4
+
+
+
+
+ True
+ False
+ E-Mail:
+
+
+ 0
+ 5
True
True
-
+ True
+
1
- 2
2
- 3
-
-
-
-
-
- True
- First Name:
-
-
- 2
- 3
- GTK_FILL
-
True
True
-
+ True
+
1
- 2
3
- 4
-
-
-
-
-
- True
- Last Name:
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
-
- True
- True
-
-
-
- 1
- 2
- 5
- 6
-
-
-
-
-
- True
- E-Mail:
-
-
- 5
- 6
- GTK_FILL
-
-
-
-
-
- True
- Jabber ID:
-
-
- 4
- 5
- GTK_FILL
-
True
True
-
+ True
+
1
- 2
4
- 5
-
+
+
+
+
+ True
+ True
+ True
+
+
+
+ 1
+ 5
@@ -1399,6 +1480,7 @@ You might consider to change possible firewall settings.
True
+ False
Personal Information
@@ -1408,6 +1490,8 @@ You might consider to change possible firewall settings.
+ True
+ True
1
@@ -1427,6 +1511,8 @@ You might consider to change possible firewall settings.
+ True
+ True
0
@@ -1438,16 +1524,19 @@ You might consider to change possible firewall settings.
False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
True
+ 0.5
True
False
+ True
1
-
+
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
6
end
@@ -1459,7 +1548,7 @@ You might consider to change possible firewall settings.
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
True
-
+
False
@@ -1470,28 +1559,11 @@ You might consider to change possible firewall settings.
False
+ True
3
-
- 5
- 127
- 1
- 5
-
-
- True
- gtk-add
-
-
- True
- gtk-remove
-
-
- True
- gtk-missing-image
-
diff --git a/data/gui/add_new_contact_window.ui b/data/gui/add_new_contact_window.ui
index cee67a0bb..69aad56e8 100644
--- a/data/gui/add_new_contact_window.ui
+++ b/data/gui/add_new_contact_window.ui
@@ -1,6 +1,28 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ I would like to add you to my contact list.
+
False
6
@@ -10,9 +32,10 @@
-
+
True
False
+ vertical
6
@@ -26,7 +49,7 @@
-
+
True
False
6
@@ -74,7 +97,7 @@
-
+
True
False
6
@@ -85,7 +108,6 @@
0
_Protocol:
True
- uid_entry
False
@@ -133,15 +155,11 @@
-
+
True
False
- True
- 6
- 3
- 2
- 6
6
+ 6
True
@@ -149,24 +167,10 @@
0
_User ID:
True
- uid_entry
- GTK_FILL
-
-
-
-
-
- True
- True
- True
- Type User ID
-
-
- 1
- 2
-
+ 0
+ 0
@@ -176,28 +180,10 @@
0
_Nickname:
True
- nickname_entry
+ 0
1
- 2
- GTK_FILL
-
-
-
-
-
- True
- True
- True
- Type Nickname
-
-
- 1
- 2
- 1
- 2
-
@@ -209,31 +195,52 @@
True
+ 0
2
- 3
- GTK_FILL
-
+
+
+
+
+ True
+ True
+ True
+ True
+ Type User ID
+
+
+ 1
+ 0
+
+
+
+
+ True
+ True
+ True
+ True
+ Type Nickname
+
+
+ 1
+ 1
True
False
+ True
True
- 0
- 1
True
- Choose a group of type a new group
+ Choose a group of type a new group
1
- 2
2
- 3
@@ -251,7 +258,6 @@
True
False
True
- False
True
0
True
@@ -293,7 +299,6 @@
True
True
False
- False
True
0
True
@@ -305,7 +310,7 @@
-
+
True
False
True
@@ -335,7 +340,8 @@ proceed.
True
True
False
- False
+ center
+ center
True
@@ -367,7 +373,7 @@ to add a contact from this protocol.
-
+
True
False
5
@@ -381,7 +387,6 @@ to add a contact from this protocol.
True
True
False
- False
True
@@ -400,7 +405,6 @@ to add a contact from this protocol.
True
True
False
- False
True
@@ -420,25 +424,4 @@ to add a contact from this protocol.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- I would like to add you to my contact list.
-
diff --git a/data/gui/adhoc_commands_window.ui b/data/gui/adhoc_commands_window.ui
index e29bf7ce0..80b8146cd 100644
--- a/data/gui/adhoc_commands_window.ui
+++ b/data/gui/adhoc_commands_window.ui
@@ -1,16 +1,18 @@
-
+
+
-
-
+
True
+ False
6
Ad-hoc Commands - Gajim
dialog
-
+
-
+
True
+ False
vertical
6
@@ -18,18 +20,22 @@
400
400
True
+ False
False
False
-
+
True
+ False
vertical
True
+ False
Please wait while retrieving command list...
+ False
False
0
@@ -37,9 +43,11 @@
True
+ False
0.050000000745099998
+ False
False
1
@@ -52,6 +60,7 @@
True
+ False
False
@@ -63,6 +72,7 @@
True
+ False
1
@@ -70,12 +80,14 @@
-
+
True
+ False
vertical
True
+ False
0.20000000298023224
6
<b>Choose command to execute:</b>
@@ -91,14 +103,14 @@
True
True
- automatic
- automatic
True
+ False
-
+
True
+ False
12
vertical
@@ -107,12 +119,15 @@
+ False
+ True
1
-
+
True
+ False
@@ -123,7 +138,7 @@
True
False
True
-
+
False
@@ -135,6 +150,7 @@
False
+ True
2
@@ -146,6 +162,7 @@
True
+ False
2
@@ -158,6 +175,7 @@
True
+ False
3
@@ -165,12 +183,14 @@
-
+
True
+ False
vertical
True
+ False
Please wait while the command is being sent...
True
@@ -186,6 +206,7 @@
True
+ False
0.050000000745099998
Please wait...
@@ -204,6 +225,7 @@
True
+ False
4
@@ -216,6 +238,7 @@
True
+ False
5
@@ -223,12 +246,14 @@
-
+
True
+ False
vertical
True
+ False
This jabber entity does not expose any commands.
@@ -241,8 +266,9 @@
-
+
True
+ False
@@ -253,7 +279,7 @@
True
False
True
-
+
False
@@ -278,6 +304,7 @@
True
+ False
6
@@ -290,6 +317,7 @@
True
+ False
7
@@ -297,12 +325,14 @@
-
+
True
+ False
vertical
True
+ False
<b>An error has occurred:</b>
True
@@ -315,7 +345,8 @@
True
- Error description...
+ False
+ Error description...
True
@@ -332,6 +363,7 @@
True
+ False
8
@@ -344,6 +376,7 @@
True
+ False
9
@@ -352,12 +385,15 @@
+ False
+ True
0
-
+
True
+ False
12
end
@@ -368,7 +404,7 @@
True
False
True
-
+
False
@@ -384,7 +420,7 @@
True
False
True
-
+
False
@@ -400,7 +436,7 @@
True
False
True
-
+
False
@@ -416,7 +452,7 @@
True
False
True
-
+
False
@@ -431,7 +467,7 @@
True
True
True
-
+
False
@@ -447,7 +483,7 @@
True
False
True
-
+
False
@@ -458,6 +494,7 @@
False
+ True
1
diff --git a/data/gui/advanced_configuration_window.ui b/data/gui/advanced_configuration_window.ui
index c5620471c..cc2875450 100644
--- a/data/gui/advanced_configuration_window.ui
+++ b/data/gui/advanced_configuration_window.ui
@@ -1,7 +1,7 @@
-
+
True
False
diff --git a/data/gui/advanced_menuitem_menu.ui b/data/gui/advanced_menuitem_menu.ui
index dbc6a778a..e99e020f0 100644
--- a/data/gui/advanced_menuitem_menu.ui
+++ b/data/gui/advanced_menuitem_menu.ui
@@ -1,7 +1,7 @@
-
+
-
+
True
False
end
@@ -119,7 +120,7 @@
0
0
-
+
True
False
2
@@ -167,59 +168,57 @@
-
+
True
False
- 3
- 2
- 6
6
+ 6
-
- False
+
True
- True
- True
-
-
-
- True
- False
- 6
-
-
- True
- False
- gtk-missing-image
-
-
- False
- True
- 0
-
-
-
-
- True
- False
- 0
- True
-
-
- True
- True
- 1
-
-
-
-
+ False
+ 0
+ Preset messages:
+
+
+ 0
+ 0
+
+
+
+
+ True
+ False
+ 0
+ Activity:
+
+
+ 0
+ 1
+
+
+
+
+ True
+ False
+ 0
+ Mood:
+
+
+ 0
+ 2
+
+
+
+
+ True
+ False
+ True
+
1
- 2
- 2
- 3
- GTK_FILL
+ 0
@@ -230,7 +229,7 @@
True
-
+
True
False
6
@@ -264,62 +263,52 @@
1
- 2
1
- 2
- GTK_FILL
-
+
+ False
True
- False
- 0
- Mood:
-
-
- 2
- 3
- GTK_FILL
- GTK_FILL
-
-
-
-
- True
- False
- 0
- Activity:
-
-
- 1
- 2
- GTK_FILL
- GTK_FILL
-
-
-
-
- True
- False
-
+ True
+ True
+
+
+
+ True
+ False
+ 6
+
+
+ True
+ False
+ gtk-missing-image
+
+
+ False
+ True
+ 0
+
+
+
+
+ True
+ False
+ 0
+ True
+
+
+ True
+ True
+ 1
+
+
+
+
1
- 2
- GTK_FILL
-
-
-
-
- True
- False
- 0
- Preset messages:
-
-
- GTK_FILL
- GTK_FILL
+ 2
diff --git a/data/gui/chat_context_menu.ui b/data/gui/chat_context_menu.ui
index f38ff3da7..c5ef3ce7e 100644
--- a/data/gui/chat_context_menu.ui
+++ b/data/gui/chat_context_menu.ui
@@ -1,7 +1,7 @@
-
+
2
- 3
- GTK_FILL
-
+ 0
@@ -114,10 +108,8 @@
+ 0
1
- 2
- GTK_FILL
-
@@ -138,11 +130,7 @@
1
- 2
1
- 2
- GTK_FILL
-
@@ -163,11 +151,7 @@
2
- 3
1
- 2
- GTK_FILL
-
@@ -186,10 +170,8 @@
+ 0
2
- 3
- GTK_FILL
-
@@ -210,11 +192,7 @@
1
- 2
2
- 3
- GTK_FILL
-
@@ -235,11 +213,7 @@
2
- 3
2
- 3
- GTK_FILL
-
@@ -258,10 +232,8 @@
+ 0
3
- 4
- GTK_FILL
-
@@ -281,11 +253,7 @@
1
- 2
3
- 4
- GTK_FILL
-
@@ -305,11 +273,7 @@
2
- 3
3
- 4
- GTK_FILL
-
diff --git a/data/gui/chat_to_muc_window.ui b/data/gui/chat_to_muc_window.ui
index 4a8f30d8a..81d48705a 100644
--- a/data/gui/chat_to_muc_window.ui
+++ b/data/gui/chat_to_muc_window.ui
@@ -1,22 +1,30 @@
-
+
+
-
-
+
+
+ True
+ False
+ gtk-jump-to
+
True
+ False
5
Invite Friends!
dialog
-
-
+
+
-
+
True
+ False
vertical
6
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
You are going to begin a Multi-User Chat.
Select the contacts you want to invite
@@ -33,8 +41,6 @@ Select the contacts you want to invite
True
True
- automatic
- automatic
in
@@ -42,10 +48,15 @@ Select the contacts you want to invite
True
True
False
+
+
+
+ False
+ True
4
1
@@ -56,13 +67,15 @@ Select the contacts you want to invite
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
+
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
vertical
True
+ False
Please select a MUC server.
center
True
@@ -77,9 +90,11 @@ Select the contacts you want to invite
True
+ False
False
+ True
1
@@ -88,6 +103,7 @@ Select the contacts you want to invite
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
MUC server
@@ -95,12 +111,14 @@ Select the contacts you want to invite
False
+ True
2
-
+
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
6
end
@@ -111,7 +129,7 @@ Select the contacts you want to invite
True
False
True
-
+
False
@@ -128,7 +146,7 @@ Select the contacts you want to invite
False
image1
True
-
+
False
@@ -140,14 +158,11 @@ Select the contacts you want to invite
False
+ True
3
-
- True
- gtk-jump-to
-
diff --git a/data/gui/choose_gpg_key_dialog.ui b/data/gui/choose_gpg_key_dialog.ui
index f9aa41613..34062b931 100644
--- a/data/gui/choose_gpg_key_dialog.ui
+++ b/data/gui/choose_gpg_key_dialog.ui
@@ -1,60 +1,23 @@
-
+
+
-
-
+
+ False
6
550
300
dialog
-
+
True
+ False
vertical
6
-
-
- True
- 6
- vertical
- 6
-
-
- True
- 0
-
-
- False
- False
- 0
-
-
-
-
- True
- True
- automatic
- automatic
- in
-
-
- True
- True
-
-
-
-
- 1
-
-
-
-
- 2
-
-
-
+
True
+ False
end
@@ -90,10 +53,58 @@
False
+ False
end
0
+
+
+ True
+ False
+ 6
+ vertical
+ 6
+
+
+ True
+ False
+ 0
+
+
+ False
+ False
+ 0
+
+
+
+
+ True
+ True
+ in
+
+
+ True
+ True
+
+
+
+
+
+
+
+ True
+ True
+ 1
+
+
+
+
+ False
+ True
+ 2
+
+
diff --git a/data/gui/contact_context_menu.ui b/data/gui/contact_context_menu.ui
index 2841ef6bb..85f1c0387 100644
--- a/data/gui/contact_context_menu.ui
+++ b/data/gui/contact_context_menu.ui
@@ -1,7 +1,7 @@
-
+
+
+
+ False
+ 6
+ Room Configuration
+ 650
+ 450
+ dialog
+
+
+
+ True
+ False
+ vertical
+ 6
+
+
+ True
+ True
+ etched-in
+
+
+ True
+ False
+
+
+ True
+ False
+ vertical
+
+
+ True
+ False
+ 5
+ vertical
+ 5
+
+
+ True
+ False
+ 0
+ True
+
+
+ False
+ False
+ 5
+ 0
+
+
+
+
+ True
+ False
+
+
+ False
+ True
+ 5
+ 1
+
+
+
+
+
+
+
+ False
+ True
+ 0
+
+
+
+
+ True
+ False
+
+
+ False
+ True
+ 5
+ 1
+
+
+
+
+ True
+ False
+ 5
+ vertical
+ 5
+
+
+
+
+
+ False
+ True
+ 2
+
+
+
+
+
+
+
+
+ False
+ True
+ 0
+
+
+
+
+ True
+ False
+ 6
+ end
+
+
+ gtk-cancel
+ True
+ True
+ True
+ False
+ True
+
+
+
+ False
+ False
+ 0
+
+
+
+
+ gtk-ok
+ True
+ True
+ True
+ False
+ True
+
+
+
+ False
+ False
+ 1
+
+
+
+
+ False
+ True
1
diff --git a/data/gui/dubbleinput_dialog.ui b/data/gui/dubbleinput_dialog.ui
index 8770d27df..72a1fe883 100644
--- a/data/gui/dubbleinput_dialog.ui
+++ b/data/gui/dubbleinput_dialog.ui
@@ -1,6 +1,7 @@
+
-
+
False
6
@@ -25,7 +26,6 @@
True
True
False
- False
True
@@ -43,7 +43,6 @@
True
True
False
- False
True
@@ -61,13 +60,14 @@
-
+
True
False
6
+ vertical
6
-
+
True
False
12
@@ -76,7 +76,7 @@
True
False
gtk-dialog-question
- 6
+ 6
False
diff --git a/data/gui/edit_groups_dialog.ui b/data/gui/edit_groups_dialog.ui
index fab50a505..e9b949058 100644
--- a/data/gui/edit_groups_dialog.ui
+++ b/data/gui/edit_groups_dialog.ui
@@ -1,6 +1,7 @@
+
-
+
False
6
@@ -28,7 +29,6 @@
True
True
False
- False
True
@@ -69,7 +69,7 @@
-
+
True
False
6
@@ -94,7 +94,6 @@
True
True
False
- False
True
diff --git a/data/gui/esession_info_window.ui b/data/gui/esession_info_window.ui
index bd6489024..9a276b10d 100644
--- a/data/gui/esession_info_window.ui
+++ b/data/gui/esession_info_window.ui
@@ -1,6 +1,7 @@
+
-
+
False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
@@ -24,7 +25,6 @@
True
True
False
- False
@@ -33,7 +33,7 @@
0
0
-
+
True
False
2
@@ -80,7 +80,6 @@
True
True
False
- False
True
@@ -99,7 +98,7 @@
-
+
True
False
@@ -135,7 +134,7 @@
-
+
True
False
4
diff --git a/data/gui/features_window.ui b/data/gui/features_window.ui
index e28309fda..8119c22f2 100644
--- a/data/gui/features_window.ui
+++ b/data/gui/features_window.ui
@@ -1,8 +1,9 @@
-
+
+
-
-
+
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
12
Features
@@ -10,14 +11,16 @@
530
dialog
-
+
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
vertical
6
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
<b>List of possible features in Gajim:</b>
@@ -34,61 +37,29 @@
True
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- automatic
- automatic
out
True
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
-
-
-
- 1
-
-
-
-
- True
- 3
- 0
- none
-
-
- True
- 6
- 0
- 0.5
- 12
-
-
- True
- 0
- True
- True
-
+
+
+
-
-
- True
- <b>Description</b>
- True
-
-
False
- 3
+ True
+ 1
-
+
True
+ False
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
end
@@ -99,7 +70,7 @@
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
True
-
+
False
@@ -110,10 +81,52 @@
False
+ True
end
2
+
+
+ True
+ False
+ 3
+ 0
+ none
+
+
+ True
+ False
+ 6
+ 0
+ 0.5
+ 12
+
+
+ True
+ False
+ 0
+ True
+ True
+
+
+
+
+
+
+ True
+ False
+ <b>Description</b>
+ True
+
+
+
+
+ False
+ True
+ 3
+
+
diff --git a/data/gui/filetransfers.ui b/data/gui/filetransfers.ui
index 194d44f0b..a697e1213 100644
--- a/data/gui/filetransfers.ui
+++ b/data/gui/filetransfers.ui
@@ -1,7 +1,7 @@
-
+
1
- 3
2
- 3
-
+ 2
@@ -258,21 +261,18 @@
True
False
Bold
-
+
True
+ False
gtk-bold
1
- 2
3
- 4
-
-
@@ -281,21 +281,18 @@
True
False
Italic
-
+
True
+ False
gtk-italic
2
- 3
3
- 4
-
-
@@ -307,6 +304,7 @@
False
+ True
1
@@ -314,215 +312,121 @@
12
True
+ False
+ False
+ True
2
+ False
+ True
1
-
+
True
+ False
False
+ True
2
-
+
True
- 9
- 2
- 6
+ False
6
+ 6
-
+
True
- 0
- Paused
+ False
- 4
- 5
- GTK_FILL
-
-
-
-
-
- True
- True
- False
-
-
-
- 1
- 2
- 4
- 5
- GTK_FILL
-
-
-
-
-
- True
- True
- False
-
-
-
- 1
- 2
- 3
- 4
- GTK_FILL
-
-
-
-
-
- True
- 0
- Composing
-
-
- 3
- 4
- GTK_FILL
-
+ 0
+ 5
+ 2
True
+ False
0
Inactive
- 2
- 3
- GTK_FILL
-
+ 0
+ 1
-
+
True
- True
- False
-
+ False
+ 0
+ Composing
- 1
- 2
+ 0
2
- 3
- GTK_FILL
-
-
+
True
- 5
- <b>Chatstate Tab Colors</b>
- True
+ False
+ 0
+ Paused
- 2
- GTK_FILL
-
+ 0
+ 3
True
+ False
0
Gone
- 5
- 6
- GTK_FILL
-
-
-
-
-
- True
- True
- False
-
-
-
- 1
- 2
- 5
- 6
- GTK_FILL
-
+ 0
+ 4
True
+ False
0
MUC
Messages
- 7
- 8
- GTK_FILL
-
-
-
-
-
- True
- True
- False
-
-
-
- 1
- 2
- 7
- 8
- GTK_FILL
-
-
-
-
-
- True
-
-
- 2
+ 0
6
- 7
- GTK_FILL
- GTK_FILL
True
+ False
0
MUC Directed
Messages
- 8
- 9
- GTK_FILL
-
+ 0
+ 7
@@ -530,36 +434,105 @@ Messages
True
True
False
-
+
1
- 2
- 8
- 9
- GTK_FILL
-
+ 7
-
+
+ True
+ True
+ False
+
+
+
+ 1
+ 6
+
-
+
+ True
+ True
+ False
+
+
+
+ 1
+ 4
+
+
+
+
+ True
+ True
+ False
+
+
+
+ 1
+ 3
+
+
+
+
+ True
+ True
+ False
+
+
+
+ 1
+ 2
+
+
+
+
+ True
+ True
+ False
+
+
+
+ 1
+ 1
+
+
+
+
+ True
+ False
+ 5
+ <b>Chatstate Tab Colors</b>
+ True
+
+
+ 0
+ 0
+ 2
+
+ False
+ True
3
+ False
+ True
0
-
+
True
+ False
6
end
@@ -570,7 +543,7 @@ Messages
True
False
True
-
+
False
@@ -581,6 +554,7 @@ Messages
False
+ True
1
diff --git a/data/gui/gc_control_popup_menu.ui b/data/gui/gc_control_popup_menu.ui
index 13edcc19b..e6023d0c2 100644
--- a/data/gui/gc_control_popup_menu.ui
+++ b/data/gui/gc_control_popup_menu.ui
@@ -1,7 +1,7 @@
-
+
@@ -449,9 +461,4 @@
-
- True
- False
- gtk-jump-to
-
diff --git a/data/gui/groups_post_window.ui b/data/gui/groups_post_window.ui
index 85734ff12..74280e325 100644
--- a/data/gui/groups_post_window.ui
+++ b/data/gui/groups_post_window.ui
@@ -1,73 +1,76 @@
-
+
+
-
-
+
+
True
+ False
Create new post
dialog
-
+
True
+ False
6
vertical
4
-
+
True
- 2
- 2
+ False
+ 6
+ 6
True
+ False
0
From:
- GTK_FILL
-
+ 0
+ 0
True
+ False
0
Subject:
+ 0
1
- 2
- GTK_FILL
-
True
True
+ True
1
- 2
-
+ 0
True
True
+ True
1
- 2
1
- 2
-
False
+ True
0
@@ -75,8 +78,6 @@
True
True
- automatic
- automatic
in
@@ -87,12 +88,15 @@
+ False
+ True
1
-
+
True
+ False
gtk-cancel
@@ -100,7 +104,7 @@
True
False
True
-
+
False
@@ -118,7 +122,7 @@
True
False
True
-
+
False
@@ -129,11 +133,11 @@
False
+ True
2
-
diff --git a/data/gui/history_manager.ui b/data/gui/history_manager.ui
index 6816779f8..22fa161f4 100644
--- a/data/gui/history_manager.ui
+++ b/data/gui/history_manager.ui
@@ -1,7 +1,7 @@
-
+