squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-02 05:38:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revise checkbox label for "Use any available ports" functionality

Browse Source 
Also reorder the checkboxes a bit.
This commit is contained in:
Chocobo1
2021-07-26 12:46:06 +08:00
parent a3fd6633c4
commit 09e558ae0b
6 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/webui/api/appcontroller.cpp
View File

@@ -154,7 +154,7 @@ void AppController::preferencesAction()
// Listening Port
data["listen_port"] = session->port();
data["upnp"] = Net::PortForwarder::instance()->isEnabled();
data["random_port"] = session->useRandomPort();
data["random_port"] = session->useAnyAvailablePort();
// Connections Limits
data["max_connec"] = session->maxConnections();
data["max_connec_per_torrent"] = session->maxConnectionsPerTorrent();
@@ -487,7 +487,7 @@ void AppController::setPreferencesAction()
if (hasKey("upnp"))
Net::PortForwarder::instance()->setEnabled(it.value().toBool());
if (hasKey("random_port"))
session->setUseRandomPort(it.value().toBool());
session->setUseAnyAvailablePort(it.value().toBool());
// Connections Limits
if (hasKey("max_connec"))
session->setMaxConnections(it.value().toInt());

14
src/webui/www/private/views/preferences.html
View File

@@ -235,12 +235,12 @@
<button style="margin-left: 1em;" onclick="qBittorrent.Preferences.generateRandomPort();">QBT_TR(Random)QBT_TR[CONTEXT=OptionsDialog]</button>
</div>
<div class="formRow">
<input type="checkbox" id="upnp_checkbox" />
<label for="upnp_checkbox">QBT_TR(Use UPnP / NAT-PMP port forwarding from my router)QBT_TR[CONTEXT=OptionsDialog]</label>
<input type="checkbox" id="useAnyPortCheckbox" onclick="qBittorrent.Preferences.updatePortValueEnabled();" />
<label for="useAnyPortCheckbox">QBT_TR(Use any available port)QBT_TR[CONTEXT=OptionsDialog]</label>
</div>
<div class="formRow">
<input type="checkbox" id="random_port_checkbox" onclick="qBittorrent.Preferences.updatePortValueEnabled();" />
<label for="random_port_checkbox">QBT_TR(Use different port on each startup)QBT_TR[CONTEXT=OptionsDialog]</label>
<input type="checkbox" id="upnp_checkbox" />
<label for="upnp_checkbox">QBT_TR(Use UPnP / NAT-PMP port forwarding from my router)QBT_TR[CONTEXT=OptionsDialog]</label>
</div>
</fieldset>
@@ -1405,7 +1405,7 @@
// Connection tab
const updatePortValueEnabled = function() {
const checked = $('random_port_checkbox').getProperty('checked');
const checked = $('useAnyPortCheckbox').getProperty('checked');
$('port_value').setProperty('disabled', checked);
};
@@ -1708,7 +1708,7 @@
// Listening Port
$('port_value').setProperty('value', pref.listen_port.toInt());
$('upnp_checkbox').setProperty('checked', pref.upnp);
$('random_port_checkbox').setProperty('checked', pref.random_port);
$('useAnyPortCheckbox').setProperty('checked', pref.random_port);
updatePortValueEnabled();
// Connections Limits
@@ -2024,7 +2024,7 @@
}
settings.set('listen_port', listen_port);
settings.set('upnp', $('upnp_checkbox').getProperty('checked'));
settings.set('random_port', $('random_port_checkbox').getProperty('checked'));
settings.set('random_port', $('useAnyPortCheckbox').getProperty('checked'));
// Connections Limits
let max_connec = -1;