diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade
index 20ce0e6c5..2a1022a7f 100644
--- a/deluge/ui/gtkui/glade/preferences_dialog.glade
+++ b/deluge/ui/gtkui/glade/preferences_dialog.glade
@@ -1165,40 +1165,127 @@ Disabled
2
15
-
+
True
True
- The maximum upload slots for all torrents. Set -1 for unlimited.
1
- -1 -1 9000 1 10 10
- 1
- True
+ -1 -1 9999 1 10 10
True
1
2
+ 5
+ 6
+ GTK_FILL
+
+
+
+
+ True
+ True
+ 1
+ -1 -1 9999 1 10 10
+ True
+
+
+ 1
+ 2
+ 4
+ 5
+ GTK_FILL
+
+
+
+
+ True
+ 0
+ Maximum Connection Attempts per Second:
+
+
+ 5
+ 6
+ GTK_FILL
+
+
+
+
+ True
+ 0
+ Maximum Half-Open Connections:
+
+
+ 4
+ 5
+ GTK_FILL
+
+
+
+
+ True
+ The maximum upload speed for all torrents. Set -1 for unlimited.
+ 0
+ Maximum Upload Speed (KiB/s):
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+ True
+ The maximum number of connections allowed. Set -1 for unlimited.
+ 0
+ Maximum Connections:
+
+
+ GTK_FILL
+
+
+
+
+ True
+ The maximum upload speed for all torrents. Set -1 for unlimited.
+ 0
+ Maximum Upload Slots:
+
+
1
2
GTK_FILL
-
+
True
True
- The maximum upload speed for all torrents. Set -1 for unlimited.
+ The maximum number of connections allowed. Set -1 for unlimited.
+ 4
1
-1 -1 9000 1 10 10
1
- 1
+ True
True
+ GTK_UPDATE_IF_VALID
1
2
- 3
- 4
+ GTK_FILL
+
+
+
+
+ True
+ The maximum download speed for all torrents. Set -1 for unlimited.
+ 0
+ Maximum Download Speed (KiB/s):
+
+
+ 2
+ 3
GTK_FILL
@@ -1223,127 +1310,40 @@ Disabled
-
- True
- The maximum download speed for all torrents. Set -1 for unlimited.
- 0
- Maximum Download Speed (KiB/s):
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
+
True
True
- The maximum number of connections allowed. Set -1 for unlimited.
- 4
+ The maximum upload speed for all torrents. Set -1 for unlimited.
1
-1 -1 9000 1 10 10
1
- True
+ 1
True
- GTK_UPDATE_IF_VALID
1
2
- GTK_FILL
-
-
-
-
- True
- The maximum upload speed for all torrents. Set -1 for unlimited.
- 0
- Maximum Upload Slots:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- The maximum number of connections allowed. Set -1 for unlimited.
- 0
- Maximum Connections:
-
-
- GTK_FILL
-
-
-
-
- True
- The maximum upload speed for all torrents. Set -1 for unlimited.
- 0
- Maximum Upload Speed (KiB/s):
-
-
3
4
GTK_FILL
-
- True
- 0
- Maximum Half-Open Connections:
-
-
- 4
- 5
- GTK_FILL
-
-
-
-
- True
- 0
- Maximum Connection Attempts per Second:
-
-
- 5
- 6
- GTK_FILL
-
-
-
-
+
True
True
+ The maximum upload slots for all torrents. Set -1 for unlimited.
1
- -1 -1 9999 1 10 10
+ -1 -1 9000 1 10 10
+ 1
+ True
True
1
2
- 4
- 5
- GTK_FILL
-
-
-
-
- True
- True
- 1
- -1 -1 9999 1 10 10
- True
-
-
- 1
- 2
- 5
- 6
+ 1
+ 2
GTK_FILL
@@ -1411,18 +1411,85 @@ Disabled
2
15
-
+
True
True
- The maximum number of connections per torrent. Set -1 for unlimited.
+ The maximum upload slots per torrent. Set -1 for unlimited.
1
-1 -1 9000 1 10 10
- 1
+ 1
+ True
True
1
2
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ True
+ The maximum number of connections per torrent. Set -1 for unlimited.
+ 1
+ -1 -1 9000 1 10 10
+ True
+ True
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Maximum Connections:
+
+
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Maximum Upload Slots:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Maximum Download Speed (KiB/s):
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Maximum Upload Speed (KiB/s):
+
+
3
4
GTK_FILL
@@ -1447,87 +1514,20 @@ Disabled
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Maximum Upload Speed (KiB/s):
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Maximum Download Speed (KiB/s):
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Maximum Upload Slots:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Maximum Connections:
-
-
- GTK_FILL
-
-
-
-
+
True
True
The maximum number of connections per torrent. Set -1 for unlimited.
1
-1 -1 9000 1 10 10
- True
+ 1
True
1
2
- GTK_FILL
-
-
-
-
- True
- True
- The maximum upload slots per torrent. Set -1 for unlimited.
- 1
- -1 -1 9000 1 10 10
- 1
- True
- True
-
-
- 1
- 2
- 1
- 2
+ 3
+ 4
GTK_FILL
@@ -2356,15 +2356,59 @@ Disabled
2
10
-
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 1
+ 0 -1 9999 1 10 10
+ True
+ True
+
+
+ 1
+ 2
+
+
+
+
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 1
+ 0 -1 9999 1 10 10
+ True
+ True
+
+
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+
+ True
+ 0
+ Total active seeding:
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
- Total active downloading:
+ Total active:
- 1
- 2
GTK_FILL
@@ -2387,62 +2431,18 @@ Disabled
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
0
- Total active:
+ Total active downloading:
+ 1
+ 2
GTK_FILL
-
-
- True
- 0
- Total active seeding:
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 1
- 0 -1 9999 1 10 10
- True
- True
-
-
- 1
- 2
- 2
- 3
-
-
-
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 1
- 0 -1 9999 1 10 10
- True
- True
-
-
- 1
- 2
-
-
-
@@ -2503,18 +2503,51 @@ Disabled
2
10
-
+
+ True
+ 0
+ Share Ratio Limit:
+
+
+ GTK_FILL
+
+
+
+
+ True
+ 0
+ Seed Time Ratio:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ 0
+ Seed Time (m):
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
True
True
6
1
- 6 -1 100 1 10 10
+ 1.5 -1 100 0.10000000000000001 10 10
+ 2
1
2
- 2
- 3
@@ -2536,52 +2569,19 @@ Disabled
-
+
True
True
6
1
- 1.5 -1 100 0.10000000000000001 10 10
- 2
+ 6 -1 100 1 10 10
1
2
-
-
-
-
-
- True
- 0
- Seed Time (m):
-
-
2
3
- GTK_FILL
-
-
-
-
- True
- 0
- Seed Time Ratio:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- 0
- Share Ratio Limit:
-
-
- GTK_FILL
+
@@ -2729,6 +2729,15 @@ Disabled
False
+
+
+ True
+
+
+ False
+ 1
+
+
True
@@ -2793,21 +2802,6 @@ HTTP W/ Auth
3
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0 0 65000 1 10 10
- True
-
-
- 1
- 2
- 4
- 5
-
-
True
@@ -2888,6 +2882,21 @@ HTTP W/ Auth
4
+
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0 0 65000 1 10 10
+ True
+
+
+ 1
+ 2
+ 4
+ 5
+
+
True
@@ -2908,12 +2917,9 @@ HTTP W/ Auth
False
- 1
+ 2
-
-
-
@@ -2954,6 +2960,15 @@ HTTP W/ Auth
False
+
+
+ True
+
+
+ False
+ 1
+
+
True
@@ -3207,7 +3222,7 @@ HTTP W/ Auth
False
- 1
+ 2