X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/blobdiff_plain/0ede0a29484e01d6a7d8853957a0de2084051c29..080dc7d603d45ba0662aa731418993ddd45b5fe8:/src/app/appsettings.cpp

diff --git a/src/app/appsettings.cpp b/src/app/appsettings.cpp
index 477c1b0..8a17ba7 100644
--- a/src/app/appsettings.cpp
+++ b/src/app/appsettings.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
- * Copyright (C) 2011-2017 Philipp Spitzer, gregor herrmann, Stefan Stahl
+ * Copyright (C) 2011-2024 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
  * This file is part of ConfClerk.
  *
@@ -22,6 +22,8 @@
 const QString PROXY_ADDRESS_SETTING ("proxyAddress"); 
 const QString PROXY_PORT_SETTING ("proxyPort"); 
 const QString PROXY_TYPE_SETTING ("proxyType");
+const QString PROXY_USERNAME_SETTING ("proxyUsername");
+const QString PROXY_PASSWORD_SETTING ("proxyPassword");
 const QString PROXY_ISDIRECT_SETTING ("proxyIsDirectConnection");
 
 QSettings AppSettings::mSettings("Toastfreeware", "ConfClerk");
@@ -36,10 +38,22 @@ quint16 AppSettings::proxyPort()
     return mSettings.value(PROXY_PORT_SETTING).toUInt();
 }
 
-//QNetworkProxy::ProxyType
-int AppSettings::proxyType()
+QNetworkProxy::ProxyType AppSettings::proxyType()
 {
-    return mSettings.value(PROXY_TYPE_SETTING).toInt();
+    bool ok;
+    int proxyType = mSettings.value(PROXY_TYPE_SETTING).toInt(&ok);
+    if (!ok || proxyType < 0 || proxyType > 5) return QNetworkProxy::DefaultProxy;
+    return QNetworkProxy::ProxyType(proxyType);
+}
+
+QString AppSettings::proxyUsername()
+{
+    return mSettings.value(PROXY_USERNAME_SETTING).toString();
+}
+
+QString AppSettings::proxyPassword()
+{
+    return mSettings.value(PROXY_PASSWORD_SETTING).toString();
 }
 
 bool AppSettings::isDirectConnection()
@@ -57,10 +71,19 @@ void AppSettings::setProxyPort(const quint16 aPort)
     mSettings.setValue(PROXY_PORT_SETTING, aPort);
 }
 
-// QNetworkProxy::ProxyType
-void AppSettings::setProxyType(const int aType)
+void AppSettings::setProxyType(QNetworkProxy::ProxyType aProxyType)
+{
+    mSettings.setValue(PROXY_TYPE_SETTING, aProxyType);
+}
+
+void AppSettings::setProxyUsername(const QString &aUsername)
+{
+    mSettings.setValue(PROXY_USERNAME_SETTING, aUsername);
+}
+
+void AppSettings::setProxyPassword(const QString &aPassword)
 {
-    mSettings.setValue(PROXY_TYPE_SETTING, aType);
+    mSettings.setValue(PROXY_PASSWORD_SETTING, aPassword);
 }
 
 void AppSettings::setDirectConnection(bool aDirectConnection)