Browse Source

qml: remove Dialog standardButtons everywhere

master
Sander van Grieken 3 years ago
parent
commit
3c1e4ba5a5
  1. 3
      electrum/gui/qml/components/ChannelOpenProgressDialog.qml
  2. 1
      electrum/gui/qml/components/CloseChannelDialog.qml
  3. 2
      electrum/gui/qml/components/ConfirmTxDialog.qml
  4. 2
      electrum/gui/qml/components/CpfpBumpFeeDialog.qml
  5. 1
      electrum/gui/qml/components/ExportTxDialog.qml
  6. 1
      electrum/gui/qml/components/GenericShareDialog.qml
  7. 1
      electrum/gui/qml/components/ImportAddressesKeysDialog.qml
  8. 1
      electrum/gui/qml/components/ImportChannelBackupDialog.qml
  9. 1
      electrum/gui/qml/components/InvoiceDialog.qml
  10. 3
      electrum/gui/qml/components/LightningPaymentProgressDialog.qml
  11. 2
      electrum/gui/qml/components/LnurlPayRequestDialog.qml
  12. 1
      electrum/gui/qml/components/OpenChannelDialog.qml
  13. 2
      electrum/gui/qml/components/OpenWalletDialog.qml
  14. 2
      electrum/gui/qml/components/OtpDialog.qml
  15. 2
      electrum/gui/qml/components/PasswordDialog.qml
  16. 1
      electrum/gui/qml/components/Pin.qml
  17. 1
      electrum/gui/qml/components/ProxyConfigDialog.qml
  18. 2
      electrum/gui/qml/components/RbfBumpFeeDialog.qml
  19. 2
      electrum/gui/qml/components/RbfCancelDialog.qml
  20. 1
      electrum/gui/qml/components/ReceiveDetailsDialog.qml
  21. 1
      electrum/gui/qml/components/ReceiveDialog.qml
  22. 1
      electrum/gui/qml/components/RequestDialog.qml
  23. 2
      electrum/gui/qml/components/SendDialog.qml
  24. 1
      electrum/gui/qml/components/ServerConfigDialog.qml
  25. 1
      electrum/gui/qml/components/SwapDialog.qml

3
electrum/gui/qml/components/ChannelOpenProgressDialog.qml

@ -13,8 +13,7 @@ ElDialog {
height: parent.height height: parent.height
title: qsTr('Opening Channel...') title: qsTr('Opening Channel...')
standardButtons: Dialog.Close
footer.visible: allowClose // work around standardButtons not really mutable to/from zero buttons
allowClose: false allowClose: false
modal: true modal: true

1
electrum/gui/qml/components/CloseChannelDialog.qml

@ -15,7 +15,6 @@ ElDialog {
property string channelid property string channelid
title: qsTr('Close Channel') title: qsTr('Close Channel')
standardButtons: closing ? 0 : Dialog.Cancel
iconSource: Qt.resolvedUrl('../../icons/lightning_disconnected.png') iconSource: Qt.resolvedUrl('../../icons/lightning_disconnected.png')
modal: true modal: true

2
electrum/gui/qml/components/ConfirmTxDialog.qml

@ -30,8 +30,6 @@ ElDialog {
height: parent.height height: parent.height
padding: 0 padding: 0
standardButtons: Dialog.Cancel
modal: true modal: true
parent: Overlay.overlay parent: Overlay.overlay
Overlay.modal: Rectangle { Overlay.modal: Rectangle {

2
electrum/gui/qml/components/CpfpBumpFeeDialog.qml

@ -21,8 +21,6 @@ ElDialog {
height: parent.height height: parent.height
padding: 0 padding: 0
standardButtons: Dialog.Cancel
modal: true modal: true
parent: Overlay.overlay parent: Overlay.overlay
Overlay.modal: Rectangle { Overlay.modal: Rectangle {

1
electrum/gui/qml/components/ExportTxDialog.qml

@ -19,7 +19,6 @@ ElDialog {
parent: Overlay.overlay parent: Overlay.overlay
modal: true modal: true
standardButtons: Dialog.Close
width: parent.width width: parent.width
height: parent.height height: parent.height

1
electrum/gui/qml/components/GenericShareDialog.qml

@ -17,7 +17,6 @@ ElDialog {
parent: Overlay.overlay parent: Overlay.overlay
modal: true modal: true
standardButtons: Dialog.Close
width: parent.width width: parent.width
height: parent.height height: parent.height

1
electrum/gui/qml/components/ImportAddressesKeysDialog.qml

@ -11,7 +11,6 @@ ElDialog {
property bool valid: false property bool valid: false
standardButtons: Dialog.Close
modal: true modal: true
parent: Overlay.overlay parent: Overlay.overlay
Overlay.modal: Rectangle { Overlay.modal: Rectangle {

1
electrum/gui/qml/components/ImportChannelBackupDialog.qml

@ -11,7 +11,6 @@ ElDialog {
property bool valid: false property bool valid: false
standardButtons: Dialog.Cancel
modal: true modal: true
parent: Overlay.overlay parent: Overlay.overlay
Overlay.modal: Rectangle { Overlay.modal: Rectangle {

1
electrum/gui/qml/components/InvoiceDialog.qml

@ -17,7 +17,6 @@ ElDialog {
signal invoiceAmountChanged signal invoiceAmountChanged
title: qsTr('Invoice') title: qsTr('Invoice')
standardButtons: invoice_key != '' ? Dialog.Close : Dialog.Cancel
iconSource: Qt.resolvedUrl('../../icons/tab_send.png') iconSource: Qt.resolvedUrl('../../icons/tab_send.png')
padding: 0 padding: 0

3
electrum/gui/qml/components/LightningPaymentProgressDialog.qml

@ -16,7 +16,6 @@ ElDialog {
height: parent.height height: parent.height
title: qsTr('Paying Lightning Invoice...') title: qsTr('Paying Lightning Invoice...')
standardButtons: Dialog.Close
modal: true modal: true
parent: Overlay.overlay parent: Overlay.overlay
@ -35,14 +34,12 @@ ElDialog {
name: 'success' name: 'success'
PropertyChanges { target: spinner; running: false } PropertyChanges { target: spinner; running: false }
PropertyChanges { target: helpText; text: qsTr('Paid!') } PropertyChanges { target: helpText; text: qsTr('Paid!') }
// PropertyChanges { target: dialog; standardButtons: Dialog.Ok }
PropertyChanges { target: icon; source: '../../icons/confirmed.png' } PropertyChanges { target: icon; source: '../../icons/confirmed.png' }
}, },
State { State {
name: 'failed' name: 'failed'
PropertyChanges { target: spinner; running: false } PropertyChanges { target: spinner; running: false }
PropertyChanges { target: helpText; text: qsTr('Payment failed') } PropertyChanges { target: helpText; text: qsTr('Payment failed') }
// PropertyChanges { target: dialog; standardButtons: Dialog.Ok }
PropertyChanges { target: errorText; visible: true } PropertyChanges { target: errorText; visible: true }
PropertyChanges { target: icon; source: '../../icons/warning.png' } PropertyChanges { target: icon; source: '../../icons/warning.png' }
} }

2
electrum/gui/qml/components/LnurlPayRequestDialog.qml

@ -15,8 +15,6 @@ ElDialog {
property InvoiceParser invoiceParser property InvoiceParser invoiceParser
standardButtons: Dialog.Cancel
modal: true modal: true
parent: Overlay.overlay parent: Overlay.overlay
Overlay.modal: Rectangle { Overlay.modal: Rectangle {

1
electrum/gui/qml/components/OpenChannelDialog.qml

@ -15,7 +15,6 @@ ElDialog {
parent: Overlay.overlay parent: Overlay.overlay
modal: true modal: true
standardButtons: Dialog.Cancel
padding: 0 padding: 0
width: parent.width width: parent.width

2
electrum/gui/qml/components/OpenWalletDialog.qml

@ -20,8 +20,6 @@ ElDialog {
property string name property string name
property string path property string path
standardButtons: Dialog.Cancel
modal: true modal: true
parent: Overlay.overlay parent: Overlay.overlay
Overlay.modal: Rectangle { Overlay.modal: Rectangle {

2
electrum/gui/qml/components/OtpDialog.qml

@ -18,8 +18,6 @@ ElDialog {
property bool _waiting: false property bool _waiting: false
property string _otpError property string _otpError
standardButtons: Dialog.Cancel
modal: true modal: true
parent: Overlay.overlay parent: Overlay.overlay
Overlay.modal: Rectangle { Overlay.modal: Rectangle {

2
electrum/gui/qml/components/PasswordDialog.qml

@ -19,7 +19,7 @@ ElDialog {
parent: Overlay.overlay parent: Overlay.overlay
modal: true modal: true
standardButtons: Dialog.Cancel
anchors.centerIn: parent anchors.centerIn: parent
padding: 0 padding: 0

1
electrum/gui/qml/components/Pin.qml

@ -25,7 +25,6 @@ ElDialog {
focus: true focus: true
standardButtons: canCancel ? Dialog.Cancel : 0
closePolicy: canCancel ? Popup.CloseOnEscape | Popup.CloseOnPressOutside : Popup.NoAutoClose closePolicy: canCancel ? Popup.CloseOnEscape | Popup.CloseOnPressOutside : Popup.NoAutoClose
property bool canCancel: true property bool canCancel: true

1
electrum/gui/qml/components/ProxyConfigDialog.qml

@ -14,7 +14,6 @@ ElDialog {
parent: Overlay.overlay parent: Overlay.overlay
modal: true modal: true
standardButtons: Dialog.Close
width: parent.width width: parent.width
height: parent.height height: parent.height

2
electrum/gui/qml/components/RbfBumpFeeDialog.qml

@ -21,8 +21,6 @@ ElDialog {
height: parent.height height: parent.height
padding: 0 padding: 0
standardButtons: Dialog.Cancel
modal: true modal: true
parent: Overlay.overlay parent: Overlay.overlay
Overlay.modal: Rectangle { Overlay.modal: Rectangle {

2
electrum/gui/qml/components/RbfCancelDialog.qml

@ -21,8 +21,6 @@ ElDialog {
height: parent.height height: parent.height
padding: 0 padding: 0
standardButtons: Dialog.Cancel
modal: true modal: true
parent: Overlay.overlay parent: Overlay.overlay
Overlay.modal: Rectangle { Overlay.modal: Rectangle {

1
electrum/gui/qml/components/ReceiveDetailsDialog.qml

@ -19,7 +19,6 @@ ElDialog {
parent: Overlay.overlay parent: Overlay.overlay
modal: true modal: true
standardButtons: Dialog.Cancel
iconSource: Qt.resolvedUrl('../../icons/pen.png') iconSource: Qt.resolvedUrl('../../icons/pen.png')
Overlay.modal: Rectangle { Overlay.modal: Rectangle {

1
electrum/gui/qml/components/ReceiveDialog.qml

@ -23,7 +23,6 @@ ElDialog {
parent: Overlay.overlay parent: Overlay.overlay
modal: true modal: true
standardButtons: Dialog.Close
iconSource: Qt.resolvedUrl('../../icons/tab_receive.png') iconSource: Qt.resolvedUrl('../../icons/tab_receive.png')
Overlay.modal: Rectangle { Overlay.modal: Rectangle {

1
electrum/gui/qml/components/RequestDialog.qml

@ -21,7 +21,6 @@ ElDialog {
parent: Overlay.overlay parent: Overlay.overlay
modal: true modal: true
standardButtons: Dialog.Close
width: parent.width width: parent.width
height: parent.height height: parent.height

2
electrum/gui/qml/components/SendDialog.qml

@ -16,7 +16,6 @@ ElDialog {
parent: Overlay.overlay parent: Overlay.overlay
modal: true modal: true
standardButtons: Dialog.Close
Overlay.modal: Rectangle { Overlay.modal: Rectangle {
color: "#aa000000" color: "#aa000000"
@ -83,7 +82,6 @@ ElDialog {
parent: Overlay.overlay parent: Overlay.overlay
modal: true modal: true
standardButtons: Dialog.Ok
Overlay.modal: Rectangle { Overlay.modal: Rectangle {
color: "#aa000000" color: "#aa000000"

1
electrum/gui/qml/components/ServerConfigDialog.qml

@ -14,7 +14,6 @@ ElDialog {
parent: Overlay.overlay parent: Overlay.overlay
modal: true modal: true
standardButtons: Dialog.Close
width: parent.width width: parent.width
height: parent.height height: parent.height

1
electrum/gui/qml/components/SwapDialog.qml

@ -15,7 +15,6 @@ ElDialog {
title: qsTr('Lightning Swap') title: qsTr('Lightning Swap')
iconSource: Qt.resolvedUrl('../../icons/update.png') iconSource: Qt.resolvedUrl('../../icons/update.png')
standardButtons: Dialog.Cancel
modal: true modal: true
parent: Overlay.overlay parent: Overlay.overlay

Loading…
Cancel
Save