codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Core] [UI] Remove deprecated lt extensions 

* These extensions have been deprecated in 1.1 so simply remove usage.
This commit is contained in:
Calum Lind 2016-10-28 11:33:15 +01:00
parent 4dc59b5255
commit 05566894ad
6 changed files with 5 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deluge/core/core.py
View File

@ -77,7 +77,6 @@ class Core(component.Component):
# --- libtorrent plugins ---
# Allows peers to download the metadata from the swarm directly
self.session.add_extension("metadata_transfer")
self.session.add_extension("ut_metadata")
# Ban peers that sends bad data
self.session.add_extension("smart_ban")

6
deluge/core/preferencesmanager.py
View File

@ -53,7 +53,6 @@ DEFAULT_PREFS = {
"upnp": True,
"natpmp": True,
"utpex": True,
"lt_tex": True,
"lsd": True,
"enc_in_policy": 1,
"enc_out_policy": 1,
@ -266,11 +265,6 @@ class PreferencesManager(component.Component):
if value:
self.session.add_extension("ut_pex")
def _on_set_lt_tex(self, key, value):
log.debug("lt_tex value set to %s", value)
if value:
self.session.add_extension("lt_trackers")
def _on_set_enc_in_policy(self, key, value):
self._on_set_encryption(key, value)

1
deluge/ui/console/modes/preferences/preference_panes.py
View File

@ -249,7 +249,6 @@ class NetworkPane(BasePreferencePane):
self.add_checked_input("upnp", "UPnP", core_conf["upnp"])
self.add_checked_input("natpmp", "NAT-PMP", core_conf["natpmp"])
self.add_checked_input("utpex", "Peer Exchange", core_conf["utpex"])
self.add_checked_input("lt_tex", "Tracker Exchange", core_conf["lt_tex"])
self.add_checked_input("lsd", "LSD", core_conf["lsd"])
self.add_checked_input("dht", "DHT", core_conf["dht"])

29
deluge/ui/gtkui/glade/preferences_dialog.ui
View File

@ -3256,7 +3256,7 @@ used sparingly.</property>
<object class="GtkTable" id="table8">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">3</property>
<property name="n_rows">2</property>
<property name="n_columns">3</property>
<property name="column_spacing">6</property>
<property name="row_spacing">1</property>
@ -3311,25 +3311,6 @@ used sparingly.</property>
<property name="right_attach">3</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="chk_lt_tex">
<property name="label" translatable="yes">Tracker Exchange</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Exchanges trackers between clients. (Disabling requires restart)</property>
<property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="chk_lsd">
<property name="label" translatable="yes">LSD</property>
@ -3373,8 +3354,6 @@ used sparingly.</property>
<object class="GtkLabel" id="label_peer_tos">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">TOS can help with network conjestion. This value is included in every IPv4 packet header sent to peers (inc. web seeds).
Requires a Hex value.</property>
<property name="xpad">3</property>
<property name="label" translatable="yes">Peer TOS Byte:</property>
</object>
@ -3390,6 +3369,7 @@ Requires a Hex value.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">4</property>
<property name="invisible_char">•</property>
<property name="width_chars">4</property>
<property name="text">0x00</property>
<property name="truncate_multiline">True</property>
@ -3406,9 +3386,10 @@ Requires a Hex value.</property>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
</object>

2
deluge/ui/gtkui/preferences.py
View File

@ -337,7 +337,6 @@ class Preferences(component.Component):
"chk_upnp": ("active", "upnp"),
"chk_natpmp": ("active", "natpmp"),
"chk_utpex": ("active", "utpex"),
"chk_lt_tex": ("active", "lt_tex"),
"chk_lsd": ("active", "lsd"),
"chk_new_releases": ("active", "new_release_check"),
"chk_send_info": ("active", "send_info"),
@ -545,7 +544,6 @@ class Preferences(component.Component):
new_core_config["upnp"] = self.builder.get_object("chk_upnp").get_active()
new_core_config["natpmp"] = self.builder.get_object("chk_natpmp").get_active()
new_core_config["utpex"] = self.builder.get_object("chk_utpex").get_active()
new_core_config["lt_tex"] = self.builder.get_object("chk_lt_tex").get_active()
new_core_config["lsd"] = self.builder.get_object("chk_lsd").get_active()
new_core_config["enc_in_policy"] = self.builder.get_object("combo_encin").get_active()
new_core_config["enc_out_policy"] = self.builder.get_object("combo_encout").get_active()

7
deluge/ui/web/js/deluge-all/preferences/NetworkPage.js
View File

@ -189,13 +189,6 @@ Deluge.preferences.Network = Ext.extend(Ext.form.FormPanel, {
ctCls: 'x-deluge-indent-checkbox',
name: 'dht'
}));
optMan.bind('lt_tex', fieldset.add({
fieldLabel: '',
labelSeparator: '',
boxLabel: _('Tracker Exchange'),
ctCls: 'x-deluge-indent-checkbox',
name: 'lt_tex'
}));
fieldset = this.add({
xtype: 'fieldset',