diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-01-30 16:32:56 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-01-30 16:32:56 -0500 |
| commit | 35b7a5f6bb469583f1e78c9f35f154d312d99dc6 (patch) | |
| tree | 9ab7b16f9baa44f2f4bfdf07123844ac53ffb052 /components | |
| parent | 21e8c7ca17763f3cc28b4bbfb7365a08ccc034d1 (diff) | |
| parent | 6940390a5e0f07914695a11a12dd12b0cff395f1 (diff) | |
| download | monzero-gui-35b7a5f6bb469583f1e78c9f35f154d312d99dc6.tar.gz monzero-gui-35b7a5f6bb469583f1e78c9f35f154d312d99dc6.tar.xz monzero-gui-35b7a5f6bb469583f1e78c9f35f154d312d99dc6.zip | |
Merge pull request #2747
6940390 Wallet: implement 'Connecting' status, add 'disconnected' property (xiphon)
Diffstat (limited to 'components')
| -rw-r--r-- | components/NetworkStatusItem.qml | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/components/NetworkStatusItem.qml b/components/NetworkStatusItem.qml index 3e8496bf..eeb85d61 100644 --- a/components/NetworkStatusItem.qml +++ b/components/NetworkStatusItem.qml @@ -39,23 +39,25 @@ Rectangle { property var connected: Wallet.ConnectionStatus_Disconnected function getConnectionStatusString(status) { - if (status == Wallet.ConnectionStatus_Connected) { - if(!appWindow.daemonSynced) - return qsTr("Synchronizing") - if(persistentSettings.useRemoteNode) - return qsTr("Remote node") - return appWindow.isMining ? qsTr("Connected") + " + " + qsTr("Mining"): qsTr("Connected") - } - if (status == Wallet.ConnectionStatus_WrongVersion) - return qsTr("Wrong version") - if (status == Wallet.ConnectionStatus_Disconnected){ - if(appWindow.walletMode <= 1){ - return qsTr("Searching node") + translationManager.emptyString; - } - return qsTr("Disconnected") + switch (status) { + case Wallet.ConnectionStatus_Connected: + if (!appWindow.daemonSynced) + return qsTr("Synchronizing"); + if (persistentSettings.useRemoteNode) + return qsTr("Remote node"); + return appWindow.isMining ? qsTr("Connected") + " + " + qsTr("Mining"): qsTr("Connected"); + case Wallet.ConnectionStatus_WrongVersion: + return qsTr("Wrong version"); + case Wallet.ConnectionStatus_Disconnected: + if (appWindow.walletMode <= 1) { + return qsTr("Searching node") + translationManager.emptyString; + } + return qsTr("Disconnected"); + case Wallet.ConnectionStatus_Connecting: + return qsTr("Connecting"); + default: + return qsTr("Invalid connection status"); } - - return qsTr("Invalid connection status") } RowLayout { @@ -159,7 +161,7 @@ Rectangle { opacity: iconItem.opacity * (refreshMouseArea.visible ? 1 : 0.5) text: FontAwesome.random visible: ( - item.connected != Wallet.ConnectionStatus_Disconnected && + !appWindow.disconnected && !persistentSettings.useRemoteNode && persistentSettings.bootstrapNodeAddress == "auto" ) |