Browse Source

qml: don't show "select server automatically" checkbox in network setup wizard

master
Sander van Grieken 2 years ago
parent
commit
9ed5f7bf43
  1. 13
      electrum/gui/qml/components/controls/ServerConfig.qml
  2. 1
      electrum/gui/qml/components/wizard/WCAutoConnect.qml
  3. 4
      electrum/gui/qml/components/wizard/WCProxyConfig.qml
  4. 9
      electrum/gui/qml/components/wizard/WCServerConfig.qml

13
electrum/gui/qml/components/controls/ServerConfig.qml

@ -5,9 +5,11 @@ import QtQuick.Controls.Material 2.0
import org.electrum 1.0 import org.electrum 1.0
Item { Item {
id: root id: root
property bool showAutoselectServer: true
property alias auto_connect: auto_server_cb.checked property alias auto_connect: auto_server_cb.checked
property alias address: address_tf.text property alias address: address_tf.text
@ -22,27 +24,26 @@ Item {
CheckBox { CheckBox {
id: auto_server_cb id: auto_server_cb
visible: showAutoselectServer
text: qsTr('Select server automatically') text: qsTr('Select server automatically')
checked: true checked: true
} }
GridLayout {
columns: 2
Layout.fillWidth: true
Label { Label {
text: qsTr("Server") text: qsTr("Server")
enabled: address_tf.enabled enabled: address_tf.enabled
} }
TextHighlightPane {
Layout.fillWidth: true
TextField { TextField {
id: address_tf id: address_tf
enabled: !auto_server_cb.checked enabled: !auto_server_cb.checked
Layout.fillWidth: true width: parent.width
} }
} }
ColumnLayout { ColumnLayout {
Heading { Heading {
text: qsTr('Servers') text: qsTr('Servers')

1
electrum/gui/qml/components/wizard/WCAutoConnect.qml

@ -1,3 +1,4 @@
import QtQuick 2.15
import QtQuick.Layouts 1.0 import QtQuick.Layouts 1.0
import QtQuick.Controls 2.1 import QtQuick.Controls 2.1

4
electrum/gui/qml/components/wizard/WCProxyConfig.qml

@ -15,10 +15,6 @@ WizardComponent {
width: parent.width width: parent.width
spacing: constants.paddingLarge spacing: constants.paddingLarge
Label {
text: qsTr('Proxy settings')
}
ProxyConfig { ProxyConfig {
id: pc id: pc
Layout.fillWidth: true Layout.fillWidth: true

9
electrum/gui/qml/components/wizard/WCServerConfig.qml

@ -9,7 +9,7 @@ WizardComponent {
last: true last: true
function apply() { function apply() {
wizard_data['autoconnect'] = sc.auto_connect wizard_data['autoconnect'] = false
wizard_data['server'] = sc.address wizard_data['server'] = sc.address
} }
@ -17,13 +17,10 @@ WizardComponent {
anchors.fill: parent anchors.fill: parent
spacing: constants.paddingLarge spacing: constants.paddingLarge
Label {
text: qsTr('Server settings')
}
ServerConfig { ServerConfig {
id: sc id: sc
width: parent.width showAutoselectServer: false
Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
} }
} }

Loading…
Cancel
Save