diff options
| author | Jaquee <jaquee.monero@gmail.com> | 2017-02-23 19:47:58 +0100 |
|---|---|---|
| committer | Jaquee <jaquee.monero@gmail.com> | 2017-02-23 19:52:06 +0100 |
| commit | faacd3d6a11efcb6dcf9a54ce55ed20e573b40f5 (patch) | |
| tree | ed5d7ba5a02dcdc5d705b71075e2d0f8bc03c9f6 /pages | |
| parent | c6688dc876d4ab8e0cea6f34f4607bf3be9a3648 (diff) | |
| download | monzero-gui-faacd3d6a11efcb6dcf9a54ce55ed20e573b40f5.tar.gz monzero-gui-faacd3d6a11efcb6dcf9a54ce55ed20e573b40f5.tar.xz monzero-gui-faacd3d6a11efcb6dcf9a54ce55ed20e573b40f5.zip | |
start daemon automatically and detached
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 1d482474..d141532a 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 |