Browse Source

Adding confirmation icons in Tachikoma's pull request, following considerations on security

283
ThomasV 12 years ago
parent
commit
d8bebdccf6
  1. 5
      icons.qrc
  2. BIN
      icons/clock1.png
  3. BIN
      icons/clock2.png
  4. BIN
      icons/clock3.png
  5. BIN
      icons/clock4.png
  6. BIN
      icons/clock5.png
  7. 5
      lib/gui_qt.py

5
icons.qrc

@ -1,6 +1,11 @@
<RCC> <RCC>
<qresource prefix="/" > <qresource prefix="/" >
<file>electrum.png</file> <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/confirmed.png</file>
<file>icons/lock.png</file> <file>icons/lock.png</file>
<file>icons/preferences.png</file> <file>icons/preferences.png</file>

BIN
icons/clock1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 946 B

BIN
icons/clock2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 944 B

BIN
icons/clock3.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 946 B

BIN
icons/clock4.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 962 B

BIN
icons/clock5.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 956 B

5
lib/gui_qt.py

@ -410,7 +410,10 @@ class ElectrumWindow(QMainWindow):
if tx['height']: if tx['height']:
conf = self.wallet.blocks - tx['height'] + 1 conf = self.wallet.blocks - tx['height'] + 1
time_str = datetime.datetime.fromtimestamp( tx['timestamp']).isoformat(' ')[:-3] 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: else:
conf = 0 conf = 0
time_str = 'pending' time_str = 'pending'

Loading…
Cancel
Save