From 39855241fcd0747ebe95e2e92cd5cfcb2d5a64be Mon Sep 17 00:00:00 2001 From: xiphon Date: Wed, 24 Oct 2018 03:50:56 +0000 Subject: password dialog: show error in place --- main.qml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'main.qml') diff --git a/main.qml b/main.qml index 534c1aca..ae2445db 100644 --- a/main.qml +++ b/main.qml @@ -397,15 +397,9 @@ ApplicationWindow { } // opening with password but password doesn't match console.error("Error opening wallet with password: ", wallet.errorString); - informationPopup.title = qsTr("Error") + translationManager.emptyString; - informationPopup.text = qsTr("Couldn't open wallet: ") + wallet.errorString; - informationPopup.icon = StandardIcon.Critical + passwordDialog.showError(qsTr("Couldn't open wallet: ") + wallet.errorString); console.log("closing wallet async : " + wallet.address) closeWallet(); - informationPopup.open() - informationPopup.onCloseCallback = function() { - passwordDialog.open(walletName) - } return; } @@ -1064,12 +1058,7 @@ ApplicationWindow { handleTransactionConfirmed() } } else { - informationPopup.title = qsTr("Error") + translationManager.emptyString; - informationPopup.text = qsTr("Wrong password"); - informationPopup.open() - informationPopup.onCloseCallback = function() { - passwordDialog.open() - } + passwordDialog.showError(qsTr("Wrong password")); } } passwordDialog.onRejectedCallback = null; -- cgit v1.2.3