From 524adaf74774cad79670f5333dd96df30eb29014 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Tue, 19 Dec 2023 12:17:54 +0100 Subject: [PATCH] qml: use warning icon and error title for failure messagedialogs --- .../gui/qml/components/ExceptionDialog.qml | 2 ++ .../gui/qml/components/NewWalletWizard.qml | 6 ++++- .../gui/qml/components/OpenChannelDialog.qml | 8 +++++-- electrum/gui/qml/components/TxDetails.qml | 6 ++++- electrum/gui/qml/components/WalletDetails.qml | 11 ++++++++-- .../gui/qml/components/WalletMainView.qml | 22 +++++++++++++++---- electrum/gui/qml/components/main.qml | 12 ++++++++-- 7 files changed, 55 insertions(+), 12 deletions(-) diff --git a/electrum/gui/qml/components/ExceptionDialog.qml b/electrum/gui/qml/components/ExceptionDialog.qml index e445f559d..8f0b62517 100644 --- a/electrum/gui/qml/components/ExceptionDialog.qml +++ b/electrum/gui/qml/components/ExceptionDialog.qml @@ -142,6 +142,8 @@ ElDialog function onSendingBugreportFailure(text) { _sending = false var dialog = app.messageDialog.createObject(app, { + title: qsTr('Error'), + iconSource: Qt.resolvedUrl('../../icons/warning.png'), text: text, richText: true }) diff --git a/electrum/gui/qml/components/NewWalletWizard.qml b/electrum/gui/qml/components/NewWalletWizard.qml index 1bd7158fa..3757afe48 100644 --- a/electrum/gui/qml/components/NewWalletWizard.qml +++ b/electrum/gui/qml/components/NewWalletWizard.qml @@ -34,7 +34,11 @@ Wizard { walletwizard.walletCreated() } function onCreateError(error) { - var dialog = app.messageDialog.createObject(app, { text: error }) + var dialog = app.messageDialog.createObject(app, { + title: qsTr('Error'), + iconSource: Qt.resolvedUrl('../../icons/warning.png'), + text: error + }) dialog.open() } } diff --git a/electrum/gui/qml/components/OpenChannelDialog.qml b/electrum/gui/qml/components/OpenChannelDialog.qml index d1730e465..5288b68e8 100644 --- a/electrum/gui/qml/components/OpenChannelDialog.qml +++ b/electrum/gui/qml/components/OpenChannelDialog.qml @@ -219,13 +219,17 @@ ElDialog { if (code == 'invalid_nodeid') { var dialog = app.messageDialog.createObject(app, { title: qsTr('Error'), + iconSource: Qt.resolvedUrl('../../icons/warning.png'), text: message }) dialog.open() } } onConflictingBackup: (message) => { - var dialog = app.messageDialog.createObject(app, { 'text': message, 'yesno': true }) + var dialog = app.messageDialog.createObject(app, { + text: message, + yesno: true + }) dialog.open() dialog.accepted.connect(function() { channelopener.openChannel(true) @@ -233,7 +237,7 @@ ElDialog { } onFinalizerChanged: { var dialog = confirmOpenChannelDialog.createObject(app, { - 'satoshis': channelopener.amount + satoshis: channelopener.amount }) dialog.accepted.connect(function() { dialog.finalizer.signAndSend() diff --git a/electrum/gui/qml/components/TxDetails.qml b/electrum/gui/qml/components/TxDetails.qml index 459b7f7f7..540a8b4af 100644 --- a/electrum/gui/qml/components/TxDetails.qml +++ b/electrum/gui/qml/components/TxDetails.qml @@ -474,7 +474,11 @@ Pane { function onSaveTxError(txid, code, message) { if (txid != txdetails.txid) return - var dialog = app.messageDialog.createObject(app, { text: message }) + var dialog = app.messageDialog.createObject(app, { + title: qsTr('Error'), + iconSource: Qt.resolvedUrl('../../icons/warning.png'), + text: message + }) dialog.open() } function onBroadcastSucceeded() { diff --git a/electrum/gui/qml/components/WalletDetails.qml b/electrum/gui/qml/components/WalletDetails.qml index c34ba1b16..c0b8b9d7d 100644 --- a/electrum/gui/qml/components/WalletDetails.qml +++ b/electrum/gui/qml/components/WalletDetails.qml @@ -455,6 +455,9 @@ Pane { var success = Daemon.setPassword(dialog.password) var done_dialog = app.messageDialog.createObject(app, { title: success ? qsTr('Success') : qsTr('Error'), + iconSource: success + ? Qt.resolvedUrl('../../icons/info.png') + : Qt.resolvedUrl('../../icons/warning.png'), text: success ? qsTr('Password changed') : qsTr('Password change failed') }) done_dialog.open() @@ -464,7 +467,7 @@ Pane { function onWalletDeleteError(code, message) { if (code == 'unpaid_requests') { var dialog = app.messageDialog.createObject(app, { - title: qsTr('Error'), + title: qsTr('Warning'), text: message, yesno: true }) @@ -474,7 +477,7 @@ Pane { dialog.open() } else if (code == 'balance') { var dialog = app.messageDialog.createObject(app, { - title: qsTr('Error'), + title: qsTr('Warning'), text: message, yesno: true }) @@ -485,6 +488,7 @@ Pane { } else { var dialog = app.messageDialog.createObject(app, { title: qsTr('Error'), + iconSource: Qt.resolvedUrl('../../icons/warning.png'), text: message }) dialog.open() @@ -504,6 +508,9 @@ Pane { var success = Daemon.currentWallet.setPassword(dialog.password) var done_dialog = app.messageDialog.createObject(app, { title: success ? qsTr('Success') : qsTr('Error'), + iconSource: success + ? Qt.resolvedUrl('../../icons/info.png') + : Qt.resolvedUrl('../../icons/warning.png'), text: success ? qsTr('Password changed') : qsTr('Password change failed') }) done_dialog.open() diff --git a/electrum/gui/qml/components/WalletMainView.qml b/electrum/gui/qml/components/WalletMainView.qml index 8dfd9c1de..187801fcf 100644 --- a/electrum/gui/qml/components/WalletMainView.qml +++ b/electrum/gui/qml/components/WalletMainView.qml @@ -331,6 +331,7 @@ Item { onValidationError: (code, message) => { var dialog = app.messageDialog.createObject(app, { title: qsTr('Error'), + iconSource: Qt.resolvedUrl('../../icons/warning.png'), text: message }) dialog.closed.connect(function() { @@ -373,8 +374,9 @@ Item { onLnurlError: (code, message) => { var dialog = app.messageDialog.createObject(app, { title: qsTr('Error'), - text: message } - ) + iconSource: Qt.resolvedUrl('../../icons/warning.png'), + text: message + }) dialog.open() } } @@ -413,7 +415,11 @@ Item { } function onRequestCreateError(error) { console.log(error) - var dialog = app.messageDialog.createObject(app, {text: error}) + var dialog = app.messageDialog.createObject(app, { + title: qsTr('Error'), + iconSource: Qt.resolvedUrl('../../icons/warning.png'), + text: error + }) dialog.open() } function onOtpRequested() { @@ -423,18 +429,26 @@ Item { } function onBroadcastFailed(txid, code, message) { var dialog = app.messageDialog.createObject(app, { + title: qsTr('Error'), + iconSource: Qt.resolvedUrl('../../icons/warning.png'), text: message }) dialog.open() } function onPaymentFailed(invoice_id, message) { var dialog = app.messageDialog.createObject(app, { + title: qsTr('Error'), + iconSource: Qt.resolvedUrl('../../icons/warning.png'), text: message }) dialog.open() } function onImportChannelBackupFailed(message) { - var dialog = app.messageDialog.createObject(app, { title: qsTr('Error'), text: message }) + var dialog = app.messageDialog.createObject(app, { + title: qsTr('Error'), + iconSource: Qt.resolvedUrl('../../icons/warning.png'), + text: message + }) dialog.open() } } diff --git a/electrum/gui/qml/components/main.qml b/electrum/gui/qml/components/main.qml index 0df1fec3e..8b01f60e2 100644 --- a/electrum/gui/qml/components/main.qml +++ b/electrum/gui/qml/components/main.qml @@ -441,6 +441,7 @@ ApplicationWindow onError: (message) => { var dialog = app.messageDialog.createObject(app, { title: qsTr('Error'), + iconSource: Qt.resolvedUrl('../../icons/warning.png'), text: message }) dialog.open() @@ -559,7 +560,11 @@ ApplicationWindow } function onWalletOpenError(error) { console.log('wallet open error') - var dialog = app.messageDialog.createObject(app, { title: qsTr('Error'), 'text': error }) + var dialog = app.messageDialog.createObject(app, { + title: qsTr('Error'), + iconSource: Qt.resolvedUrl('../../icons/warning.png'), + text: error + }) dialog.open() } function onAuthRequired(method, authMessage) { @@ -663,7 +668,10 @@ ApplicationWindow qtobject.authProceed() return } - var dialog = app.messageDialog.createObject(app, {title: authMessage, yesno: true}) + var dialog = app.messageDialog.createObject(app, { + title: authMessage, + yesno: true + }) dialog.accepted.connect(function() { qtobject.authProceed() })