diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-24 16:04:13 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-24 16:04:13 +0200 |
| commit | 2ca2376d45224f02bba54059b219abf4de679b36 (patch) | |
| tree | 75150695f2d5b2a2c8a4b52d94f39173dd992e91 /pages | |
| parent | 6120013ae2bdd195d7b0e71fb2a276490db26efb (diff) | |
| parent | faacd3d6a11efcb6dcf9a54ce55ed20e573b40f5 (diff) | |
| download | monzero-gui-2ca2376d45224f02bba54059b219abf4de679b36.tar.gz monzero-gui-2ca2376d45224f02bba54059b219abf4de679b36.tar.xz monzero-gui-2ca2376d45224f02bba54059b219abf4de679b36.zip | |
Merge pull request #486
faacd3d start daemon automatically and detached (Jaquee)
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/Receive.qml | 2 | ||||
| -rw-r--r-- | pages/Settings.qml | 16 | ||||
| -rw-r--r-- | pages/Transfer.qml | 2 |
3 files changed, 4 insertions, 16 deletions
diff --git a/pages/Receive.qml b/pages/Receive.qml index 5ba14527..3191460c 100644 --- a/pages/Receive.qml +++ b/pages/Receive.qml @@ -96,7 +96,7 @@ Rectangle { setTrackingLineText("-") return } - if (appWindow.currentWallet.connected == Wallet.ConnectionStatus_Disconnected) { + if (appWindow.currentWallet.connected() == Wallet.ConnectionStatus_Disconnected) { setTrackingLineText(qsTr("WARNING: no connection to daemon")) return } diff --git a/pages/Settings.qml b/pages/Settings.qml index d2e1a3b3..651357cb 100644 --- a/pages/Settings.qml +++ b/pages/Settings.qml @@ -173,21 +173,8 @@ Rectangle { StandardButton { visible: true - id: daemonConsolePopupButton - text: qsTr("Show log") + translationManager.emptyString - shadowReleasedColor: "#FF4304" - shadowPressedColor: "#B32D00" - releasedColor: "#FF6C3C" - pressedColor: "#FF4304" - onClicked: { - daemonConsolePopup.open(); - } - } - - StandardButton { - visible: true id: daemonStatusButton - text: qsTr("Status") + translationManager.emptyString + text: qsTr("Show status") + translationManager.emptyString shadowReleasedColor: "#FF4304" shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" @@ -420,6 +407,7 @@ Rectangle { console.log("Settings page loaded"); initSettings(); viewOnly = currentWallet.viewOnly; + daemonManager.running(persistentSettings.testnet) } // fires only once diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 7eccdfdb..6f0079a9 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -700,7 +700,7 @@ Rectangle { } pageRoot.enabled = false; - switch (currentWallet.connected) { + switch (currentWallet.connected()) { case Wallet.ConnectionStatus_Disconnected: statusText.text = qsTr("Wallet is not connected to daemon.") + "<br>" + root.startLinkText break |