Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

Merge pull request #1091

Browse Source 
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)
This commit is contained in:
luigi1111
2018-03-06 12:24:20 -05:00
parent 7dae6a1ff0 fd1f4bf628
commit 2deff0611d
5 changed files with 61 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
pages/Settings.qml
View File

@@ -248,7 +248,7 @@ Rectangle {
}
GridLayout {
visible: !isMobile
visible: !isMobile && !persistentSettings.useRemoteNode
id: daemonStatusRow
columns: (isMobile) ? 2 : 4
StandardButton {
@@ -260,6 +260,9 @@ Rectangle {
releasedColor: "#FF6C3C"
pressedColor: "#FF4304"
onClicked: {
// Update bootstrap daemon address
persistentSettings.bootstrapNodeAddress = bootstrapNodeEdit.daemonAddrText ? bootstrapNodeEdit.getAddress() : "";
// Set current daemon address to local
appWindow.currentDaemonAddress = appWindow.localDaemonAddress
appWindow.startDaemon(daemonFlags.text)
@@ -296,7 +299,7 @@ Rectangle {
ColumnLayout {
id: blockchainFolderRow
visible: !isMobile
visible: !isMobile && !persistentSettings.useRemoteNode
Label {
id: blockchainFolderLabel
color: "#4A4949"
@@ -325,7 +328,7 @@ Rectangle {
RowLayout {
visible: daemonAdvanced.checked && !isMobile
visible: daemonAdvanced.checked && !isMobile && !persistentSettings.useRemoteNode
id: daemonFlagsRow
Label {
id: daemonFlagsLabel
@@ -343,7 +346,7 @@ Rectangle {
RowLayout {
Layout.fillWidth: true
visible: daemonAdvanced.checked || isMobile
visible: (daemonAdvanced.checked || isMobile) && persistentSettings.useRemoteNode
Label {
id: daemonLoginLabel
Layout.fillWidth: true
@@ -354,7 +357,7 @@ Rectangle {
}
ColumnLayout {
visible: daemonAdvanced.checked || isMobile
visible: (daemonAdvanced.checked || isMobile) && persistentSettings.useRemoteNode
LineEdit {
id: daemonUsername
Layout.preferredWidth: 100 * scaleRatio
@@ -374,6 +377,26 @@ Rectangle {
}
}
RowLayout {
visible: persistentSettings.startLocalNode
ColumnLayout {
Label {
color: "#4A4949"
text: qsTr("Bootstrap node (leave blank if not wanted)") + translationManager.emptyString
}
RemoteNodeEdit {
id: bootstrapNodeEdit
Layout.minimumWidth: 100 * scaleRatio
daemonAddrText: persistentSettings.bootstrapNodeAddress.split(":")[0].trim()
daemonPortText: (persistentSettings.bootstrapNodeAddress.split(":")[1].trim() == "") ? "18081" : persistentSettings.bootstrapNodeAddress.split(":")[1]
onEditingFinished: {
persistentSettings.bootstrapNodeAddress = daemonAddrText ? bootstrapNodeEdit.getAddress() : "";
console.log("setting bootstrap node to " + persistentSettings.bootstrapNodeAddress)
}
}
}
}
RowLayout {
visible: persistentSettings.useRemoteNode
ColumnLayout {