From 5a98a221cc926c7a378dcce20a22284cb7d90030 Mon Sep 17 00:00:00 2001 From: Sergey Starosek Date: Thu, 26 Jun 2014 20:20:34 +0400 Subject: Implement proxy re-configuration - application level proxy is reconfigured on settings saving - tested with direct connection (no proxy), local proxy without auth (tinyproxy) and SOCKS (ssh -D dynamic port forwarding) - not sure about QNetworkProxy reuse between invocations - consider using QNetworkProxyFactory (but since no plain TCP connections are used, QNetworkProxy seems to be good choice) Signed-off-by: Sergey Starosek Signed-off-by: Dirk Hohndel --- qt-ui/mainwindow.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'qt-ui') diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index de624a79d..10b3e5304 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -51,6 +51,7 @@ #ifndef NO_USERMANUAL #include "usermanual.h" #endif +#include MainWindow *MainWindow::m_Instance = NULL; @@ -828,6 +829,18 @@ void MainWindow::readSettings() default_dive_computer_product = getSetting(s, "dive_computer_product"); default_dive_computer_device = getSetting(s, "dive_computer_device"); s.endGroup(); + + QNetworkProxy proxy; + proxy.setType(QNetworkProxy::ProxyType(prefs.proxy_type)); + proxy.setHostName(prefs.proxy_host); + proxy.setPort(prefs.proxy_port); + if (prefs.proxy_auth) { + proxy.setUser(prefs.proxy_user); + proxy.setPassword(prefs.proxy_pass); + } + QNetworkProxy::setApplicationProxy(proxy); + + loadRecentFiles(&s); checkSurvey(&s); } -- cgit v1.2.3-70-g09d2