diff --git a/proxyface/proxy.hxx b/proxyface/proxy.hxx index b025ef6..a57b995 100644 --- a/proxyface/proxy.hxx +++ b/proxyface/proxy.hxx @@ -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) { diff --git a/proxyface/proxy_de.ts b/proxyface/proxy_de.ts index 3aadfd2..f7bcb27 100644 --- a/proxyface/proxy_de.ts +++ b/proxyface/proxy_de.ts @@ -63,35 +63,25 @@ gui::Proxy - - Kein Proxy - Kein Proxy + Kein Proxy - - HTTP: - HTTP: + HTTP: - - Socks5Proxy: - Socks5Proxy: + Socks5Proxy: - - System - System + System - - %1:%2 proxy host/port - %1:%2 + %1:%2 diff --git a/proxyface/proxy_en.ts b/proxyface/proxy_en.ts index bd8c94e..29e53cf 100644 --- a/proxyface/proxy_en.ts +++ b/proxyface/proxy_en.ts @@ -63,35 +63,25 @@ gui::Proxy - - Kein Proxy - No proxy + No proxy - - HTTP: - HTTP: + HTTP: - - Socks5Proxy: - Socks5Proxy: + Socks5Proxy: - - System - System + System - - %1:%2 proxy host/port - %1:%2 + %1:%2 diff --git a/proxyface/proxy_fr.ts b/proxyface/proxy_fr.ts index 16e0cc0..36ff53c 100644 --- a/proxyface/proxy_fr.ts +++ b/proxyface/proxy_fr.ts @@ -63,35 +63,25 @@ gui::Proxy - - Kein Proxy - Pas de Proxy + Pas de Proxy - - HTTP: - HTTP: + HTTP: - - Socks5Proxy: - Socks5Proxy: + Socks5Proxy: - - System - Système + Système - - %1:%2 proxy host/port - %1:%2 + %1:%2 diff --git a/proxyface/proxy_it.ts b/proxyface/proxy_it.ts index daeb9a4..abf6838 100644 --- a/proxyface/proxy_it.ts +++ b/proxyface/proxy_it.ts @@ -63,35 +63,25 @@ gui::Proxy - - Kein Proxy - Senza Proxy + Senza Proxy - - HTTP: - HTTP: + HTTP: - - Socks5Proxy: - Socks5Proxy: + Socks5Proxy: - - System - Sistema + Sistema - - %1:%2 proxy host/port - %1:%2 + %1:%2