AaronFiore/electrum
1
0
Fork 0
Code Activity

qt: handle LN invoices better in Send tab

Browse Source
This commit is contained in:
SomberNight
2019-02-26 16:34:06 +01:00
committed by ThomasV
parent 962628ac3d
commit dfc2a35ae6
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
electrum/gui/qt/invoice_list.py
View File

@@ -39,6 +39,13 @@ from .util import (MyTreeView, read_QIcon, MONOSPACE_FONT, PR_UNPAID,
import_meta_gui, export_meta_gui, pr_icons) import_meta_gui, export_meta_gui, pr_icons)
REQUEST_TYPE_BITCOIN = 0
REQUEST_TYPE_LN = 1
ROLE_REQUEST_TYPE = Qt.UserRole
ROLE_REQUEST_ID = Qt.UserRole + 1
class InvoiceList(MyTreeView): class InvoiceList(MyTreeView):
class Columns(IntEnum): class Columns(IntEnum):
@@ -80,7 +87,8 @@ class InvoiceList(MyTreeView):
self.set_editability(items) self.set_editability(items)
items[self.Columns.DATE].setIcon(read_QIcon('bitcoin.png')) items[self.Columns.DATE].setIcon(read_QIcon('bitcoin.png'))
items[self.Columns.STATUS].setIcon(read_QIcon(pr_icons.get(status))) items[self.Columns.STATUS].setIcon(read_QIcon(pr_icons.get(status)))
items[self.Columns.DATE].setData(key, role=Qt.UserRole) items[self.Columns.DATE].setData(key, role=ROLE_REQUEST_ID)
items[self.Columns.DATE].setData(REQUEST_TYPE_BITCOIN, role=ROLE_REQUEST_TYPE)
self.model().insertRow(idx, items) self.model().insertRow(idx, items)
lnworker = self.parent.wallet.lnworker lnworker = self.parent.wallet.lnworker
@@ -99,10 +107,11 @@ class InvoiceList(MyTreeView):
date_str = format_time(lnaddr.date) date_str = format_time(lnaddr.date)
labels = [date_str, description, amount_str, pr_tooltips.get(status,'')] labels = [date_str, description, amount_str, pr_tooltips.get(status,'')]
items = [QStandardItem(e) for e in labels] items = [QStandardItem(e) for e in labels]
#items[self.Columns.DATE].setData(REQUEST_TYPE_LN, ROLE_REQUEST_TYPE) self.set_editability(items)
#items[self.Columns.DATE].setData(key, ROLE_RHASH_OR_ADDR)
items[self.Columns.DATE].setIcon(read_QIcon('lightning.png')) items[self.Columns.DATE].setIcon(read_QIcon('lightning.png'))
items[self.Columns.STATUS].setIcon(read_QIcon(pr_icons.get(status))) items[self.Columns.STATUS].setIcon(read_QIcon(pr_icons.get(status)))
items[self.Columns.DATE].setData(key, role=ROLE_REQUEST_ID)
items[self.Columns.DATE].setData(REQUEST_TYPE_LN, role=ROLE_REQUEST_TYPE)
self.model().insertRow(self.model().rowCount(), items) self.model().insertRow(self.model().rowCount(), items)
self.selectionModel().select(self.model().index(0,0), QItemSelectionModel.SelectCurrent) self.selectionModel().select(self.model().index(0,0), QItemSelectionModel.SelectCurrent)
@@ -127,18 +136,31 @@ class InvoiceList(MyTreeView):
item_col0 = self.model().itemFromIndex(idx.sibling(idx.row(), self.Columns.DATE)) item_col0 = self.model().itemFromIndex(idx.sibling(idx.row(), self.Columns.DATE))
if not item or not item_col0: if not item or not item_col0:
return return
key = item_col0.data(Qt.UserRole) key = item_col0.data(ROLE_REQUEST_ID)
request_type = item_col0.data(ROLE_REQUEST_TYPE)
assert request_type in [REQUEST_TYPE_BITCOIN, REQUEST_TYPE_LN]
column = idx.column() column = idx.column()
column_title = self.model().horizontalHeaderItem(column).text() column_title = self.model().horizontalHeaderItem(column).text()
column_data = item.text() column_data = item.text()
status = self.parent.invoices.get_status(key)
menu = QMenu(self) menu = QMenu(self)
if column_data: if column_data:
if column == self.Columns.AMOUNT: if column == self.Columns.AMOUNT:
column_data = column_data.strip() column_data = column_data.strip()
menu.addAction(_("Copy {}").format(column_title), lambda: self.parent.app.clipboard().setText(column_data)) menu.addAction(_("Copy {}").format(column_title), lambda: self.parent.app.clipboard().setText(column_data))
menu.addAction(_("Details"), lambda: self.parent.show_invoice(key)) if request_type == REQUEST_TYPE_BITCOIN:
if status == PR_UNPAID: self.create_menu_bitcoin_payreq(menu, key)
menu.addAction(_("Pay Now"), lambda: self.parent.do_pay_invoice(key)) elif request_type == REQUEST_TYPE_LN:
menu.addAction(_("Delete"), lambda: self.parent.delete_invoice(key)) self.create_menu_ln_payreq(menu, key)
menu.exec_(self.viewport().mapToGlobal(position)) menu.exec_(self.viewport().mapToGlobal(position))
def create_menu_bitcoin_payreq(self, menu, payreq_key):
status = self.parent.invoices.get_status(payreq_key)
menu.addAction(_("Details"), lambda: self.parent.show_invoice(payreq_key))
if status == PR_UNPAID:
menu.addAction(_("Pay Now"), lambda: self.parent.do_pay_invoice(payreq_key))
menu.addAction(_("Delete"), lambda: self.parent.delete_invoice(payreq_key))
def create_menu_ln_payreq(self, menu, payreq_key):
req = self.parent.wallet.lnworker.invoices[payreq_key][0]
menu.addAction(_("Copy Lightning invoice"), lambda: self.parent.do_copy('Lightning invoice', req))
menu.addAction(_("Delete"), lambda: self.parent.delete_lightning_payreq(payreq_key))

1
electrum/gui/qt/main_window.py
View File

@@ -1022,6 +1022,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
def delete_lightning_payreq(self, payreq_key): def delete_lightning_payreq(self, payreq_key):
self.wallet.lnworker.delete_invoice(payreq_key) self.wallet.lnworker.delete_invoice(payreq_key)
self.request_list.update() self.request_list.update()
self.invoice_list.update()
self.clear_receive_tab() self.clear_receive_tab()
def get_request_URI(self, addr): def get_request_URI(self, addr):