Adding confirmation icons in Tachikoma's pull request, following considerations on...
authorThomasV <thomasv@gitorious>
Sat, 13 Oct 2012 06:57:22 +0000 (08:57 +0200)
committerThomasV <thomasv@gitorious>
Sat, 13 Oct 2012 06:57:22 +0000 (08:57 +0200)
icons.qrc
icons/clock1.png [new file with mode: 0644]
icons/clock2.png [new file with mode: 0644]
icons/clock3.png [new file with mode: 0644]
icons/clock4.png [new file with mode: 0644]
icons/clock5.png [new file with mode: 0644]
lib/gui_qt.py

index 966b88e..266764c 100644 (file)
--- 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
new file mode 100644 (file)
index 0000000..448e47f
Binary files /dev/null and b/icons/clock1.png differ
diff --git a/icons/clock2.png b/icons/clock2.png
new file mode 100644 (file)
index 0000000..c1a6e99
Binary files /dev/null and b/icons/clock2.png differ
diff --git a/icons/clock3.png b/icons/clock3.png
new file mode 100644 (file)
index 0000000..e429a40
Binary files /dev/null and b/icons/clock3.png differ
diff --git a/icons/clock4.png b/icons/clock4.png
new file mode 100644 (file)
index 0000000..ba036f4
Binary files /dev/null and b/icons/clock4.png differ
diff --git a/icons/clock5.png b/icons/clock5.png
new file mode 100644 (file)
index 0000000..411d7a7
Binary files /dev/null and b/icons/clock5.png differ
index 530bcfb..d7a13d5 100644 (file)
@@ -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'