update comment on default proxy value as we use QNetworkProxy::ProxyType instead...

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

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index dfaff36e1523d56cdb36178a1e348b83ffea2702..f00ce9438389d79eefefa50b3490b152ae9db6ee 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -21,7 +21,6 @@
 
 #include "appsettings.h"
 #include <QDebug>
-#include <QNetworkProxy>
 
 SettingsDialog::SettingsDialog(QWidget *aParent)
     : QDialog(aParent)
@@ -36,6 +35,9 @@ void SettingsDialog::loadDialogData()
     // deserialize dialog data
     address->setText(AppSettings::proxyAddress());
     port->setValue(AppSettings::proxyPort());
+    const QNetworkProxy::ProxyType proxyType = AppSettings::proxyType();
+    proxyTypeHTTP->setChecked(proxyType != QNetworkProxy::Socks5Proxy); // we enable QNetworkProxy::HttpProxy by default unless we have QNetworkProxy::Socks5Proxy
+    proxyTypeSOCKS5->setChecked(proxyType == QNetworkProxy::Socks5Proxy);
     directConnection->setChecked(AppSettings::isDirectConnection());
     proxyWidget->setDisabled(directConnection->isChecked());
 }
@@ -46,7 +48,7 @@ void SettingsDialog::saveDialogData()
     // serialize dialog data
     AppSettings::setProxyAddress(address->text());
     AppSettings::setProxyPort(port->value());
-    AppSettings::setProxyType(QNetworkProxy::HttpProxy); // TODO!!
+    AppSettings::setProxyType(proxyTypeHTTP->isChecked() ? QNetworkProxy::HttpProxy : proxyTypeSOCKS5->isChecked() ? QNetworkProxy::Socks5Proxy : QNetworkProxy::DefaultProxy);
     AppSettings::setDirectConnection(directConnection->isChecked());
 }