Merge pull request #1091

89ec822 removed persistentSettings.startLocalNode as it's synonym for !persistentSettings.useRemoteNode
af882e8 rectified visual switch between local node & remote node
fd1f4bf Bootstrap daemon (requires #3165)

1 files changed, 23 insertions, 2 deletions

diff --git a/wizard/WizardDaemonSettings.qml b/wizard/WizardDaemonSettings.qml
index f57fb4cb..953bb21d 100644
--- a/wizard/WizardDaemonSettings.qml
+++ b/wizard/WizardDaemonSettings.qml
@@ -54,8 +54,8 @@ ColumnLayout {
 
     function onPageClosed(settingsObject) {
         appWindow.persistentSettings.useRemoteNode = remoteNode.checked
-        appWindow.persistentSettings.startLocalNode = localNode.checked
         appWindow.persistentSettings.remoteNodeAddress = remoteNodeEdit.getAddress();
+        appWindow.persistentSettings.bootstrapNodeAddress = bootstrapNodeEdit.daemonAddrText ? bootstrapNodeEdit.getAddress() : "";
         return true
     }
 
@@ -129,8 +129,12 @@ ColumnLayout {
                 fontSize: 16 * scaleRatio
                 checkedIcon: "../images/checkedVioletIcon.png"
                 uncheckedIcon: "../images/uncheckedIcon.png"
-                checked: appWindow.persistentSettings.startLocalNode && !isAndroid && !isIOS
+                checked: !appWindow.persistentSettings.useRemoteNode && !isAndroid && !isIOS
                 visible: !isAndroid && !isIOS
+                onClicked: {
+                    checked = true;
+                    remoteNode.checked = false;
+                }
             }
         }
 
@@ -162,6 +166,19 @@ ColumnLayout {
                 }
 
             }
+            Label {
+                Layout.fillWidth: true
+                Layout.topMargin: 20 * scaleRatio
+                fontSize: 14 * scaleRatio
+                text: qsTr("Bootstrap node (leave blank if not wanted)") + translationManager.emptyString
+            }
+            RemoteNodeEdit {
+                Layout.minimumWidth: 300 * scaleRatio
+                opacity: localNode.checked
+                id: bootstrapNodeEdit
+                daemonAddrText: persistentSettings.bootstrapNodeAddress.split(":")[0].trim()
+                daemonPortText: (persistentSettings.bootstrapNodeAddress.split(":")[1].trim() == "") ? "18081" : persistentSettings.bootstrapNodeAddress.split(":")[1]
+            }
         }
 
         RowLayout {
@@ -176,6 +193,10 @@ ColumnLayout {
                 checkedIcon: "../images/checkedVioletIcon.png"
                 uncheckedIcon: "../images/uncheckedIcon.png"
                 checked: appWindow.persistentSettings.useRemoteNode
+                onClicked: {
+                    checked = true
+                    localNode.checked = false
+                }
             }
 
         }