From 00430d674eb6a5c650fa2230aa1a686d010402eb Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Fri, 6 May 2022 10:29:30 +0200 Subject: [PATCH] font sizes, accent colors --- electrum/gui/qml/components/AddressDetails.qml | 12 ++++++++++++ electrum/gui/qml/components/History.qml | 5 +++-- .../qml/components/controls/GenericShareDialog.qml | 2 ++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/electrum/gui/qml/components/AddressDetails.qml b/electrum/gui/qml/components/AddressDetails.qml index 7149685eb..51e008c82 100644 --- a/electrum/gui/qml/components/AddressDetails.qml +++ b/electrum/gui/qml/components/AddressDetails.qml @@ -58,6 +58,7 @@ Pane { Label { text: qsTr('Address') Layout.columnSpan: 2 + color: Material.accentColor } TextHighlightPane { @@ -70,8 +71,10 @@ Pane { width: parent.width Label { text: root.address + font.pixelSize: constants.fontSizeLarge font.family: FixedFont Layout.fillWidth: true + wrapMode: Text.Wrap } ToolButton { icon.source: '../../icons/share.png' @@ -87,6 +90,7 @@ Pane { Label { text: qsTr('Label') Layout.columnSpan: 2 + color: Material.accentColor } TextHighlightPane { @@ -106,6 +110,7 @@ Pane { text: addressdetails.label wrapMode: Text.Wrap Layout.fillWidth: true + font.pixelSize: constants.fontSizeLarge } ToolButton { visible: !labelContent.editmode @@ -120,6 +125,7 @@ Pane { id: labelEdit visible: labelContent.editmode text: addressdetails.label + font.pixelSize: constants.fontSizeLarge Layout.fillWidth: true } ToolButton { @@ -143,6 +149,7 @@ Pane { Label { text: qsTr('Public keys') Layout.columnSpan: 2 + color: Material.accentColor } Repeater { @@ -158,6 +165,7 @@ Pane { text: modelData Layout.fillWidth: true wrapMode: Text.Wrap + font.pixelSize: constants.fontSizeLarge font.family: FixedFont } ToolButton { @@ -174,6 +182,7 @@ Pane { Label { text: qsTr('Script type') + color: Material.accentColor } Label { @@ -183,6 +192,7 @@ Pane { Label { text: qsTr('Balance') + color: Material.accentColor } RowLayout { @@ -203,6 +213,7 @@ Pane { Label { text: qsTr('Derivation path') + color: Material.accentColor } Label { @@ -211,6 +222,7 @@ Pane { Label { text: qsTr('Frozen') + color: Material.accentColor } Label { diff --git a/electrum/gui/qml/components/History.qml b/electrum/gui/qml/components/History.qml index 8f1d05dca..fd3b93ef1 100644 --- a/electrum/gui/qml/components/History.qml +++ b/electrum/gui/qml/components/History.qml @@ -93,10 +93,10 @@ Pane { } Label { - font.pixelSize: constants.fontSizeLarge Layout.fillWidth: true + font.pixelSize: model.label !== '' ? constants.fontSizeLarge : constants.fontSizeMedium text: model.label !== '' ? model.label : '' - color: model.label !== '' ? Material.accentColor : 'gray' + color: model.label !== '' ? Material.foreground : 'gray' wrapMode: Text.Wrap maximumLineCount: 2 elide: Text.ElideRight @@ -117,6 +117,7 @@ Pane { Label { font.pixelSize: constants.fontSizeSmall text: model.date + color: Material.accentColor } Label { id: fiatLabel diff --git a/electrum/gui/qml/components/controls/GenericShareDialog.qml b/electrum/gui/qml/components/controls/GenericShareDialog.qml index 3df017071..4e6f383e2 100644 --- a/electrum/gui/qml/components/controls/GenericShareDialog.qml +++ b/electrum/gui/qml/components/controls/GenericShareDialog.qml @@ -82,6 +82,8 @@ Dialog { width: parent.width text: dialog.text wrapMode: Text.Wrap + font.pixelSize: constants.fontSizeLarge + font.family: FixedFont } }