aboutsummaryrefslogtreecommitdiff
path: root/pages/settings
diff options
context:
space:
mode:
authorselsta <selsta@sent.at>2020-08-29 23:21:32 +0200
committerselsta <selsta@sent.at>2020-09-28 01:57:47 +0200
commit0fcaadae530167df5be37712f2a0972618c6fbc5 (patch)
treed58a6b76277fbf102b1da56161c0cfac48c342b6 /pages/settings
parentd313c2de377e5163a27835d28a835c274ee7abf4 (diff)
downloadmonzero-gui-0fcaadae530167df5be37712f2a0972618c6fbc5.tar.gz
monzero-gui-0fcaadae530167df5be37712f2a0972618c6fbc5.tar.xz
monzero-gui-0fcaadae530167df5be37712f2a0972618c6fbc5.zip
main: command line option for socks5 proxy
Diffstat (limited to 'pages/settings')
-rw-r--r--pages/settings/SettingsLayout.qml8
1 files changed, 5 insertions, 3 deletions
diff --git a/pages/settings/SettingsLayout.qml b/pages/settings/SettingsLayout.qml
index f65b3747..9db3874f 100644
--- a/pages/settings/SettingsLayout.qml
+++ b/pages/settings/SettingsLayout.qml
@@ -254,7 +254,8 @@ Rectangle {
MoneroComponents.CheckBox {
id: proxyCheckbox
Layout.topMargin: 6
- checked: persistentSettings.proxyEnabled
+ enabled: !socksProxyFlagSet
+ checked: socksProxyFlagSet ? socksProxyFlag : persistentSettings.proxyEnabled
onClicked: {
persistentSettings.proxyEnabled = !persistentSettings.proxyEnabled;
}
@@ -265,16 +266,17 @@ Rectangle {
MoneroComponents.RemoteNodeEdit {
id: proxyEdit
+ enabled: proxyCheckbox.enabled
Layout.leftMargin: 36
Layout.topMargin: 6
Layout.minimumWidth: 100
placeholderFontSize: 15
- visible: persistentSettings.proxyEnabled
+ visible: proxyCheckbox.checked
daemonAddrLabelText: qsTr("IP address") + translationManager.emptyString
daemonPortLabelText: qsTr("Port") + translationManager.emptyString
- initialAddress: persistentSettings.proxyAddress
+ initialAddress: socksProxyFlagSet ? socksProxyFlag : persistentSettings.proxyAddress
onEditingFinished: {
persistentSettings.proxyAddress = proxyEdit.getAddress();
}