NetworkSettings: store proxy configuration

No credentials, just type, host, and port.

4 files changed, 72 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84f440f6..9fea5b0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,7 @@ set(libqmatrixclient_SRCS
    user.cpp
    avatar.cpp
    settings.cpp
+   networksettings.cpp
    events/event.cpp
    events/eventcontent.cpp
    events/roommessageevent.cpp
diff --git a/libqmatrixclient.pri b/libqmatrixclient.pri
index f0c2417f..5910554c 100644
--- a/libqmatrixclient.pri
+++ b/libqmatrixclient.pri
@@ -32,7 +32,8 @@ HEADERS += \
     $$PWD/jobs/setroomstatejob.h \
     $$files($$PWD/jobs/generated/*.h, false) \
     $$PWD/logging.h \
-    $$PWD/settings.h
+    $$PWD/settings.h \
+    $$PWD/networksettings.h
 
 SOURCES += \
     $$PWD/connectiondata.cpp \
@@ -59,4 +60,5 @@ SOURCES += \
     $$PWD/jobs/setroomstatejob.cpp \
     $$files($$PWD/jobs/generated/*.cpp, false) \
     $$PWD/logging.cpp \
-    $$PWD/settings.cpp
+    $$PWD/settings.cpp \
+    $$PWD/networksettings.cpp
diff --git a/networksettings.cpp b/networksettings.cpp
new file mode 100644
index 00000000..6b023bd5
--- /dev/null
+++ b/networksettings.cpp
@@ -0,0 +1,25 @@
+/******************************************************************************
+ * Copyright (C) 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "networksettings.h"
+
+using namespace QMatrixClient;
+
+QMC_DEFINE_SETTING(NetworkSettings, QNetworkProxy::ProxyType, proxyType, "proxy_type", QNetworkProxy::NoProxy, setProxyType)
+QMC_DEFINE_SETTING(NetworkSettings, QString, proxyHostName, "proxy_hostname", "", setProxyHostName)
+QMC_DEFINE_SETTING(NetworkSettings, int, proxyPort, "proxy_port", -1, setProxyPort)
diff --git a/networksettings.h b/networksettings.h
new file mode 100644
index 00000000..e113cd9b
--- /dev/null
+++ b/networksettings.h
@@ -0,0 +1,42 @@
+/******************************************************************************
+ * Copyright (C) 2017 Kitsune Ral <kitsune-ral@users.sf.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#pragma once
+
+#include "settings.h"
+
+#include <QtNetwork/QNetworkProxy>
+
+Q_DECLARE_METATYPE(QNetworkProxy::ProxyType)
+
+namespace QMatrixClient {
+    class NetworkSettings: public SettingsGroup
+    {
+            Q_OBJECT
+            QMC_DECLARE_SETTING(QNetworkProxy::ProxyType, proxyType, setProxyType)
+            QMC_DECLARE_SETTING(QString, proxyHostName, setProxyHostName)
+            QMC_DECLARE_SETTING(int, proxyPort, setProxyPort)
+            Q_PROPERTY(QString proxyHost READ proxyHostName WRITE setProxyHostName)
+        public:
+            template <typename... ArgTs>
+            explicit NetworkSettings(ArgTs... qsettingsArgs)
+                : SettingsGroup(QStringLiteral("Network"), qsettingsArgs...)
+            { }
+            ~NetworkSettings() override = default;
+    };
+}