lukechilds
/
electrum
mirror of https://github.com/lukechilds/electrum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

simplify requests list

dependabot/pip/contrib/deterministic-build/ecdsa-0.13.3
ThomasV 6 years ago
parent
290a1c61a8
commit
3ce0f7f0cd
2 changed files with 20 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      electrum/gui/qt/main_window.py
  2. 36
      electrum/gui/qt/request_list.py

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

@ -1093,17 +1093,10 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger):
self.sign_payment_request(addr) self.sign_payment_request(addr)
return addr return addr
def view_and_paste(self, title, msg, data): def do_copy(self, title, content):
dialog = WindowModalDialog(self, title) self.app.clipboard().setText(content)
vbox = QVBoxLayout() self.show_message(_("{} copied to clipboard").format(title))
label = QLabel(msg) #QToolTip.showText(QCursor.pos(), _("{} copied to clipboard").format(title), self.parent)
label.setWordWrap(True)
vbox.addWidget(label)
pr_e = ShowQRTextEdit(text=data)
vbox.addWidget(pr_e)
vbox.addLayout(Buttons(CopyCloseButton(pr_e.text, self.app, dialog)))
dialog.setLayout(vbox)
dialog.exec_()
def export_payment_request(self, addr): def export_payment_request(self, addr):
r = self.wallet.receive_requests.get(addr) r = self.wallet.receive_requests.get(addr)

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

@ -50,16 +50,14 @@ class RequestList(MyTreeView):
class Columns(IntEnum): class Columns(IntEnum):
DATE = 0 DATE = 0
ADDRESS = 1 TYPE = 1
SIGNATURE = 2 DESCRIPTION = 2
DESCRIPTION = 3 AMOUNT = 3
AMOUNT = 4 STATUS = 4
STATUS = 5
headers = { headers = {
Columns.DATE: _('Date'), Columns.DATE: _('Date'),
Columns.ADDRESS: _('Address'), Columns.TYPE: _('Type'),
Columns.SIGNATURE: '',
Columns.DESCRIPTION: _('Description'), Columns.DESCRIPTION: _('Description'),
Columns.AMOUNT: _('Amount'), Columns.AMOUNT: _('Amount'),
Columns.STATUS: _('Status'), Columns.STATUS: _('Status'),
@ -74,7 +72,6 @@ class RequestList(MyTreeView):
self.setSortingEnabled(True) self.setSortingEnabled(True)
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 select_key(self, key): def select_key(self, key):
for i in range(self.model().rowCount()): for i in range(self.model().rowCount()):
@ -88,12 +85,11 @@ class RequestList(MyTreeView):
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
addr = self.model().itemFromIndex(idx.sibling(idx.row(), self.Columns.ADDRESS)).text()
req = self.wallet.receive_requests.get(addr)
item = self.model().itemFromIndex(idx.sibling(idx.row(), 0)) item = self.model().itemFromIndex(idx.sibling(idx.row(), 0))
request_type = item.data(ROLE_REQUEST_TYPE) request_type = item.data(ROLE_REQUEST_TYPE)
key = item.data(ROLE_RHASH_OR_ADDR) key = item.data(ROLE_RHASH_OR_ADDR)
if request_type == REQUEST_TYPE_BITCOIN: if request_type == REQUEST_TYPE_BITCOIN:
req = self.wallet.receive_requests.get(key)
if req is None: if req is None:
self.update() self.update()
return return
@ -129,7 +125,6 @@ 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:
@ -143,12 +138,12 @@ class RequestList(MyTreeView):
signature = req.get('sig') signature = req.get('sig')
requestor = req.get('name', '') requestor = req.get('name', '')
amount_str = self.parent.format_amount(amount) if amount else "" amount_str = self.parent.format_amount(amount) if amount else ""
labels = [date, address, '', message, amount_str, pr_tooltips.get(status,'')] labels = [date, 'on-chain', message, amount_str, pr_tooltips.get(status,'')]
items = [QStandardItem(e) for e in labels] items = [QStandardItem(e) for e in labels]
self.set_editability(items) self.set_editability(items)
if signature is not None: if signature is not None:
items[self.Columns.SIGNATURE].setIcon(read_QIcon("seal.png")) items[self.Columns.TYPE].setIcon(read_QIcon("seal.png"))
items[self.Columns.SIGNATURE].setToolTip(f'signed by {requestor}') items[self.Columns.TYPE].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)))
self.model().insertRow(self.model().rowCount(), items) self.model().insertRow(self.model().rowCount(), items)
@ -166,9 +161,9 @@ class RequestList(MyTreeView):
description = v description = v
break break
date = format_time(lnaddr.date) date = format_time(lnaddr.date)
labels = [date, invoice, '', description, amount_str, ''] labels = [date, 'lightning', description, amount_str, '']
items = [QStandardItem(e) for e in labels] items = [QStandardItem(e) for e in labels]
items[2].setIcon(self.icon_cache.get(":icons/lightning.png")) items[1].setIcon(self.icon_cache.get(":icons/lightning.png"))
items[0].setData(REQUEST_TYPE_LN, ROLE_REQUEST_TYPE) items[0].setData(REQUEST_TYPE_LN, ROLE_REQUEST_TYPE)
items[0].setData(payreq_key, ROLE_RHASH_OR_ADDR) items[0].setData(payreq_key, ROLE_RHASH_OR_ADDR)
self.model().insertRow(self.model().rowCount(), items) self.model().insertRow(self.model().rowCount(), items)
@ -195,10 +190,10 @@ 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 != self.Columns.SIGNATURE: if column != self.Columns.TYPE:
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.do_copy(column_title, column_data))
if request_type == REQUEST_TYPE_BITCOIN: if request_type == REQUEST_TYPE_BITCOIN:
self.create_menu_bitcoin_payreq(menu, addr) self.create_menu_bitcoin_payreq(menu, addr)
elif request_type == REQUEST_TYPE_LN: elif request_type == REQUEST_TYPE_LN:
@ -206,11 +201,12 @@ class RequestList(MyTreeView):
menu.exec_(self.viewport().mapToGlobal(position)) menu.exec_(self.viewport().mapToGlobal(position))
def create_menu_bitcoin_payreq(self, menu, addr): 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(_("Copy Address"), lambda: self.parent.do_copy('Address', addr))
menu.addAction(_("Copy URI"), lambda: self.parent.do_copy('URI', self.parent.get_request_URI(addr)))
menu.addAction(_("Save as BIP70 file"), lambda: self.parent.export_payment_request(addr)) menu.addAction(_("Save as BIP70 file"), lambda: self.parent.export_payment_request(addr))
menu.addAction(_("Delete"), lambda: self.parent.delete_payment_request(addr)) menu.addAction(_("Delete"), lambda: self.parent.delete_payment_request(addr))
run_hook('receive_list_menu', menu, addr) run_hook('receive_list_menu', menu, addr)
def create_menu_ln_payreq(self, menu, payreq_key, req): def create_menu_ln_payreq(self, menu, payreq_key, req):
menu.addAction(_("Copy Lightning invoice"), lambda: self.parent.view_and_paste('Invoice', '', req)) menu.addAction(_("Copy Lightning invoice"), lambda: self.parent.do_copy('Lightning invoice', req))
menu.addAction(_("Delete"), lambda: self.parent.delete_lightning_payreq(payreq_key)) menu.addAction(_("Delete"), lambda: self.parent.delete_lightning_payreq(payreq_key))

Write Preview
Loading…
Cancel
Save