Browse Source

qml: use warning icon and error title for failure messagedialogs

master
Sander van Grieken 2 years ago
parent
commit
524adaf747
No known key found for this signature in database
GPG Key ID: 9BCF8209EA402EBA
  1. 2
      electrum/gui/qml/components/ExceptionDialog.qml
  2. 6
      electrum/gui/qml/components/NewWalletWizard.qml
  3. 8
      electrum/gui/qml/components/OpenChannelDialog.qml
  4. 6
      electrum/gui/qml/components/TxDetails.qml
  5. 11
      electrum/gui/qml/components/WalletDetails.qml
  6. 22
      electrum/gui/qml/components/WalletMainView.qml
  7. 12
      electrum/gui/qml/components/main.qml

2
electrum/gui/qml/components/ExceptionDialog.qml

@ -142,6 +142,8 @@ ElDialog
function onSendingBugreportFailure(text) { function onSendingBugreportFailure(text) {
_sending = false _sending = false
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {
title: qsTr('Error'),
iconSource: Qt.resolvedUrl('../../icons/warning.png'),
text: text, text: text,
richText: true richText: true
}) })

6
electrum/gui/qml/components/NewWalletWizard.qml

@ -34,7 +34,11 @@ Wizard {
walletwizard.walletCreated() walletwizard.walletCreated()
} }
function onCreateError(error) { 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() dialog.open()
} }
} }

8
electrum/gui/qml/components/OpenChannelDialog.qml

@ -219,13 +219,17 @@ ElDialog {
if (code == 'invalid_nodeid') { if (code == 'invalid_nodeid') {
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {
title: qsTr('Error'), title: qsTr('Error'),
iconSource: Qt.resolvedUrl('../../icons/warning.png'),
text: message text: message
}) })
dialog.open() dialog.open()
} }
} }
onConflictingBackup: (message) => { 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.open()
dialog.accepted.connect(function() { dialog.accepted.connect(function() {
channelopener.openChannel(true) channelopener.openChannel(true)
@ -233,7 +237,7 @@ ElDialog {
} }
onFinalizerChanged: { onFinalizerChanged: {
var dialog = confirmOpenChannelDialog.createObject(app, { var dialog = confirmOpenChannelDialog.createObject(app, {
'satoshis': channelopener.amount satoshis: channelopener.amount
}) })
dialog.accepted.connect(function() { dialog.accepted.connect(function() {
dialog.finalizer.signAndSend() dialog.finalizer.signAndSend()

6
electrum/gui/qml/components/TxDetails.qml

@ -474,7 +474,11 @@ Pane {
function onSaveTxError(txid, code, message) { function onSaveTxError(txid, code, message) {
if (txid != txdetails.txid) if (txid != txdetails.txid)
return 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() dialog.open()
} }
function onBroadcastSucceeded() { function onBroadcastSucceeded() {

11
electrum/gui/qml/components/WalletDetails.qml

@ -455,6 +455,9 @@ Pane {
var success = Daemon.setPassword(dialog.password) var success = Daemon.setPassword(dialog.password)
var done_dialog = app.messageDialog.createObject(app, { var done_dialog = app.messageDialog.createObject(app, {
title: success ? qsTr('Success') : qsTr('Error'), 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') text: success ? qsTr('Password changed') : qsTr('Password change failed')
}) })
done_dialog.open() done_dialog.open()
@ -464,7 +467,7 @@ Pane {
function onWalletDeleteError(code, message) { function onWalletDeleteError(code, message) {
if (code == 'unpaid_requests') { if (code == 'unpaid_requests') {
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {
title: qsTr('Error'), title: qsTr('Warning'),
text: message, text: message,
yesno: true yesno: true
}) })
@ -474,7 +477,7 @@ Pane {
dialog.open() dialog.open()
} else if (code == 'balance') { } else if (code == 'balance') {
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {
title: qsTr('Error'), title: qsTr('Warning'),
text: message, text: message,
yesno: true yesno: true
}) })
@ -485,6 +488,7 @@ Pane {
} else { } else {
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {
title: qsTr('Error'), title: qsTr('Error'),
iconSource: Qt.resolvedUrl('../../icons/warning.png'),
text: message text: message
}) })
dialog.open() dialog.open()
@ -504,6 +508,9 @@ Pane {
var success = Daemon.currentWallet.setPassword(dialog.password) var success = Daemon.currentWallet.setPassword(dialog.password)
var done_dialog = app.messageDialog.createObject(app, { var done_dialog = app.messageDialog.createObject(app, {
title: success ? qsTr('Success') : qsTr('Error'), 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') text: success ? qsTr('Password changed') : qsTr('Password change failed')
}) })
done_dialog.open() done_dialog.open()

22
electrum/gui/qml/components/WalletMainView.qml

@ -331,6 +331,7 @@ Item {
onValidationError: (code, message) => { onValidationError: (code, message) => {
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {
title: qsTr('Error'), title: qsTr('Error'),
iconSource: Qt.resolvedUrl('../../icons/warning.png'),
text: message text: message
}) })
dialog.closed.connect(function() { dialog.closed.connect(function() {
@ -373,8 +374,9 @@ Item {
onLnurlError: (code, message) => { onLnurlError: (code, message) => {
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {
title: qsTr('Error'), title: qsTr('Error'),
text: message } iconSource: Qt.resolvedUrl('../../icons/warning.png'),
) text: message
})
dialog.open() dialog.open()
} }
} }
@ -413,7 +415,11 @@ Item {
} }
function onRequestCreateError(error) { function onRequestCreateError(error) {
console.log(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() dialog.open()
} }
function onOtpRequested() { function onOtpRequested() {
@ -423,18 +429,26 @@ Item {
} }
function onBroadcastFailed(txid, code, message) { function onBroadcastFailed(txid, code, message) {
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {
title: qsTr('Error'),
iconSource: Qt.resolvedUrl('../../icons/warning.png'),
text: message text: message
}) })
dialog.open() dialog.open()
} }
function onPaymentFailed(invoice_id, message) { function onPaymentFailed(invoice_id, message) {
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {
title: qsTr('Error'),
iconSource: Qt.resolvedUrl('../../icons/warning.png'),
text: message text: message
}) })
dialog.open() dialog.open()
} }
function onImportChannelBackupFailed(message) { 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() dialog.open()
} }
} }

12
electrum/gui/qml/components/main.qml

@ -441,6 +441,7 @@ ApplicationWindow
onError: (message) => { onError: (message) => {
var dialog = app.messageDialog.createObject(app, { var dialog = app.messageDialog.createObject(app, {
title: qsTr('Error'), title: qsTr('Error'),
iconSource: Qt.resolvedUrl('../../icons/warning.png'),
text: message text: message
}) })
dialog.open() dialog.open()
@ -559,7 +560,11 @@ ApplicationWindow
} }
function onWalletOpenError(error) { function onWalletOpenError(error) {
console.log('wallet open 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() dialog.open()
} }
function onAuthRequired(method, authMessage) { function onAuthRequired(method, authMessage) {
@ -663,7 +668,10 @@ ApplicationWindow
qtobject.authProceed() qtobject.authProceed()
return 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() { dialog.accepted.connect(function() {
qtobject.authProceed() qtobject.authProceed()
}) })

Loading…
Cancel
Save