AaronFiore/electrum
1
0
Fork 0
Code Activity

lightning: post rebase qt gui fixes

Browse Source
This commit is contained in:
Janus
2018-12-04 18:56:30 +01:00
committed by ThomasV
parent d493dd1953
commit 4a2a45d7e3
3 changed files with 58 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@
from enum import IntEnum
from PyQt5.QtGui import QStandardItemModel, QStandardItem
from PyQt5.QtWidgets import QMenu
from PyQt5.QtWidgets import QMenu, QHeaderView
from PyQt5.QtCore import Qt
from electrum.i18n import _
@@ -35,12 +35,17 @@ from electrum.plugin import run_hook
from electrum.paymentrequest import PR_UNKNOWN
from electrum.wallet import InternalAddressCorruption
from electrum.bitcoin import COIN
from electrum.lnaddr import lndecode
import electrum.constants as constants
from .util import MyTreeView, pr_tooltips, pr_icons, read_QIcon
REQUEST_TYPE_BITCOIN = 0
REQUEST_TYPE_LN = 1
ROLE_REQUEST_TYPE = Qt.UserRole
ROLE_RHASH_OR_ADDR = Qt.UserRole + 1
class RequestList(MyTreeView):
class Columns(IntEnum):
@@ -67,9 +72,9 @@ class RequestList(MyTreeView):
editable_columns=[])
self.setModel(QStandardItemModel(self))
self.setSortingEnabled(True)
self.setColumnWidth(self.Columns.DATE, 180)
self.update()
self.selectionModel().currentRowChanged.connect(self.item_changed)
self.setColumnWidth(self.Columns.ADDRESS, 250)
def item_changed(self, idx):
# TODO use siblingAtColumn when min Qt version is >=5.11
@@ -79,12 +84,13 @@ class RequestList(MyTreeView):
self.update()
return
item = self.model().itemFromIndex(idx.sibling(idx.row(), 0))
request_type = item.data(Qt.UserRole)
key = str(item.data(Qt.UserRole + 1))
request_type = item.data(ROLE_REQUEST_TYPE)
key = item.data(ROLE_RHASH_OR_ADDR)
if request_type == REQUEST_TYPE_BITCOIN:
req = self.parent.get_request_URI(key)
elif request_type == REQUEST_TYPE_LN:
preimage, req = self.wallet.lnworker.invoices.get(key)
print(key, req)
self.parent.receive_address_e.setText(req)
def update(self):
@@ -98,8 +104,6 @@ class RequestList(MyTreeView):
self.parent.expires_label.hide()
self.parent.expires_combo.show()
# update the receive address if necessary
#current_address = self.parent.receive_address_e.text()
domain = self.wallet.get_receiving_addresses()
try:
addr = self.wallet.get_unused_address()
@@ -113,6 +117,7 @@ class RequestList(MyTreeView):
self.model().clear()
self.update_headers(self.__class__.headers)
self.header().setSectionResizeMode(self.Columns.ADDRESS, QHeaderView.Interactive) # override resizemode in update_headers
for req in self.wallet.get_sorted_requests(self.config):
address = req['address']
if address not in domain:
@@ -134,15 +139,12 @@ class RequestList(MyTreeView):
items[self.Columns.SIGNATURE].setToolTip(f'signed by {requestor}')
if status is not PR_UNKNOWN:
items[self.Columns.STATUS].setIcon(read_QIcon(pr_icons.get(status)))
items[self.Columns.DESCRIPTION].setData(address, Qt.UserRole)
self.model().insertRow(self.model().rowCount(), items)
items[0].setData(REQUEST_TYPE_BITCOIN, Qt.UserRole)
items[0].setData(address, Qt.UserRole+1)
items[0].setData(REQUEST_TYPE_BITCOIN, ROLE_REQUEST_TYPE)
items[0].setData(address, ROLE_RHASH_OR_ADDR)
self.filter()
# lightning
for payreq_key, (preimage_hex, invoice) in self.wallet.lnworker.invoices.items():
from electrum.lnaddr import lndecode
import electrum.constants as constants
lnaddr = lndecode(invoice, expected_hrp=constants.net.SEGWIT_HRP)
amount_sat = lnaddr.amount*COIN if lnaddr.amount else None
amount_str = self.parent.format_amount(amount_sat) if amount_sat else ''
@@ -152,51 +154,28 @@ class RequestList(MyTreeView):
description = v
break
date = format_time(lnaddr.date)
labels = [date, r, '', description, amount_str, '']
labels = [date, invoice, '', description, amount_str, '']
items = [QStandardItem(e) for e in labels]
items.setIcon(2, QIcon(":icons/lightning.png"))
items[0].setData(REQUEST_TYPE_LN, Qt.UserRole)
items[0].setData(payreq_key, Qt.UserRole+1)
items[2].setIcon(self.icon_cache.get(":icons/lightning.png"))
items[0].setData(REQUEST_TYPE_LN, ROLE_REQUEST_TYPE)
items[0].setData(payreq_key, ROLE_RHASH_OR_ADDR)
self.model().insertRow(self.model().rowCount(), items)
def create_menu(self, position):
idx = self.indexAt(position)
item = self.model().itemFromIndex(idx)
# TODO use siblingAtColumn when min Qt version is >=5.11
item_addr = self.model().itemFromIndex(idx.sibling(idx.row(), self.Columns.ADDRESS))
if not item_addr:
item = self.model().itemFromIndex(idx.sibling(idx.row(), self.Columns.DATE))
if not item:
return
addr = item_addr.text()
request_type = self.model().itemFromIndex(idx.sibling(idx.row(), 0)).data(Qt.UserRole)
addr = item.data(ROLE_RHASH_OR_ADDR)
request_type = item.data(ROLE_REQUEST_TYPE)
menu = None
assert request_type in [REQUEST_TYPE_BITCOIN, REQUEST_TYPE_LN]
if request_type == REQUEST_TYPE_BITCOIN:
menu = self.create_menu_bitcoin_payreq(idx, addr)
req = self.wallet.receive_requests.get(addr)
elif request_type == REQUEST_TYPE_LN:
menu = self.create_menu_ln_payreq(idx, addr)
if menu:
menu.exec_(self.viewport().mapToGlobal(position))
def create_menu_bitcoin_payreq(self, idx, addr):
req = self.wallet.receive_requests.get(addr)
if req is None:
self.update()
return
column = idx.column()
column_title = self.model().horizontalHeaderItem(column).text()
column_data = item.text()
menu = QMenu(self)
if column != self.Columns.SIGNATURE:
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(_("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)
return menu
def create_menu_ln_payreq(self, idx, payreq_key):
preimage, req = self.wallet.lnworker.invoices.get(payreq_key)
preimage, req = self.wallet.lnworker.invoices.get(addr)
if req is None:
self.update()
return
@@ -204,8 +183,22 @@ class RequestList(MyTreeView):
column_title = self.model().horizontalHeaderItem(column).text()
column_data = self.model().itemFromIndex(idx).text()
menu = QMenu(self)
if column != 2:
if column != self.Columns.SIGNATURE:
if column == self.Columns.AMOUNT:
column_data = column_data.strip()
menu.addAction(_("Copy {}").format(column_title), lambda: self.parent.app.clipboard().setText(column_data))
if request_type == REQUEST_TYPE_BITCOIN:
self.create_menu_bitcoin_payreq(menu, addr)
elif request_type == REQUEST_TYPE_LN:
self.create_menu_ln_payreq(menu, addr, req)
menu.exec_(self.viewport().mapToGlobal(position))
def create_menu_bitcoin_payreq(self, menu, addr):
menu.addAction(_("Copy URI"), lambda: self.parent.view_and_paste('URI', '', self.parent.get_request_URI(addr)))
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)
def create_menu_ln_payreq(self, menu, payreq_key, req):
menu.addAction(_("Copy BOLT-11 Lightning invoice"), lambda: self.parent.view_and_paste('Invoice', '', req))
menu.addAction(_("Delete"), lambda: self.parent.delete_lightning_payreq(payreq_key))
return menu