Browse Source

Merge pull request #13484 from Chocobo1/webui

Fix image not loading under proxy
adaptive-webui-19844
Mike Tzou 4 years ago committed by GitHub
parent
commit
4fa8862398
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/gui/advancedsettings.cpp
  2. 2
      src/webui/www/private/scripts/dynamicTable.js
  3. 4
      src/webui/www/private/views/preferences.html

4
src/gui/advancedsettings.cpp

@ -578,10 +578,10 @@ void AdvancedSettings::loadAdvancedSettings() @@ -578,10 +578,10 @@ void AdvancedSettings::loadAdvancedSettings()
}
connect(&m_comboBoxInterface, qOverload<int>(&QComboBox::currentIndexChanged)
, this, &AdvancedSettings::updateInterfaceAddressCombo);
addRow(NETWORK_IFACE, tr("Network Interface"), &m_comboBoxInterface);
addRow(NETWORK_IFACE, tr("Network interface"), &m_comboBoxInterface);
// Network interface address
updateInterfaceAddressCombo();
addRow(NETWORK_IFACE_ADDRESS, tr("Optional IP Address to bind to"), &m_comboBoxInterfaceAddress);
addRow(NETWORK_IFACE_ADDRESS, tr("Optional IP address to bind to"), &m_comboBoxInterfaceAddress);
// Announce IP
m_lineEditAnnounceIP.setText(session->announceIP());
addRow(ANNOUNCE_IP, tr("IP Address to report to trackers (requires restart)"), &m_lineEditAnnounceIP);

2
src/webui/www/private/scripts/dynamicTable.js

@ -1765,7 +1765,7 @@ window.qBittorrent.DynamicTable = (function() { @@ -1765,7 +1765,7 @@ window.qBittorrent.DynamicTable = (function() {
}
else {
const treeImg = new Element('img', {
src: '../images/L.gif',
src: 'images/L.gif',
styles: {
'margin-bottom': -2
}

4
src/webui/www/private/views/preferences.html

@ -890,7 +890,7 @@ @@ -890,7 +890,7 @@
<table>
<tr>
<td>
<label for="networkInterface">QBT_TR(Network Interface:)QBT_TR[CONTEXT=OptionsDialog]</label>
<label for="networkInterface">QBT_TR(Network interface:)QBT_TR[CONTEXT=OptionsDialog]</label>
</td>
<td>
<select id="networkInterface" style="width: 15em;">
@ -899,7 +899,7 @@ @@ -899,7 +899,7 @@
</tr>
<tr>
<td>
<label for="optionalIPAddressToBind">QBT_TR(Optional IP Address to bind to:)QBT_TR[CONTEXT=OptionsDialog]</label>
<label for="optionalIPAddressToBind">QBT_TR(Optional IP address to bind to:)QBT_TR[CONTEXT=OptionsDialog]</label>
</td>
<td>
<select id="optionalIPAddressToBind" style="width: 15em;">

Loading…
Cancel
Save