From d8bebdccf663ead67c554951c8a8db6bbe68165e Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Sat, 13 Oct 2012 08:57:22 +0200
Subject: [PATCH] Adding confirmation icons in Tachikoma's pull request,
 following considerations on security

---
 icons.qrc        |   5 +++++
 icons/clock1.png | Bin 0 -> 946 bytes
 icons/clock2.png | Bin 0 -> 944 bytes
 icons/clock3.png | Bin 0 -> 946 bytes
 icons/clock4.png | Bin 0 -> 962 bytes
 icons/clock5.png | Bin 0 -> 956 bytes
 lib/gui_qt.py    |   5 ++++-
 7 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 icons/clock1.png
 create mode 100644 icons/clock2.png
 create mode 100644 icons/clock3.png
 create mode 100644 icons/clock4.png
 create mode 100644 icons/clock5.png

diff --git a/icons.qrc b/icons.qrc
index 966b88e1..266764c2 100644
--- 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
index 0000000000000000000000000000000000000000..448e47f947d3da4e023f69279e7f8a830ed5ca75
GIT binary patch
literal 946
zcmV;j15NyiP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H1120KLK~y-6Rg+CmTx9@-pZDH7!wfLY3=D*iwxOgH7e=L);L1de
ztPBg2rbg3*l}qCv=z@PR9g}e*cH5mUG?pf{O{Hnag0v<UsT3>Ip-$*fn9H5H_r6~)
zqzOIA*`4R?9$~HJXy)hVy-X%^Hjd*nj@HvsO4>@T#BsbDhT*TJQYkvR7cUQl5TaZz
zpYBrX%Im!YZ>4+tN#}B$cv_`dt+KWK)cz12{86*^Lb+UiU=KlItwjhSipAoEH+!-R
zg|2=ts~r+uX@WRrKr1?f7CVg>^!@#a?}O)ZG2wo>u(0s8wbpt7<#PG-gqQecz|DDb
zXOA7FDfIWV@n{`fhfyy<JqYMG9_M5#q1wBb4$hyy2i$Xo5Z+)qy*QE|9`Qnn=X!Xq
zi!p{Lo15gDK7+Aju<0Y(ZLV5NW_;Xf1bgp&b@}pwlg(zQUQ2aOn!SK(t%g(zgGDMy
zv)Lrt+XLT+R={>o56wa!wll{&`My)G>&|#esVUi$!`Y9?<Z~!2LK`rapxq*lBI1rD
zk4Hz@>F%OnG=95HG;|ETxpBsErJPo-M`#ox=@A=!SjF=fyOh@+@_FSh-`>1ItTp?=
z0Y6^5N+1;-N=<oMYfl=@)^?R_s*6H42UdeMygxI8wU$`M#7Yula8gO${qO_gjwIR`
z&k3}y7z`t0C&?6giG}^YShOopF3^#{O{a*g=Gkt8M$p8{2w&@E4_J0<Rl<Q`o^1X@
zZ+8!wR2qcEIu@-B28+TVg<+$%MQAnCyGf*!zj=*DqjEor)=v%%Pecx=q)Y5MSfw$>
zVjR%M;72X|R=~vM8^n&~_RrU!g<-hpluD&&tKI%Y{<)@y$H(xp-Q4+om9?!+B2VyF
ztx8*19{*e8r&~7&UC?*$n1{aqX{A!}9e`r7_~2%}{)M`~s+F+xo){)GG(aE>*DJTF
zw|tIGoZ_Q%A7fXR&3E<s#igaCTh?0picE8Jb7w~qi7S)&{8(`OIPF9NqZDqdMS6Xm
zUuw1OwS$At4q@|(jW07hJKLE~r)RX*Zzq(Rl2PRN#w;tPR`>V!udS@CH0=@SKhXx{
U3^ThEGXMYp07*qoM6N<$g34vUH2?qr

literal 0
HcmV?d00001

diff --git a/icons/clock2.png b/icons/clock2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1a6e99f7f28d66f4dd6901f4c09a2e4325ac3b7
GIT binary patch
literal 944
zcmV;h15f;kP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H111(8JK~y-6Rg+I_lVt$LfA9Cb?b>Z$OUJg1324BT5lxs2GsJ|8
zhaDFZHJA{RCA%9hCR{x1qSx9(JrNEb)RP`GM$`nzB9zh05p{96Wei$2V6<y#zwdkd
z{_!A7#_#<6p40OP=N$W)pP!dO5S&&@P5Rg~N+}mAT~SIcMNxFSSS-f-^J1?+2q8+P
zQoi3a-@Y+Ca4OX|NN<qkX#9}o_5(H_RoxG@@ULpyT`ZMK%kG6J_vAvMaPj0o>hhqM
zk=e+S@HOq`BiczvkjOFI<HRS2*53U7ar<^WH}|m+;!Ee8lK`bsDL;NNeR(KKNZoqM
z6RjB>8s^{CRmgh07D%?AwHfjSAEa$U2hA^@pFh6{Ec!wSIg&|VJ)Fvo$}mRyKGK(1
zYuH#{C#Rc?B)W{aCPH=i<)P+mU&~vH<k`}dudaC6Y<4PtFf(E5O&(OMbhW|a=xR-~
z*(7c?AZ$V0#>5c^=#VpAW`bwqzVA;<t@V@;39PRPayc{(VJuijJM5s6F(|-vkv8P*
zY(y)J8S@p!^iFz7Vc&^J5?PB#CQ#O(tVLPF(|VoK^%ds6S>*FySD+hH4<jxucIfYR
z=s{0OZH(*!o3$$0RGPtT7MuZRd3So6{_ZYAtqpRW8kmrr7xURfmq2#WTKlpUs^5JZ
zz4ywoV+f^CT7&q1B-Zz-dk5G_p2E+JaiqP5tNl&V#554Jl)WQ?J0@(P69a6luQAXc
z5Tw!|z<B~=z~az;4}SzFsYHstc$>*&gw}dV?(FQ8mx=#*eLQy}_B?blfs#H>JFK->
zPhhN|6-Tr>A^Eo^u)^@;t!uR?YW(aKi^X`e5q=nL-7};4F=RHw&AZF2Y~Cl9l6%!E
zp%AQXZSm8M>qNd!yiu_$kJ}f@<#NjdC=?3I*H*Vb()X7wo@3zX5rRV_v<3WDzQuN@
z&EXSy&b@yQHWux7ceg%WSXj8>oO3UoX?Aw@^k^Wzo_KZSxJ_r+^#Y7Fq@y~nvBk|l
z*J>+Io?mz&+n3(B$IQ%3Z#tcx)>==dggs-7_Uj#0)><#^?(SZ#R4PrkPx=ps^~c_I
S7%Wc!0000<MNUMnLSTX@g1sRC

literal 0
HcmV?d00001

diff --git a/icons/clock3.png b/icons/clock3.png
new file mode 100644
index 0000000000000000000000000000000000000000..e429a402cfba88ebcff6eada2d1226557c3ea736
GIT binary patch
literal 946
zcmV;j15NyiP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H1120KLK~y-6Rg+CjTvY%@&%N&s%mA-%7z;%}QfZ19jcG`+U04^I
zvSg!%xM+%D;ZEI{xH2I|-Hw=!iK#ZR3pI7&!We&IVhw3SVI=jB+LoVCpqK*fyqW2|
zci(;Yx+w`g>+gKKBb;;WWpZ*-`M!TtYdxf-J08ceYs99kwVscn=*ra8RJ?aDb`OLQ
zqEspkv}Mz;p6bmXY0c$n&KBqk)(LlRvAVh8zWY7;dwt8DDwRrC-2+kW%Ee;w)L?Js
z>;YNG_}Y^3EcMz3^~B=KJe{QC?dO-D{`Q~xm3U&}Eg{4w&N-(5N~O}k;A737b!w%O
z`WAPLVSh&lH~+m3Jst-;7609-)8ScOIh15f-1w+AHZ}{)dO`?wpwRq7UrW&A=@_Lv
zl;>fsWo3DZ_H0O3py_H25w5|{Wy6Vqs+_-_IZ^ub{5cr}!SEBk!B7&0+*)5JF$N1H
z#t>FQ;@UkhRj_r^q(MG+pLP*5`pnLt=XoQ_7&9zwhE!_&d^^U0uqjwez0pAH7*YW)
zLCJ_`4@Xp^n8SsXG;JA@N}A(QqKJ$|WSY>aMH`DwEn7QxDP34#;=MUO{9*xI#NArN
zJD)db^XfD!Gpww0P1;IU*ER@Rvh2?XU>#V;3nxc-uInO6qDhSg5z*cj^TBHdztv!j
z@l>^@FR4u9rJl$85k{kp0VlwLl^!aS(v&e^QxKY)w<8dmdrnflZ|4*+m*@({E3mS-
zL}6bWel816;E-4hQp6w=Kr_1-VO>O_Yahm#d9}U0J@eNMbG^U6Fc1rg@tV+5;he!b
zi<Jh1W~Y`A)+1hh(GppY*U#lwqbT}OPEAe4D;u@3sB$gs?jJz;0hj0hU}1TcSSl{x
zXkcYRc`4%k3pMZ(&Rz`CrA={qW@e@;0gA=q)nCh7Z<z2;i{~ix^x=0tO5F<1d|zd)
zqB(iY@$s8k&iqnHznSshot~cl%{k{DifMd&{Al+h-j_$7>^_uApK9Xs^1<^|Dj^GN
zlCLiXtBafN^aI&GRO2qAqoXakTyDe|GnCEPV_L^Dtf#ZanE6Vj@>9874&5H<e^2_z
UPHp92g8%>k07*qoM6N<$g2J7>Bme*a

literal 0
HcmV?d00001

diff --git a/icons/clock4.png b/icons/clock4.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba036f47d33e7ac9a3db80ccdec293e0ee3be034
GIT binary patch
literal 962
zcmV;z13mnSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H113yVbK~y-6Rg+6-oK+mf&;9N<olMfnOq1!P8cjoL9+3D7jrB<t
zp;{MNv{X?D4Okb>D(iwsmO+s?$ftr*sTFZ0xRGYjMF_~`(Ig8SE6t;MA*OkKU%t$p
zd;j<TUD!Z+HfM8wXLXKXW*pYw;GmyQr%!9GyQOq5YOT3krYWuUv{GukSS(f!=fy#R
z5JCh&&{lJle(r3odp>of4%Nvl9&cX7ZnT1xwRQgeruuVzjr)QinB|9{e*g~;5BIgV
zC%?}p>ivvok&p)Q-Wt?~L$)dlEv*>%XtC?JTk&|M^5K9G;%jDR9{_?NXlrfrzdIp)
z-^3f(2no5|aooH6H=LDdI_YEMpBVKyhYN3*gr@SBdwcIq0GN<M2tR+KYNRP!*XTP1
zUrPACgmVr{iwnqPL*(-s`Gyb>W!xGey!=Y!&E84876d<D^D>!CPy4B=XYKwDR#w+w
zh~OMx3?U3dsLBo?BCv>IT^X5U`^eT*aQ>aG4k_h1pNM*FrB+B0B3*k7<N(1IfI}RY
zVRQvf2ml5$q0oIsA&M(#X|b@jy4#b|oUvL$X$RpSfi@1B9JFzGu(geEznR0wS0?fK
z&>YxP*xpt6^lBN^sTj#5_4w9W--5BUypGJ#D&*=ifMZBWxKe0FeLe|eG{|YNr;yE6
z@W~LNCQBe9>Bq4xS;6l%Hnl)F4Q&av=@4z5Ge{=)01*5X0kB}9v9PG%JdGXl5Jhg%
z2QUe_2I2-REzINTXLiu_!aM*1v-#hJ0fYeyjj7uTRw!g2s|68F`<t7arI{J^S663k
zN5jb_Jn_^vIAH)b5NyC800vt-24SRdvClz~#6TgttdzRx6^q5n>WX@QEBwQ}eKExG
zCc=#ygwaugOAy8<6s$D3J*)89&>mdE;QF<Uy}uwXmrA7w4<{`Og+k$npFS{~<+r#r
z`#RrSd5ItF_wc1lZG303gG1NK|CU?$i?5!evu9tu3czFLN6*yX-+#J3r?0<xeygMT
zRD{MS_rcIuT^6`I=i%31GRsTze0gkaY?PVZBX2xVZ*OmPDwR4%MBRym=^-*Qirgd-
kP4DjRj!aEWg?tG54@-sA^r!^w`~Uy|07*qoM6N<$f(o*_jsO4v

literal 0
HcmV?d00001

diff --git a/icons/clock5.png b/icons/clock5.png
new file mode 100644
index 0000000000000000000000000000000000000000..411d7a78a0a3c1d71a6e9d73ee7164eabe1e649b
GIT binary patch
literal 956
zcmV;t14I0YP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H1135`VK~y-6Rg+CjTvZr`-*fM|z|1&5bQn7n5eY3pZE8b0YNGCJ
z6GK9pE^J(ol60f2Ok8!L35y!t(OFzKkS4m)CQWSIRFf)(g#%2`Dyb#3A_ST`3}x<R
znDg_UbKHob&-#6y-OHSFILzeaBu}T)XOvRI9(S)xDV=OlRVlS3gqSav%kuD^9RwI-
zEDXcJ_O$zE@TKgjY<nK*L<T|MCTh_J{@&Pf^WTZ(-Ay+ZhT(7SKan5EQ&Ur8y+a){
zefbp6WekEqq1oI*M{LoP${~?AtnZ`0PTslIoWCqDf5;g7!a3(S0EA&U*gKS%>Cbzd
zbPctC2whzTtgf!$S@<Ztz_IhVi6aGzw=d{GQ0v;oy^9L~7JSAS?<^*64;;((1YCdz
zKDh70I*YZnhX^_&q>n0e6eAe4u>1p||IOHY@N4kabokYEFPqJlil=I)dG}pxY;Hhn
zf^~pageZ#8l)KP~q0xl2Ed;rJWO5QOkM0clzJHDrQ7O~C&v-UQp#*qA1Ljc?b}xly
zvjw3f6k{;ZFkGPLRe>m$C>%F1COOQVuU|{%6<U!+TSmkB`|wU|!$m37zpbGfZh}uU
z96jEK^H;hNJrTI^aSLa!YWVG)C2o!31j5Q}fc$_)@kIr|0GSp>u4Ld?3ZxaJQP2?J
zM<hl*CD;ssh<q-Zrn0+@cLzpdc%FoY0YGq$fOdidfwd6=7$~N&wJM;XK#_-5Y!^9z
z#rhgts$kfkcNhvM3_71vaLm9#!-8O;LC`QzxW6bMtw1uL0TC_ndc9t8Kea7)y@Hd<
z5-cYuMsQC5A285}pJ>F9!0Goa_Jxm|@8{Nq5VyT@xhxxx+}IztI&}Y8LdP+}>~+HL
zKN2J(-1|j9I*t2Pfty$NprBEi$(s5@cBxXS#LPJd#u%HJnE0UgjooWQ7wUX#MIzND
zk<1gO#~V2Rxrf~I22vO-%w){+jb}cYot^v4IcJ|b)A;!KnPivxa^Rhvq3l46bniYa
z6n54b9^dnD_v`HX_5*imZf@>p=bU}&jR%a5jwTa{#5p1wW`QmdX}=ZQMIu^iG#cMm
etJTOIlKurBK+b`Ue8F7+0000<MNUMnLSTZ%eYC3p

literal 0
HcmV?d00001

diff --git a/lib/gui_qt.py b/lib/gui_qt.py
index 530bcfbb..d7a13d53 100644
--- 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'