From 28f744f778cc594082b2266f73b788be2aae6b83 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Sat, 21 Feb 2026 16:25:53 +0100 Subject: [PATCH] qml: additional styling updates --- electrum/gui/qml/components/Addresses.qml | 6 ++-- .../components/ChannelOpenProgressDialog.qml | 4 ++- electrum/gui/qml/components/Channels.qml | 5 ++-- .../gui/qml/components/CloseChannelDialog.qml | 4 ++- .../gui/qml/components/ConfirmTxDialog.qml | 29 ++++++++++++------- .../gui/qml/components/CpfpBumpFeeDialog.qml | 20 ++++++++----- .../gui/qml/components/ExportTxDialog.qml | 4 ++- .../gui/qml/components/GenericShareDialog.qml | 5 ++-- electrum/gui/qml/components/InvoiceDialog.qml | 15 +++++----- electrum/gui/qml/components/Invoices.qml | 6 ++-- .../gui/qml/components/NostrConfigDialog.qml | 2 +- .../gui/qml/components/RbfBumpFeeDialog.qml | 22 +++++++++----- .../gui/qml/components/RbfCancelDialog.qml | 20 ++++++++----- electrum/gui/qml/components/ReceiveDialog.qml | 2 +- .../gui/qml/components/ReceiveRequests.qml | 7 ++--- electrum/gui/qml/components/SwapDialog.qml | 1 + electrum/gui/qml/components/SweepDialog.qml | 4 +-- electrum/gui/qml/components/Wallets.qml | 4 +-- .../components/controls/ButtonContainer.qml | 15 ++++------ .../controls/DialogButtonContainer.qml | 16 ++++++++++ .../controls/DialogHighlightPane.qml | 5 ++++ .../controls/PaneInsetBackground.qml | 16 +++++++--- .../components/wizard/WCCosignerKeystore.qml | 3 +- .../qml/components/wizard/WCHaveMasterKey.qml | 3 +- .../gui/qml/components/wizard/WCHaveSeed.qml | 3 +- 25 files changed, 136 insertions(+), 85 deletions(-) create mode 100644 electrum/gui/qml/components/controls/DialogHighlightPane.qml diff --git a/electrum/gui/qml/components/Addresses.qml b/electrum/gui/qml/components/Addresses.qml index 368a04662..4da07dd1a 100644 --- a/electrum/gui/qml/components/Addresses.qml +++ b/electrum/gui/qml/components/Addresses.qml @@ -107,10 +107,9 @@ Pane { Layout.fillWidth: true Layout.fillHeight: true - verticalPadding: 0 + verticalPadding: bg.lineWidth horizontalPadding: 0 - bottomPadding: 1 - background: PaneInsetBackground {} + background: PaneInsetBackground { id: bg; vertical: false } ElListView { id: listview @@ -250,7 +249,6 @@ Pane { ButtonContainer { Layout.fillWidth: true - headerComponent: null FlatButton { Layout.fillWidth: true diff --git a/electrum/gui/qml/components/ChannelOpenProgressDialog.qml b/electrum/gui/qml/components/ChannelOpenProgressDialog.qml index 3cea2e135..d251f7ee1 100644 --- a/electrum/gui/qml/components/ChannelOpenProgressDialog.qml +++ b/electrum/gui/qml/components/ChannelOpenProgressDialog.qml @@ -81,7 +81,7 @@ ElDialog { } } - TextHighlightPane { + DialogHighlightPane { Layout.alignment: Qt.AlignHCenter Layout.preferredWidth: dialog.width * 3/4 Label { @@ -100,6 +100,7 @@ ElDialog { visible: false iconStyle: InfoTextArea.IconStyle.Error textFormat: TextEdit.PlainText + backgroundColor: constants.darkerDialogBackground } InfoTextArea { @@ -108,6 +109,7 @@ ElDialog { Layout.preferredWidth: dialog.width * 2/3 visible: false textFormat: TextEdit.PlainText + backgroundColor: constants.darkerDialogBackground } } diff --git a/electrum/gui/qml/components/Channels.qml b/electrum/gui/qml/components/Channels.qml index 8a7d80055..4b015acf5 100644 --- a/electrum/gui/qml/components/Channels.qml +++ b/electrum/gui/qml/components/Channels.qml @@ -64,9 +64,9 @@ Pane { Layout.fillHeight: true Layout.topMargin: constants.paddingLarge - verticalPadding: 0 + verticalPadding: bg.lineWidth horizontalPadding: 0 - background: PaneInsetBackground {} + background: PaneInsetBackground { id: bg; vertical: false } ColumnLayout { spacing: 0 @@ -118,7 +118,6 @@ Pane { ButtonContainer { Layout.fillWidth: true - headerComponent: null FlatButton { Layout.fillWidth: true diff --git a/electrum/gui/qml/components/CloseChannelDialog.qml b/electrum/gui/qml/components/CloseChannelDialog.qml index cfae22c69..1862ad7c8 100644 --- a/electrum/gui/qml/components/CloseChannelDialog.qml +++ b/electrum/gui/qml/components/CloseChannelDialog.qml @@ -70,7 +70,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true @@ -91,6 +91,7 @@ ElDialog { Layout.fillWidth: true Layout.bottomMargin: constants.paddingLarge text: channeldetails.messageForceClose + backgroundColor: constants.darkerDialogBackground } Label { @@ -140,6 +141,7 @@ ElDialog { Layout.maximumWidth: parent.width visible: !channeldetails.isClosing && errorText.text iconStyle: InfoTextArea.IconStyle.Error + backgroundColor: constants.darkerDialogBackground } Label { Layout.alignment: Qt.AlignHCenter diff --git a/electrum/gui/qml/components/ConfirmTxDialog.qml b/electrum/gui/qml/components/ConfirmTxDialog.qml index 94617d305..2faa088fa 100644 --- a/electrum/gui/qml/components/ConfirmTxDialog.qml +++ b/electrum/gui/qml/components/ConfirmTxDialog.qml @@ -71,7 +71,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true GridLayout { @@ -122,7 +122,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true height: feepicker.height @@ -153,7 +153,7 @@ ElDialog { visible: showOptions } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true visible: optionstoggle.visible && !optionstoggle.collapsed @@ -214,6 +214,7 @@ ElDialog { visible: finalizer.warning != '' text: finalizer.warning iconStyle: InfoTextArea.IconStyle.Warn + backgroundColor: constants.darkerDialogBackground } ToggleLabel { @@ -234,6 +235,7 @@ ElDialog { Layout.columnSpan: 2 Layout.fillWidth: true visible: finalizer.valid + backgroundColor: constants.darkerDialogBackground idx: index model: modelData @@ -258,6 +260,7 @@ ElDialog { Layout.columnSpan: 2 Layout.fillWidth: true visible: finalizer.valid + backgroundColor: constants.darkerDialogBackground allowShare: false allowClickAddress: false @@ -270,15 +273,19 @@ ElDialog { } } - FlatButton { - id: sendButton + DialogButtonContainer { Layout.fillWidth: true - text: (Daemon.currentWallet.isWatchOnly || !Daemon.currentWallet.canSignWithoutCosigner) - ? qsTr('Finalize...') - : qsTr('Pay...') - icon.source: '../../icons/confirmed.png' - enabled: finalizer.valid - onClicked: doAccept() + + FlatButton { + id: sendButton + Layout.fillWidth: true + text: (Daemon.currentWallet.isWatchOnly || !Daemon.currentWallet.canSignWithoutCosigner) + ? qsTr('Finalize...') + : qsTr('Pay...') + icon.source: '../../icons/confirmed.png' + enabled: finalizer.valid + onClicked: doAccept() + } } } diff --git a/electrum/gui/qml/components/CpfpBumpFeeDialog.qml b/electrum/gui/qml/components/CpfpBumpFeeDialog.qml index 1c8f7b127..69803bf50 100644 --- a/electrum/gui/qml/components/CpfpBumpFeeDialog.qml +++ b/electrum/gui/qml/components/CpfpBumpFeeDialog.qml @@ -59,7 +59,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true height: feepicker_childinfo.height @@ -82,7 +82,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true @@ -159,6 +159,7 @@ ElDialog { visible: cpfpfeebumper.warning != '' text: cpfpfeebumper.warning iconStyle: InfoTextArea.IconStyle.Warn + backgroundColor: constants.darkerDialogBackground } ToggleLabel { @@ -213,13 +214,16 @@ ElDialog { } } - FlatButton { - id: sendButton + DialogButtonContainer { Layout.fillWidth: true - text: qsTr('Ok') - icon.source: '../../icons/confirmed.png' - enabled: cpfpfeebumper.valid - onClicked: doAccept() + FlatButton { + id: sendButton + Layout.fillWidth: true + text: qsTr('Ok') + icon.source: '../../icons/confirmed.png' + enabled: cpfpfeebumper.valid + onClicked: doAccept() + } } } } diff --git a/electrum/gui/qml/components/ExportTxDialog.qml b/electrum/gui/qml/components/ExportTxDialog.qml index 998079d03..230c72dc7 100644 --- a/electrum/gui/qml/components/ExportTxDialog.qml +++ b/electrum/gui/qml/components/ExportTxDialog.qml @@ -39,7 +39,7 @@ ElDialog { width: parent.width spacing: constants.paddingMedium - TextHighlightPane { + DialogHighlightPane { Layout.fillWidth: true Layout.leftMargin: constants.paddingMedium Layout.rightMargin: constants.paddingMedium @@ -61,6 +61,7 @@ ElDialog { Layout.margins: constants.paddingLarge visible: dialog.text_help text: dialog.text_help + backgroundColor: constants.darkerDialogBackground } InfoTextArea { @@ -72,6 +73,7 @@ ElDialog { visible: dialog.text_warn text: dialog.text_warn iconStyle: InfoTextArea.IconStyle.Warn + backgroundColor: constants.darkerDialogBackground } } } diff --git a/electrum/gui/qml/components/GenericShareDialog.qml b/electrum/gui/qml/components/GenericShareDialog.qml index 4f5886d48..b14730dc6 100644 --- a/electrum/gui/qml/components/GenericShareDialog.qml +++ b/electrum/gui/qml/components/GenericShareDialog.qml @@ -42,7 +42,7 @@ ElDialog { width: parent.width spacing: constants.paddingMedium - TextHighlightPane { + DialogHighlightPane { Layout.alignment: Qt.AlignHCenter Layout.fillWidth: true Layout.leftMargin: constants.paddingMedium @@ -60,7 +60,7 @@ ElDialog { Layout.bottomMargin: constants.paddingMedium } - TextHighlightPane { + DialogHighlightPane { Layout.fillWidth: true visible: dialog.text @@ -84,6 +84,7 @@ ElDialog { visible: dialog.text_help text: dialog.text_help Layout.fillWidth: true + backgroundColor: constants.darkerDialogBackground } } } diff --git a/electrum/gui/qml/components/InvoiceDialog.qml b/electrum/gui/qml/components/InvoiceDialog.qml index a5465f3d7..f2edb0f8c 100644 --- a/electrum/gui/qml/components/InvoiceDialog.qml +++ b/electrum/gui/qml/components/InvoiceDialog.qml @@ -67,6 +67,7 @@ ElDialog { ? InfoTextArea.IconStyle.Pending : InfoTextArea.IconStyle.Error : InfoTextArea.IconStyle.Info + backgroundColor: constants.darkerDialogBackground } Label { @@ -77,7 +78,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true visible: invoice.invoiceType == Invoice.OnchainInvoice @@ -114,7 +115,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true @@ -137,7 +138,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { id: amountContainer Layout.columnSpan: 2 @@ -320,7 +321,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true @@ -358,7 +359,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true @@ -401,7 +402,7 @@ ElDialog { visible: 'r' in invoice.lnprops && invoice.lnprops.r.length model: invoice.lnprops.r - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true @@ -428,7 +429,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true visible: invoice.invoiceType == Invoice.LightningInvoice && invoice.address diff --git a/electrum/gui/qml/components/Invoices.qml b/electrum/gui/qml/components/Invoices.qml index e57223fd9..f4767d7e3 100644 --- a/electrum/gui/qml/components/Invoices.qml +++ b/electrum/gui/qml/components/Invoices.qml @@ -18,7 +18,6 @@ Pane { ColumnLayout { Layout.fillWidth: true - Layout.margins: constants.paddingLarge InfoTextArea { Layout.fillWidth: true @@ -32,9 +31,9 @@ Pane { } Frame { - background: PaneInsetBackground {} + background: PaneInsetBackground {id: bg; vertical: false} - verticalPadding: 0 + verticalPadding: bg.lineWidth horizontalPadding: 0 Layout.fillHeight: true Layout.fillWidth: true @@ -87,6 +86,7 @@ Pane { ButtonContainer { Layout.fillWidth: true + FlatButton { Layout.fillWidth: true Layout.preferredWidth: 1 diff --git a/electrum/gui/qml/components/NostrConfigDialog.qml b/electrum/gui/qml/components/NostrConfigDialog.qml index b9e2aa8c4..2a62fc748 100644 --- a/electrum/gui/qml/components/NostrConfigDialog.qml +++ b/electrum/gui/qml/components/NostrConfigDialog.qml @@ -52,7 +52,7 @@ ElDialog { Layout.rightMargin: constants.paddingLarge Layout.bottomMargin: constants.paddingLarge - TextHighlightPane { + DialogHighlightPane { Layout.fillWidth: true Label { text: qsTr('Enter the list of Nostr relays') + '

' + diff --git a/electrum/gui/qml/components/RbfBumpFeeDialog.qml b/electrum/gui/qml/components/RbfBumpFeeDialog.qml index 4d9fdcf9c..f3e5fcdf6 100644 --- a/electrum/gui/qml/components/RbfBumpFeeDialog.qml +++ b/electrum/gui/qml/components/RbfBumpFeeDialog.qml @@ -46,6 +46,7 @@ ElDialog { Layout.fillWidth: true Layout.bottomMargin: constants.paddingLarge text: qsTr('Move the slider to increase your transaction\'s fee. This will improve its position in the mempool') + backgroundColor: constants.darkerDialogBackground } Label { @@ -107,7 +108,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true height: feepicker.height @@ -127,7 +128,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true visible: !optionstoggle.collapsed @@ -167,6 +168,7 @@ ElDialog { iconStyle: InfoTextArea.IconStyle.Warn visible: rbffeebumper.warning != '' text: rbffeebumper.warning + backgroundColor: constants.darkerDialogBackground } ToggleLabel { @@ -221,13 +223,17 @@ ElDialog { } } - FlatButton { - id: sendButton + DialogButtonContainer { Layout.fillWidth: true - text: qsTr('Ok') - icon.source: '../../icons/confirmed.png' - enabled: rbffeebumper.valid - onClicked: doAccept() + + FlatButton { + id: sendButton + Layout.fillWidth: true + text: qsTr('Ok') + icon.source: '../../icons/confirmed.png' + enabled: rbffeebumper.valid + onClicked: doAccept() + } } } } diff --git a/electrum/gui/qml/components/RbfCancelDialog.qml b/electrum/gui/qml/components/RbfCancelDialog.qml index b8832b10d..5e9b5d7b6 100644 --- a/electrum/gui/qml/components/RbfCancelDialog.qml +++ b/electrum/gui/qml/components/RbfCancelDialog.qml @@ -43,6 +43,7 @@ ElDialog { Layout.fillWidth: true Layout.bottomMargin: constants.paddingLarge text: qsTr('Cancel an unconfirmed transaction by double-spending its inputs back to your wallet with a higher fee.') + backgroundColor: constants.darkerDialogBackground } Label { @@ -79,7 +80,7 @@ ElDialog { color: Material.accentColor } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true height: feepicker.height @@ -99,6 +100,7 @@ ElDialog { iconStyle: InfoTextArea.IconStyle.Warn visible: txcanceller.warning != '' text: txcanceller.warning + backgroundColor: constants.darkerDialogBackground } ToggleLabel { @@ -153,13 +155,17 @@ ElDialog { } } - FlatButton { - id: confirmButton + DialogButtonContainer { Layout.fillWidth: true - text: qsTr('Ok') - icon.source: '../../icons/confirmed.png' - enabled: txcanceller.valid - onClicked: doAccept() + + FlatButton { + id: confirmButton + Layout.fillWidth: true + text: qsTr('Ok') + icon.source: '../../icons/confirmed.png' + enabled: txcanceller.valid + onClicked: doAccept() + } } } } diff --git a/electrum/gui/qml/components/ReceiveDialog.qml b/electrum/gui/qml/components/ReceiveDialog.qml index 9b7ca92db..b7ebf3cc9 100644 --- a/electrum/gui/qml/components/ReceiveDialog.qml +++ b/electrum/gui/qml/components/ReceiveDialog.qml @@ -50,7 +50,7 @@ ElDialog { width: parent.width spacing: constants.paddingMedium - TextHighlightPane { + DialogHighlightPane { Layout.alignment: Qt.AlignHCenter Layout.fillWidth: true diff --git a/electrum/gui/qml/components/ReceiveRequests.qml b/electrum/gui/qml/components/ReceiveRequests.qml index c6792fdd1..ffdd99c50 100644 --- a/electrum/gui/qml/components/ReceiveRequests.qml +++ b/electrum/gui/qml/components/ReceiveRequests.qml @@ -21,7 +21,6 @@ Pane { ColumnLayout { Layout.fillWidth: true - Layout.margins: constants.paddingLarge InfoTextArea { Layout.fillWidth: true @@ -31,13 +30,13 @@ Pane { } Heading { - text: qsTr('Pending requests') + text: qsTr('Pending payment requests') } Frame { - background: PaneInsetBackground {} + background: PaneInsetBackground {id: bg; vertical: false} - verticalPadding: 0 + verticalPadding: bg.lineWidth horizontalPadding: 0 Layout.fillHeight: true Layout.fillWidth: true diff --git a/electrum/gui/qml/components/SwapDialog.qml b/electrum/gui/qml/components/SwapDialog.qml index 02f02a82d..12bd5d668 100644 --- a/electrum/gui/qml/components/SwapDialog.qml +++ b/electrum/gui/qml/components/SwapDialog.qml @@ -42,6 +42,7 @@ ElDialog { : swaphelper.state == SwapHelper.NoService ? InfoTextArea.IconStyle.Warn : InfoTextArea.IconStyle.Info + backgroundColor: constants.darkerDialogBackground } GridLayout { diff --git a/electrum/gui/qml/components/SweepDialog.qml b/electrum/gui/qml/components/SweepDialog.qml index 14d2898ed..6ea763f50 100644 --- a/electrum/gui/qml/components/SweepDialog.qml +++ b/electrum/gui/qml/components/SweepDialog.qml @@ -58,9 +58,9 @@ ElDialog { RowLayout { Layout.fillWidth: true - TextHighlightPane { + + DialogHighlightPane { Layout.fillWidth: true - backgroundColor: constants.darkerDialogBackground Label { text: qsTr('Enter the list of private keys to sweep into this wallet') diff --git a/electrum/gui/qml/components/Wallets.qml b/electrum/gui/qml/components/Wallets.qml index 0d0435695..635bd19dd 100644 --- a/electrum/gui/qml/components/Wallets.qml +++ b/electrum/gui/qml/components/Wallets.qml @@ -41,9 +41,9 @@ Pane { id: detailsFrame Layout.fillWidth: true Layout.fillHeight: true - verticalPadding: 0 + verticalPadding: bg.lineWidth horizontalPadding: 0 - background: PaneInsetBackground {} + background: PaneInsetBackground { id: bg; vertical: false } ElListView { id: listview diff --git a/electrum/gui/qml/components/controls/ButtonContainer.qml b/electrum/gui/qml/components/controls/ButtonContainer.qml index 511168d38..59cc6fe3a 100644 --- a/electrum/gui/qml/components/controls/ButtonContainer.qml +++ b/electrum/gui/qml/components/controls/ButtonContainer.qml @@ -8,20 +8,16 @@ Container { property bool showSeparator: true property color separatorColor: constants.darkerBackground - property Component headerComponent: Component { - Rectangle { - Layout.fillWidth: true - Layout.preferredHeight: 2 - Layout.leftMargin: constants.paddingSmall - Layout.rightMargin: constants.paddingSmall - color: root.separatorColor - } - } + property Component headerComponent: null property var _contentRootItem property var _headerItem property Item _layout + background: Rectangle { + color: constants.highlightBackground + } + function fillContentItem() { var outerLayout = rootLayout.createObject(root) if (headerComponent != null) @@ -97,3 +93,4 @@ Container { } } + diff --git a/electrum/gui/qml/components/controls/DialogButtonContainer.qml b/electrum/gui/qml/components/controls/DialogButtonContainer.qml index 35e526921..3c7f9f1ba 100644 --- a/electrum/gui/qml/components/controls/DialogButtonContainer.qml +++ b/electrum/gui/qml/components/controls/DialogButtonContainer.qml @@ -1,3 +1,19 @@ +import QtQuick +import QtQuick.Layouts + ButtonContainer { + id: root separatorColor: constants.darkerDialogBackground + background: Rectangle { + color: "transparent" + } + headerComponent: Component { + Rectangle { + Layout.fillWidth: true + Layout.preferredHeight: 2 + Layout.leftMargin: constants.paddingSmall + Layout.rightMargin: constants.paddingSmall + color: root.separatorColor + } + } } diff --git a/electrum/gui/qml/components/controls/DialogHighlightPane.qml b/electrum/gui/qml/components/controls/DialogHighlightPane.qml new file mode 100644 index 000000000..1913972ec --- /dev/null +++ b/electrum/gui/qml/components/controls/DialogHighlightPane.qml @@ -0,0 +1,5 @@ +import QtQuick + +TextHighlightPane { + backgroundColor: constants.darkerDialogBackground +} diff --git a/electrum/gui/qml/components/controls/PaneInsetBackground.qml b/electrum/gui/qml/components/controls/PaneInsetBackground.qml index 9762e4101..8733a5705 100644 --- a/electrum/gui/qml/components/controls/PaneInsetBackground.qml +++ b/electrum/gui/qml/components/controls/PaneInsetBackground.qml @@ -3,25 +3,33 @@ import QtQuick.Controls.Material Rectangle { property color baseColor: Material.background + property bool vertical: true + property bool horizontal: true + property int lineWidth: 2 + Rectangle { anchors { left: parent.left; top: parent.top; right: parent.right } - height: 1 + height: lineWidth color: Qt.darker(baseColor, 1.50) + visible: horizontal } Rectangle { anchors { left: parent.left; top: parent.top; bottom: parent.bottom } - width: 1 + width: lineWidth color: Qt.darker(baseColor, 1.50) + visible: vertical } Rectangle { anchors { left: parent.left; bottom: parent.bottom; right: parent.right } - height: 1 + height: lineWidth color: Qt.lighter(baseColor, 1.50) + visible: horizontal } Rectangle { anchors { right: parent.right; top: parent.top; bottom: parent.bottom } - width: 1 + width: lineWidth color: Qt.lighter(baseColor, 1.50) + visible: vertical } color: Qt.darker(baseColor, 1.15) } diff --git a/electrum/gui/qml/components/wizard/WCCosignerKeystore.qml b/electrum/gui/qml/components/wizard/WCCosignerKeystore.qml index ab14a5db0..bac431183 100644 --- a/electrum/gui/qml/components/wizard/WCCosignerKeystore.qml +++ b/electrum/gui/qml/components/wizard/WCCosignerKeystore.qml @@ -39,11 +39,10 @@ WizardComponent { wrapMode: Text.Wrap } - TextHighlightPane { + DialogHighlightPane { Layout.fillWidth: true visible: cosigner - backgroundColor: constants.darkerDialogBackground RowLayout { width: parent.width diff --git a/electrum/gui/qml/components/wizard/WCHaveMasterKey.qml b/electrum/gui/qml/components/wizard/WCHaveMasterKey.qml index 91702d8b6..b71174e7c 100644 --- a/electrum/gui/qml/components/wizard/WCHaveMasterKey.qml +++ b/electrum/gui/qml/components/wizard/WCHaveMasterKey.qml @@ -71,11 +71,10 @@ WizardComponent { wrapMode: Text.Wrap } - TextHighlightPane { + DialogHighlightPane { Layout.fillWidth: true visible: cosigner - backgroundColor: constants.darkerDialogBackground RowLayout { width: parent.width diff --git a/electrum/gui/qml/components/wizard/WCHaveSeed.qml b/electrum/gui/qml/components/wizard/WCHaveSeed.qml index eb0f53878..95ce6cd6f 100644 --- a/electrum/gui/qml/components/wizard/WCHaveSeed.qml +++ b/electrum/gui/qml/components/wizard/WCHaveSeed.qml @@ -117,12 +117,11 @@ WizardComponent { wrapMode: Text.Wrap } - TextHighlightPane { + DialogHighlightPane { Layout.columnSpan: 2 Layout.fillWidth: true visible: cosigner - backgroundColor: constants.darkerDialogBackground RowLayout { width: parent.width