AaronFiore/electrum
1
0
Fork 0
Code Activity

distinction between unconfirmed and unverified transactions

Browse Source
This commit is contained in:
ecdsa
2013-04-27 17:48:27 +02:00
parent 827e29c1dc
commit c95c80163d
4 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gui/gui_classic.py
View File

@@ -606,22 +606,22 @@ class ElectrumWindow(QMainWindow):
self.history_list.clear()
for item in self.wallet.get_tx_history(self.current_account):
tx_hash, conf, is_mine, value, fee, balance, timestamp = item
if conf:
if conf > 0:
try:
time_str = datetime.datetime.fromtimestamp( timestamp).isoformat(' ')[:-3]
except:
time_str = "unknown"
if conf == -1:
icon = None
if conf == 0:
icon = QIcon(":icons/unconfirmed.png")
elif conf < 6:
icon = QIcon(":icons/clock%d.png"%conf)
else:
icon = QIcon(":icons/confirmed.png")
else:
if conf == -1:
time_str = 'unverified'
icon = None
elif conf == 0:
time_str = 'pending'
icon = QIcon(":icons/unconfirmed.png")
elif conf < 6:
icon = QIcon(":icons/clock%d.png"%conf)
else:
icon = QIcon(":icons/confirmed.png")
if value is not None:
v_str = self.format_amount(value, True)

5
gui/gui_gtk.py
View File

@@ -1167,12 +1167,15 @@ class ElectrumWindow:
for item in self.wallet.get_tx_history():
tx_hash, conf, is_mine, value, fee, balance, timestamp = item
if conf:
if conf > 0:
try:
time_str = datetime.datetime.fromtimestamp( timestamp).isoformat(' ')[:-3]
except:
time_str = "------"
conf_icon = gtk.STOCK_APPLY
elif conf == -1:
time_str = 'unverified'
conf_icon = None
else:
time_str = 'pending'
conf_icon = gtk.STOCK_EXECUTE