Proxy fix.
This commit is contained in:
parent
1d211d1baf
commit
a4d3dd90fd
@ -160,7 +160,9 @@ void Manager::applySettings () {
|
|||||||
useResultDialog_ = GET (resultShowType).toBool ();
|
useResultDialog_ = GET (resultShowType).toBool ();
|
||||||
|
|
||||||
QNetworkProxy proxy = QNetworkProxy::applicationProxy ();
|
QNetworkProxy proxy = QNetworkProxy::applicationProxy ();
|
||||||
proxy.setType (QNetworkProxy::ProxyType (GET (proxyType).toInt ()));
|
QList<int> proxyTypes = proxyTypeOrder ();
|
||||||
|
int proxyTypeIndex = std::min (GET (proxyType).toInt (), proxyTypes.size ());
|
||||||
|
proxy.setType (QNetworkProxy::ProxyType (proxyTypes.at (std::max (proxyTypeIndex, 0))));
|
||||||
proxy.setHostName (GET (proxyHostName).toString ());
|
proxy.setHostName (GET (proxyHostName).toString ());
|
||||||
proxy.setPort (GET (proxyPort).toInt ());
|
proxy.setPort (GET (proxyPort).toInt ());
|
||||||
proxy.setUser (GET (proxyUser).toString ());
|
proxy.setUser (GET (proxyUser).toString ());
|
||||||
|
@ -38,10 +38,9 @@ SettingsEditor::SettingsEditor (const LanguageHelper &dictionary, QWidget *paren
|
|||||||
proxyTypeNames.insert (QNetworkProxy::NoProxy, tr ("Нет"));
|
proxyTypeNames.insert (QNetworkProxy::NoProxy, tr ("Нет"));
|
||||||
proxyTypeNames.insert (QNetworkProxy::Socks5Proxy, tr ("SOCKS 5"));
|
proxyTypeNames.insert (QNetworkProxy::Socks5Proxy, tr ("SOCKS 5"));
|
||||||
proxyTypeNames.insert (QNetworkProxy::HttpProxy, tr ("HTTP"));
|
proxyTypeNames.insert (QNetworkProxy::HttpProxy, tr ("HTTP"));
|
||||||
QList<ProxyType> proxyOrder;
|
QList<int> proxyOrder = proxyTypeOrder ();
|
||||||
proxyOrder << QNetworkProxy::NoProxy << QNetworkProxy::Socks5Proxy << QNetworkProxy::HttpProxy;
|
foreach (int type, proxyOrder) {
|
||||||
foreach (ProxyType type, proxyOrder) {
|
ui->proxyTypeCombo->addItem (proxyTypeNames.value (QNetworkProxy::ProxyType (type)));
|
||||||
ui->proxyTypeCombo->addItem (proxyTypeNames.value (type));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QRegExp urlRegexp (R"(^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$)");
|
QRegExp urlRegexp (R"(^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$)");
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
#include <QNetworkProxy>
|
||||||
|
|
||||||
#include "Utils.h"
|
#include "Utils.h"
|
||||||
|
|
||||||
QString encode (const QString &source) {
|
QString encode (const QString &source) {
|
||||||
@ -11,3 +13,9 @@ QString encode (const QString &source) {
|
|||||||
}
|
}
|
||||||
return QString::fromUtf8 (result.data ());
|
return QString::fromUtf8 (result.data ());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QList<int> proxyTypeOrder () {
|
||||||
|
QList<int> proxyOrder;
|
||||||
|
proxyOrder << QNetworkProxy::NoProxy << QNetworkProxy::Socks5Proxy << QNetworkProxy::HttpProxy;
|
||||||
|
return proxyOrder;
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user