--- a/E5Network/E5NetworkProxyFactory.py Fri Oct 18 23:00:41 2013 +0200 +++ b/E5Network/E5NetworkProxyFactory.py Fri Nov 01 15:48:48 2013 +0100 @@ -49,7 +49,8 @@ @param proxy reference to the proxy object (QNetworkProxy) @param auth reference to the authenticator object (QAuthenticator) """ - info = QCoreApplication.translate("E5NetworkProxyFactory", + info = QCoreApplication.translate( + "E5NetworkProxyFactory", "<b>Connect to proxy '{0}' using:</b>")\ .format(Utilities.html_encode(proxy.hostName())) @@ -135,10 +136,13 @@ protocolKey = query.protocolTag().capitalize() host = Preferences.getUI("ProxyHost/{0}".format(protocolKey)) if not host: - E5MessageBox.critical(None, - QCoreApplication.translate("E5NetworkProxyFactory", + E5MessageBox.critical( + None, + QCoreApplication.translate( + "E5NetworkProxyFactory", "Proxy Configuration Error"), - QCoreApplication.translate("E5NetworkProxyFactory", + QCoreApplication.translate( + "E5NetworkProxyFactory", """Proxy usage was activated""" """ but no proxy host for protocol""" """ '{0}' configured.""").format(protocolKey)) @@ -151,7 +155,8 @@ proxyType = QNetworkProxy.HttpCachingProxy else: proxyType = QNetworkProxy.HttpProxy - proxy = QNetworkProxy(proxyType, host, + proxy = QNetworkProxy( + proxyType, host, Preferences.getUI("ProxyPort/" + protocolKey), Preferences.getUI("ProxyUser/" + protocolKey), Preferences.getUI("ProxyPassword/" + protocolKey))