monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 12:09:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1286

Browse source 
cd4418d Receive: make tracking optional
a9331a7 Set daemon address to WalletManager (requires #3576)
This commit is contained in:
luigi1111 2018-04-24 21:40:46 -05:00
commit 1956f5896d
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
main.qml
View file

@ -420,7 +420,9 @@ ApplicationWindow {
function connectRemoteNode() {
console.log("connecting remote node");
persistentSettings.useRemoteNode = true;
currentWallet.initAsync(persistentSettings.remoteNodeAddress);
currentDaemonAddress = persistentSettings.remoteNodeAddress;
currentWallet.initAsync(currentDaemonAddress);
walletManager.setDaemonAddress(currentDaemonAddress);
remoteNodeConnected = true;
}
@ -429,6 +431,7 @@ ApplicationWindow {
persistentSettings.useRemoteNode = false;
currentDaemonAddress = localDaemonAddress
currentWallet.initAsync(currentDaemonAddress);
walletManager.setDaemonAddress(currentDaemonAddress);
remoteNodeConnected = false;
}

9
pages/Receive.qml
View file

@ -72,7 +72,7 @@ Rectangle {
}
function update() {
if (!appWindow.currentWallet) {
if (!appWindow.currentWallet || !trackingEnabled.checked) {
setTrackingLineText("-")
return
}
@ -325,6 +325,11 @@ Rectangle {
}
}
CheckBox {
id: trackingEnabled
text: qsTr("Enable") + translationManager.emptyString
}
TextEdit {
id: trackingLine
readOnly: true
@ -407,6 +412,8 @@ Rectangle {
update()
timer.running = true
trackingEnabled.checked = false
}
function onPageClosed() {