From b16fb5088b53686ed5d4bd2c826e76c4d094549e Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Fri, 3 Mar 2023 15:05:29 +0100 Subject: [PATCH] qml: padding around label above TextHighlightPanes --- electrum/gui/qml/components/AddressDetails.qml | 6 ++++-- electrum/gui/qml/components/InvoiceDialog.qml | 13 ++++++++++--- .../gui/qml/components/LightningPaymentDetails.qml | 9 ++++++--- electrum/gui/qml/components/TxDetails.qml | 9 ++++++--- electrum/gui/qml/components/WalletDetails.qml | 4 ++++ 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/electrum/gui/qml/components/AddressDetails.qml b/electrum/gui/qml/components/AddressDetails.qml index b07d4fd99..6077225d2 100644 --- a/electrum/gui/qml/components/AddressDetails.qml +++ b/electrum/gui/qml/components/AddressDetails.qml @@ -72,8 +72,9 @@ Pane { } Label { - text: qsTr('Label') Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall + text: qsTr('Label') color: Material.accentColor } @@ -130,8 +131,9 @@ Pane { } Label { - text: qsTr('Public keys') Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall + text: qsTr('Public keys') color: Material.accentColor } diff --git a/electrum/gui/qml/components/InvoiceDialog.qml b/electrum/gui/qml/components/InvoiceDialog.qml index a414b813f..831a63435 100644 --- a/electrum/gui/qml/components/InvoiceDialog.qml +++ b/electrum/gui/qml/components/InvoiceDialog.qml @@ -94,8 +94,9 @@ ElDialog { } Label { - visible: invoice.invoiceType == Invoice.OnchainInvoice Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall + visible: invoice.invoiceType == Invoice.OnchainInvoice text: qsTr('Address') color: Material.accentColor } @@ -116,6 +117,8 @@ ElDialog { } Label { + Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall visible: invoice.invoiceType == Invoice.LightningInvoice text: qsTr('Remote Pubkey') color: Material.accentColor @@ -152,6 +155,8 @@ ElDialog { } Label { + Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall visible: invoice.invoiceType == Invoice.LightningInvoice text: qsTr('Payment hash') color: Material.accentColor @@ -188,9 +193,10 @@ ElDialog { } Label { + Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall text: qsTr('Description') visible: invoice.message - Layout.columnSpan: 2 color: Material.accentColor } @@ -211,9 +217,10 @@ ElDialog { } Label { + Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall text: qsTr('Amount to send') color: Material.accentColor - Layout.columnSpan: 2 } TextHighlightPane { diff --git a/electrum/gui/qml/components/LightningPaymentDetails.qml b/electrum/gui/qml/components/LightningPaymentDetails.qml index 2fcfcc24f..097643947 100644 --- a/electrum/gui/qml/components/LightningPaymentDetails.qml +++ b/electrum/gui/qml/components/LightningPaymentDetails.qml @@ -74,8 +74,9 @@ Pane { } Label { - text: qsTr('Label') Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall + text: qsTr('Label') color: Material.accentColor } @@ -132,8 +133,9 @@ Pane { } Label { - text: qsTr('Payment hash') Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall + text: qsTr('Payment hash') color: Material.accentColor } @@ -164,8 +166,9 @@ Pane { } Label { - text: qsTr('Preimage') Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall + text: qsTr('Preimage') color: Material.accentColor } diff --git a/electrum/gui/qml/components/TxDetails.qml b/electrum/gui/qml/components/TxDetails.qml index 088409b9c..815b4336e 100644 --- a/electrum/gui/qml/components/TxDetails.qml +++ b/electrum/gui/qml/components/TxDetails.qml @@ -212,8 +212,9 @@ Pane { } Label { - text: qsTr('Label') Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall + text: qsTr('Label') color: Material.accentColor } @@ -270,8 +271,9 @@ Pane { } Label { - text: qsTr('Transaction ID') Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall + text: qsTr('Transaction ID') color: Material.accentColor } @@ -303,8 +305,9 @@ Pane { } Label { - text: qsTr('Outputs') Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall + text: qsTr('Outputs') color: Material.accentColor } diff --git a/electrum/gui/qml/components/WalletDetails.qml b/electrum/gui/qml/components/WalletDetails.qml index 9bcf2b342..54378d517 100644 --- a/electrum/gui/qml/components/WalletDetails.qml +++ b/electrum/gui/qml/components/WalletDetails.qml @@ -227,6 +227,7 @@ Pane { Label { Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall visible: Daemon.currentWallet.hasSeed text: qsTr('Seed') color: Material.accentColor @@ -267,6 +268,7 @@ Pane { Label { Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall visible: Daemon.currentWallet.isLightning text: qsTr('Lightning Node ID') color: Material.accentColor @@ -330,6 +332,7 @@ Pane { Label { Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall visible: _is2fa && !Daemon.currentWallet.canSignWithoutServer text: qsTr('Billing') color: Material.accentColor @@ -377,6 +380,7 @@ Pane { model: Daemon.currentWallet.keystores delegate: ColumnLayout { Layout.columnSpan: 2 + Layout.topMargin: constants.paddingSmall RowLayout { Label { text: qsTr('Keystore')