AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch 'master' into tray_tip_wallet

Browse Source
This commit is contained in:
Neil Booth
2015-04-30 13:28:13 +09:00
parent f56413d602 8dbb5e2a87
commit 506ed8ee74
9 changed files with 80 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/qt/amountedit.py
View File

@@ -18,6 +18,8 @@ class AmountEdit(MyLineEdit):
def __init__(self, base_unit, is_int = False, parent=None):
QLineEdit.__init__(self, parent)
# This seems sufficient for hundred-BTC amounts with 8 decimals
self.setFixedWidth(140)
self.base_unit = base_unit
self.textChanged.connect(self.numbify)
self.is_int = is_int

2
gui/qt/history_widget.py
View File

@@ -28,7 +28,7 @@ from electrum.plugins import run_hook
class HistoryWidget(MyTreeWidget):
def __init__(self, parent=None):
MyTreeWidget.__init__(self, parent, self.create_menu, [ '', _('Date'), _('Description') , _('Amount'), _('Balance')], [40, 140, None, 140, 140])
MyTreeWidget.__init__(self, parent, self.create_menu, [ '', _('Date'), _('Description') , _('Amount'), _('Balance')], 2)
self.config = self.parent.config
self.setSortingEnabled(False)

2
gui/qt/history_widget_lite.py
View File

@@ -20,6 +20,6 @@ class HistoryWidget(QTreeWidget):
if date is None:
date = _("Unknown")
item = QTreeWidgetItem([amount, address, date])
if float(amount) < 0:
if amount.find('-') != -1:
item.setForeground(0, QBrush(QColor("#BC1E1E")))
self.insertTopLevelItem(0, item)

19
gui/qt/main_window.py
View File

@@ -633,7 +633,7 @@ class ElectrumWindow(QMainWindow):
buttons.addWidget(self.new_request_button)
self.receive_requests_label = QLabel(_('My Requests'))
self.receive_list = MyTreeWidget(self, self.receive_list_menu, [_('Date'), _('Account'), _('Address'), _('Description'), _('Amount'), _('Status')], [])
self.receive_list = MyTreeWidget(self, self.receive_list_menu, [_('Date'), _('Account'), _('Address'), _('Description'), _('Amount'), _('Status')], 3)
self.receive_list.currentItemChanged.connect(self.receive_item_changed)
self.receive_list.itemClicked.connect(self.receive_item_changed)
self.receive_list.setSortingEnabled(True)
@@ -905,7 +905,7 @@ class ElectrumWindow(QMainWindow):
self.from_label = QLabel(_('From'))
grid.addWidget(self.from_label, 3, 0)
self.from_list = MyTreeWidget(self, self.from_list_menu, ['',''], [350, 50])
self.from_list = MyTreeWidget(self, self.from_list_menu, ['',''])
self.from_list.setHeaderHidden(True)
self.from_list.setMaximumHeight(80)
grid.addWidget(self.from_list, 3, 1, 1, 3)
@@ -972,12 +972,11 @@ class ElectrumWindow(QMainWindow):
self.fee_e.textChanged.connect(entry_changed)
self.invoices_label = QLabel(_('Invoices'))
self.invoices_list = MyTreeWidget(
self,
self.create_invoice_menu,
[_('Date'), _('Requestor'), _('Description'), _('Amount'), _('Status')],
[150, 150, None, 150, 100]
)
self.invoices_list = MyTreeWidget(self, self.create_invoice_menu,
[_('Date'), _('Requestor'), _('Description'), _('Amount'), _('Status')], 2)
self.invoices_list.header().setResizeMode(1, QHeaderView.Interactive)
self.invoices_list.setColumnWidth(1, 200)
vbox0 = QVBoxLayout()
vbox0.addLayout(grid)
vbox0.addLayout(buttons)
@@ -1313,14 +1312,14 @@ class ElectrumWindow(QMainWindow):
return w
def create_addresses_tab(self):
l = MyTreeWidget(self, self.create_receive_menu, [ _('Address'), _('Label'), _('Balance'), _('Tx')], [370, None, 130])
l = MyTreeWidget(self, self.create_receive_menu, [ _('Address'), _('Label'), _('Balance'), _('Tx')], 1)
l.setSelectionMode(QAbstractItemView.ExtendedSelection)
l.setSortingEnabled(False)
self.address_list = l
return self.create_list_tab(l)
def create_contacts_tab(self):
l = MyTreeWidget(self, self.create_contact_menu, [_('Key'), _('Value'), _('Type')], [250, None, 130])
l = MyTreeWidget(self, self.create_contact_menu, [_('Key'), _('Value'), _('Type')], 1)
self.contacts_list = l
return self.create_list_tab(l)

12
gui/qt/util.py
View File

@@ -260,7 +260,7 @@ def filename_field(parent, config, defaultname, select_msg):
class MyTreeWidget(QTreeWidget):
def __init__(self, parent, create_menu, headers, column_width):
def __init__(self, parent, create_menu, headers, stretch_column=0):
QTreeWidget.__init__(self, parent)
self.parent = parent
self.setColumnCount(len(headers))
@@ -277,13 +277,9 @@ class MyTreeWidget(QTreeWidget):
self.edit_column = None
self.itemDoubleClicked.connect(self.edit_label)
self.itemChanged.connect(self.label_changed)
# set column width
for i, width in enumerate(column_width):
if width is None:
self.header().setResizeMode(i, QHeaderView.Stretch)
self.edit_column = i
else:
self.setColumnWidth(i, width)
# stretch
for i in range(len(headers)):
self.header().setResizeMode(i, QHeaderView.Stretch if i == stretch_column else QHeaderView.ResizeToContents)
self.setSortingEnabled(True)
def on_activated(self, item):