commit d8bebdccf663ead67c554951c8a8db6bbe68165e
parent cdf81f370b8ccab9c1b55726233b881c4908692a
Author: ThomasV <thomasv@gitorious>
Date: Sat, 13 Oct 2012 08:57:22 +0200
Adding confirmation icons in Tachikoma's pull request, following considerations on security
Diffstat:
7 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/icons.qrc b/icons.qrc
@@ -1,6 +1,11 @@
<RCC>
<qresource prefix="/" >
<file>electrum.png</file>
+ <file>icons/clock1.png</file>
+ <file>icons/clock2.png</file>
+ <file>icons/clock3.png</file>
+ <file>icons/clock4.png</file>
+ <file>icons/clock5.png</file>
<file>icons/confirmed.png</file>
<file>icons/lock.png</file>
<file>icons/preferences.png</file>
diff --git a/icons/clock1.png b/icons/clock1.png
Binary files differ.
diff --git a/icons/clock2.png b/icons/clock2.png
Binary files differ.
diff --git a/icons/clock3.png b/icons/clock3.png
Binary files differ.
diff --git a/icons/clock4.png b/icons/clock4.png
Binary files differ.
diff --git a/icons/clock5.png b/icons/clock5.png
Binary files differ.
diff --git a/lib/gui_qt.py b/lib/gui_qt.py
@@ -410,7 +410,10 @@ class ElectrumWindow(QMainWindow):
if tx['height']:
conf = self.wallet.blocks - tx['height'] + 1
time_str = datetime.datetime.fromtimestamp( tx['timestamp']).isoformat(' ')[:-3]
- icon = QIcon(":icons/confirmed.png")
+ if conf < 6:
+ icon = QIcon(":icons/clock%d.png"%conf)
+ else:
+ icon = QIcon(":icons/confirmed.png")
else:
conf = 0
time_str = 'pending'