From 625b92318fbe14e06eedb8537a1eabceb4c8a319 Mon Sep 17 00:00:00 2001 From: Sander Ferdinand Date: Thu, 22 Mar 2018 05:07:09 +0100 Subject: [PATCH] Restyled warning box (not connected to daemon) --- components/LineEdit.qml | 4 +- images/warning.png | Bin 0 -> 19517 bytes pages/History.qml | 2 +- pages/Transfer.qml | 81 +++++++++++++++++++++++++++------------- qml.qrc | 1 + 5 files changed, 60 insertions(+), 28 deletions(-) create mode 100755 images/warning.png diff --git a/components/LineEdit.qml b/components/LineEdit.qml index f5e8a478..9afb5ebc 100644 --- a/components/LineEdit.qml +++ b/components/LineEdit.qml @@ -78,9 +78,9 @@ Item { onTextUpdated: { // check to remove placeholder text when there is content if(item.isEmpty()){ - placeholderLabel.visible = true + placeholderLabel.visible = true; } else { - placeholderLabel.visible = false + placeholderLabel.visible = false; } } diff --git a/images/warning.png b/images/warning.png new file mode 100755 index 0000000000000000000000000000000000000000..8036d84a0e33fdd20a2de1e2c164f5da94a4d3cd GIT binary patch literal 19517 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" + root.startLinkText + warningText.text = qsTr("Wallet is not connected to daemon.") + root.startLinkText return; } if (currentWallet.viewOnly) { - // statusText.text = qsTr("Wallet is view only.") + // warningText.text = qsTr("Wallet is view only.") //return; } - pageRoot.enabled = false; + //pageRoot.enabled = false; switch (currentWallet.connected()) { case Wallet.ConnectionStatus_Disconnected: - statusText.text = qsTr("Wallet is not connected to daemon.") + "
" + root.startLinkText + warningText.text = qsTr("Wallet is not connected to daemon.") + root.startLinkText break case Wallet.ConnectionStatus_WrongVersion: - statusText.text = qsTr("Connected daemon is not compatible with GUI. \n" + + warningText.text = qsTr("Connected daemon is not compatible with GUI. \n" + "Please upgrade or connect to another daemon") break default: if(!appWindow.daemonSynced){ - statusText.text = qsTr("Waiting on daemon synchronization to finish") + warningText.text = qsTr("Waiting on daemon synchronization to finish") } else { // everything OK, enable transfer page // Light wallet is always ready pageRoot.enabled = true; - statusText.text = ""; + warningText.text = ""; } - } } diff --git a/qml.qrc b/qml.qrc index ad4f1f86..0be96187 100644 --- a/qml.qrc +++ b/qml.qrc @@ -203,5 +203,6 @@ components/HistoryTableInnerColumn.qml components/CheckBox2.qml js/TxUtils.js + images/warning.png