squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-17 14:08:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revise wordings related to SOCKS4 proxy

Browse Source 
The affected options are not really incompatible with SOCKS4 but it is due to Qt missing
implementation. Therefore 'unavailable' is more suitable.

PR #22483.
This commit is contained in:
Chocobo1
2025-03-29 21:09:49 +08:00
committed by GitHub
parent 830d2c207b
commit ade39432be
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/optionsdialog.cpp
View File

@@ -1689,7 +1689,7 @@ void OptionsDialog::adjustProxyOptions()
if (currentProxyType == Net::ProxyType::None) if (currentProxyType == Net::ProxyType::None)
{ {
m_ui->labelProxyTypeIncompatible->setVisible(false); m_ui->labelProxyTypeUnavailable->setVisible(false);
m_ui->lblProxyIP->setEnabled(false); m_ui->lblProxyIP->setEnabled(false);
m_ui->textProxyIP->setEnabled(false); m_ui->textProxyIP->setEnabled(false);
@@ -1714,7 +1714,7 @@ void OptionsDialog::adjustProxyOptions()
if (currentProxyType == Net::ProxyType::SOCKS4) if (currentProxyType == Net::ProxyType::SOCKS4)
{ {
m_ui->labelProxyTypeIncompatible->setVisible(true); m_ui->labelProxyTypeUnavailable->setVisible(true);
m_ui->checkProxyHostnameLookup->setEnabled(false); m_ui->checkProxyHostnameLookup->setEnabled(false);
m_ui->checkProxyRSS->setEnabled(false); m_ui->checkProxyRSS->setEnabled(false);
@@ -1723,7 +1723,7 @@ void OptionsDialog::adjustProxyOptions()
else else
{ {
// SOCKS5 or HTTP // SOCKS5 or HTTP
m_ui->labelProxyTypeIncompatible->setVisible(false); m_ui->labelProxyTypeUnavailable->setVisible(false);
m_ui->checkProxyHostnameLookup->setEnabled(true); m_ui->checkProxyHostnameLookup->setEnabled(true);
m_ui->checkProxyRSS->setEnabled(true); m_ui->checkProxyRSS->setEnabled(true);

6
src/gui/optionsdialog.ui
View File

@@ -2077,14 +2077,14 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'.</st
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QLabel" name="labelProxyTypeIncompatible"> <widget class="QLabel" name="labelProxyTypeUnavailable">
<property name="font"> <property name="font">
<font> <font>
<italic>true</italic> <italic>true</italic>
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Some options are incompatible with the chosen proxy type!</string> <string>Some functions are unavailable with the chosen proxy type!</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -2144,7 +2144,7 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'.</st
<item> <item>
<widget class="QLabel" name="label_23"> <widget class="QLabel" name="label_23">
<property name="text"> <property name="text">
<string>Info: The password is saved unencrypted</string> <string>Note: The password is saved unencrypted</string>
</property> </property>
</widget> </widget>
</item> </item>

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

@@ -537,7 +537,7 @@
</tbody> </tbody>
</table> </table>
<div class="formRow"> <div class="formRow">
<span>QBT_TR(Info: The password is saved unencrypted)QBT_TR[CONTEXT=OptionsDialog]</span> <span>QBT_TR(Note: The password is saved unencrypted)QBT_TR[CONTEXT=OptionsDialog]</span>
</div> </div>
</fieldset> </fieldset>