From 28a9ed439d3b22211f0a35a16676a02731121f16 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Tue, 25 Mar 2025 04:45:32 +0800 Subject: [PATCH] Revise wordings related to SOCKS4 proxy The affected options are not really incompatible with SOCKS4 but it is due to Qt missing implementation. Therefore 'unavailable' is more suitable. --- src/gui/optionsdialog.cpp | 6 +++--- src/gui/optionsdialog.ui | 6 +++--- src/webui/www/private/views/preferences.html | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp index 7c1c6c919..114f3004f 100644 --- a/src/gui/optionsdialog.cpp +++ b/src/gui/optionsdialog.cpp @@ -1689,7 +1689,7 @@ void OptionsDialog::adjustProxyOptions() if (currentProxyType == Net::ProxyType::None) { - m_ui->labelProxyTypeIncompatible->setVisible(false); + m_ui->labelProxyTypeUnavailable->setVisible(false); m_ui->lblProxyIP->setEnabled(false); m_ui->textProxyIP->setEnabled(false); @@ -1714,7 +1714,7 @@ void OptionsDialog::adjustProxyOptions() if (currentProxyType == Net::ProxyType::SOCKS4) { - m_ui->labelProxyTypeIncompatible->setVisible(true); + m_ui->labelProxyTypeUnavailable->setVisible(true); m_ui->checkProxyHostnameLookup->setEnabled(false); m_ui->checkProxyRSS->setEnabled(false); @@ -1723,7 +1723,7 @@ void OptionsDialog::adjustProxyOptions() else { // SOCKS5 or HTTP - m_ui->labelProxyTypeIncompatible->setVisible(false); + m_ui->labelProxyTypeUnavailable->setVisible(false); m_ui->checkProxyHostnameLookup->setEnabled(true); m_ui->checkProxyRSS->setEnabled(true); diff --git a/src/gui/optionsdialog.ui b/src/gui/optionsdialog.ui index 49311f602..dbac539f7 100644 --- a/src/gui/optionsdialog.ui +++ b/src/gui/optionsdialog.ui @@ -2077,14 +2077,14 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. - + true - Some options are incompatible with the chosen proxy type! + Some functions are unavailable with the chosen proxy type! @@ -2144,7 +2144,7 @@ readme[0-9].txt: filter 'readme1.txt', 'readme2.txt' but not 'readme10.txt'. - Info: The password is saved unencrypted + Note: The password is saved unencrypted diff --git a/src/webui/www/private/views/preferences.html b/src/webui/www/private/views/preferences.html index a55290cd1..30173ccb0 100644 --- a/src/webui/www/private/views/preferences.html +++ b/src/webui/www/private/views/preferences.html @@ -537,7 +537,7 @@
- QBT_TR(Info: The password is saved unencrypted)QBT_TR[CONTEXT=OptionsDialog] + QBT_TR(Note: The password is saved unencrypted)QBT_TR[CONTEXT=OptionsDialog]