davide/purple-electrumwallet
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

qml: additional styling updates

Browse Source
This commit is contained in:
Sander van Grieken
2026-02-21 16:25:53 +01:00
parent e99b3023e9
commit 28f744f778
25 changed files with 136 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
electrum/gui/qml/components/Addresses.qml
+2 -4
View File
@@ -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
electrum/gui/qml/components/ChannelOpenProgressDialog.qml
+3 -1
View File
@@ -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
}
}
electrum/gui/qml/components/Channels.qml
+2 -3
View File
@@ -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
electrum/gui/qml/components/CloseChannelDialog.qml
+3 -1
View File
@@ -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
electrum/gui/qml/components/ConfirmTxDialog.qml
+18 -11
View File
@@ -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()
}
}
}
electrum/gui/qml/components/CpfpBumpFeeDialog.qml
+12 -8
View File
@@ -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()
}
}
}
}
electrum/gui/qml/components/ExportTxDialog.qml
+3 -1
View File
@@ -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
}
}
}
electrum/gui/qml/components/GenericShareDialog.qml
+3 -2
View File
@@ -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
}
}
}
electrum/gui/qml/components/InvoiceDialog.qml
+8 -7
View File
@@ -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
electrum/gui/qml/components/Invoices.qml
+3 -3
View File
@@ -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
electrum/gui/qml/components/NostrConfigDialog.qml
+1 -1
View File
@@ -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') + '<br/><br/>' +
electrum/gui/qml/components/RbfBumpFeeDialog.qml
+14 -8
View File
@@ -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()
}
}
}
}
electrum/gui/qml/components/RbfCancelDialog.qml
+13 -7
View File
@@ -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()
}
}
}
}
electrum/gui/qml/components/ReceiveDialog.qml
+1 -1
View File
@@ -50,7 +50,7 @@ ElDialog {
width: parent.width
spacing: constants.paddingMedium
TextHighlightPane {
DialogHighlightPane {
Layout.alignment: Qt.AlignHCenter
Layout.fillWidth: true
electrum/gui/qml/components/ReceiveRequests.qml
+3 -4
View File
@@ -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
electrum/gui/qml/components/SwapDialog.qml
+1
View File
@@ -42,6 +42,7 @@ ElDialog {
: swaphelper.state == SwapHelper.NoService
? InfoTextArea.IconStyle.Warn
: InfoTextArea.IconStyle.Info
backgroundColor: constants.darkerDialogBackground
}
GridLayout {
electrum/gui/qml/components/SweepDialog.qml
+2 -2
View File
@@ -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')
electrum/gui/qml/components/Wallets.qml
+2 -2
View File
@@ -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
electrum/gui/qml/components/controls/ButtonContainer.qml
+6 -9
View File
@@ -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 {
}
}
electrum/gui/qml/components/controls/DialogButtonContainer.qml
+16
View File
@@ -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
}
}
}
electrum/gui/qml/components/controls/DialogHighlightPane.qml
+5
View File
@@ -0,0 +1,5 @@
import QtQuick
TextHighlightPane {
backgroundColor: constants.darkerDialogBackground
}
electrum/gui/qml/components/controls/PaneInsetBackground.qml
+12 -4
View File
@@ -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)
}
electrum/gui/qml/components/wizard/WCCosignerKeystore.qml
+1 -2
View File
@@ -39,11 +39,10 @@ WizardComponent {
wrapMode: Text.Wrap
}
TextHighlightPane {
DialogHighlightPane {
Layout.fillWidth: true
visible: cosigner
backgroundColor: constants.darkerDialogBackground
RowLayout {
width: parent.width
electrum/gui/qml/components/wizard/WCHaveMasterKey.qml
+1 -2
View File
@@ -71,11 +71,10 @@ WizardComponent {
wrapMode: Text.Wrap
}
TextHighlightPane {
DialogHighlightPane {
Layout.fillWidth: true
visible: cosigner
backgroundColor: constants.darkerDialogBackground
RowLayout {
width: parent.width
electrum/gui/qml/components/wizard/WCHaveSeed.qml
+1 -2
View File
@@ -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