BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove duplication of parent column names. 

We no longer assume how many columns the history widget
has or their names.

Add a fiat balance column.

Remove extra columns when shutting the plugin.
This commit is contained in:
Neil Booth 2015-09-05 15:51:18 +09:00
parent 0ef7320d7d
commit 2df8881824
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/exchange_rate.py
View File

@ -255,6 +255,17 @@ class Plugin(BasePlugin):
window.fx_fields = {} window.fx_fields = {}
self.add_send_edit(window) self.add_send_edit(window)
self.add_receive_edit(window) self.add_receive_edit(window)
history_list = window.history_list
cols = history_list.columnCount()
header = history_list.headerItem()
labels = [header.text(c) for c in range(history_list.columnCount())]
labels.extend([_('Fiat Amount'), _('Fiat Balance')])
history_list.setColumnCount(cols + 2)
# For unclear reasons setting this column to ResizeToContents
# makes e.g. label editing very slow
history_list.setColumnWidth(cols, 120)
history_list.setColumnWidth(cols + 1, 120)
history_list.setHeaderLabels(labels)
window.update_status() window.update_status()
def close(self): def close(self):
@ -264,6 +275,8 @@ class Plugin(BasePlugin):
for window in self.parent.windows: for window in self.parent.windows:
window.send_fiat_e.hide() window.send_fiat_e.hide()
window.receive_fiat_e.hide() window.receive_fiat_e.hide()
if self.config_history():
window.history_list.setColumnCount(window.history_list.columnCount() - 2)
window.update_status() window.update_status()
def set_currencies(self, currency_options): def set_currencies(self, currency_options):
@ -340,24 +353,19 @@ class Plugin(BasePlugin):
def history_tab_update(self, window, entries): def history_tab_update(self, window, entries):
if not self.config_history(): if not self.config_history():
return return
history_list = window.history_list ccy = self.fiat_unit()
history_list.setColumnCount(7) first = window.history_list.columnCount() - 2
# For unclear reasons setting this column to ResizeToContents
# makes e.g. label editing very slow
history_list.setColumnWidth(6, 130)
#window.history_list.header().setResizeMode(6, QHeaderView.ResizeToConte
history_list.setHeaderLabels([ '', '', _('Date'), _('Description') , _('Amount'), _('Balance'), _('Fiat Amount')] )
for item, tx in entries: for item, tx in entries:
tx_hash, conf, value, timestamp, balance = tx tx_hash, conf, value, timestamp, balance = tx
date = timestamp_to_datetime(timestamp) date = timestamp_to_datetime(timestamp)
if not date: if not date:
date = timestmap_to_datetime(0) date = timestmap_to_datetime(0)
text = self.exchange.historical_value_str(self.fiat_unit(), for column, amount in [(first, value), (first + 1, balance)]:
value, date) text = self.exchange.historical_value_str(ccy, amount, date)
item.setText(6, "%16s" % text) item.setText(column, "%16s" % text)
item.setFont(6, QFont(MONOSPACE_FONT)) item.setFont(column, QFont(MONOSPACE_FONT))
if value < 0: if amount < 0:
item.setForeground(6, QBrush(QColor("#BC1E1E"))) item.setForeground(column, QBrush(QColor("#BC1E1E")))
def settings_widget(self, window): def settings_widget(self, window):
return EnterButton(_('Settings'), self.settings_dialog) return EnterButton(_('Settings'), self.settings_dialog)
@ -411,9 +419,6 @@ class Plugin(BasePlugin):
self.get_historical_rates() self.get_historical_rates()
else: else:
self.config.set_key('history_rates', 'unchecked') self.config.set_key('history_rates', 'unchecked')
for window in self.parent.windows:
window.history_list.setHeaderLabels( [ '', '', _('Date'), _('Description') , _('Amount'), _('Balance')] )
window.history_list.setColumnCount(6)
def set_currencies(combo): def set_currencies(combo):
try: try: