diff --git a/deluge/ui/gtkui/glade/preferences_dialog.ui b/deluge/ui/gtkui/glade/preferences_dialog.ui
index 269851836..f41c218f1 100644
--- a/deluge/ui/gtkui/glade/preferences_dialog.ui
+++ b/deluge/ui/gtkui/glade/preferences_dialog.ui
@@ -361,37 +361,6 @@
@@ -1182,37 +1151,6 @@ and daemon (does not apply in Standalone mode).
True
False
-
-
- True
- False
- 0
- 10
- 10
- Downloads
-
-
-
-
-
-
-
- False
- True
- 0
-
-
-
-
- True
- False
-
-
- False
- True
- 1
-
-
True
@@ -1230,8 +1168,7 @@ and daemon (does not apply in Standalone mode).
True
False
- 4
- 2
+ 7
Move completed to:
@@ -1242,28 +1179,28 @@ and daemon (does not apply in Standalone mode).
True
-
- 1
- 2
- GTK_FILL
-
-
-
-
- Copy of .torrent files to:
- False
- True
- True
- False
- True
-
-
2
3
GTK_FILL
+
+
+ Copy of .torrent files to:
+ False
+ True
+ True
+ False
+ True
+
+
+
+ 4
+ 5
+ GTK_FILL
+
+
Delete copy of torrent file on remove
@@ -1275,9 +1212,8 @@ and daemon (does not apply in Standalone mode).
True
- 2
- 3
- 4
+ 6
+ 7
15
@@ -1293,25 +1229,12 @@ and daemon (does not apply in Standalone mode).
-
+
True
False
- 5
+ 15
-
-
-
-
- 1
- 2
-
-
-
-
- True
- False
-
-
+
True
False
5
@@ -1322,16 +1245,15 @@ and daemon (does not apply in Standalone mode).
- 1
- 2
- 2
- 3
+ 1
+ 2
-
+
True
False
+ 15
True
@@ -1344,10 +1266,29 @@ and daemon (does not apply in Standalone mode).
- 1
- 2
- 1
- 2
+ 3
+ 4
+
+
+
+
+ True
+ False
+ 15
+
+
+ True
+ False
+ 5
+
+
+
+
+
+
+
+ 5
+ 6
@@ -1358,7 +1299,7 @@ and daemon (does not apply in Standalone mode).
True
False
- Folders
+ Download Folders
@@ -1369,7 +1310,7 @@ and daemon (does not apply in Standalone mode).
False
False
5
- 2
+ 0
@@ -1465,7 +1406,7 @@ used sparingly.
True
False
- Options
+ Add Torrent Options
@@ -1476,7 +1417,7 @@ used sparingly.
False
False
5
- 4
+ 1
@@ -1499,6 +1440,1121 @@ used sparingly.
False
+
+
+ True
+ True
+ automatic
+ automatic
+
+
+ True
+ False
+ queue
+ none
+
+
+ True
+ False
+
+
+ True
+ False
+ 0
+ none
+
+
+ True
+ False
+ 2
+ 2
+ 12
+
+
+ True
+ False
+ 5
+
+
+ True
+ False
+ 6
+ 3
+ 10
+
+
+ True
+ True
+ 4
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_max_conn_per_sec
+ True
+
+
+ 1
+ 2
+ 5
+ 6
+ GTK_FILL
+
+
+
+
+ True
+ True
+ 4
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_max_half_open_conn
+ True
+
+
+ 1
+ 2
+ 4
+ 5
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 0
+ Connection Attempts per Second:
+
+
+ 5
+ 6
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 0
+ Half-Open Connections:
+
+
+ 4
+ 5
+ GTK_FILL
+
+
+
+
+ True
+ False
+ The maximum upload speed for all torrents. Set -1 for unlimited.
+ 0
+ Upload Speed:
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+ True
+ False
+ The maximum number of connections allowed. Set -1 for unlimited.
+ 0
+ Connections:
+
+
+ GTK_FILL
+
+
+
+
+ True
+ False
+ The maximum upload slots for all torrents. Set -1 for unlimited.
+ 0
+ Upload Slots:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ True
+ The maximum number of connections allowed. Set -1 for unlimited.
+ 4
+ 4
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_max_conn_global
+ 1
+ True
+ True
+ if-valid
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ False
+ The maximum download speed for all torrents. Set -1 for unlimited.
+ 0
+ Download Speed:
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+ True
+ True
+ The maximum download speed for all torrents. Set -1 for unlimited.
+ 6
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_max_download
+ 1
+ 1
+ True
+
+
+ 1
+ 2
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+ True
+ True
+ The maximum upload speed for all torrents. Set -1 for unlimited.
+ 6
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_max_upload
+ 1
+ 1
+ True
+
+
+ 1
+ 2
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+ True
+ True
+ The maximum upload slots for all torrents. Set -1 for unlimited.
+ 4
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_max_upload_slots_global
+ 1
+ True
+ True
+
+
+ 1
+ 2
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ True
+ False
+ 0
+ KiB/s
+
+
+ 2
+ 3
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ True
+ False
+ 0
+ KiB/s
+
+
+ 2
+ 3
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+ True
+ True
+ 0
+
+
+
+
+ True
+ False
+ 5
+
+
+ Ignore limits on local network
+ False
+ True
+ True
+ False
+ True
+ True
+
+
+
+
+ True
+ True
+ 1
+
+
+
+
+ True
+ False
+ 5
+
+
+ Rate limit IP overhead
+ False
+ True
+ True
+ False
+ If checked, the estimated TCP/IP overhead is drained from the rate limiters, to avoid exceeding the limits with the total traffic
+ True
+ True
+
+
+
+
+ True
+ True
+ 2
+
+
+
+
+
+
+
+
+ True
+ False
+ Global Bandwidth Limits
+
+
+
+
+
+
+
+ False
+ False
+ 5
+ 0
+
+
+
+
+ True
+ False
+ 0
+ none
+
+
+ True
+ False
+ 2
+ 2
+ 12
+
+
+ True
+ False
+ 4
+ 3
+ 10
+
+
+ True
+ True
+ The maximum upload slots per torrent. Set -1 for unlimited.
+ 4
+ 4
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_max_upload_slots_per_torrent
+ 1
+ True
+ True
+
+
+ 1
+ 2
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ True
+ The maximum number of connections per torrent. Set -1 for unlimited.
+ 4
+ 4
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_max_conn_per_torrent
+ True
+ True
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 0
+ Connections:
+
+
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 0
+ Upload Slots:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 0
+ Download Speed:
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 0
+ Upload Speed:
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+ True
+ True
+ The maximum number download speed per torrent. Set -1 for unlimited.
+ 6
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_max_download_per_torrent
+ 1
+ True
+
+
+ 1
+ 2
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+ True
+ True
+ The maximum upload speed per torrent. Set -1 for unlimited.
+ 5
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_max_upload_per_torrent
+ 1
+ True
+
+
+ 1
+ 2
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+
+
+
+
+
+ True
+ False
+ 0
+ KiB/s
+
+
+ 2
+ 3
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
+ True
+ False
+ 0
+ KiB/s
+
+
+ 2
+ 3
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+
+
+
+
+
+ True
+ False
+ Per-Torrent Bandwidth Limits
+
+
+
+
+
+
+
+ False
+ True
+ 5
+ 1
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+ True
+ False
+ page 8
+
+
+ 2
+ False
+
+
+
+
+ True
+ True
+ automatic
+ automatic
+
+
+ True
+ False
+ queue
+ none
+
+
+ True
+ False
+ 5
+
+
+ True
+ False
+ 0
+ none
+
+
+ True
+ False
+ 5
+ 12
+
+
+ True
+ False
+
+
+ Queue new torrents to top
+ False
+ True
+ True
+ False
+ True
+
+
+ True
+ True
+ 0
+
+
+
+
+
+
+
+
+ True
+ False
+ General
+
+
+
+
+
+
+
+ False
+ False
+ 0
+
+
+
+
+ True
+ False
+ 0
+ none
+
+
+ True
+ False
+ 5
+ 12
+
+
+ True
+ False
+ 5
+
+
+ True
+ False
+ 3
+ 2
+ 10
+
+
+ True
+ True
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_active
+ True
+ True
+
+
+ 1
+ 2
+
+
+
+
+
+ True
+ True
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_seeding
+ True
+ True
+
+
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+
+ True
+ False
+ 0
+ Total active seeding:
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 0
+ Total active:
+
+
+ GTK_FILL
+
+
+
+
+ True
+ True
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_downloading
+ True
+ True
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+ True
+ False
+ 0
+ Total active downloading:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ True
+ 0
+
+
+
+
+ Do not count slow torrents
+ False
+ True
+ True
+ False
+ True
+
+
+ True
+ True
+ 1
+
+
+
+
+ Prefer Seeding over Downloading
+ False
+ True
+ True
+ False
+ True
+
+
+ True
+ True
+ 2
+
+
+
+
+
+
+
+
+ True
+ False
+ Active Torrents
+
+
+
+
+
+
+
+ False
+ False
+ 1
+
+
+
+
+ True
+ False
+ 0
+ none
+
+
+ True
+ False
+ 5
+ 12
+
+
+ True
+ False
+ 2
+
+
+ True
+ False
+ 3
+ 2
+ 10
+
+
+ True
+ False
+ 0
+ Share Ratio Limit:
+
+
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 0
+ Seed Time Ratio:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 0
+ Seed Time (m):
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+ True
+ True
+ 6
+ 1
+ False
+ False
+ True
+ True
+ adjustment_share_ratio_limit
+ 2
+
+
+ 1
+ 2
+
+
+
+
+
+ True
+ True
+ 6
+ 1
+ False
+ False
+ True
+ True
+ adjustment_time_ratio_limit
+ 2
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+ True
+ True
+ 6
+ 1
+ False
+ False
+ True
+ True
+ adjustment_spin_seed_time_limit
+
+
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+
+ True
+ True
+ 0
+
+
+
+
+ True
+ False
+
+
+ Stop seeding when share ratio reaches:
+ False
+ True
+ True
+ False
+ True
+
+
+
+
+
+ True
+ True
+ 1
+
+
+
+
+ True
+ False
+ 0
+ 0
+ 12
+
+
+ True
+ False
+ True
+ •
+ 1
+ False
+ False
+ True
+ True
+ adjustment_share_ratio
+ 2
+ True
+
+
+
+
+ False
+ False
+ 2
+
+
+
+
+ True
+ False
+ 10
+
+
+ Remove torrent when share ratio reached
+ False
+ True
+ False
+ True
+ False
+ True
+
+
+
+
+ True
+ True
+ 3
+
+
+
+
+
+
+
+
+ True
+ False
+ Seeding
+
+
+
+
+
+
+
+ False
+ False
+ 2
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+ True
+ False
+ page 10
+
+
+ 3
+ False
+
+
True
@@ -1515,37 +2571,6 @@ used sparingly.
True
False
-
-
- True
- False
- 0
- 10
- 10
- Network
-
-
-
-
-
-
-
- False
- True
- 0
-
-
-
-
- True
- False
-
-
- False
- True
- 1
-
-
True
@@ -1592,7 +2617,7 @@ used sparingly.
False
False
2
- 2
+ 0
@@ -1823,7 +2848,7 @@ used sparingly.
False
True
2
- 3
+ 1
@@ -1950,7 +2975,7 @@ used sparingly.
False
False
2
- 4
+ 2
@@ -2112,7 +3137,7 @@ used sparingly.
False
False
5
- 5
+ 3
@@ -2307,7 +3332,7 @@ Requires a Hex value.
False
True
5
- 6
+ 4
@@ -2316,362 +3341,245 @@ Requires a Hex value.
- 2
+ 4
-
+
True
False
- page 8
+ page 11
- 2
+ 4
False
-
+
True
True
automatic
automatic
-
+
True
False
queue
none
-
+
True
False
+ 5
-
- True
- False
- 0
- 10
- 10
- Bandwidth
-
-
-
-
-
-
-
- False
- True
- 0
-
-
-
-
- True
- False
-
-
- False
- True
- 1
-
-
-
-
+
True
False
0
none
-
+
True
False
- 2
- 2
+ 5
12
+ 12
-
+
True
False
- 5
+ 7
+ 2
+ 5
-
+
True
False
- 6
- 2
- 15
-
-
- True
- True
- 4
- 1
- False
- False
- True
- True
- adjustment_spin_max_conn_per_sec
- True
-
-
- 1
- 2
- 5
- 6
- GTK_FILL
-
-
-
-
- True
- True
- 4
- 1
- False
- False
- True
- True
- adjustment_spin_max_half_open_conn
- True
-
-
- 1
- 2
- 4
- 5
- GTK_FILL
-
-
-
-
- True
- False
- 0
- Maximum Connection Attempts per Second:
-
-
- 5
- 6
- GTK_FILL
-
-
-
-
- True
- False
- 0
- Maximum Half-Open Connections:
-
-
- 4
- 5
- GTK_FILL
-
-
-
-
- True
- False
- The maximum upload speed for all torrents. Set -1 for unlimited.
- 0
- Maximum Upload Speed (KiB/s):
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
- True
- False
- The maximum number of connections allowed. Set -1 for unlimited.
- 0
- Maximum Connections:
-
-
- GTK_FILL
-
-
-
-
- True
- False
- The maximum upload slots for all torrents. Set -1 for unlimited.
- 0
- Maximum Upload Slots:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- True
- The maximum number of connections allowed. Set -1 for unlimited.
- 4
- 4
- 1
- False
- False
- True
- True
- adjustment_spin_max_conn_global
- 1
- True
- True
- if-valid
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- False
- 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 download speed for all torrents. Set -1 for unlimited.
- 6
- 1
- False
- False
- True
- True
- adjustment_spin_max_download
- 1
- 1
- True
-
-
- 1
- 2
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- True
- The maximum upload speed for all torrents. Set -1 for unlimited.
- 6
- 1
- False
- False
- True
- True
- adjustment_spin_max_upload
- 1
- 1
- True
-
-
- 1
- 2
- 3
- 4
- GTK_FILL
-
-
-
-
- True
- True
- The maximum upload slots for all torrents. Set -1 for unlimited.
- 4
- 1
- False
- False
- True
- True
- adjustment_spin_max_upload_slots_global
- 1
- True
- True
-
-
- 1
- 2
- 1
- 2
- GTK_FILL
-
-
+ 0
+ Password:
- True
- True
- 0
+ 2
+ 3
+ GTK_FILL
-
+
True
- False
- 5
-
-
- Ignore limits on local network
- False
- True
- True
- False
- True
- True
-
-
+ True
+ False
+ True
+ False
+ False
+ True
+ True
- True
- True
- 1
+ 1
+ 2
+ 2
+ 3
+ GTK_FILL
-
+
True
False
- 5
+ 0
+ Hostname:
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+ True
+ True
+ True
+ False
+ False
+ True
+ True
+
+
+ 1
+ 2
+ 3
+ 4
+
+
+
+
+ True
+ False
+ 1
+ Port:
+
+
+ 4
+ 5
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 0
+ 0
-
- Rate limit IP overhead
- False
+
True
True
- False
- If checked, the estimated TCP/IP overhead is drained from the rate limiters, to avoid exceeding the limits with the total traffic
- True
- True
+ False
+ False
+ True
+ True
+ adjustment_spin_proxy_port
+ True
- True
- True
- 2
+ 1
+ 2
+ 4
+ 5
+ GTK_FILL
+
+
+
+
+ True
+ True
+ True
+ False
+ False
+ True
+ True
+
+
+ 1
+ 2
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ False
+ liststore_proxy
+
+
+
+
+ 0
+
+
+
+
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+ False
+ 0
+ Username:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ Proxy Hostnames
+ False
+ True
+ True
+ False
+ Hostnames should be attempted to be resolved through
+the proxy instead of using the local DNS service
+ True
+ True
+
+
+ 2
+ 5
+ 6
+ GTK_FILL
+
+
+
+
+ Proxy Peer Connections
+ False
+ True
+ True
+ False
+ Proxy peer and web seed connections.
+ 0.49000000953674316
+ True
+ True
+
+
+ 2
+ 6
+ 7
+ GTK_FILL
@@ -2679,10 +3587,118 @@ Requires a Hex value.
-
+
True
False
- Global Bandwidth Usage
+ Proxy
+
+
+
+
+
+
+
+ False
+ False
+ 0
+
+
+
+
+ True
+ False
+ 0
+ none
+
+
+ True
+ False
+ 5
+ 12
+ 12
+
+
+ True
+ False
+ 2
+ 2
+ 5
+ 2
+
+
+ True
+ False
+ 0
+ Hostname:
+
+
+ GTK_FILL
+
+
+
+
+ True
+ True
+ True
+ False
+ False
+ True
+ True
+
+
+ 1
+ 2
+
+
+
+
+ True
+ False
+ 1
+ Port:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 0
+ 0
+
+
+ True
+ True
+ False
+ False
+ True
+ True
+ adjustment_spin_i2p_port
+ True
+
+
+
+
+ 1
+ 2
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+
+
+
+ True
+ False
+ I2P Proxy
@@ -2693,192 +3709,7 @@ Requires a Hex value.
False
False
5
- 2
-
-
-
-
- True
- False
- 0
- none
-
-
- True
- False
- 2
- 2
- 12
-
-
- True
- False
- 4
- 2
- 15
-
-
- True
- True
- The maximum upload slots per torrent. Set -1 for unlimited.
- 4
- 4
- 1
- False
- False
- True
- True
- adjustment_spin_max_upload_slots_per_torrent
- 1
- True
- True
-
-
- 1
- 2
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- True
- The maximum number of connections per torrent. Set -1 for unlimited.
- 4
- 4
- 1
- False
- False
- True
- True
- adjustment_spin_max_conn_per_torrent
- True
- True
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- False
- 0
- Maximum Connections:
-
-
- GTK_FILL
-
-
-
-
- True
- False
- 0
- Maximum Upload Slots:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- False
- 0
- Maximum Download Speed (KiB/s):
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- False
- 0
- Maximum Upload Speed (KiB/s):
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
- True
- True
- The maximum number download speed per torrent. Set -1 for unlimited.
- 6
- 1
- False
- False
- True
- True
- adjustment_spin_max_download_per_torrent
- 1
- True
-
-
- 1
- 2
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- True
- The maximum upload speed per torrent. Set -1 for unlimited.
- 5
- 1
- False
- False
- True
- True
- adjustment_spin_max_upload_per_torrent
- 1
- True
-
-
- 1
- 2
- 3
- 4
- GTK_FILL
-
-
-
-
-
-
-
-
- True
- False
- Per Torrent Bandwidth Usage
-
-
-
-
-
-
-
- False
- True
- 5
- 3
+ 1
@@ -2887,17 +3718,585 @@ Requires a Hex value.
- 3
+ 5
-
+
True
False
- page 10
+ page 11
- 3
+ 5
+ False
+
+
+
+
+ True
+ True
+ automatic
+ automatic
+
+
+ True
+ False
+ queue
+ none
+
+
+ True
+ False
+
+
+ True
+ False
+ 0
+ none
+
+
+ True
+ False
+ 5
+ 12
+
+
+ True
+ False
+ 2
+ 2
+ 5
+
+
+ True
+ False
+ 0
+ Cache Size (16 KiB blocks):
+
+
+ GTK_FILL
+
+
+
+
+ True
+ False
+ True
+ The number of seconds from the last cached write to a piece in the write cache, to when it's forcefully flushed to disk. Default is 60 seconds.
+ 0
+ Cache Expiry (seconds):
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ True
+ ●
+ 6
+ 1
+ False
+ False
+ True
+ True
+ adjustment_cache_size
+ True
+ if-valid
+
+
+ 1
+ 2
+
+
+
+
+
+ True
+ True
+ 5
+ ●
+ 6
+ 1
+ False
+ False
+ True
+ True
+ adjustment_cache_expiry
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+
+
+
+
+ True
+ False
+ Settings
+
+
+
+
+
+
+
+ False
+ False
+ 5
+ 0
+
+
+
+
+ True
+ False
+ 0
+ none
+
+
+ True
+ False
+ 5
+ 12
+
+
+ True
+ False
+
+
+ True
+ False
+ 0
+ none
+
+
+ True
+ False
+ 12
+
+
+ True
+ False
+ 3
+ 2
+ 5
+
+
+ True
+ False
+ The total number of 16 KiB blocks written to disk since this session was started.
+ 0
+ Blocks Written:
+
+
+ GTK_FILL
+
+
+
+
+ True
+ False
+ The total number of write operations performed since this session was started.
+ 0
+ Writes:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ False
+ The ratio (blocks_written - writes) / blocks_written represents the number of saved write operations per total write operations, i.e. a kind of cache hit ratio for the write cache.
+ 0
+ Write Cache Hit Ratio:
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 1
+
+
+ 1
+ 2
+
+
+
+
+
+ True
+ False
+ 1
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+ True
+ False
+ 1
+
+
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+
+
+
+
+
+ True
+ False
+ Write
+
+
+
+
+
+
+
+ True
+ True
+ 0
+
+
+
+
+ True
+ False
+ 0
+ none
+
+
+ True
+ False
+ 12
+
+
+ True
+ False
+ 4
+ 2
+ 5
+
+
+ True
+ False
+ The number of blocks that were requested from the bittorrent engine (from peers), that were served from disk or cache.
+ 0
+ Blocks Read:
+
+
+ GTK_FILL
+
+
+
+
+ True
+ False
+ The number of blocks that were served from cache.
+ 0
+ Blocks Read Hit:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ False
+ The cache hit ratio for the read cache.
+ 0
+ Read Cache Hit Ratio:
+
+
+ 3
+ 4
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 1
+
+
+ 1
+ 2
+
+
+
+
+
+ True
+ False
+ 1
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+ True
+ False
+ 1
+
+
+ 1
+ 2
+ 3
+ 4
+
+
+
+
+
+ True
+ False
+ True
+ The total number of read operations performed since this session was started.
+ 0
+ Reads:
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+ True
+ False
+
+
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+
+
+
+
+
+ True
+ False
+ Read
+
+
+
+
+
+
+
+ True
+ True
+ 1
+
+
+
+
+ True
+ False
+ 0
+ none
+
+
+ True
+ False
+ 12
+
+
+ True
+ False
+ 2
+ 2
+ 5
+
+
+ True
+ False
+ The number of 16 KiB blocks currently in the disk cache. This includes both read and write cache.
+ 0
+ Cache Size:
+
+
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 0
+ Read Cache Size:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+ True
+ False
+ 1
+
+
+ 1
+ 2
+
+
+
+
+
+ True
+ False
+ 1
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+
+
+
+
+
+ True
+ False
+ Size
+
+
+
+
+
+
+
+ True
+ True
+ 2
+
+
+
+
+ True
+ False
+ start
+
+
+ gtk-refresh
+ False
+ True
+ True
+ True
+ True
+
+
+
+ False
+ False
+ 0
+
+
+
+
+ True
+ True
+ 3
+
+
+
+
+
+
+
+
+ True
+ False
+ Status
+
+
+
+
+
+
+
+ False
+ False
+ 5
+ 1
+
+
+
+
+
+
+
+
+ 6
+
+
+
+
+ True
+ False
+ page 12
+
+
+ 6
False
@@ -2917,37 +4316,6 @@ Requires a Hex value.
True
False
-
-
- True
- False
- 0
- 10
- 10
- Other
-
-
-
-
-
-
-
- False
- True
- 0
-
-
-
-
- True
- False
-
-
- False
- True
- 1
-
-
True
@@ -3005,7 +4373,7 @@ Requires a Hex value.
False
False
5
- 2
+ 0
@@ -3080,7 +4448,7 @@ Requires a Hex value.
False
False
5
- 3
+ 1
@@ -3166,7 +4534,7 @@ Requires a Hex value.
False
False
5
- 4
+ 2
@@ -3230,7 +4598,7 @@ Requires a Hex value.
False
False
- 5
+ 3
@@ -3239,19 +4607,11 @@ Requires a Hex value.
- 4
+ 7
-
- True
- False
- page 11
-
-
- 4
- False
-
+
@@ -3269,37 +4629,6 @@ Requires a Hex value.
True
False
-
-
- True
- False
- 0
- 10
- 10
- Daemon
-
-
-
-
-
-
-
- False
- True
- 0
-
-
-
-
- True
- False
-
-
- False
- True
- 1
-
-
True
@@ -3376,7 +4705,7 @@ Requires a Hex value.
False
False
5
- 2
+ 0
@@ -3418,7 +4747,7 @@ Requires a Hex value.
False
False
5
- 3
+ 1
@@ -3460,7 +4789,7 @@ Requires a Hex value.
False
False
5
- 4
+ 2
@@ -3575,1568 +4904,7 @@ Requires a Hex value.
True
True
- 5
-
-
-
-
-
-
-
-
- 5
-
-
-
-
- True
- False
- page 11
-
-
- 5
- False
-
-
-
-
- True
- True
- automatic
- automatic
-
-
- True
- False
- queue
- none
-
-
- True
- False
-
-
- True
- False
- 0
- 10
- 10
- Queue
-
-
-
-
-
-
-
- False
- True
- 0
-
-
-
-
- True
- False
-
-
- False
- True
- 1
-
-
-
-
- True
- False
- 5
-
-
- True
- False
- 0
- none
-
-
- True
- False
- 5
- 12
-
-
- True
- False
-
-
- Queue new torrents to top
- False
- True
- True
- False
- True
-
-
- True
- True
- 0
-
-
-
-
-
-
-
-
- True
- False
- General
-
-
-
-
-
-
-
- False
- False
- 0
-
-
-
-
- True
- False
- 0
- none
-
-
- True
- False
- 5
- 12
-
-
- True
- False
- 5
-
-
- True
- False
- 3
- 2
- 10
-
-
- True
- True
- 1
- False
- False
- True
- True
- adjustment_spin_active
- True
- True
-
-
- 1
- 2
-
-
-
-
-
- True
- True
- 1
- False
- False
- True
- True
- adjustment_spin_seeding
- True
- True
-
-
- 1
- 2
- 2
- 3
-
-
-
-
-
- True
- False
- 0
- Total active seeding:
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- False
- 0
- Total active:
-
-
- GTK_FILL
-
-
-
-
- True
- True
- 1
- False
- False
- True
- True
- adjustment_spin_downloading
- True
- True
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
- True
- False
- 0
- Total active downloading:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- True
- 0
-
-
-
-
- Do not count slow torrents
- False
- True
- True
- False
- True
-
-
- True
- True
- 1
-
-
-
-
- Prefer Seeding over Downloading
- False
- True
- True
- False
- True
-
-
- True
- True
- 2
-
-
-
-
-
-
-
-
- True
- False
- Active Torrents
-
-
-
-
-
-
-
- False
- False
- 1
-
-
-
-
- True
- False
- 0
- none
-
-
- True
- False
- 5
- 12
-
-
- True
- False
- 2
-
-
- True
- False
- 3
- 2
- 10
-
-
- True
- False
- 0
- Share Ratio Limit:
-
-
- GTK_FILL
-
-
-
-
- True
- False
- 0
- Seed Time Ratio:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- False
- 0
- Seed Time (m):
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- True
- 6
- 1
- False
- False
- True
- True
- adjustment_share_ratio_limit
- 2
-
-
- 1
- 2
-
-
-
-
-
- True
- True
- 6
- 1
- False
- False
- True
- True
- adjustment_time_ratio_limit
- 2
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
- True
- True
- 6
- 1
- False
- False
- True
- True
- adjustment_spin_seed_time_limit
-
-
- 1
- 2
- 2
- 3
-
-
-
-
-
- True
- True
- 0
-
-
-
-
- True
- False
- 5
-
-
- Stop seeding when share ratio reaches:
- False
- True
- True
- False
- True
-
-
-
- False
- False
- 0
-
-
-
-
- True
- False
- True
- 1
- False
- False
- True
- True
- adjustment_share_ratio
- 2
- True
-
-
- False
- False
- 1
-
-
-
-
- False
- False
- 1
-
-
-
-
- True
- False
- 10
-
-
- Remove torrent when share ratio reached
- False
- True
- False
- True
- False
- True
-
-
-
-
- True
- True
- 2
-
-
-
-
-
-
-
-
- True
- False
- Seeding
-
-
-
-
-
-
-
- False
- False
- 2
-
-
-
-
- True
- True
- 5
- 2
-
-
-
-
-
-
-
-
- 6
-
-
-
-
- True
- False
- page 12
-
-
- 6
- False
-
-
-
-
- True
- True
- automatic
- automatic
-
-
- True
- False
- queue
- none
-
-
- True
- False
-
-
- True
- False
- 0
- 10
- 10
- Proxy
-
-
-
-
-
-
-
- False
- True
- 0
-
-
-
-
- True
- False
-
-
- False
- True
- 1
-
-
-
-
- True
- False
- 5
-
-
- True
- False
- 0
- none
-
-
- True
- False
- 5
- 12
- 12
-
-
- True
- False
- 7
- 2
- 5
-
-
- True
- False
- 0
- Password:
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- True
- False
- True
- False
- False
- True
- True
-
-
- 1
- 2
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- False
- 0
- Hostname:
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
- True
- True
- True
- False
- False
- True
- True
-
-
- 1
- 2
- 3
- 4
-
-
-
-
- True
- False
- 1
- Port:
-
-
- 4
- 5
- GTK_FILL
-
-
-
-
- True
- False
- 0
- 0
-
-
- True
- True
- False
- False
- True
- True
- adjustment_spin_proxy_port
- True
-
-
-
-
- 1
- 2
- 4
- 5
- GTK_FILL
-
-
-
-
- True
- True
- True
- False
- False
- True
- True
-
-
- 1
- 2
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- False
- liststore_proxy
-
-
-
-
- 0
-
-
-
-
- 2
- GTK_FILL
-
-
-
-
-
- True
- False
- 0
- Username:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- Proxy Hostnames
- False
- True
- True
- False
- Hostnames should be attempted to be resolved through
-the proxy instead of using the local DNS service
- True
- True
-
-
- 2
- 5
- 6
- GTK_FILL
-
-
-
-
- Proxy Peer Connections
- False
- True
- True
- False
- Proxy peer and web seed connections.
- 0.49000000953674316
- True
- True
-
-
- 2
- 6
- 7
- GTK_FILL
-
-
-
-
-
-
-
-
- True
- False
- Proxy
-
-
-
-
-
-
-
- False
- False
- 0
-
-
-
-
- True
- False
- 0
- none
-
-
- True
- False
- 5
- 12
- 12
-
-
- True
- False
- 2
- 2
- 5
- 2
-
-
- True
- False
- 0
- Hostname:
-
-
- GTK_FILL
-
-
-
-
- True
- True
- True
- False
- False
- True
- True
-
-
- 1
- 2
-
-
-
-
- True
- False
- 1
- Port:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- False
- 0
- 0
-
-
- True
- True
- False
- False
- True
- True
- adjustment_spin_i2p_port
- True
-
-
-
-
- 1
- 2
- 1
- 2
- GTK_FILL
-
-
-
-
-
-
-
-
- True
- False
- I2P Proxy
-
-
-
-
-
-
-
- False
- False
- 5
- 1
-
-
-
-
- True
- True
- 5
- 2
-
-
-
-
-
-
-
-
- 7
-
-
-
-
-
-
-
- True
- True
- automatic
- automatic
-
-
- True
- False
- queue
- none
-
-
- True
- False
-
-
- True
- False
- 0
- 10
- 10
- Cache
-
-
-
-
-
-
-
- False
- True
- 0
-
-
-
-
- True
- False
-
-
- False
- True
- 1
-
-
-
-
- True
- False
- 12
-
-
- True
- False
-
-
- True
- False
- 0
- none
-
-
- True
- False
- 5
- 12
-
-
- True
- False
- 2
- 2
- 5
-
-
- True
- False
- 0
- Cache Size (16 KiB blocks):
-
-
- GTK_FILL
-
-
-
-
- True
- False
- True
- The number of seconds from the last cached write to a piece in the write cache, to when it's forcefully flushed to disk. Default is 60 seconds.
- 0
- Cache Expiry (seconds):
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- True
- ●
- 6
- 1
- False
- False
- True
- True
- adjustment_cache_size
- True
- if-valid
-
-
- 1
- 2
-
-
-
-
-
- True
- True
- 5
- ●
- 6
- 1
- False
- False
- True
- True
- adjustment_cache_expiry
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
-
-
-
-
- True
- False
- Settings
-
-
-
-
-
-
-
- False
- False
- 5
- 0
-
-
-
-
- True
- False
- 0
- none
-
-
- True
- False
- 5
- 12
-
-
- True
- False
-
-
- True
- False
- 0
- none
-
-
- True
- False
- 12
-
-
- True
- False
- 3
- 2
- 5
-
-
- True
- False
- The total number of 16 KiB blocks written to disk since this session was started.
- 0
- Blocks Written:
-
-
- GTK_FILL
-
-
-
-
- True
- False
- The total number of write operations performed since this session was started.
- 0
- Writes:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- False
- The ratio (blocks_written - writes) / blocks_written represents the number of saved write operations per total write operations, i.e. a kind of cache hit ratio for the write cache.
- 0
- Write Cache Hit Ratio:
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- False
- 1
-
-
- 1
- 2
-
-
-
-
-
- True
- False
- 1
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
- True
- False
- 1
-
-
- 1
- 2
- 2
- 3
-
-
-
-
-
-
-
-
-
- True
- False
- Write
-
-
-
-
-
-
-
- True
- True
- 0
-
-
-
-
- True
- False
- 0
- none
-
-
- True
- False
- 12
-
-
- True
- False
- 4
- 2
- 5
-
-
- True
- False
- The number of blocks that were requested from the bittorrent engine (from peers), that were served from disk or cache.
- 0
- Blocks Read:
-
-
- GTK_FILL
-
-
-
-
- True
- False
- The number of blocks that were served from cache.
- 0
- Blocks Read Hit:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- False
- The cache hit ratio for the read cache.
- 0
- Read Cache Hit Ratio:
-
-
- 3
- 4
- GTK_FILL
-
-
-
-
- True
- False
- 1
-
-
- 1
- 2
-
-
-
-
-
- True
- False
- 1
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
- True
- False
- 1
-
-
- 1
- 2
- 3
- 4
-
-
-
-
-
- True
- False
- True
- The total number of read operations performed since this session was started.
- 0
- Reads:
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
- True
- False
-
-
- 1
- 2
- 2
- 3
-
-
-
-
-
-
-
-
-
- True
- False
- Read
-
-
-
-
-
-
-
- True
- True
- 1
-
-
-
-
- True
- False
- 0
- none
-
-
- True
- False
- 12
-
-
- True
- False
- 2
- 2
- 5
-
-
- True
- False
- The number of 16 KiB blocks currently in the disk cache. This includes both read and write cache.
- 0
- Cache Size:
-
-
- GTK_FILL
-
-
-
-
- True
- False
- 0
- Read Cache Size:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
- True
- False
- 1
-
-
- 1
- 2
-
-
-
-
-
- True
- False
- 1
-
-
- 1
- 2
- 1
- 2
-
-
-
-
-
-
-
-
-
- True
- False
- Size
-
-
-
-
-
-
-
- True
- True
- 2
-
-
-
-
- True
- False
- start
-
-
- gtk-refresh
- False
- True
- True
- True
- True
-
-
-
- False
- False
- 0
-
-
-
-
- True
- True
- 3
-
-
-
-
-
-
-
-
- True
- False
- Status
-
-
-
-
-
-
-
- False
- False
- 5
- 1
-
-
-
-
-
-
- True
- True
- 2
+ 3
@@ -5167,37 +4935,6 @@ the proxy instead of using the local DNS service
True
False
-
-
- True
- False
- 0
- 10
- 10
- Plugins
-
-
-
-
-
-
-
- False
- True
- 0
-
-
-
-
- True
- False
-
-
- False
- True
- 1
-
-
True
@@ -5217,12 +4954,13 @@ the proxy instead of using the local DNS service
- False
- True
+ True
+ False
+ 115
True
True
automatic
@@ -5262,7 +5000,7 @@ the proxy instead of using the local DNS service
2
4
5
-
+ GTK_FILL
@@ -5276,7 +5014,7 @@ the proxy instead of using the local DNS service
2
1
2
-
+ GTK_FILL
@@ -5317,7 +5055,7 @@ the proxy instead of using the local DNS service
1
2
GTK_FILL
-
+ GTK_FILL
@@ -5329,7 +5067,7 @@ the proxy instead of using the local DNS service
GTK_FILL
-
+ GTK_FILL
@@ -5371,7 +5109,7 @@ the proxy instead of using the local DNS service
2
3
4
-
+ GTK_FILL
@@ -5385,7 +5123,7 @@ the proxy instead of using the local DNS service
2
2
3
-
+ GTK_FILL
@@ -5409,14 +5147,14 @@ the proxy instead of using the local DNS service
False
- False
+ True
True
True
- 2
+ 0
@@ -5432,36 +5170,12 @@ the proxy instead of using the local DNS service
True
-
+
True
False
- 5
-
-
- True
- False
- gtk-add
-
-
- False
- False
- 0
-
-
-
-
- True
- False
- _Install Plugin
- True
- True
-
-
- False
- False
- 1
-
-
+ _Install
+ True
+ True
@@ -5479,36 +5193,12 @@ the proxy instead of using the local DNS service
True
-
+
True
False
- 5
-
-
- True
- False
- gtk-refresh
-
-
- False
- False
- 0
-
-
-
-
- True
- False
- _Rescan Plugins
- True
- True
-
-
- False
- False
- 1
-
-
+ _Refresh
+ True
+ True
@@ -5518,17 +5208,6 @@ the proxy instead of using the local DNS service
1
-
-
- False
- False
- 3
-
-
-
-
- True
- False
False
@@ -5537,50 +5216,26 @@ the proxy instead of using the local DNS service
True
-
+
True
False
- 5
-
-
- True
- False
- gtk-find
-
-
- False
- False
- 0
-
-
-
-
- True
- False
- _Find More Plugins
- True
- True
-
-
- False
- False
- 1
-
-
+ _Find More...
+ True
+ True
False
False
- 0
+ 2
False
False
- 4
+ 1
diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py
index d7c6fb16b..25cd0d583 100644
--- a/deluge/ui/gtkui/preferences.py
+++ b/deluge/ui/gtkui/preferences.py
@@ -96,8 +96,8 @@ class Preferences(component.Component):
self.treeview.append_column(column)
# Add the default categories
i = 0
- for category in (_("Interface"), _("Downloads"), _("Network"), _("Bandwidth"), _("Other"),
- _("Daemon"), _("Queue"), _("Proxy"), _("Cache"), _("Plugins"), "_separator_"):
+ for category in (_("Interface"), _("Downloads"), _("Bandwidth"), _("Queue"), _("Network"),
+ _("Proxy"), _("Cache"), _("Other"), _("Daemon"), _("Plugins"), "_separator_"):
self.liststore.append([i, category])
i += 1