zebra.lucky
/
electrum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

qml: add frozen lightning to BalanceDetails, indent frozen on-chain and lightning amounts

master
Sander van Grieken 2 years ago
parent
297f971fae
commit
a6ceeec09d
No known key found for this signature in database
GPG Key ID: 9BCF8209EA402EBA
2 changed files with 73 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 108
      electrum/gui/qml/components/BalanceDetails.qml
  2. 7
      electrum/gui/qml/qewallet.py

108
electrum/gui/qml/components/BalanceDetails.qml
Unescape View File

@ -81,77 +81,101 @@ Pane {
GridLayout {
Layout.alignment: Qt.AlignHCenter
visible: Daemon.currentWallet
columns: 3
columns: 2
Rectangle {
Layout.preferredWidth: constants.iconSizeXSmall
Layout.preferredHeight: constants.iconSizeXSmall
border.color: constants.colorPiechartTotal
color: 'transparent'
radius: constants.iconSizeXSmall/2
}
Label {
text: qsTr('Total')
RowLayout {
Rectangle {
Layout.preferredWidth: constants.iconSizeXSmall
Layout.preferredHeight: constants.iconSizeXSmall
border.color: constants.colorPiechartTotal
color: 'transparent'
radius: constants.iconSizeXSmall/2
}
Label {
text: qsTr('Total')
}
}
FormattedAmount {
amount: Daemon.currentWallet.totalBalance
}
Rectangle {
visible: Daemon.currentWallet.isLightning
Layout.preferredWidth: constants.iconSizeXSmall
Layout.preferredHeight: constants.iconSizeXSmall
color: constants.colorPiechartLightning
RowLayout {
Rectangle {
visible: Daemon.currentWallet.isLightning
Layout.preferredWidth: constants.iconSizeXSmall
Layout.preferredHeight: constants.iconSizeXSmall
color: constants.colorPiechartLightning
}
Label {
visible: Daemon.currentWallet.isLightning
text: qsTr('Lightning')
}
}
Label {
FormattedAmount {
visible: Daemon.currentWallet.isLightning
text: qsTr('Lightning')
amount: Daemon.currentWallet.lightningBalance
}
RowLayout {
visible: Daemon.currentWallet.isLightning
Rectangle {
Layout.leftMargin: constants.paddingLarge
Layout.preferredWidth: constants.iconSizeXSmall
Layout.preferredHeight: constants.iconSizeXSmall
color: constants.colorPiechartLightningFrozen
}
Label {
text: qsTr('Frozen')
}
}
FormattedAmount {
visible: Daemon.currentWallet.isLightning
amount: Daemon.currentWallet.lightningBalance
amount: Daemon.currentWallet.lightningBalanceFrozen
}
Rectangle {
RowLayout {
visible: Daemon.currentWallet.isLightning || !Daemon.currentWallet.frozenBalance.isEmpty
Layout.preferredWidth: constants.iconSizeXSmall
Layout.preferredHeight: constants.iconSizeXSmall
color: constants.colorPiechartOnchain
}
Label {
visible: Daemon.currentWallet.isLightning || !Daemon.currentWallet.frozenBalance.isEmpty
text: qsTr('On-chain')
Rectangle {
Layout.preferredWidth: constants.iconSizeXSmall
Layout.preferredHeight: constants.iconSizeXSmall
color: constants.colorPiechartOnchain
}
Label {
text: qsTr('On-chain')
}
}
FormattedAmount {
visible: Daemon.currentWallet.isLightning || !Daemon.currentWallet.frozenBalance.isEmpty
amount: Daemon.currentWallet.confirmedBalance
}
Rectangle {
RowLayout {
visible: !Daemon.currentWallet.frozenBalance.isEmpty
Layout.preferredWidth: constants.iconSizeXSmall
Layout.preferredHeight: constants.iconSizeXSmall
color: constants.colorPiechartFrozen
}
Label {
visible: !Daemon.currentWallet.frozenBalance.isEmpty
text: qsTr('Frozen')
Rectangle {
Layout.leftMargin: constants.paddingLarge
Layout.preferredWidth: constants.iconSizeXSmall
Layout.preferredHeight: constants.iconSizeXSmall
color: constants.colorPiechartFrozen
}
Label {
text: qsTr('Frozen')
}
}
FormattedAmount {
amount: Daemon.currentWallet.frozenBalance
visible: !Daemon.currentWallet.frozenBalance.isEmpty
}
Rectangle {
visible: !Daemon.currentWallet.unconfirmedBalance.isEmpty
Layout.preferredWidth: constants.iconSizeXSmall
Layout.preferredHeight: constants.iconSizeXSmall
color: constants.colorPiechartUnconfirmed
}
Label {
RowLayout {
visible: !Daemon.currentWallet.unconfirmedBalance.isEmpty
text: qsTr('Unconfirmed')
Rectangle {
Layout.preferredWidth: constants.iconSizeXSmall
Layout.preferredHeight: constants.iconSizeXSmall
color: constants.colorPiechartUnconfirmed
}
Label {
text: qsTr('Unconfirmed')
}
}
FormattedAmount {
amount: Daemon.currentWallet.unconfirmedBalance

7
electrum/gui/qml/qewallet.py
Unescape View File

@ -103,6 +103,7 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
self._totalbalance = QEAmount()
self._lightningcanreceive = QEAmount()
self._lightningcansend = QEAmount()
self._lightningbalancefrozen = QEAmount()
self._seed = ''
@ -461,6 +462,12 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
self._lightningbalance.satsInt = int(self.wallet.lnworker.get_balance())
return self._lightningbalance
@pyqtProperty(QEAmount, notify=balanceChanged)
def lightningBalanceFrozen(self):
if self.isLightning:
self._lightningbalancefrozen.satsInt = int(self.wallet.lnworker.get_balance(frozen=True))
return self._lightningbalancefrozen
@pyqtProperty(QEAmount, notify=balanceChanged)
def totalBalance(self):
total = self.confirmedBalance.satsInt + self.lightningBalance.satsInt

Write Preview
Loading…
Cancel
Save