diff --git a/src/mumble/ACLEditor.ui b/src/mumble/ACLEditor.ui
index 934790c843f..b3a8fc2a44b 100644
--- a/src/mumble/ACLEditor.ui
+++ b/src/mumble/ACLEditor.ui
@@ -6,8 +6,8 @@
0
0
- 607
- 509
+ 881
+ 503
@@ -17,7 +17,7 @@
-
- 0
+ 1
@@ -27,23 +27,6 @@
QFormLayout::AllNonFixedFieldsGrow
-
-
-
-
- Description
-
-
-
- -
-
-
-
- 0
- 1
-
-
-
-
-
@@ -157,6 +140,23 @@ When checked the channel created will be marked as temporary. This means when th
+ -
+
+
+
+ 0
+ 1
+
+
+
+
+ -
+
+
+ Description
+
+
+
@@ -274,6 +274,19 @@ Add a new group.
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 0
+ 20
+
+
+
+
@@ -282,153 +295,207 @@ Add a new group.
Members
-
- -
-
-
- Members
-
-
- qlwGroupAdd
-
-
-
- -
-
-
- Inherited members
-
-
- qlwGroupInherit
-
-
-
- -
-
-
- Contains the list of members added to the group by this channel.
-
-
- <b>Members</b><br />
+
+
-
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Contains the list of members added to the group by this channel.
+
+
+ <b>Members</b><br />
This list contains all members that were added to the group by the current channel. Be aware that this does not include members inherited by higher levels of the channel tree. These can be found in the <i>Inherited members</i> list. To prevent this list to be inherited by lower level channels uncheck <i>Inheritable</i> or manually add the members to the <i>Excluded members</i> list.
-
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Add member to group
+
+
+ Type in the name of a user you wish to add to the group and click Add.
+
+
+ true
+
+
+ QComboBox::NoInsert
+
+
+ QComboBox::AdjustToContents
+
+
+
+ -
+
+
+ Add
+
+
+
+ -
+
+
+ Members
+
+
+ qlwGroupAdd
+
+
+
+ -
+
+
+ Remove
+
+
+
+
- -
-
-
- Contains a list of members whose group membership will not be inherited from the parent channel.
-
-
- <b>Excluded members</b><br />
+
-
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Contains a list of members whose group membership will not be inherited from the parent channel.
+
+
+ <b>Excluded members</b><br />
Contains a list of members whose group membership will not be inherited from the parent channel.
-
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Remove member from group
+
+
+ Type in the name of a user you wish to remove from the group and click Add.
+
+
+ true
+
+
+ QComboBox::NoInsert
+
+
+ QComboBox::AdjustToContents
+
+
+
+ -
+
+
+ Add
+
+
+
+ -
+
+
+ Remove
+
+
+
+ -
+
+
+ Excluded members
+
+
+ qlwGroupRemove
+
+
+
+
- -
-
-
- Contains the list of members inherited by other channels.
-
-
- <b>Inherited members</b><br />
+
-
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Inherited members
+
+
+ qlwGroupInherit
+
+
+
+ -
+
+
+ Contains the list of members inherited by other channels.
+
+
+ <b>Inherited members</b><br />
Contains the list of members inherited by the current channel. Uncheck <i>Inherit</i> to prevent inheritance from higher level channels.
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Add member to group
-
-
- Type in the name of a user you wish to add to the group and click Add.
-
-
- true
-
-
- MUComboBox::NoInsert
-
-
- MUComboBox::AdjustToMinimumContentsLength
-
-
-
- -
-
-
- Add
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Remove member from group
-
-
- Type in the name of a user you wish to remove from the group and click Add.
-
-
- true
-
-
- MUComboBox::NoInsert
-
-
- MUComboBox::AdjustToMinimumContentsLength
-
-
-
- -
-
-
- Add
-
-
-
- -
-
-
- Remove
-
-
-
- -
-
-
- Remove
-
-
-
- -
-
-
- Exclude
-
-
-
- -
-
-
- Excluded members
-
-
- qlwGroupRemove
-
+
+
+
+ -
+
+
+ Exclude
+
+
+
+
@@ -649,7 +716,7 @@ Contains the list of members inherited by the current channel. Uncheck <i>
true
- MUComboBox::AdjustToMinimumContentsLength
+ QComboBox::AdjustToContents