request list: remove Type column

This commit is contained in:
ThomasV 2018-06-03 08:49:20 +02:00 committed by Janus
parent ed496dca4b
commit eb9434ca48

View File

@ -35,22 +35,22 @@ from .util import MyTreeWidget, pr_tooltips, pr_icons
class RequestList(MyTreeWidget): class RequestList(MyTreeWidget):
filter_columns = [0, 2, 3, 4] # Date, Address, Description, Amount filter_columns = [0, 1, 2, 3] # Date, Address, Description, Amount
def __init__(self, parent): def __init__(self, parent):
MyTreeWidget.__init__(self, parent, self.create_menu, [_('Date'), _('Type'), _('Address'), _('Description'), _('Amount'), _('Status')], 3) MyTreeWidget.__init__(self, parent, self.create_menu, [_('Date'), _('Address'), _('Description'), _('Amount'), _('Status')], 2)
self.currentItemChanged.connect(self.item_changed) self.currentItemChanged.connect(self.item_changed)
self.itemClicked.connect(self.item_changed) self.itemClicked.connect(self.item_changed)
self.setSortingEnabled(True) self.setSortingEnabled(True)
self.setColumnWidth(0, 180) self.setColumnWidth(0, 180)
self.setColumnWidth(2, 250) self.setColumnWidth(1, 250)
def update_headers(self, headers): def update_headers(self, headers):
self.setColumnCount(len(headers)) self.setColumnCount(len(headers))
self.setHeaderLabels(headers) self.setHeaderLabels(headers)
self.header().setStretchLastSection(False) self.header().setStretchLastSection(False)
for col in range(len(headers)): for col in range(len(headers)):
if col in [2]: continue if col in [1]: continue
sm = QHeaderView.Stretch if col == self.stretch_column else QHeaderView.ResizeToContents sm = QHeaderView.Stretch if col == self.stretch_column else QHeaderView.ResizeToContents
self.header().setSectionResizeMode(col, sm) self.header().setSectionResizeMode(col, sm)
@ -59,7 +59,7 @@ class RequestList(MyTreeWidget):
return return
if not item.isSelected(): if not item.isSelected():
return return
addr = str(item.text(2)) addr = str(item.text(1))
self.parent.receive_address_e.setText(addr) self.parent.receive_address_e.setText(addr)
#req = self.wallet.receive_requests.get(addr) #req = self.wallet.receive_requests.get(addr)
#if req is None: #if req is None:
@ -109,10 +109,10 @@ class RequestList(MyTreeWidget):
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 ""
URI = self.parent.get_request_URI(address) URI = self.parent.get_request_URI(address)
item = QTreeWidgetItem([date, '', URI, message, amount_str, pr_tooltips.get(status,'')]) item = QTreeWidgetItem([date, URI, message, amount_str, pr_tooltips.get(status,'')])
if signature is not None: if signature is not None:
item.setIcon(2, self.icon_cache.get(":icons/seal.png")) item.setIcon(1, self.icon_cache.get(":icons/seal.png"))
item.setToolTip(2, 'signed by '+ requestor) item.setToolTip(1, 'signed by '+ requestor)
if status is not PR_UNKNOWN: if status is not PR_UNKNOWN:
item.setIcon(6, self.icon_cache.get(pr_icons.get(status))) item.setIcon(6, self.icon_cache.get(pr_icons.get(status)))
self.addTopLevelItem(item) self.addTopLevelItem(item)
@ -128,7 +128,7 @@ class RequestList(MyTreeWidget):
break break
else: else:
description = '' description = ''
item = QTreeWidgetItem([date, '', r, description, amount_str, '']) item = QTreeWidgetItem([date, r, description, amount_str, ''])
item.setIcon(1, QIcon(":icons/lightning.png")) item.setIcon(1, QIcon(":icons/lightning.png"))
self.addTopLevelItem(item) self.addTopLevelItem(item)