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 #2230

Browse source 
484d403 NetworkStatusItem: correctly display remote node status (selsta)
This commit is contained in:
luigi1111 2019-06-21 14:44:53 -05:00
commit 30997a8262
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/NetworkStatusItem.qml
View file

@ -41,7 +41,7 @@ Rectangle {
if (status == Wallet.ConnectionStatus_Connected) { if (status == Wallet.ConnectionStatus_Connected) {
if(!appWindow.daemonSynced) if(!appWindow.daemonSynced)
return qsTr("Synchronizing") return qsTr("Synchronizing")
if(appWindow.remoteNodeConnected) if(persistentSettings.useRemoteNode)
return qsTr("Remote node") return qsTr("Remote node")
return appWindow.isMining ? qsTr("Connected") + " + " + qsTr("Mining"): qsTr("Connected") return appWindow.isMining ? qsTr("Connected") + " + " + qsTr("Mining"): qsTr("Connected")
} }

3
main.qml
View file

@ -76,7 +76,6 @@ ApplicationWindow {
property bool isMining: false property bool isMining: false
property int walletMode: persistentSettings.walletMode property int walletMode: persistentSettings.walletMode
property var cameraUi property var cameraUi
property bool remoteNodeConnected: false
property bool androidCloseTapped: false; property bool androidCloseTapped: false;
property int userLastActive; // epoch property int userLastActive; // epoch
// Default daemon addresses // Default daemon addresses
@ -607,7 +606,6 @@ ApplicationWindow {
currentDaemonAddress = persistentSettings.remoteNodeAddress; currentDaemonAddress = persistentSettings.remoteNodeAddress;
currentWallet.initAsync(currentDaemonAddress); currentWallet.initAsync(currentDaemonAddress);
walletManager.setDaemonAddressAsync(currentDaemonAddress); walletManager.setDaemonAddressAsync(currentDaemonAddress);
remoteNodeConnected = true;
} }
function disconnectRemoteNode() { function disconnectRemoteNode() {
@ -619,7 +617,6 @@ ApplicationWindow {
currentDaemonAddress = localDaemonAddress currentDaemonAddress = localDaemonAddress
currentWallet.initAsync(currentDaemonAddress); currentWallet.initAsync(currentDaemonAddress);
walletManager.setDaemonAddressAsync(currentDaemonAddress); walletManager.setDaemonAddressAsync(currentDaemonAddress);
remoteNodeConnected = false;
} }
function onHeightRefreshed(bcHeight, dCurrentBlock, dTargetBlock) { function onHeightRefreshed(bcHeight, dCurrentBlock, dTargetBlock) {