LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-02 02:05:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

33
electrum/gui/qt/channels_list.py
View file

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import traceback import traceback
import asyncio import asyncio
from PyQt5 import QtCore, QtWidgets from PyQt5 import QtCore, QtWidgets, QtGui
from PyQt5.QtWidgets import * from PyQt5.QtWidgets import *
from electrum.util import inv_dict, bh2u, bfh from electrum.util import inv_dict, bh2u, bfh
@ -9,16 +9,17 @@ from electrum.i18n import _
from electrum.lnchan import Channel from electrum.lnchan import Channel
from electrum.lnutil import LOCAL, REMOTE, ConnStringFormatError from electrum.lnutil import LOCAL, REMOTE, ConnStringFormatError
from .util import MyTreeWidget, SortableTreeWidgetItem, WindowModalDialog, Buttons, OkButton, CancelButton from .util import MyTreeView, WindowModalDialog, Buttons, OkButton, CancelButton
from .amountedit import BTCAmountEdit from .amountedit import BTCAmountEdit
from .channel_details import ChannelDetailsDialog from .channel_details import ChannelDetailsDialog
class ChannelsList(MyTreeWidget): class ChannelsList(MyTreeView):
update_rows = QtCore.pyqtSignal() update_rows = QtCore.pyqtSignal()
update_single_row = QtCore.pyqtSignal(Channel) update_single_row = QtCore.pyqtSignal(Channel)
def __init__(self, parent): def __init__(self, parent):
MyTreeWidget.__init__(self, parent, self.create_menu, [_('Node ID'), _('Balance'), _('Remote'), _('Status')], 0) super().__init__(parent, self.create_menu, 0)
self.setModel(QtGui.QStandardItemModel(self))
self.main_window = parent self.main_window = parent
self.update_rows.connect(self.do_update_rows) self.update_rows.connect(self.do_update_rows)
self.update_single_row.connect(self.do_update_single_row) self.update_single_row.connect(self.do_update_single_row)
@ -46,10 +47,11 @@ class ChannelsList(MyTreeWidget):
network = self.parent.network network = self.parent.network
lnworker = self.parent.wallet.lnworker lnworker = self.parent.wallet.lnworker
menu = QMenu() menu = QMenu()
item = self.currentItem() idx = self.selectionModel().currentIndex()
item = self.model().itemFromIndex(idx)
if not item: if not item:
return return
channel_id = item.data(0, QtCore.Qt.UserRole) channel_id = idx.sibling(idx.row(), 0).data(QtCore.Qt.UserRole)
def on_success(txid): def on_success(txid):
self.main_window.show_error('Channel closed' + '\n' + txid) self.main_window.show_error('Channel closed' + '\n' + txid)
def on_failure(exc_info): def on_failure(exc_info):
@ -77,19 +79,20 @@ class ChannelsList(MyTreeWidget):
@QtCore.pyqtSlot(Channel) @QtCore.pyqtSlot(Channel)
def do_update_single_row(self, chan): def do_update_single_row(self, chan):
for i in range(self.topLevelItemCount()): for row in range(self.model().rowCount()):
item = self.topLevelItem(i) item = self.model().item(row,0)
if item.data(0, QtCore.Qt.UserRole) == chan.channel_id: if item.data(QtCore.Qt.UserRole) == chan.channel_id:
for i, v in enumerate(self.format_fields(chan)): for column, v in enumerate(self.format_fields(chan)):
item.setData(i, QtCore.Qt.DisplayRole, v) self.model().item(row, column).setData(v, QtCore.Qt.DisplayRole)
@QtCore.pyqtSlot() @QtCore.pyqtSlot()
def do_update_rows(self): def do_update_rows(self):
self.clear() self.model().clear()
self.update_headers([_('Node ID'), _('Balance'), _('Remote'), _('Status')])
for chan in self.parent.wallet.lnworker.channels.values(): for chan in self.parent.wallet.lnworker.channels.values():
item = SortableTreeWidgetItem(self.format_fields(chan)) items = [QtGui.QStandardItem(x) for x in self.format_fields(chan)]
item.setData(0, QtCore.Qt.UserRole, chan.channel_id) items[0].setData(chan.channel_id, QtCore.Qt.UserRole)
self.insertTopLevelItem(0, item) self.model().insertRow(0, items)
def get_toolbar(self): def get_toolbar(self):
b = QPushButton(_('Open Channel')) b = QPushButton(_('Open Channel'))

2
electrum/gui/qt/main_window.py
View file

@ -1070,8 +1070,6 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
self.address_list.update() self.address_list.update()
self.clear_receive_tab() self.clear_receive_tab()
self.request_list.update() self.request_list.update()
items = self.request_list.findItems(key, Qt.UserRole|Qt.MatchContains|Qt.MatchRecursive, column=0)
self.request_list.setCurrentItem(items[0])
def create_bitcoin_request(self, amount, message, expiration): def create_bitcoin_request(self, amount, message, expiration):
addr = self.wallet.get_unused_address() addr = self.wallet.get_unused_address()

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

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