From d977915f32085a6c42a42cf5934b98bc4c7fa8f3 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Wed, 29 Mar 2017 11:30:56 +0100 Subject: [PATCH] [#2991] Fix display/setting single proxy in UIs * Now copies all proxy settings from peer to other types to reflect how that the single undelying libtorrent proxy is set. * Grey-out the other proxies types in GTKUI to avoid some confusion. --- deluge/core/preferencesmanager.py | 43 +- .../ui/gtkui/glade/preferences_dialog.glade | 866 ++++++++++++++++-- deluge/ui/gtkui/preferences.py | 10 + 3 files changed, 806 insertions(+), 113 deletions(-) diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py index febb2a479..794810f8f 100644 --- a/deluge/core/preferencesmanager.py +++ b/deluge/core/preferencesmanager.py @@ -151,6 +151,8 @@ DEFAULT_PREFS = { } class PreferencesManager(component.Component): + LT_SINGLE_PROXY = deluge.common.VersionSplit(lt.version) >= deluge.common.VersionSplit("0.16.0.0") + def __init__(self): component.Component.__init__(self, "PreferencesManager") @@ -478,23 +480,34 @@ class PreferencesManager(component.Component): self.new_release_timer.stop() def _on_set_proxies(self, key, value): - lt_single_proxy = deluge.common.VersionSplit(lt.version) >= deluge.common.VersionSplit("0.16.0.0") - for k, v in value.items(): - if k != "peer" and lt_single_proxy: - # Only set peer proxy to stop overwriting proxy setting in libtorrent >= 0.16. - if v["hostname"]: - log.warning("Using libtorrent >= 0.16 ignores proxy settings for %s", k) - self.config["proxies"][k] = DEFAULT_PREFS["proxies"][k] - continue + # Test for single proxy with lt >= 0.16 + if self.LT_SINGLE_PROXY: + for proxy_type in value: + if proxy_type == "peer": + continue + if self.config["proxies"][proxy_type] != value["peer"]: + log.warning("This version of libtorrent only supports a single proxy setting " + "based upon 'peer' which will apply to all other other types.") + self.config["proxies"][proxy_type] = value["peer"] proxy_settings = lt.proxy_settings() - proxy_settings.type = lt.proxy_type(v["type"]) - proxy_settings.username = str(v["username"]) - proxy_settings.password = str(v["password"]) - proxy_settings.hostname = str(v["hostname"]) - proxy_settings.port = v["port"] - log.debug("Setting %s proxy settings: %s", k, v) - getattr(self.session, "set_%s_proxy" % k)(proxy_settings) + proxy_settings.type = lt.proxy_type(value["peer"]["type"]) + proxy_settings.username = str(value["peer"]["username"]) + proxy_settings.password = str(value["peer"]["password"]) + proxy_settings.hostname = str(value["peer"]["hostname"]) + proxy_settings.port = value["peer"]["port"] + log.debug("Setting proxy settings: %s", value["peer"]) + self.session.set_proxy(proxy_settings) + else: + for k, v in value.items(): + proxy_settings = lt.proxy_settings() + proxy_settings.type = lt.proxy_type(v["type"]) + proxy_settings.username = str(v["username"]) + proxy_settings.password = str(v["password"]) + proxy_settings.hostname = str(v["hostname"]) + proxy_settings.port = v["port"] + log.debug("Setting %s proxy settings: %s", k, v) + getattr(self.session, "set_%s_proxy" % k)(proxy_settings) def _on_rate_limit_ip_overhead(self, key, value): log.debug("%s: %s", key, value) diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade index 397a014d7..5eb564952 100644 --- a/deluge/ui/gtkui/glade/preferences_dialog.glade +++ b/deluge/ui/gtkui/glade/preferences_dialog.glade @@ -1,8 +1,9 @@ - + - + + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 Preferences @@ -16,8 +17,71 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 2 + + + True + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + end + + + gtk-cancel + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + False + False + 0 + + + + + gtk-apply + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + False + False + 1 + + + + + gtk-ok + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + + + + False + False + 2 + + + + + False + True + end + 0 + + True @@ -26,6 +90,7 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK queue @@ -58,16 +123,19 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK queue none True + False 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 0 10 @@ -77,61 +145,78 @@ False + True 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + True 1 True + False 0 none True + False 2 2 12 True + False 5 2 True + False 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 5 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK select-folder + True + True 0 True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + False + True + True + True + True 1 @@ -148,18 +233,23 @@ True + False True + False 5 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK select-folder Select A Folder + True + True 0 @@ -167,8 +257,14 @@ True True + False + False + True + True + True + True 1 @@ -216,27 +312,37 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 True False + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK select-folder Select A Folder + True + True 0 True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + False + True + True + True + True 1 @@ -249,6 +355,7 @@ True + False 0 Download to: @@ -274,31 +381,42 @@ True + False 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 5 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK select-folder Select A Folder + True + True 0 True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - ● + ● + True + False + False + True + True + True + True 1 @@ -335,6 +453,7 @@ True + False <b>Folders</b> True @@ -353,17 +472,20 @@ True + False 0 none True + False 2 2 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 10 @@ -407,6 +529,7 @@ True + False <b>Allocation</b> True @@ -425,17 +548,20 @@ True + False 0 none True + False 2 2 12 True + False Prioritize first and last pieces of torrent @@ -448,6 +574,7 @@ False + True 0 @@ -460,6 +587,8 @@ True + True + True 1 @@ -470,6 +599,7 @@ True + False <b>Options</b> True @@ -494,8 +624,9 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - page 6 + page 6 False @@ -512,16 +643,19 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK queue none True + False 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 0 10 @@ -531,36 +665,43 @@ False + True 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + True 1 True + False 0 none True + False 2 2 12 True + False True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 20 @@ -576,6 +717,7 @@ False + True 5 0 @@ -583,16 +725,19 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True + False 1 Active Port: right False + True 5 0 @@ -600,12 +745,14 @@ True + False 0 - 0000 + 0000 5 False + True 5 1 @@ -613,12 +760,15 @@ False + True 5 1 + True + True 5 0 @@ -626,13 +776,16 @@ True + False True + False From: False + True 0 @@ -643,6 +796,10 @@ True 5 1 + False + False + True + True 0 0 65535 1 10 0 1 True @@ -650,6 +807,7 @@ False + True 5 1 @@ -657,6 +815,7 @@ True + False 5 To: @@ -673,6 +832,10 @@ True 5 1 + False + False + True + True 0 0 65535 1 10 0 1 True @@ -680,6 +843,7 @@ False + True 5 3 @@ -702,20 +866,25 @@ True + False 5 + False gtk-missing-image False + True 5 + True + True 5 1 @@ -727,6 +896,7 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Incoming Ports</b> True @@ -738,6 +908,7 @@ False + True 5 2 @@ -745,16 +916,19 @@ True + False 0 none True + False 5 12 True + False 5 @@ -774,10 +948,12 @@ True + False 5 True + False From: @@ -793,6 +969,10 @@ True 5 1 + False + False + True + True 0 0 65535 1 10 0 1 True @@ -800,6 +980,7 @@ False + True 5 1 @@ -807,6 +988,7 @@ True + False To: @@ -822,6 +1004,10 @@ True 5 1 + False + False + True + True 0 0 65535 1 10 0 1 True @@ -829,12 +1015,15 @@ False + True 5 3 + True + True 1 @@ -845,6 +1034,7 @@ True + False <b>Outgoing Ports</b> True @@ -862,26 +1052,33 @@ True + False 0 none True + False 2 2 12 True + False True True - True Enter the IP address of the interface to listen for incoming bittorrent connections on. Leave this empty if you want to use the default. 60 - ● + ● 30 + True + False + False + True + True False @@ -899,6 +1096,7 @@ True + False <b>Interface</b> True @@ -916,24 +1114,29 @@ True + False 0 none True + False 2 2 12 True + False True + False 5 True + False The TOS byte set in the IP header of every packet sent to peers (including web seeds). Expects a Hex value. Peer TOS Byte: @@ -948,8 +1151,12 @@ True True 4 + 0x00 True - 0x00 + False + False + True + True False @@ -959,6 +1166,8 @@ + True + True 0 @@ -969,6 +1178,7 @@ True + False <b>TOS</b> True @@ -979,6 +1189,7 @@ False + True 5 5 @@ -986,17 +1197,20 @@ True + False 0 none True + False 2 2 12 True + False 2 3 5 @@ -1093,6 +1307,7 @@ True + False <b>Network Extras</b> True @@ -1103,6 +1318,7 @@ False + True 5 6 @@ -1110,40 +1326,50 @@ True + False 0 none True + False 2 2 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True + False 1 Inbound: + True + True 0 True + False 0 Level: + True + True 1 @@ -1157,26 +1383,33 @@ True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK True + False Forced Enabled Disabled + True + True 0 True + False Handshake Full Stream Either + True + True 1 @@ -1190,14 +1423,17 @@ Either True + False 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 True + False 1 Outbound: @@ -1210,17 +1446,21 @@ Either True + False Forced Enabled Disabled False + True 1 + True + True 0 @@ -1235,12 +1475,15 @@ Disabled False + True 3 1 + True + True 2 @@ -1251,6 +1494,7 @@ Disabled True + False <b>Encryption</b> True @@ -1278,8 +1522,9 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - page 7 + page 7 1 @@ -1297,16 +1542,19 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK queue none True + False 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 0 10 @@ -1316,37 +1564,44 @@ Disabled False + True 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + True 1 True + False 0 none True + False 2 2 12 True + False 5 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 6 2 @@ -1356,6 +1611,10 @@ Disabled True True 1 + False + False + True + True -1 -1 9999 1 10 0 True @@ -1372,6 +1631,10 @@ Disabled True True 1 + False + False + True + True -1 -1 9999 1 10 0 True @@ -1386,6 +1649,7 @@ Disabled True + False 0 Maximum Connection Attempts per Second: @@ -1398,6 +1662,7 @@ Disabled True + False 0 Maximum Half-Open Connections: @@ -1410,6 +1675,7 @@ Disabled True + False The maximum upload speed for all torrents. Set -1 for unlimited. 0 Maximum Upload Speed (KiB/s): @@ -1423,6 +1689,7 @@ Disabled True + False The maximum number of connections allowed. Set -1 for unlimited. 0 Maximum Connections: @@ -1434,6 +1701,7 @@ Disabled True + False The maximum upload slots for all torrents. Set -1 for unlimited. 0 Maximum Upload Slots: @@ -1451,6 +1719,10 @@ Disabled The maximum number of connections allowed. Set -1 for unlimited. 4 1 + False + False + True + True -1 -1 9000 1 10 0 1 True @@ -1466,6 +1738,7 @@ Disabled True + False The maximum download speed for all torrents. Set -1 for unlimited. 0 Maximum Download Speed (KiB/s): @@ -1483,6 +1756,10 @@ Disabled GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK The maximum download speed for all torrents. Set -1 for unlimited. 1 + False + False + True + True -1 -1 2097151 1 10 0 1 1 @@ -1502,6 +1779,10 @@ Disabled True The maximum upload speed for all torrents. Set -1 for unlimited. 1 + False + False + True + True -1 -1 2097151 1 10 0 1 1 @@ -1521,6 +1802,10 @@ Disabled True The maximum upload slots for all torrents. Set -1 for unlimited. 1 + False + False + True + True -1 -1 9000 1 10 0 1 True @@ -1536,12 +1821,15 @@ Disabled + True + True 0 True + False 5 @@ -1555,12 +1843,15 @@ Disabled + True + True 1 True + False 5 @@ -1575,6 +1866,8 @@ Disabled + True + True 2 @@ -1585,6 +1878,7 @@ Disabled True + False <b>Global Bandwidth Usage</b> True @@ -1603,12 +1897,14 @@ Disabled 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 2 2 @@ -1616,6 +1912,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 4 2 @@ -1626,6 +1923,10 @@ Disabled True The maximum upload slots per torrent. Set -1 for unlimited. 1 + False + False + True + True -1 -1 9000 1 10 0 1 True @@ -1645,6 +1946,10 @@ Disabled True The maximum number of connections per torrent. Set -1 for unlimited. 1 + False + False + True + True -1 -1 9000 1 10 0 True True @@ -1658,6 +1963,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Maximum Connections: @@ -1669,6 +1975,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Maximum Upload Slots: @@ -1682,6 +1989,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Maximum Download Speed (KiB/s): @@ -1695,6 +2003,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Maximum Upload Speed (KiB/s): @@ -1711,6 +2020,10 @@ Disabled True The maximum download speed per torrent. Set -1 for unlimited. 1 + False + False + True + True -1 -1 2097151 1 10 0 1 True @@ -1729,6 +2042,10 @@ Disabled True The maximum upload speed per torrent. Set -1 for unlimited. 1 + False + False + True + True -1 -1 2097151 1 10 0 1 True @@ -1748,6 +2065,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Per Torrent Bandwidth Usage</b> True @@ -1759,6 +2077,7 @@ Disabled False + True 5 3 @@ -1775,8 +2094,9 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - page 8 + page 8 2 @@ -1794,16 +2114,19 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK queue none True + False 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 0 10 @@ -1813,28 +2136,33 @@ Disabled False + True 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + True 1 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 2 2 @@ -1855,6 +2183,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Classic Mode</b> True @@ -1874,17 +2203,20 @@ Disabled True + False 0 none True + False 2 2 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -1896,6 +2228,8 @@ Disabled True + True + True 0 @@ -1909,6 +2243,8 @@ Disabled True + True + True 1 @@ -1919,6 +2255,7 @@ Disabled True + False <b>Main Window</b> True @@ -1937,17 +2274,20 @@ Disabled True + False 0 none True + False 2 2 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -1960,12 +2300,15 @@ Disabled + True + True 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -1979,6 +2322,8 @@ Disabled + True + True 1 @@ -1989,6 +2334,7 @@ Disabled True + False <b>Add Torrents Dialog</b> True @@ -2007,17 +2353,20 @@ Disabled True + False 0 none True + False 2 2 12 True + False Enable system tray icon @@ -2029,12 +2378,15 @@ Disabled + True + True 0 True + False 10 @@ -2049,12 +2401,15 @@ Disabled + True + True 1 True + False 10 @@ -2069,12 +2424,15 @@ Disabled + True + True 2 True + False 10 @@ -2089,12 +2447,15 @@ Disabled + True + True 3 True + False 3 10 @@ -2112,27 +2473,32 @@ Disabled False + True 4 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 20 True + False 5 True False + False 0 Password: False + True 0 @@ -2141,14 +2507,19 @@ Disabled True False True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False 16 ******** + True + False + False + True + True False + True 1 @@ -2156,6 +2527,8 @@ Disabled + True + True 5 @@ -2166,6 +2539,7 @@ Disabled True + False <b>System Tray</b> True @@ -2176,6 +2550,7 @@ Disabled False + True 5 5 @@ -2192,7 +2567,8 @@ Disabled True - page 10 + False + page 10 3 @@ -2210,16 +2586,19 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK queue none True + False 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 0 10 @@ -2229,38 +2608,45 @@ Disabled False + True 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + True 1 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 2 12 True + False 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 @@ -2287,6 +2673,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Updates</b> True @@ -2306,22 +2693,26 @@ Disabled 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 2 12 True + False 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 0 Help us improve Deluge by sending us your Python version, PyGTK version, OS and processor types. Absolutely no other information is sent. @@ -2337,6 +2728,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 10 @@ -2352,6 +2744,7 @@ Disabled False + True 1 @@ -2362,6 +2755,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>System Information</b> True @@ -2381,30 +2775,36 @@ Disabled 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 2 12 True + False 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 True + False 5 True + False Location: @@ -2417,11 +2817,17 @@ Disabled True True - True If Deluge cannot find the database file at this location it will fallback to using DNS to resolve the peer's country. - ● + ● + True + False + False + True + True + True + True 1 @@ -2441,6 +2847,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>GeoIP Database</b> True @@ -2460,10 +2867,12 @@ Disabled True + False 12 True + False start @@ -2474,22 +2883,29 @@ Disabled True + False 2 True + False gtk-missing-image + True + True 0 True + False Associate Magnet links with Deluge + True + True 1 @@ -2523,7 +2939,8 @@ Disabled True - page 11 + False + page 11 4 @@ -2541,16 +2958,19 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK queue none True + False 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 0 10 @@ -2560,43 +2980,51 @@ Disabled False + True 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + True 1 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 2 12 True + False 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 5 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Daemon port: @@ -2612,6 +3040,10 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 1 + False + False + True + True 0 0 65535 1 10 0 @@ -2634,6 +3066,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Port</b> True @@ -2653,12 +3086,14 @@ Disabled 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 5 10 @@ -2677,6 +3112,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Connections</b> True @@ -2696,12 +3132,14 @@ Disabled 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 5 10 @@ -2720,6 +3158,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Other</b> True @@ -2748,7 +3187,8 @@ Disabled True - page 11 + False + page 11 5 @@ -2766,16 +3206,19 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK queue none True + False 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 0 10 @@ -2785,39 +3228,46 @@ Disabled False + True 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + True 1 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 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 5 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK @@ -2829,6 +3279,8 @@ Disabled True + True + True 0 @@ -2839,6 +3291,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>General</b> True @@ -2857,22 +3310,26 @@ Disabled 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 5 12 True + False 5 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 3 2 @@ -2883,6 +3340,10 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 1 + False + False + True + True 0 -1 9999 1 10 0 True True @@ -2899,6 +3360,10 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 1 + False + False + True + True 0 -1 9999 1 10 0 True True @@ -2914,6 +3379,7 @@ Disabled True + False 0 Total active seeding: @@ -2926,6 +3392,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Total active: @@ -2940,6 +3407,10 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 1 + False + False + True + True 0 -1 9999 1 10 0 True True @@ -2955,6 +3426,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Total active downloading: @@ -2967,6 +3439,8 @@ Disabled + True + True 0 @@ -2979,6 +3453,8 @@ Disabled True + True + True 1 @@ -2989,6 +3465,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Active Torrents</b> True @@ -3007,29 +3484,34 @@ Disabled 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 5 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 2 True + False 3 2 10 True + False 0 Share Ratio Limit: @@ -3040,6 +3522,7 @@ Disabled True + False 0 Seed Time Ratio: @@ -3052,6 +3535,7 @@ Disabled True + False 0 Seed Time (m): @@ -3067,6 +3551,10 @@ Disabled True 6 1 + False + False + True + True 1.5 -1 100 0.10000000000000001 10 0 2 @@ -3082,6 +3570,10 @@ Disabled True 6 1 + False + False + True + True 6 -1 100 0.10000000000000001 10 0 2 @@ -3099,6 +3591,10 @@ Disabled True 6 1 + False + False + True + True 6 -1 10000 1 10 0 @@ -3111,12 +3607,15 @@ Disabled + True + True 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 @@ -3142,6 +3641,10 @@ Disabled True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 1 + False + False + True + True 2 0.5 100 0.10000000000000001 1 0 2 True @@ -3162,6 +3665,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 10 @@ -3177,6 +3681,8 @@ Disabled + True + True 2 @@ -3187,6 +3693,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK <b>Seeding</b> True @@ -3204,6 +3711,8 @@ Disabled + True + True 5 2 @@ -3220,7 +3729,8 @@ Disabled True - page 12 + False + page 12 6 @@ -3238,16 +3748,19 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK queue none True + False 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 0 10 @@ -3257,35 +3770,42 @@ Disabled False + True 0 True + False False + True 1 True + False 5 - + True + False 0 none True + False 12 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 2 @@ -3293,6 +3813,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Password: @@ -3307,9 +3828,13 @@ Disabled True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + True + False + False + True + True 1 @@ -3322,6 +3847,7 @@ Disabled True + False 0 Host: @@ -3335,8 +3861,12 @@ Disabled True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + False + True + True 1 @@ -3348,6 +3878,7 @@ Disabled True + False 0 Port: @@ -3360,6 +3891,7 @@ Disabled True + False 0 0 @@ -3367,6 +3899,10 @@ Disabled True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + False + True + True 8080 0 65535 1 10 0 True @@ -3384,8 +3920,12 @@ Disabled True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + False + True + True 1 @@ -3398,6 +3938,7 @@ Disabled True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK None Socksv4 @@ -3417,6 +3958,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Type: @@ -3429,6 +3971,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Username: @@ -3446,6 +3989,7 @@ HTTP W/ Auth True + False <b>Peer</b> True @@ -3461,18 +4005,21 @@ HTTP W/ Auth - + True + False 0 none True + False 12 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 2 @@ -3480,6 +4027,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Password: @@ -3494,9 +4042,13 @@ HTTP W/ Auth True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + True + False + False + True + True 1 @@ -3509,6 +4061,7 @@ HTTP W/ Auth True + False 0 Host: @@ -3522,8 +4075,12 @@ HTTP W/ Auth True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + False + True + True 1 @@ -3535,6 +4092,7 @@ HTTP W/ Auth True + False 0 Port: @@ -3547,6 +4105,7 @@ HTTP W/ Auth True + False 0 0 @@ -3554,6 +4113,10 @@ HTTP W/ Auth True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + False + True + True 8080 0 65535 1 10 0 True @@ -3571,8 +4134,12 @@ HTTP W/ Auth True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + False + True + True 1 @@ -3585,6 +4152,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK None Socksv4 @@ -3604,6 +4172,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Type: @@ -3616,6 +4185,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Username: @@ -3633,6 +4203,7 @@ HTTP W/ Auth True + False <b>Web Seed</b> True @@ -3648,18 +4219,21 @@ HTTP W/ Auth - + True + False 0 none True + False 12 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 2 @@ -3667,6 +4241,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Password: @@ -3681,9 +4256,13 @@ HTTP W/ Auth True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + True + False + False + True + True 1 @@ -3696,6 +4275,7 @@ HTTP W/ Auth True + False 0 Host: @@ -3709,8 +4289,12 @@ HTTP W/ Auth True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + False + True + True 1 @@ -3722,6 +4306,7 @@ HTTP W/ Auth True + False 0 Port: @@ -3734,6 +4319,7 @@ HTTP W/ Auth True + False 0 0 @@ -3741,6 +4327,10 @@ HTTP W/ Auth True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + False + True + True 8080 0 65535 1 10 0 True @@ -3758,8 +4348,12 @@ HTTP W/ Auth True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + False + True + True 1 @@ -3772,6 +4366,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK None Socksv4 @@ -3791,6 +4386,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Type: @@ -3803,6 +4399,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Username: @@ -3820,6 +4417,7 @@ HTTP W/ Auth True + False <b>Tracker</b> True @@ -3835,18 +4433,21 @@ HTTP W/ Auth - + True + False 0 none True + False 12 12 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 2 @@ -3854,6 +4455,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Password: @@ -3869,9 +4471,13 @@ HTTP W/ Auth True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + True + False + False + True + True 1 @@ -3884,6 +4490,7 @@ HTTP W/ Auth True + False 0 Host: @@ -3898,8 +4505,12 @@ HTTP W/ Auth True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + False + True + True 1 @@ -3911,6 +4522,7 @@ HTTP W/ Auth True + False 0 Port: @@ -3924,6 +4536,7 @@ HTTP W/ Auth True + False 0 0 @@ -3931,6 +4544,10 @@ HTTP W/ Auth True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + False + True + True 8080 0 65535 1 10 0 True @@ -3948,8 +4565,12 @@ HTTP W/ Auth True True - True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False + False + True + True 1 @@ -3962,6 +4583,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK None Socksv4 @@ -3981,6 +4603,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Type: @@ -3993,6 +4616,7 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 Username: @@ -4011,6 +4635,7 @@ HTTP W/ Auth True + False <b>DHT</b> True @@ -4027,6 +4652,8 @@ HTTP W/ Auth + True + True 5 2 @@ -4055,14 +4682,17 @@ HTTP W/ Auth True + False queue none True + False True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 0 10 @@ -4072,44 +4702,53 @@ HTTP W/ Auth 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): @@ -4120,6 +4759,7 @@ HTTP W/ Auth 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 @@ -4135,8 +4775,12 @@ HTTP W/ Auth True True - ● + ● 1 + False + False + True + True 512 0 999999 1 10 0 True if-valid @@ -4152,9 +4796,13 @@ HTTP W/ Auth True True 5 - ● + ● 5 1 + False + False + True + True 60 1 32000 1 10 0 @@ -4172,6 +4820,7 @@ HTTP W/ Auth True + False <b>Settings</b> True @@ -4190,34 +4839,41 @@ HTTP W/ Auth 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: @@ -4229,6 +4885,7 @@ HTTP W/ Auth True + False The total number of write operations performed since this session was started. 0 Writes: @@ -4242,6 +4899,7 @@ HTTP W/ Auth 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: @@ -4255,6 +4913,7 @@ HTTP W/ Auth True + False 1 @@ -4266,6 +4925,7 @@ HTTP W/ Auth True + False 1 @@ -4279,6 +4939,7 @@ HTTP W/ Auth True + False 1 @@ -4296,6 +4957,7 @@ HTTP W/ Auth True + False <b>Write</b> True @@ -4305,27 +4967,33 @@ HTTP W/ Auth + 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: @@ -4337,6 +5005,7 @@ HTTP W/ Auth True + False The number of blocks that were served from cache. 0 Blocks Read Hit: @@ -4350,6 +5019,7 @@ HTTP W/ Auth True + False The cache hit ratio for the read cache. 0 Read Cache Hit Ratio: @@ -4363,6 +5033,7 @@ HTTP W/ Auth True + False 1 @@ -4374,6 +5045,7 @@ HTTP W/ Auth True + False 1 @@ -4387,6 +5059,7 @@ HTTP W/ Auth True + False 1 @@ -4400,6 +5073,7 @@ HTTP W/ Auth True + False True The total number of read operations performed since this session was started. 0 @@ -4414,6 +5088,7 @@ HTTP W/ Auth True + False 1 @@ -4430,6 +5105,7 @@ HTTP W/ Auth True + False <b>Read</b> True @@ -4439,27 +5115,33 @@ HTTP W/ Auth + 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: @@ -4471,6 +5153,7 @@ HTTP W/ Auth True + False 0 Read Cache Size: @@ -4483,6 +5166,7 @@ HTTP W/ Auth True + False 1 @@ -4494,6 +5178,7 @@ HTTP W/ Auth True + False 1 @@ -4511,6 +5196,7 @@ HTTP W/ Auth True + False <b>Size</b> True @@ -4520,12 +5206,15 @@ HTTP W/ Auth + True + True 2 True + False start @@ -4544,6 +5233,8 @@ HTTP W/ Auth + True + True 3 @@ -4554,6 +5245,7 @@ HTTP W/ Auth True + False <b>Status</b> True @@ -4573,6 +5265,8 @@ HTTP W/ Auth + True + True 2 @@ -4601,16 +5295,19 @@ HTTP W/ Auth True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK queue none True + False 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 0 10 @@ -4620,16 +5317,19 @@ HTTP W/ Auth False + True 0 True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK False + True 1 @@ -4667,26 +5367,31 @@ HTTP W/ Auth True + False queue none True + False 0 none True + False 12 True + False 5 2 5 True + False 0 @@ -4700,6 +5405,7 @@ HTTP W/ Auth True + False 0 @@ -4713,6 +5419,7 @@ HTTP W/ Auth True + False 0 @@ -4724,6 +5431,7 @@ HTTP W/ Auth True + False 0 0 Details: @@ -4738,6 +5446,7 @@ HTTP W/ Auth True + False 0 Version: @@ -4751,6 +5460,7 @@ HTTP W/ Auth True + False 0 Author: @@ -4762,6 +5472,7 @@ HTTP W/ Auth True + False 0 Homepage: @@ -4775,6 +5486,7 @@ HTTP W/ Auth True + False 0 Author Email: @@ -4788,6 +5500,7 @@ HTTP W/ Auth True + False 0 @@ -4801,6 +5514,7 @@ HTTP W/ Auth True + False 0 @@ -4818,6 +5532,7 @@ HTTP W/ Auth True + False <b>Info</b> True @@ -4837,12 +5552,15 @@ HTTP W/ Auth + True + True 2 True + False center @@ -4853,10 +5571,12 @@ HTTP W/ Auth True + False 5 True + False gtk-add @@ -4868,6 +5588,7 @@ HTTP W/ Auth True + False _Install Plugin True True @@ -4896,10 +5617,12 @@ HTTP W/ Auth True + False 5 True + False gtk-refresh @@ -4911,6 +5634,7 @@ HTTP W/ Auth True + False _Rescan Plugins True True @@ -4940,6 +5664,7 @@ HTTP W/ Auth True + False True @@ -4949,10 +5674,12 @@ HTTP W/ Auth True + False 5 True + False gtk-find @@ -4964,6 +5691,7 @@ HTTP W/ Auth True + False _Find More Plugins True True @@ -5022,69 +5750,11 @@ HTTP W/ Auth + True + True 1 - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - end - - - gtk-cancel - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - False - False - 0 - - - - - gtk-apply - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - False - False - 1 - - - - - gtk-ok - True - True - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - True - - - - False - False - 2 - - - - - False - end - 0 - - diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py index fb3f1dc5b..645ad26a7 100644 --- a/deluge/ui/gtkui/preferences.py +++ b/deluge/ui/gtkui/preferences.py @@ -317,7 +317,17 @@ class Preferences(component.Component): "spin_cache_expiry": ("value", self.core_config["cache_expiry"]) } # Add proxy stuff + + # Display workaround for single proxy in libtorrent >v0.16 + try: + lt_single_proxy = component.get("PreferencesManager").LT_SINGLE_PROXY + except AttributeError: + lt_single_proxy = False + for t in ("peer", "web_seed", "tracker", "dht"): + if lt_single_proxy and not t == "peer": + widget = self.glade.get_widget("frame_%s" % t) + widget.set_sensitive(False) core_widgets["spin_proxy_port_%s" % t] = ("value", self.core_config["proxies"][t]["port"]) core_widgets["combo_proxy_type_%s" % t] = ("active", self.core_config["proxies"][t]["type"]) core_widgets["txt_proxy_server_%s" % t] = ("text", self.core_config["proxies"][t]["hostname"])