AaronFiore/electrum
1
0
Fork 0
Code Activity

Allow user to remove onchain backups.

Browse Source
This commit is contained in:
ThomasV
2021-03-22 19:28:24 +01:00
parent ec01380105
commit a5fea043d1
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
electrum/gui/kivy/uix/dialogs/lightning_channels.py
View File

@@ -225,7 +225,7 @@ Builder.load_string(r'''
id: popuproot
data: []
is_closed: False
is_redeemed: False
can_be_deleted: False
node_id:''
short_id:''
initiator:''
@@ -334,13 +334,13 @@ Builder.load_string(r'''
height: '48dp'
text: _('Delete')
on_release: root.remove_channel()
disabled: not root.is_redeemed
disabled: not root.can_be_deleted
<ChannelBackupPopup@Popup>:
id: popuproot
data: []
is_funded: False
is_imported: False
can_be_deleted: False
node_id:''
short_id:''
initiator:''
@@ -412,7 +412,7 @@ Builder.load_string(r'''
height: '48dp'
text: _('Delete')
on_release: root.remove_backup()
disabled: not root.is_imported
disabled: not root.can_be_deleted
''')
@@ -423,7 +423,7 @@ class ChannelBackupPopup(Popup, Logger):
Logger.__init__(self)
self.chan = chan
self.is_funded = chan.get_state() == ChannelState.FUNDED
self.is_imported = chan.is_imported
self.can_be_deleted = chan.can_be_deleted()
self.funding_txid = chan.funding_outpoint.txid
self.app = app
self.short_id = format_short_channel_id(chan.short_channel_id)
@@ -464,7 +464,7 @@ class ChannelDetailsPopup(Popup, Logger):
Popup.__init__(self, **kwargs)
Logger.__init__(self)
self.is_closed = chan.is_closed()
self.is_redeemed = chan.is_redeemed()
self.can_be_deleted = chan.can_be_deleted()
self.app = app
self.chan = chan
self.title = _('Channel details')

4
electrum/gui/qt/channels_list.py
View File

@@ -214,7 +214,7 @@ class ChannelsList(MyTreeView):
menu.addAction(_("View funding transaction"), lambda: self.parent.show_transaction(funding_tx))
if chan.get_state() == ChannelState.FUNDED:
menu.addAction(_("Request force-close"), lambda: self.request_force_close(channel_id))
if chan.is_imported:
if chan.can_be_deleted():
menu.addAction(_("Delete"), lambda: self.remove_channel_backup(channel_id))
menu.exec_(self.viewport().mapToGlobal(position))
return
@@ -252,7 +252,7 @@ class ChannelsList(MyTreeView):
menu.addAction(_("View closing transaction"), lambda: self.parent.show_transaction(closing_tx))
menu.addSeparator()
menu.addAction(_("Export backup"), lambda: self.export_channel_backup(channel_id))
if chan.is_redeemed():
if chan.can_be_deleted():
menu.addSeparator()
menu.addAction(_("Delete"), lambda: self.remove_channel(channel_id))
menu.exec_(self.viewport().mapToGlobal(position))