qml: remove Dialog standardButtons everywhere

2023-01-17 18:03:13 +01:00
parent 4b7472b13f
commit 3c1e4ba5a5
25 changed files with 2 additions and 36 deletions
--- a/electrum/gui/qml/components/ChannelOpenProgressDialog.qml
+++ b/electrum/gui/qml/components/ChannelOpenProgressDialog.qml
@@ -13,8 +13,7 @@ ElDialog {
    height: parent.height

    title: qsTr('Opening Channel...')
-    standardButtons: Dialog.Close
-    footer.visible: allowClose // work around standardButtons not really mutable to/from zero buttons
+
    allowClose: false

    modal: true
--- a/electrum/gui/qml/components/CloseChannelDialog.qml
+++ b/electrum/gui/qml/components/CloseChannelDialog.qml
@@ -15,7 +15,6 @@ ElDialog {
    property string channelid

    title: qsTr('Close Channel')
-    standardButtons: closing ? 0 : Dialog.Cancel
    iconSource: Qt.resolvedUrl('../../icons/lightning_disconnected.png')

    modal: true
--- a/electrum/gui/qml/components/ConfirmTxDialog.qml
+++ b/electrum/gui/qml/components/ConfirmTxDialog.qml
@@ -30,8 +30,6 @@ ElDialog {
    height: parent.height
    padding: 0

-    standardButtons: Dialog.Cancel
-
    modal: true
    parent: Overlay.overlay
    Overlay.modal: Rectangle {
--- a/electrum/gui/qml/components/CpfpBumpFeeDialog.qml
+++ b/electrum/gui/qml/components/CpfpBumpFeeDialog.qml
@@ -21,8 +21,6 @@ ElDialog {
    height: parent.height
    padding: 0

-    standardButtons: Dialog.Cancel
-
    modal: true
    parent: Overlay.overlay
    Overlay.modal: Rectangle {
--- a/electrum/gui/qml/components/ExportTxDialog.qml
+++ b/electrum/gui/qml/components/ExportTxDialog.qml
@@ -19,7 +19,6 @@ ElDialog {

    parent: Overlay.overlay
    modal: true
-    standardButtons: Dialog.Close

    width: parent.width
    height: parent.height
--- a/electrum/gui/qml/components/GenericShareDialog.qml
+++ b/electrum/gui/qml/components/GenericShareDialog.qml
@@ -17,7 +17,6 @@ ElDialog {

    parent: Overlay.overlay
    modal: true
-    standardButtons: Dialog.Close

    width: parent.width
    height: parent.height
--- a/electrum/gui/qml/components/ImportAddressesKeysDialog.qml
+++ b/electrum/gui/qml/components/ImportAddressesKeysDialog.qml
@@ -11,7 +11,6 @@ ElDialog {

    property bool valid: false

-    standardButtons: Dialog.Close
    modal: true
    parent: Overlay.overlay
    Overlay.modal: Rectangle {
--- a/electrum/gui/qml/components/ImportChannelBackupDialog.qml
+++ b/electrum/gui/qml/components/ImportChannelBackupDialog.qml
@@ -11,7 +11,6 @@ ElDialog {

    property bool valid: false

-    standardButtons: Dialog.Cancel
    modal: true
    parent: Overlay.overlay
    Overlay.modal: Rectangle {
--- a/electrum/gui/qml/components/InvoiceDialog.qml
+++ b/electrum/gui/qml/components/InvoiceDialog.qml
@@ -17,7 +17,6 @@ ElDialog {
    signal invoiceAmountChanged

    title: qsTr('Invoice')
-    standardButtons: invoice_key != '' ? Dialog.Close : Dialog.Cancel
    iconSource: Qt.resolvedUrl('../../icons/tab_send.png')

    padding: 0
--- a/electrum/gui/qml/components/LightningPaymentProgressDialog.qml
+++ b/electrum/gui/qml/components/LightningPaymentProgressDialog.qml
@@ -16,7 +16,6 @@ ElDialog {
    height: parent.height

    title: qsTr('Paying Lightning Invoice...')
-    standardButtons: Dialog.Close

    modal: true
    parent: Overlay.overlay
@@ -35,14 +34,12 @@ ElDialog {
                name: 'success'
                PropertyChanges { target: spinner; running: false }
                PropertyChanges { target: helpText; text: qsTr('Paid!') }
-                // PropertyChanges { target: dialog; standardButtons: Dialog.Ok }
                PropertyChanges { target: icon; source: '../../icons/confirmed.png' }
            },
            State {
                name: 'failed'
                PropertyChanges { target: spinner; running: false }
                PropertyChanges { target: helpText; text: qsTr('Payment failed') }
-                // PropertyChanges { target: dialog; standardButtons: Dialog.Ok }
                PropertyChanges { target: errorText; visible: true }
                PropertyChanges { target: icon; source: '../../icons/warning.png' }
            }
--- a/electrum/gui/qml/components/LnurlPayRequestDialog.qml
+++ b/electrum/gui/qml/components/LnurlPayRequestDialog.qml
@@ -15,8 +15,6 @@ ElDialog {

    property InvoiceParser invoiceParser

-    standardButtons: Dialog.Cancel
-
    modal: true
    parent: Overlay.overlay
    Overlay.modal: Rectangle {
--- a/electrum/gui/qml/components/OpenChannelDialog.qml
+++ b/electrum/gui/qml/components/OpenChannelDialog.qml
@@ -15,7 +15,6 @@ ElDialog {

    parent: Overlay.overlay
    modal: true
-    standardButtons: Dialog.Cancel
    padding: 0

    width: parent.width
--- a/electrum/gui/qml/components/OpenWalletDialog.qml
+++ b/electrum/gui/qml/components/OpenWalletDialog.qml
@@ -20,8 +20,6 @@ ElDialog {
    property string name
    property string path

-    standardButtons: Dialog.Cancel
-
    modal: true
    parent: Overlay.overlay
    Overlay.modal: Rectangle {
--- a/electrum/gui/qml/components/OtpDialog.qml
+++ b/electrum/gui/qml/components/OtpDialog.qml
@@ -18,8 +18,6 @@ ElDialog {
    property bool _waiting: false
    property string _otpError

-    standardButtons: Dialog.Cancel
-
    modal: true
    parent: Overlay.overlay
    Overlay.modal: Rectangle {
--- a/electrum/gui/qml/components/PasswordDialog.qml
+++ b/electrum/gui/qml/components/PasswordDialog.qml
@@ -19,7 +19,7 @@ ElDialog {

    parent: Overlay.overlay
    modal: true
-    standardButtons: Dialog.Cancel
+
    anchors.centerIn: parent
    padding: 0

--- a/electrum/gui/qml/components/Pin.qml
+++ b/electrum/gui/qml/components/Pin.qml
@@ -25,7 +25,6 @@ ElDialog {

    focus: true

-    standardButtons: canCancel ? Dialog.Cancel : 0
    closePolicy: canCancel ? Popup.CloseOnEscape | Popup.CloseOnPressOutside : Popup.NoAutoClose

    property bool canCancel: true
--- a/electrum/gui/qml/components/ProxyConfigDialog.qml
+++ b/electrum/gui/qml/components/ProxyConfigDialog.qml
@@ -14,7 +14,6 @@ ElDialog {

    parent: Overlay.overlay
    modal: true
-    standardButtons: Dialog.Close

    width: parent.width
    height: parent.height
--- a/electrum/gui/qml/components/RbfBumpFeeDialog.qml
+++ b/electrum/gui/qml/components/RbfBumpFeeDialog.qml
@@ -21,8 +21,6 @@ ElDialog {
    height: parent.height
    padding: 0

-    standardButtons: Dialog.Cancel
-
    modal: true
    parent: Overlay.overlay
    Overlay.modal: Rectangle {
--- a/electrum/gui/qml/components/RbfCancelDialog.qml
+++ b/electrum/gui/qml/components/RbfCancelDialog.qml
@@ -21,8 +21,6 @@ ElDialog {
    height: parent.height
    padding: 0

-    standardButtons: Dialog.Cancel
-
    modal: true
    parent: Overlay.overlay
    Overlay.modal: Rectangle {
--- a/electrum/gui/qml/components/ReceiveDetailsDialog.qml
+++ b/electrum/gui/qml/components/ReceiveDetailsDialog.qml
@@ -19,7 +19,6 @@ ElDialog {

    parent: Overlay.overlay
    modal: true
-    standardButtons: Dialog.Cancel
    iconSource: Qt.resolvedUrl('../../icons/pen.png')

    Overlay.modal: Rectangle {
--- a/electrum/gui/qml/components/ReceiveDialog.qml
+++ b/electrum/gui/qml/components/ReceiveDialog.qml
@@ -23,7 +23,6 @@ ElDialog {

    parent: Overlay.overlay
    modal: true
-    standardButtons: Dialog.Close
    iconSource: Qt.resolvedUrl('../../icons/tab_receive.png')

    Overlay.modal: Rectangle {
--- a/electrum/gui/qml/components/RequestDialog.qml
+++ b/electrum/gui/qml/components/RequestDialog.qml
@@ -21,7 +21,6 @@ ElDialog {

    parent: Overlay.overlay
    modal: true
-    standardButtons: Dialog.Close

    width: parent.width
    height: parent.height
--- a/electrum/gui/qml/components/SendDialog.qml
+++ b/electrum/gui/qml/components/SendDialog.qml
@@ -16,7 +16,6 @@ ElDialog {

    parent: Overlay.overlay
    modal: true
-    standardButtons: Dialog.Close

    Overlay.modal: Rectangle {
        color: "#aa000000"
@@ -83,7 +82,6 @@ ElDialog {

            parent: Overlay.overlay
            modal: true
-            standardButtons: Dialog.Ok

            Overlay.modal: Rectangle {
                color: "#aa000000"
--- a/electrum/gui/qml/components/ServerConfigDialog.qml
+++ b/electrum/gui/qml/components/ServerConfigDialog.qml
@@ -14,7 +14,6 @@ ElDialog {

    parent: Overlay.overlay
    modal: true
-    standardButtons: Dialog.Close

    width: parent.width
    height: parent.height
--- a/electrum/gui/qml/components/SwapDialog.qml
+++ b/electrum/gui/qml/components/SwapDialog.qml
@@ -15,7 +15,6 @@ ElDialog {

    title: qsTr('Lightning Swap')
    iconSource: Qt.resolvedUrl('../../icons/update.png')
-    standardButtons: Dialog.Cancel

    modal: true
    parent: Overlay.overlay