From b4d13ffb41ab9ae50e3928ba252178b068687094 Mon Sep 17 00:00:00 2001 From: Sander van Grieken Date: Tue, 4 Oct 2022 10:40:09 +0200 Subject: [PATCH] qml: show balance summary on top --- .../gui/qml/components/BalanceSummary.qml | 151 +++++++++++------- electrum/gui/qml/components/History.qml | 13 ++ 2 files changed, 102 insertions(+), 62 deletions(-) diff --git a/electrum/gui/qml/components/BalanceSummary.qml b/electrum/gui/qml/components/BalanceSummary.qml index 6d59814b1..aef5a0d82 100644 --- a/electrum/gui/qml/components/BalanceSummary.qml +++ b/electrum/gui/qml/components/BalanceSummary.qml @@ -5,7 +5,7 @@ import QtQuick.Controls.Material 2.0 Frame { id: root - height: layout.height + font.pixelSize: constants.fontSizeMedium property string formattedBalance @@ -35,97 +35,124 @@ Frame { columns: 2 Label { - font.pixelSize: constants.fontSizeLarge - text: qsTr('Balance: ') + font.pixelSize: constants.fontSizeXLarge + text: qsTr('Balance:') + color: Material.accentColor + Layout.alignment: Qt.AlignRight | Qt.AlignTop } - RowLayout { - Label { - font.pixelSize: constants.fontSizeLarge - font.family: FixedFont - text: formattedBalance - } - Label { - font.pixelSize: constants.fontSizeMedium - color: Material.accentColor - text: Config.baseUnit + ColumnLayout { + spacing: 0 + + RowLayout { + Label { + font.pixelSize: constants.fontSizeXLarge + font.family: FixedFont + text: formattedBalance + } + Label { + font.pixelSize: constants.fontSizeXLarge + color: Material.accentColor + text: Config.baseUnit + } } + Label { - font.pixelSize: constants.fontSizeMedium - text: Daemon.fx.enabled - ? '(' + root.formattedBalanceFiat + ' ' + Daemon.fx.fiatCurrency + ')' - : '' + visible: Daemon.fx.enabled + font.pixelSize: constants.fontSizeSmall + color: constants.mutedForeground + text: root.formattedBalanceFiat + ' ' + Daemon.fx.fiatCurrency } } + Label { visible: Daemon.currentWallet.unconfirmedBalance.satsInt > 0 - font.pixelSize: constants.fontSizeSmall - text: qsTr('Unconfirmed: ') + font.pixelSize: constants.fontSizeLarge + text: qsTr('Unconfirmed:') + color: Material.accentColor + Layout.alignment: Qt.AlignRight | Qt.AlignTop } - RowLayout { + ColumnLayout { visible: Daemon.currentWallet.unconfirmedBalance.satsInt > 0 - Label { - font.pixelSize: constants.fontSizeSmall - font.family: FixedFont - text: formattedUnconfirmed + spacing: 0 + RowLayout { + Label { + font.pixelSize: constants.fontSizeLarge + font.family: FixedFont + text: formattedUnconfirmed + } + Label { + font.pixelSize: constants.fontSizeLarge + color: Material.accentColor + text: Config.baseUnit + } } Label { + visible: Daemon.fx.enabled font.pixelSize: constants.fontSizeSmall - color: Material.accentColor - text: Config.baseUnit - } - Label { - font.pixelSize: constants.fontSizeSmall - text: Daemon.fx.enabled - ? '(' + root.formattedUnconfirmedFiat + ' ' + Daemon.fx.fiatCurrency + ')' - : '' + color: constants.mutedForeground + text: root.formattedUnconfirmedFiat + ' ' + Daemon.fx.fiatCurrency } } + Label { visible: Daemon.currentWallet.frozenBalance.satsInt > 0 - font.pixelSize: constants.fontSizeSmall - text: qsTr('Frozen: ') + font.pixelSize: constants.fontSizeLarge + text: qsTr('Frozen:') + color: Material.accentColor + Layout.alignment: Qt.AlignRight | Qt.AlignTop } - RowLayout { + ColumnLayout { visible: Daemon.currentWallet.frozenBalance.satsInt > 0 - Label { - font.pixelSize: constants.fontSizeSmall - font.family: FixedFont - text: root.formattedFrozen - } - Label { - font.pixelSize: constants.fontSizeSmall - color: Material.accentColor - text: Config.baseUnit + spacing: 0 + + RowLayout { + Label { + font.pixelSize: constants.fontSizeLarge + font.family: FixedFont + text: root.formattedFrozen + } + Label { + font.pixelSize: constants.fontSizeLarge + color: Material.accentColor + text: Config.baseUnit + } } Label { + visible: Daemon.fx.enabled font.pixelSize: constants.fontSizeSmall - text: Daemon.fx.enabled - ? '(' + root.formattedFrozenFiat + ' ' + Daemon.fx.fiatCurrency + ')' - : '' + color: constants.mutedForeground + text: root.formattedFrozenFiat + ' ' + Daemon.fx.fiatCurrency } } + Label { visible: Daemon.currentWallet.isLightning - font.pixelSize: constants.fontSizeSmall - text: qsTr('Lightning: ') + font.pixelSize: constants.fontSizeLarge + text: qsTr('Lightning:') + color: Material.accentColor + Layout.alignment: Qt.AlignRight | Qt.AlignTop } - RowLayout { + ColumnLayout { visible: Daemon.currentWallet.isLightning - Label { - font.pixelSize: constants.fontSizeSmall - font.family: FixedFont - text: formattedLightningBalance - } - Label { - font.pixelSize: constants.fontSizeSmall - color: Material.accentColor - text: Config.baseUnit + spacing: 0 + + RowLayout { + Label { + font.pixelSize: constants.fontSizeLarge + font.family: FixedFont + text: formattedLightningBalance + } + Label { + font.pixelSize: constants.fontSizeLarge + color: Material.accentColor + text: Config.baseUnit + } } Label { + visible: Daemon.fx.enabled font.pixelSize: constants.fontSizeSmall - text: Daemon.fx.enabled - ? '(' + root.formattedLightningBalanceFiat + ' ' + Daemon.fx.fiatCurrency + ')' - : '' + color: constants.mutedForeground + text: root.formattedLightningBalanceFiat + ' ' + Daemon.fx.fiatCurrency } } } diff --git a/electrum/gui/qml/components/History.qml b/electrum/gui/qml/components/History.qml index 1df795418..53ebf288b 100644 --- a/electrum/gui/qml/components/History.qml +++ b/electrum/gui/qml/components/History.qml @@ -26,6 +26,19 @@ Pane { model: visualModel + header: Item { + width: parent.width + height: headerLayout.height + ColumnLayout { + id: headerLayout + anchors.centerIn: parent + Item { height: constants.paddingXLarge; width: 1 } + BalanceSummary {} + Item { height: constants.paddingXLarge; width: 1 } + } + } + headerPositioning: ListView.InlineHeader + readonly property variant sectionLabels: { 'today': qsTr('Today'), 'yesterday': qsTr('Yesterday'),