tlightning: GUI improvements - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit c4081284bdf82e1f9a9c18338153c436dafe5aa4
DIR parent 670424f080c8446689bfd6f5a5848db0b98db862
HTML Author: ThomasV <thomasv@electrum.org>
Date: Mon, 6 May 2019 15:58:12 +0200
lightning: GUI improvements
Diffstat:
M electrum/gui/qt/channels_list.py | 2 +-
M electrum/gui/qt/history_list.py | 8 ++++----
M electrum/lnworker.py | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
---
DIR diff --git a/electrum/gui/qt/channels_list.py b/electrum/gui/qt/channels_list.py
t@@ -90,7 +90,7 @@ class ChannelsList(MyTreeView):
@QtCore.pyqtSlot()
def do_update_rows(self):
self.model().clear()
- self.update_headers([_('Node ID'), _('Balance'), _('Remote'), _('Status')])
+ self.update_headers([_('Node ID'), _('Local'), _('Remote'), _('Status')])
for chan in self.parent.wallet.lnworker.channels.values():
items = [QtGui.QStandardItem(x) for x in self.format_fields(chan)]
items[0].setData(chan.channel_id, QtCore.Qt.UserRole)
DIR diff --git a/electrum/gui/qt/history_list.py b/electrum/gui/qt/history_list.py
t@@ -81,8 +81,8 @@ class HistoryColumns(IntEnum):
STATUS = 0
DESCRIPTION = 1
AMOUNT = 2
- LN_AMOUNT = 3
- BALANCE = 4
+ BALANCE = 3
+ LN_AMOUNT = 4
LN_BALANCE = 5
FIAT_VALUE = 6
FIAT_ACQ_PRICE = 7
t@@ -390,9 +390,9 @@ class HistoryModel(QAbstractItemModel, Logger):
HistoryColumns.STATUS: _('Date'),
HistoryColumns.DESCRIPTION: _('Description'),
HistoryColumns.AMOUNT: _('Amount'),
- HistoryColumns.LN_AMOUNT: u'\U0001f5f2',
+ HistoryColumns.LN_AMOUNT: u'\U0001f5f2 ' + _('Amount'),
HistoryColumns.BALANCE: _('Balance'),
- HistoryColumns.LN_BALANCE: u'\U0001f5f2',
+ HistoryColumns.LN_BALANCE: u'\U0001f5f2 ' + _('Balance'),
HistoryColumns.FIAT_VALUE: fiat_title,
HistoryColumns.FIAT_ACQ_PRICE: fiat_acq_title,
HistoryColumns.FIAT_CAP_GAINS: fiat_cg_title,
DIR diff --git a/electrum/lnworker.py b/electrum/lnworker.py
t@@ -346,7 +346,7 @@ class LNWallet(LNWorker):
'txid': closing_txid,
'label': _('Close channel'),
'type': 'channel_closure',
- 'amount_msat': -chan.balance(LOCAL),
+ 'amount_msat': -chan.balance_minus_outgoing_htlcs(LOCAL),
'direction': 'sent',
'timestamp': closing_timestamp,
}