AaronFiore/electrum
1
0
Fork 0
Code Activity

qml: refactor proxy options to map, remove explicit TOR option

Browse Source
This commit is contained in:
Sander van Grieken
2023-01-12 16:03:57 +01:00
parent d70a574780
commit d26440b964
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/gui/qml/components/ProxyConfigDialog.qml
View File

@@ -58,7 +58,6 @@ ElDialog {
Component.onCompleted: {
var p = Network.proxy
console.log(JSON.stringify(p))
if ('mode' in p) {
proxyconfig.proxy_enabled = true
@@ -66,10 +65,9 @@ ElDialog {
proxyconfig.proxy_port = p['port']
proxyconfig.username = p['user']
proxyconfig.password = p['password']
if (p['mode'] == 'socks5' && p['port'] == 9050)
p['mode'] = 'tor'
proxyconfig.proxy_type = proxyconfig.proxy_types.indexOf(p['mode'].toUpperCase())
console.log('proxy type: ' + proxyconfig.proxy_type)
proxyconfig.proxy_type = proxyconfig.proxy_types.map(function(x) {
return x.value
}).indexOf(p['mode'])
} else {
proxyconfig.proxy_enabled = false
}

35
electrum/gui/qml/components/controls/ProxyConfig.qml
View File

@@ -5,6 +5,8 @@ import QtQuick.Controls 2.1
Item {
id: pc
implicitHeight: rootLayout.height
property alias proxy_enabled: proxy_enabled_cb.checked
property alias proxy_type: proxytype.currentIndex
property alias proxy_address: address.text
@@ -12,17 +14,16 @@ Item {
property alias username: username_tf.text
property alias password: password_tf.text
property var proxy_types: ['TOR', 'SOCKS5', 'SOCKS4']
height: rootLayout.height
property var proxy_type_map: [
{ text: qsTr('SOCKS5/TOR'), value: 'socks5' },
{ text: qsTr('SOCKS4'), value: 'socks4' }
]
function toProxyDict() {
var p = {}
p['enabled'] = pc.proxy_enabled
if (pc.proxy_enabled) {
var type = pc.proxy_types[pc.proxy_type].toLowerCase()
if (type == 'tor')
type = 'socks5'
var type = proxy_type_map[pc.proxy_type]['value']
p['mode'] = type
p['host'] = pc.proxy_address
p['port'] = pc.proxy_port
@@ -43,14 +44,20 @@ Item {
text: qsTr('Enable Proxy')
}
ComboBox {
ElComboBox {
id: proxytype
enabled: proxy_enabled_cb.checked
model: proxy_types
textRole: 'text'
valueRole: 'value'
model: proxy_type_map
onCurrentIndexChanged: {
if (currentIndex == 0) {
address.text = "127.0.0.1"
port.text = "9050"
if (address.text == '' || port.text == '') {
address.text = "127.0.0.1"
port.text = "9050"
}
}
}
}
@@ -66,7 +73,7 @@ Item {
TextField {
id: address
enabled: proxytype.enabled && proxytype.currentIndex > 0
enabled: proxy_enabled_cb.checked
}
Label {
@@ -76,7 +83,7 @@ Item {
TextField {
id: port
enabled: proxytype.enabled && proxytype.currentIndex > 0
enabled: proxy_enabled_cb.checked
}
Label {
@@ -86,7 +93,7 @@ Item {
TextField {
id: username_tf
enabled: proxytype.enabled && proxytype.currentIndex > 0
enabled: proxy_enabled_cb.checked
}
Label {
@@ -96,7 +103,7 @@ Item {
PasswordField {
id: password_tf
enabled: proxytype.enabled && proxytype.currentIndex > 0
enabled: proxy_enabled_cb.checked
}
}
}