diff --git a/glade/preferences_dialog.glade b/glade/preferences_dialog.glade
index 69857f6ad..281676410 100644
--- a/glade/preferences_dialog.glade
+++ b/glade/preferences_dialog.glade
@@ -56,15 +56,13 @@
2
2
-
+
True
- GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
+ Ask me where to save each download
+ True
- 1
2
- 1
- 2
@@ -80,13 +78,15 @@
-
+
True
- Ask me where to save each download
- True
+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
+ 1
2
+ 1
+ 2
@@ -126,6 +126,14 @@
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
1
2
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 0
+ Maximum simultaneous active torrents:
+
+
True
@@ -142,14 +150,6 @@
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- Maximum simultaneous active torrents:
-
-
@@ -224,6 +224,29 @@
True
2
2
+
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ Queue torrents to bottom when they begin seeding
+ True
+
+
+ 2
+
+
+
+
+ True
+ Stop seeding torrents when their share ratio reaches:
+ True
+
+
+ 1
+ 2
+
+
True
@@ -242,29 +265,6 @@
-
-
- True
- Stop seeding torrents when their share ratio reaches:
- True
-
-
- 1
- 2
-
-
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Queue torrents to bottom when they begin seeding
- True
-
-
- 2
-
-
@@ -360,53 +360,13 @@
-
+
True
- Try from:
-
-
-
-
- True
- to:
-
-
- 2
- 3
-
-
-
-
- True
- True
- 0.5
- 0 0 65535 1 10 10
-
-
- 1
- 2
-
-
-
-
- True
- True
- 0.5
- 0 0 65535 1 10 10
+ Test Port
3
4
-
-
-
-
- True
- Active port:
-
-
- 1
- 2
1
2
@@ -424,17 +384,57 @@
-
+
True
- Test Port
+ Active port:
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+ True
+ True
+ 0.5
+ 0 0 65535 1 10 10
3
4
- 1
- 2
+
+
+ True
+ True
+ 0.5
+ 0 0 65535 1 10 10
+
+
+ 1
+ 2
+
+
+
+
+ True
+ to:
+
+
+ 2
+ 3
+
+
+
+
+ True
+ Try from:
+
+
@@ -513,19 +513,15 @@
2
2
-
+
True
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 1
- 0 0 100 1 10 10
+ Enable Mainline DHT
+ True
- 1
2
- 1
- 2
- GTK_FILL
@@ -540,15 +536,19 @@
-
+
True
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Enable Mainline DHT
- True
+ 1
+ 0 0 100 1 10 10
+ 1
2
+ 1
+ 2
+ GTK_FILL
@@ -573,43 +573,7 @@
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- GTK_SHADOW_NONE
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 12
-
-
- True
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- Enable Peer Exchange
- True
-
-
-
-
-
-
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- <b>PEX</b>
- True
-
-
- label_item
-
-
-
-
- False
- 4
-
+
@@ -671,25 +635,129 @@
5
3
-
+
True
- <i>(-1 is unlimited)</i>
- True
+ 2
3
+ 2
+ 3
-
+
+ True
+
+
+ 2
+ 3
+ 1
+ 2
+
+
+
+
True
KB/s
2
3
+ 4
+ 5
+
+
+
+
+
+ True
+ True
+ 10
+ 1
+ -1 -1 1024 1 10 10
+
+
+ 1
+ 2
+ 4
+ 5
+
+
+
+
+
+ True
+ 0
+ Maximum Upload Rate:
+
+
+ 4
+ 5
+
+
+
+
+ True
+ True
+ 10
+ 1
+ -1 -1 100 1 10 10
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+ True
+ 0
+ Maximum Connections
+
+
+ 1
+ 2
+
+
+
+
+ True
+ 0
+ Upload Slots
+
+
+ 2
+ 3
+
+
+
+
+ True
+ 0
+ Maximum Download Rate:
+
+
3
4
+
+
+
+
+ True
+ True
+ 10
+ 1
+ -1 -1 100 1 10 10
+
+
+ 1
+ 2
+ 2
+ 3
@@ -710,130 +778,26 @@
-
- True
- True
- 10
- 1
- -1 -1 100 1 10 10
-
-
- 1
- 2
- 2
- 3
-
-
-
-
-
- True
- 0
- Maximum Download Rate:
-
-
- 3
- 4
-
-
-
-
- True
- 0
- Upload Slots
-
-
- 2
- 3
-
-
-
-
- True
- 0
- Maximum Connections
-
-
- 1
- 2
-
-
-
-
- True
- True
- 10
- 1
- -1 -1 100 1 10 10
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
- True
- 0
- Maximum Upload Rate:
-
-
- 4
- 5
-
-
-
-
- True
- True
- 10
- 1
- -1 -1 1024 1 10 10
-
-
- 1
- 2
- 4
- 5
-
-
-
-
-
+
True
KB/s
2
3
- 4
- 5
+ 3
+ 4
-
+
True
+ <i>(-1 is unlimited)</i>
+ True
- 2
3
- 1
- 2
-
-
-
-
- True
-
-
- 2
- 3
- 2
- 3
@@ -918,17 +882,6 @@
True
2
2
-
-
- True
- Enable system tray icon
- True
- True
-
-
- 2
-
-
True
@@ -942,6 +895,17 @@
12
+
+
+ True
+ Enable system tray icon
+ True
+ True
+
+
+ 2
+
+
@@ -980,16 +944,12 @@
1
3
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- seconds
+ 0
+ GUI update interval
-
- 2
- 3
-
-
@@ -1008,12 +968,16 @@
-
+
True
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- 0
- GUI update interval
+ seconds
+
+ 2
+ 3
+
+