Add ProxyType setting in preparation of SOCKS5 proxy support.

diff --git a/src/app/appsettings.cpp b/src/app/appsettings.cpp
index b98060dd6d893d8c6d041a8c724d0490fa8a4582..477c1b0e40317ab686832cabcac09c7d07e2600d 100644 (file)
--- a/src/app/appsettings.cpp
+++ b/src/app/appsettings.cpp
@@ -21,7 +21,8 @@
 
 const QString PROXY_ADDRESS_SETTING ("proxyAddress"); 
 const QString PROXY_PORT_SETTING ("proxyPort"); 
 
 const QString PROXY_ADDRESS_SETTING ("proxyAddress"); 
 const QString PROXY_PORT_SETTING ("proxyPort"); 

-const QString PROXY_ISDIRECT_SETTING ("proxyIsDirectConnection"); 
+const QString PROXY_TYPE_SETTING ("proxyType");
+const QString PROXY_ISDIRECT_SETTING ("proxyIsDirectConnection");

 
 QSettings AppSettings::mSettings("Toastfreeware", "ConfClerk");
 
 
 QSettings AppSettings::mSettings("Toastfreeware", "ConfClerk");
 


@@ -35,6 +36,12 @@ quint16 AppSettings::proxyPort()
     return mSettings.value(PROXY_PORT_SETTING).toUInt();
 }
 
     return mSettings.value(PROXY_PORT_SETTING).toUInt();
 }
 

+//QNetworkProxy::ProxyType
+int AppSettings::proxyType()
+{
+    return mSettings.value(PROXY_TYPE_SETTING).toInt();
+}
+

 bool AppSettings::isDirectConnection()
 {
     return mSettings.value(PROXY_ISDIRECT_SETTING).toBool();
 bool AppSettings::isDirectConnection()
 {
     return mSettings.value(PROXY_ISDIRECT_SETTING).toBool();


@@ -50,6 +57,12 @@ void AppSettings::setProxyPort(const quint16 aPort)
     mSettings.setValue(PROXY_PORT_SETTING, aPort);
 }
 
     mSettings.setValue(PROXY_PORT_SETTING, aPort);
 }
 

+// QNetworkProxy::ProxyType
+void AppSettings::setProxyType(const int aType)
+{
+    mSettings.setValue(PROXY_TYPE_SETTING, aType);
+}
+

 void AppSettings::setDirectConnection(bool aDirectConnection)
 {
     mSettings.setValue(PROXY_ISDIRECT_SETTING, aDirectConnection);
 void AppSettings::setDirectConnection(bool aDirectConnection)
 {
     mSettings.setValue(PROXY_ISDIRECT_SETTING, aDirectConnection);

diff --git a/src/app/appsettings.h b/src/app/appsettings.h
index 8e5822e01d5c8a2163ed91262d7f3d49bb9aaba9..7f264412474a0716fa58f3abc28dbdfadebb34ab 100644 (file)
--- a/src/app/appsettings.h
+++ b/src/app/appsettings.h
@@ -23,6 +23,7 @@
 
 #include <QString>
 #include <QSettings>
 
 #include <QString>
 #include <QSettings>

+#include <QNetworkProxy>

 
 class AppSettings
 {
 
 class AppSettings
 {


@@ -35,10 +36,12 @@ class AppSettings
 
         static QString proxyAddress();
         static quint16 proxyPort();
 
         static QString proxyAddress();
         static quint16 proxyPort();

+        static int proxyType(); // QNetworkProxy::ProxyType

         static bool isDirectConnection();
 
         static void setProxyAddress(const QString &aAddress);
         static void setProxyPort(const quint16 aPort);
         static bool isDirectConnection();
 
         static void setProxyAddress(const QString &aAddress);
         static void setProxyPort(const quint16 aPort);

+        static void setProxyType(const int aProxyType); // QNetworkProxy::ProxyType

         static void setDirectConnection(bool aDirectConnection);
         static int preEventAlarmSec() {return 60*15;} ///< seconds that alarm should ring before an event starts
 };
         static void setDirectConnection(bool aDirectConnection);
         static int preEventAlarmSec() {return 60*15;} ///< seconds that alarm should ring before an event starts
 };

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 3b2582a213eab1f72b0a87d5ac4e5c4283005957..dbbcb2f275dffa6ddb96301c0468c8530022b8fb 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -82,7 +82,7 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) {
         AppSettings::setDirectConnection(true);
 
     QNetworkProxy proxy(
         AppSettings::setDirectConnection(true);
 
     QNetworkProxy proxy(

-            AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
+            AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : (QNetworkProxy::ProxyType)AppSettings::proxyType(),

             AppSettings::proxyAddress(),
             AppSettings::proxyPort(),
             PROXY_USERNAME,
             AppSettings::proxyAddress(),
             AppSettings::proxyPort(),
             PROXY_USERNAME,


@@ -363,7 +363,7 @@ void MainWindow::on_settingsAction_triggered()
     if (dialog.exec() == QDialog::Accepted) {
         dialog.saveDialogData();
         QNetworkProxy proxy(
     if (dialog.exec() == QDialog::Accepted) {
         dialog.saveDialogData();
         QNetworkProxy proxy(

-                AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
+                AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : (QNetworkProxy::ProxyType)AppSettings::proxyType(),

                 AppSettings::proxyAddress(),
                 AppSettings::proxyPort(),
                 PROXY_USERNAME,
                 AppSettings::proxyAddress(),
                 AppSettings::proxyPort(),
                 PROXY_USERNAME,

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 13e4e1d8436eac5986f3b852785a53f89e07c837..dfaff36e1523d56cdb36178a1e348b83ffea2702 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -21,6 +21,7 @@
 
 #include "appsettings.h"
 #include <QDebug>
 
 #include "appsettings.h"
 #include <QDebug>

+#include <QNetworkProxy>

 
 SettingsDialog::SettingsDialog(QWidget *aParent)
     : QDialog(aParent)
 
 SettingsDialog::SettingsDialog(QWidget *aParent)
     : QDialog(aParent)


@@ -45,6 +46,7 @@ void SettingsDialog::saveDialogData()
     // serialize dialog data
     AppSettings::setProxyAddress(address->text());
     AppSettings::setProxyPort(port->value());
     // serialize dialog data
     AppSettings::setProxyAddress(address->text());
     AppSettings::setProxyPort(port->value());

+    AppSettings::setProxyType(QNetworkProxy::HttpProxy); // TODO!!

     AppSettings::setDirectConnection(directConnection->isChecked());
 }
 
     AppSettings::setDirectConnection(directConnection->isChecked());
 }