Changeset 0ede0a2

Timestamp:

10/05/17 17:59:45 (5 years ago)

Author:

gregor herrmann <gregor@…>

Branches:

master

Children:

68efead

Parents:

8180111

git-author:

gregor herrmann <gregor@…> (10/05/17 13:27:04)

git-committer:

gregor herrmann <gregor@…> (10/05/17 17:59:45)

Message:

Add ProxyType? setting in preparation of SOCKS5 proxy support.

Location:

src

Files:

• app/appsettings.cpp (modified) (3 diffs)
• app/appsettings.h (modified) (2 diffs)
• gui/mainwindow.cpp (modified) (2 diffs)
• gui/settingsdialog.cpp (modified) (2 diffs)

src/app/appsettings.cpp

@@ -22 +22 @@
 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");
@@ -34 +35 @@
 {
     return mSettings.value(PROXY_PORT_SETTING).toUInt();
+}
+
+//QNetworkProxy::ProxyType
+int AppSettings::proxyType()
+{
+    return mSettings.value(PROXY_TYPE_SETTING).toInt();
 }
 
@@ -51 +58 @@
 }
 
+// QNetworkProxy::ProxyType
+void AppSettings::setProxyType(const int aType)
+{
+    mSettings.setValue(PROXY_TYPE_SETTING, aType);
+}
+
 void AppSettings::setDirectConnection(bool aDirectConnection)
 {

src/app/appsettings.h

@@ -24 +24 @@
 #include <QString>
 #include <QSettings>
+#include <QNetworkProxy>
 
 class AppSettings
@@ -36 +37 @@
         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 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

src/gui/mainwindow.cpp

@@ -83 +83 @@
 
     QNetworkProxy proxy(
-            AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
+            AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : (QNetworkProxy::ProxyType)AppSettings::proxyType(),
             AppSettings::proxyAddress(),
             AppSettings::proxyPort(),
@@ -364 +364 @@
         dialog.saveDialogData();
         QNetworkProxy proxy(
-                AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : QNetworkProxy::HttpProxy,
+                AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : (QNetworkProxy::ProxyType)AppSettings::proxyType(),
                 AppSettings::proxyAddress(),
                 AppSettings::proxyPort(),

src/gui/settingsdialog.cpp

@@ -22 +22 @@
 #include "appsettings.h"
 #include <QDebug>
+#include <QNetworkProxy>
 
 SettingsDialog::SettingsDialog(QWidget *aParent)
@@ -46 +47 @@
     AppSettings::setProxyAddress(address->text());
     AppSettings::setProxyPort(port->value());
+    AppSettings::setProxyType(QNetworkProxy::HttpProxy); // TODO!!
     AppSettings::setDirectConnection(directConnection->isChecked());
 }