AppSettings returns the proxy type as QNetworkProxy instead of int now.

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

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 13e4e1d8436eac5986f3b852785a53f89e07c837..91f5fdc0f7dcc539f012e695077ba78bce50f226 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -35,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 it by default unless SOCKS5=1
+    proxyTypeSOCKS5->setChecked(proxyType == QNetworkProxy::Socks5Proxy);
     directConnection->setChecked(AppSettings::isDirectConnection());
     proxyWidget->setDisabled(directConnection->isChecked());
 }
@@ -45,6 +48,7 @@ void SettingsDialog::saveDialogData()
     // serialize dialog data
     AppSettings::setProxyAddress(address->text());
     AppSettings::setProxyPort(port->value());
+    AppSettings::setProxyType(proxyTypeHTTP->isChecked() ? QNetworkProxy::HttpProxy : proxyTypeSOCKS5->isChecked() ? QNetworkProxy::Socks5Proxy : QNetworkProxy::DefaultProxy);
     AppSettings::setDirectConnection(directConnection->isChecked());
 }