Settings (dialog): add username/password options for proxy server

[toast/confclerk.git] / src / gui / mainwindow.cpp

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index dbbcb2f275dffa6ddb96301c0468c8530022b8fb..918134382b7caaaa0661c9c3c9c49f2aed5d23f1 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -49,9 +49,6 @@
 #include "tabcontainer.h"
 #include "appsettings.h"
 
 #include "tabcontainer.h"
 #include "appsettings.h"
 

-const QString PROXY_USERNAME;
-const QString PROXY_PASSWD;
-

 MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) {
     setupUi(this);
 
 MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) {
     setupUi(this);
 


@@ -85,8 +82,8 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) {
             AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : (QNetworkProxy::ProxyType)AppSettings::proxyType(),
             AppSettings::proxyAddress(),
             AppSettings::proxyPort(),
             AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : (QNetworkProxy::ProxyType)AppSettings::proxyType(),
             AppSettings::proxyAddress(),
             AppSettings::proxyPort(),

-            PROXY_USERNAME,
-            PROXY_PASSWD);
+            AppSettings::proxyUsername(),
+            AppSettings::proxyPassword());

     QNetworkProxy::setApplicationProxy(proxy);
 
     // event details have changed
     QNetworkProxy::setApplicationProxy(proxy);
 
     // event details have changed


@@ -366,8 +363,8 @@ void MainWindow::on_settingsAction_triggered()
                 AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : (QNetworkProxy::ProxyType)AppSettings::proxyType(),
                 AppSettings::proxyAddress(),
                 AppSettings::proxyPort(),
                 AppSettings::isDirectConnection() ? QNetworkProxy::NoProxy : (QNetworkProxy::ProxyType)AppSettings::proxyType(),
                 AppSettings::proxyAddress(),
                 AppSettings::proxyPort(),

-                PROXY_USERNAME,
-                PROXY_PASSWD);
+                AppSettings::proxyUsername(),
+                AppSettings::proxyPassword());

         QNetworkProxy::setApplicationProxy(proxy);
     }
 }
         QNetworkProxy::setApplicationProxy(proxy);
     }
 }