fix issue #421
This commit is contained in:
parent
4c729f0ff0
commit
c89c449dd7
|
@ -634,7 +634,6 @@ class ElectrumWindow(QMainWindow):
|
||||||
l.editItem( item, column )
|
l.editItem( item, column )
|
||||||
item.setFlags(Qt.ItemIsSelectable | Qt.ItemIsUserCheckable | Qt.ItemIsEnabled | Qt.ItemIsDragEnabled)
|
item.setFlags(Qt.ItemIsSelectable | Qt.ItemIsUserCheckable | Qt.ItemIsEnabled | Qt.ItemIsDragEnabled)
|
||||||
|
|
||||||
|
|
||||||
def address_label_changed(self, item, column, l, column_addr, column_label):
|
def address_label_changed(self, item, column, l, column_addr, column_label):
|
||||||
if column == column_label:
|
if column == column_label:
|
||||||
addr = unicode( item.text(column_addr) )
|
addr = unicode( item.text(column_addr) )
|
||||||
|
@ -642,30 +641,26 @@ class ElectrumWindow(QMainWindow):
|
||||||
is_editable = item.data(0, 32).toBool()
|
is_editable = item.data(0, 32).toBool()
|
||||||
if not is_editable:
|
if not is_editable:
|
||||||
return
|
return
|
||||||
|
|
||||||
changed = self.wallet.set_label(addr, text)
|
changed = self.wallet.set_label(addr, text)
|
||||||
if changed:
|
if changed:
|
||||||
self.update_history_tab()
|
self.update_history_tab()
|
||||||
self.update_completions()
|
self.update_completions()
|
||||||
|
|
||||||
self.current_item_changed(item)
|
self.current_item_changed(item)
|
||||||
|
|
||||||
run_hook('item_changed', item, column)
|
run_hook('item_changed', item, column)
|
||||||
|
|
||||||
|
|
||||||
def current_item_changed(self, a):
|
def current_item_changed(self, a):
|
||||||
run_hook('current_item_changed', a)
|
run_hook('current_item_changed', a)
|
||||||
|
|
||||||
|
|
||||||
def update_history_tab(self):
|
def update_history_tab(self):
|
||||||
|
l = self.history_list
|
||||||
self.history_list.clear()
|
item = l.currentItem()
|
||||||
|
current_tx = item.data(0, Qt.UserRole).toString() if item else None
|
||||||
|
l.clear()
|
||||||
for item in self.wallet.get_history(self.current_account):
|
for item in self.wallet.get_history(self.current_account):
|
||||||
tx_hash, conf, value, timestamp, balance = item
|
tx_hash, conf, value, timestamp, balance = item
|
||||||
time_str = _("unknown")
|
time_str = _("unknown")
|
||||||
if conf is None and timestamp is None:
|
if conf is None and timestamp is None:
|
||||||
continue # skip history in offline mode
|
continue # skip history in offline mode
|
||||||
|
|
||||||
if conf > 0:
|
if conf > 0:
|
||||||
time_str = format_time(timestamp)
|
time_str = format_time(timestamp)
|
||||||
if conf == -1:
|
if conf == -1:
|
||||||
|
@ -678,14 +673,11 @@ class ElectrumWindow(QMainWindow):
|
||||||
icon = QIcon(":icons/clock%d.png"%conf)
|
icon = QIcon(":icons/clock%d.png"%conf)
|
||||||
else:
|
else:
|
||||||
icon = QIcon(":icons/confirmed.png")
|
icon = QIcon(":icons/confirmed.png")
|
||||||
|
|
||||||
v_str = self.format_amount(value, True, whitespaces=True)
|
v_str = self.format_amount(value, True, whitespaces=True)
|
||||||
balance_str = self.format_amount(balance, whitespaces=True)
|
balance_str = self.format_amount(balance, whitespaces=True)
|
||||||
|
|
||||||
label, is_default_label = self.wallet.get_label(tx_hash)
|
label, is_default_label = self.wallet.get_label(tx_hash)
|
||||||
if is_default_label:
|
if is_default_label:
|
||||||
label = ''
|
label = ''
|
||||||
|
|
||||||
item = QTreeWidgetItem( [ '', time_str, label, v_str, balance_str] )
|
item = QTreeWidgetItem( [ '', time_str, label, v_str, balance_str] )
|
||||||
item.setFont(2, QFont(MONOSPACE_FONT))
|
item.setFont(2, QFont(MONOSPACE_FONT))
|
||||||
item.setFont(3, QFont(MONOSPACE_FONT))
|
item.setFont(3, QFont(MONOSPACE_FONT))
|
||||||
|
@ -694,15 +686,13 @@ class ElectrumWindow(QMainWindow):
|
||||||
item.setForeground(3, QBrush(QColor("#BC1E1E")))
|
item.setForeground(3, QBrush(QColor("#BC1E1E")))
|
||||||
if tx_hash:
|
if tx_hash:
|
||||||
item.setData(0, Qt.UserRole, tx_hash)
|
item.setData(0, Qt.UserRole, tx_hash)
|
||||||
#item.setToolTip(0, "%d %s\nTxId:%s" % (conf, _('Confirmations'), tx_hash) )
|
|
||||||
if is_default_label:
|
if is_default_label:
|
||||||
item.setForeground(2, QBrush(QColor('lightgrey')))
|
item.setForeground(2, QBrush(QColor('lightgrey')))
|
||||||
|
|
||||||
item.setIcon(0, icon)
|
item.setIcon(0, icon)
|
||||||
self.history_list.insertTopLevelItem(0,item)
|
l.insertTopLevelItem(0, item)
|
||||||
|
if current_tx == tx_hash:
|
||||||
|
l.setCurrentItem(item)
|
||||||
|
|
||||||
|
|
||||||
self.history_list.setCurrentItem(self.history_list.topLevelItem(0))
|
|
||||||
run_hook('history_tab_update')
|
run_hook('history_tab_update')
|
||||||
|
|
||||||
|
|
||||||
|
@ -1627,31 +1617,24 @@ class ElectrumWindow(QMainWindow):
|
||||||
|
|
||||||
def update_address_tab(self):
|
def update_address_tab(self):
|
||||||
l = self.address_list
|
l = self.address_list
|
||||||
# extend the syntax for consistency
|
item = l.currentItem()
|
||||||
l.addChild = l.addTopLevelItem
|
current_address = item.data(0, Qt.UserRole+1).toString() if item else None
|
||||||
l.insertChild = l.insertTopLevelItem
|
|
||||||
|
|
||||||
l.clear()
|
l.clear()
|
||||||
|
|
||||||
accounts = self.wallet.get_accounts()
|
accounts = self.wallet.get_accounts()
|
||||||
if self.current_account is None:
|
if self.current_account is None:
|
||||||
account_items = sorted(accounts.items())
|
account_items = sorted(accounts.items())
|
||||||
else:
|
else:
|
||||||
account_items = [(self.current_account, accounts.get(self.current_account))]
|
account_items = [(self.current_account, accounts.get(self.current_account))]
|
||||||
|
|
||||||
|
|
||||||
for k, account in account_items:
|
for k, account in account_items:
|
||||||
|
|
||||||
if len(accounts) > 1:
|
if len(accounts) > 1:
|
||||||
name = self.wallet.get_account_name(k)
|
name = self.wallet.get_account_name(k)
|
||||||
c,u = self.wallet.get_account_balance(k)
|
c, u = self.wallet.get_account_balance(k)
|
||||||
account_item = QTreeWidgetItem( [ name, '', self.format_amount(c+u), ''] )
|
account_item = QTreeWidgetItem( [ name, '', self.format_amount(c+u), ''] )
|
||||||
l.addTopLevelItem(account_item)
|
l.addTopLevelItem(account_item)
|
||||||
account_item.setExpanded(self.accounts_expanded.get(k, True))
|
account_item.setExpanded(self.accounts_expanded.get(k, True))
|
||||||
account_item.setData(0, 32, k)
|
account_item.setData(0, Qt.UserRole+1, k)
|
||||||
else:
|
else:
|
||||||
account_item = l
|
account_item = l
|
||||||
|
|
||||||
sequences = [0,1] if account.has_change() else [0]
|
sequences = [0,1] if account.has_change() else [0]
|
||||||
for is_change in sequences:
|
for is_change in sequences:
|
||||||
if len(sequences) > 1:
|
if len(sequences) > 1:
|
||||||
|
@ -1662,10 +1645,8 @@ class ElectrumWindow(QMainWindow):
|
||||||
seq_item.setExpanded(True)
|
seq_item.setExpanded(True)
|
||||||
else:
|
else:
|
||||||
seq_item = account_item
|
seq_item = account_item
|
||||||
|
|
||||||
used_item = QTreeWidgetItem( [ _("Used"), '', '', '', ''] )
|
used_item = QTreeWidgetItem( [ _("Used"), '', '', '', ''] )
|
||||||
used_flag = False
|
used_flag = False
|
||||||
|
|
||||||
addr_list = account.get_addresses(is_change)
|
addr_list = account.get_addresses(is_change)
|
||||||
for address in addr_list:
|
for address in addr_list:
|
||||||
num, is_used = self.wallet.is_used(address)
|
num, is_used = self.wallet.is_used(address)
|
||||||
|
@ -1674,7 +1655,8 @@ class ElectrumWindow(QMainWindow):
|
||||||
balance = self.format_amount(c + u)
|
balance = self.format_amount(c + u)
|
||||||
item = QTreeWidgetItem( [ address, label, balance, "%d"%num] )
|
item = QTreeWidgetItem( [ address, label, balance, "%d"%num] )
|
||||||
item.setFont(0, QFont(MONOSPACE_FONT))
|
item.setFont(0, QFont(MONOSPACE_FONT))
|
||||||
item.setData(0, 32, True) # label can be edited
|
item.setData(0, Qt.UserRole, True) # label can be edited
|
||||||
|
item.setData(0, Qt.UserRole+1, address)
|
||||||
if address in self.wallet.frozen_addresses:
|
if address in self.wallet.frozen_addresses:
|
||||||
item.setBackgroundColor(0, QColor('lightblue'))
|
item.setBackgroundColor(0, QColor('lightblue'))
|
||||||
if self.wallet.is_beyond_limit(address, account, is_change):
|
if self.wallet.is_beyond_limit(address, account, is_change):
|
||||||
|
@ -1686,28 +1668,28 @@ class ElectrumWindow(QMainWindow):
|
||||||
used_item.addChild(item)
|
used_item.addChild(item)
|
||||||
else:
|
else:
|
||||||
seq_item.addChild(item)
|
seq_item.addChild(item)
|
||||||
|
if address == current_address:
|
||||||
# we use column 1 because column 0 may be hidden
|
l.setCurrentItem(item)
|
||||||
l.setCurrentItem(l.topLevelItem(0),1)
|
|
||||||
|
|
||||||
|
|
||||||
def update_contacts_tab(self):
|
def update_contacts_tab(self):
|
||||||
l = self.contacts_list
|
l = self.contacts_list
|
||||||
|
item = l.currentItem()
|
||||||
|
current_address = item.data(0, Qt.UserRole+1).toString() if item else None
|
||||||
l.clear()
|
l.clear()
|
||||||
|
|
||||||
for address in self.wallet.addressbook:
|
for address in self.wallet.addressbook:
|
||||||
label = self.wallet.labels.get(address,'')
|
label = self.wallet.labels.get(address,'')
|
||||||
n = self.wallet.get_num_tx(address)
|
n = self.wallet.get_num_tx(address)
|
||||||
item = QTreeWidgetItem( [ address, label, "%d"%n] )
|
item = QTreeWidgetItem( [ address, label, "%d"%n] )
|
||||||
item.setFont(0, QFont(MONOSPACE_FONT))
|
item.setFont(0, QFont(MONOSPACE_FONT))
|
||||||
# 32 = label can be edited (bool)
|
# 32 = label can be edited (bool)
|
||||||
item.setData(0,32, True)
|
item.setData(0, Qt.UserRole, True)
|
||||||
# 33 = payto string
|
# 33 = payto string
|
||||||
item.setData(0,33, address)
|
item.setData(0, Qt.UserRole+1, address)
|
||||||
l.addTopLevelItem(item)
|
l.addTopLevelItem(item)
|
||||||
|
if address == current_address:
|
||||||
|
l.setCurrentItem(item)
|
||||||
run_hook('update_contacts_tab', l)
|
run_hook('update_contacts_tab', l)
|
||||||
l.setCurrentItem(l.topLevelItem(0))
|
|
||||||
|
|
||||||
|
|
||||||
def create_console_tab(self):
|
def create_console_tab(self):
|
||||||
|
|
|
@ -252,10 +252,14 @@ def filename_field(parent, config, defaultname, select_msg):
|
||||||
|
|
||||||
|
|
||||||
class MyTreeWidget(QTreeWidget):
|
class MyTreeWidget(QTreeWidget):
|
||||||
|
|
||||||
def __init__(self, parent):
|
def __init__(self, parent):
|
||||||
QTreeWidget.__init__(self, parent)
|
QTreeWidget.__init__(self, parent)
|
||||||
self.setContextMenuPolicy(Qt.CustomContextMenu)
|
self.setContextMenuPolicy(Qt.CustomContextMenu)
|
||||||
self.itemActivated.connect(self.on_activated)
|
self.itemActivated.connect(self.on_activated)
|
||||||
|
# extend the syntax for consistency
|
||||||
|
self.addChild = self.addTopLevelItem
|
||||||
|
self.insertChild = self.insertTopLevelItem
|
||||||
|
|
||||||
def on_activated(self, item):
|
def on_activated(self, item):
|
||||||
if not item: return
|
if not item: return
|
||||||
|
|
Loading…
Reference in New Issue