AaronFiore/electrum
1
0
Fork 0
Code Activity

lightning: improve receive in Qt GUI

Browse Source
This commit is contained in:
ThomasV
2018-07-16 11:13:24 +02:00
parent 31b67c422b
commit 18bc5aa27b
2 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
electrum/gui/qt/request_list.py
View File

@@ -78,23 +78,14 @@ class RequestList(MyTreeView):
if req is None:
self.update()
return
expires = age(req['time'] + req['exp']) if req.get('exp') else _('Never')
amount = req['amount']
message = req['memo']
self.parent.receive_address_e.setText(addr)
#req = self.wallet.receive_requests.get(addr)
#if req is None:
# self.update()
# return
#expires = age(req['time'] + req['exp']) if req.get('exp') else _('Never')
#amount = req['amount']
#message = self.wallet.labels.get(addr, '')
#self.parent.receive_message_e.setText(message)
#self.parent.receive_amount_e.setAmount(amount)
#self.parent.expires_combo.hide()
#self.parent.expires_label.show()
#self.parent.expires_label.setText(expires)
#self.parent.new_request_button.setEnabled(True)
item = self.model().itemFromIndex(idx.sibling(idx.row(), 0))
request_type = item.data(Qt.UserRole)
key = str(item.data(Qt.UserRole + 1))
if request_type == REQUEST_TYPE_BITCOIN:
req = self.parent.get_request_URI(key)
elif request_type == REQUEST_TYPE_LN:
req = self.wallet.lnworker.invoices.get(key)
self.parent.receive_address_e.setText(req)
def update(self):
self.wallet = self.parent.wallet
@@ -122,7 +113,6 @@ class RequestList(MyTreeView):
self.model().clear()
self.update_headers(self.__class__.headers)
self.hideColumn(self.Columns.ADDRESS)
for req in self.wallet.get_sorted_requests(self.config):
address = req['address']
if address not in domain:
@@ -136,8 +126,7 @@ class RequestList(MyTreeView):
signature = req.get('sig')
requestor = req.get('name', '')
amount_str = self.parent.format_amount(amount) if amount else ""
URI = self.parent.get_request_URI(address)
labels = [date, URI, '', message, amount_str, pr_tooltips.get(status,'')]
labels = [date, address, '', message, amount_str, pr_tooltips.get(status,'')]
items = [QStandardItem(e) for e in labels]
self.set_editability(items)
if signature is not None:
@@ -201,7 +190,7 @@ class RequestList(MyTreeView):
if column == self.Columns.AMOUNT:
column_data = column_data.strip()
menu.addAction(_("Copy {}").format(column_title), lambda: self.parent.app.clipboard().setText(column_data))
menu.addAction(_("Copy URI"), lambda: self.parent.view_and_paste('URI', '', self.parent.get_request_URI(addr)))
menu.addAction(_("Copy"), lambda: self.parent.app.clipboard().setText(req))
menu.addAction(_("Save as BIP70 file"), lambda: self.parent.export_payment_request(addr))
menu.addAction(_("Delete"), lambda: self.parent.delete_payment_request(addr))
run_hook('receive_list_menu', menu, addr)
@@ -218,6 +207,6 @@ class RequestList(MyTreeView):
menu = QMenu(self)
if column != 2:
menu.addAction(_("Copy {}").format(column_title), lambda: self.parent.app.clipboard().setText(column_data))
menu.addAction(_("Copy URI"), lambda: self.parent.view_and_paste('URI', '', req))
menu.addAction(_("Copy"), lambda: self.parent.app.clipboard().setText(req))
menu.addAction(_("Delete"), lambda: self.parent.delete_lightning_payreq(payreq_key))
return menu