libraries/proxyface
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

From SwissStick-Ticket #150: Fallback for Proxy Configuration - If the configured proxy can't be found, try detection

Browse Source
This commit is contained in:
Marc Wäckerlin
2009-10-28 15:46:57 +00:00
parent 97b41e1277
commit a563d8995a
5 changed files with 21 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
proxyface/proxy.hxx
View File

@@ -53,32 +53,13 @@ namespace gui {
_url->setEnabled(false);
_port->setEnabled(false);
type=QNetworkProxy::NoProxy;
_auto.proxy(_testUrl);
} catch (...) {} break;
case 1: type=QNetworkProxy::HttpProxy; break;
case 2: type=QNetworkProxy::Socks5Proxy; break;
}
QNetworkProxy::setApplicationProxy
(QNetworkProxy(type, _url->text(), _port->value()));
qDebug()<<"Proxy:"
<<(QNetworkProxy::applicationProxy().type()
==QNetworkProxy::NoProxy
?trUtf8("Kein Proxy")
:QNetworkProxy::applicationProxy().type()
==QNetworkProxy::HttpProxy
?trUtf8("HTTP:")
:QNetworkProxy::applicationProxy().type()
==QNetworkProxy::Socks5Proxy
?trUtf8("Socks5Proxy:")
:trUtf8("System"))
<<(QNetworkProxy::applicationProxy().type()
==QNetworkProxy::NoProxy ||
QNetworkProxy::applicationProxy().type()
==QNetworkProxy::DefaultProxy
?QString()
:trUtf8("%1:%2", "proxy host/port")
.arg(QNetworkProxy::applicationProxy().hostName())
.arg(QNetworkProxy::applicationProxy().port()));
_auto.proxy(_testUrl);
}
Q_SIGNALS:
@@ -92,25 +73,6 @@ namespace gui {
QNetworkProxy::setApplicationProxy(p);
_url->setText(p.hostName());
_port->setValue(p.port());
qDebug()<<"Auto Proxy Found:"
<<(QNetworkProxy::applicationProxy().type()
==QNetworkProxy::NoProxy
?trUtf8("Kein Proxy")
:QNetworkProxy::applicationProxy().type()
==QNetworkProxy::HttpProxy
?trUtf8("HTTP:")
:QNetworkProxy::applicationProxy().type()
==QNetworkProxy::Socks5Proxy
?trUtf8("Socks5Proxy:")
:trUtf8("System"))
<<(QNetworkProxy::applicationProxy().type()
==QNetworkProxy::NoProxy ||
QNetworkProxy::applicationProxy().type()
==QNetworkProxy::DefaultProxy
?QString()
:trUtf8("%1:%2", "proxy host/port")
.arg(QNetworkProxy::applicationProxy().hostName())
.arg(QNetworkProxy::applicationProxy().port()));
}
void on__type_currentIndexChanged(int index) {

20
proxyface/proxy_de.ts
View File

@@ -63,35 +63,25 @@
<context>
<name>gui::Proxy</name>
<message>
<location filename="proxy.hxx" line="66"/>
<location filename="proxy.hxx" line="98"/>
<source>Kein Proxy</source>
<translation>Kein Proxy</translation>
<translation type="obsolete">Kein Proxy</translation>
</message>
<message>
<location filename="proxy.hxx" line="69"/>
<location filename="proxy.hxx" line="101"/>
<source>HTTP:</source>
<translation>HTTP:</translation>
<translation type="obsolete">HTTP:</translation>
</message>
<message>
<location filename="proxy.hxx" line="72"/>
<location filename="proxy.hxx" line="104"/>
<source>Socks5Proxy:</source>
<translation>Socks5Proxy:</translation>
<translation type="obsolete">Socks5Proxy:</translation>
</message>
<message>
<location filename="proxy.hxx" line="73"/>
<location filename="proxy.hxx" line="105"/>
<source>System</source>
<translation>System</translation>
<translation type="obsolete">System</translation>
</message>
<message>
<location filename="proxy.hxx" line="79"/>
<location filename="proxy.hxx" line="111"/>
<source>%1:%2</source>
<comment>proxy host/port</comment>
<translation>%1:%2</translation>
<translation type="obsolete">%1:%2</translation>
</message>
</context>
</TS>

20
proxyface/proxy_en.ts
View File

@@ -63,35 +63,25 @@
<context>
<name>gui::Proxy</name>
<message>
<location filename="proxy.hxx" line="66"/>
<location filename="proxy.hxx" line="98"/>
<source>Kein Proxy</source>
<translation>No proxy</translation>
<translation type="obsolete">No proxy</translation>
</message>
<message>
<location filename="proxy.hxx" line="69"/>
<location filename="proxy.hxx" line="101"/>
<source>HTTP:</source>
<translation>HTTP:</translation>
<translation type="obsolete">HTTP:</translation>
</message>
<message>
<location filename="proxy.hxx" line="72"/>
<location filename="proxy.hxx" line="104"/>
<source>Socks5Proxy:</source>
<translation>Socks5Proxy:</translation>
<translation type="obsolete">Socks5Proxy:</translation>
</message>
<message>
<location filename="proxy.hxx" line="73"/>
<location filename="proxy.hxx" line="105"/>
<source>System</source>
<translation>System</translation>
<translation type="obsolete">System</translation>
</message>
<message>
<location filename="proxy.hxx" line="79"/>
<location filename="proxy.hxx" line="111"/>
<source>%1:%2</source>
<comment>proxy host/port</comment>
<translation>%1:%2</translation>
<translation type="obsolete">%1:%2</translation>
</message>
</context>
</TS>

20
proxyface/proxy_fr.ts
View File

@@ -63,35 +63,25 @@
<context>
<name>gui::Proxy</name>
<message>
<location filename="proxy.hxx" line="66"/>
<location filename="proxy.hxx" line="98"/>
<source>Kein Proxy</source>
<translation>Pas de Proxy</translation>
<translation type="obsolete">Pas de Proxy</translation>
</message>
<message>
<location filename="proxy.hxx" line="69"/>
<location filename="proxy.hxx" line="101"/>
<source>HTTP:</source>
<translation>HTTP:</translation>
<translation type="obsolete">HTTP:</translation>
</message>
<message>
<location filename="proxy.hxx" line="72"/>
<location filename="proxy.hxx" line="104"/>
<source>Socks5Proxy:</source>
<translation>Socks5Proxy:</translation>
<translation type="obsolete">Socks5Proxy:</translation>
</message>
<message>
<location filename="proxy.hxx" line="73"/>
<location filename="proxy.hxx" line="105"/>
<source>System</source>
<translation>Système</translation>
<translation type="obsolete">Système</translation>
</message>
<message>
<location filename="proxy.hxx" line="79"/>
<location filename="proxy.hxx" line="111"/>
<source>%1:%2</source>
<comment>proxy host/port</comment>
<translation>%1:%2</translation>
<translation type="obsolete">%1:%2</translation>
</message>
</context>
</TS>

20
proxyface/proxy_it.ts
View File

@@ -63,35 +63,25 @@
<context>
<name>gui::Proxy</name>
<message>
<location filename="proxy.hxx" line="66"/>
<location filename="proxy.hxx" line="98"/>
<source>Kein Proxy</source>
<translation>Senza Proxy</translation>
<translation type="obsolete">Senza Proxy</translation>
</message>
<message>
<location filename="proxy.hxx" line="69"/>
<location filename="proxy.hxx" line="101"/>
<source>HTTP:</source>
<translation>HTTP:</translation>
<translation type="obsolete">HTTP:</translation>
</message>
<message>
<location filename="proxy.hxx" line="72"/>
<location filename="proxy.hxx" line="104"/>
<source>Socks5Proxy:</source>
<translation>Socks5Proxy:</translation>
<translation type="obsolete">Socks5Proxy:</translation>
</message>
<message>
<location filename="proxy.hxx" line="73"/>
<location filename="proxy.hxx" line="105"/>
<source>System</source>
<translation>Sistema</translation>
<translation type="obsolete">Sistema</translation>
</message>
<message>
<location filename="proxy.hxx" line="79"/>
<location filename="proxy.hxx" line="111"/>
<source>%1:%2</source>
<comment>proxy host/port</comment>
<translation>%1:%2</translation>
<translation type="obsolete">%1:%2</translation>
</message>
</context>
</TS>