From 443ee0a4f864bb5862c1536aecf50616013ef518 Mon Sep 17 00:00:00 2001 From: apprb Date: Tue, 7 Oct 2014 11:16:06 +0900 Subject: [PATCH] Proxy settings is more close to General group in settings.ini than to Privacy --- misc/settings.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/misc/settings.cpp b/misc/settings.cpp index 8e4df9f02..545684272 100644 --- a/misc/settings.cpp +++ b/misc/settings.cpp @@ -110,6 +110,10 @@ void Settings::load() enableIPv6 = s.value("enableIPv6", true).toBool(); useTranslations = s.value("useTranslations", true).toBool(); makeToxPortable = s.value("makeToxPortable", false).toBool(); + forceTCP = s.value("forceTCP", false).toBool(); + useProxy = s.value("useProxy", false).toBool(); + proxyAddr = s.value("proxyAddr", "").toString(); + proxyPort = s.value("proxyPort", 0).toInt(); s.endGroup(); s.beginGroup("Widgets"); @@ -140,10 +144,6 @@ void Settings::load() s.beginGroup("Privacy"); typingNotification = s.value("typingNotification", false).toBool(); - forceTCP = s.value("forceTCP", false).toBool(); - useProxy = s.value("useProxy", false).toBool(); - proxyAddr = s.value("proxyAddr", "").toString(); - proxyPort = s.value("proxyPort", 0).toInt(); s.endGroup(); // try to set a smiley pack if none is selected @@ -213,6 +213,10 @@ void Settings::save(QString path) s.setValue("enableIPv6", enableIPv6); s.setValue("useTranslations",useTranslations); s.setValue("makeToxPortable",makeToxPortable); + s.setValue("useProxy", useProxy); + s.setValue("forceTCP", forceTCP); + s.setValue("proxyAddr", proxyAddr); + s.setValue("proxyPort", proxyPort); s.endGroup(); s.beginGroup("Widgets"); @@ -243,10 +247,6 @@ void Settings::save(QString path) s.beginGroup("Privacy"); s.setValue("typingNotification", typingNotification); - s.setValue("useProxy", useProxy); - s.setValue("forceTCP", forceTCP); - s.setValue("proxyAddr", proxyAddr); - s.setValue("proxyPort", proxyPort); s.endGroup(); }