Add system proxy setting to global settings

Fix #3841
This commit is contained in:
Igor Malinovskiy
2018-04-30 13:45:12 +03:00
parent 8f7175fcd1
commit 96364fb060
3 changed files with 22 additions and 3 deletions
+7
View File
@@ -7,6 +7,7 @@
#include <QSettings>
#include <QMessageBox>
#include <QQuickWindow>
#include <QNetworkProxyFactory>
#include <easylogging++.h>
#include <qredisclient/redisclient.h>
@@ -102,6 +103,12 @@ void Application::initAppFonts()
QApplication::setFont(defaultFont);
}
void Application::initProxySettings()
{
QSettings settings;
QNetworkProxyFactory::setUseSystemConfiguration(settings.value("app/useSystemProxy", false).toBool());
}
void Application::registerQmlTypes()
{
qmlRegisterType<SortFilterProxyModel>("rdm.models", 1, 0, "SortFilterProxyModel");
+2 -1
View File
@@ -30,7 +30,8 @@ public:
private:
void initAppInfo();
void initAppFonts();
void initAppFonts();
void initProxySettings();
void registerQmlTypes();
void registerQmlRootObjects();
void initLog();
+13 -2
View File
@@ -59,6 +59,17 @@ Dialog {
description: qsTr("Application restart is needed to apply this setting.")
}
BoolOption {
id: systemProxy
Layout.fillWidth: true
Layout.preferredHeight: 40
value: false
label: qsTr("Use system proxy settings")
description: qsTr("Application restart is needed to apply this setting.")
}
Text {
text: qsTr("Connections Tree")
font.pixelSize: 18
@@ -110,8 +121,7 @@ Dialog {
value: 10
label: qsTr("Live update interval (in seconds)")
description: ""
}
}
Text {
text: qsTr("Custom Value View Formatters")
@@ -170,6 +180,7 @@ Dialog {
property alias appFont: appFont.value
property alias appFontSize: appFontSize.value
property alias locale: appLang.value
property alias useSystemProxy: systemProxy.value
}
Settings {