better icons for confirmations

11 files changed, 31 insertions, 21 deletions

diff --git a/doc/assets-attribution.txt b/doc/assets-attribution.txt
index b33251bcfd..eced20143e 100644
--- a/doc/assets-attribution.txt
+++ b/doc/assets-attribution.txt
@@ -1,3 +1,7 @@
+Icon: src/qt/res/icons/clock*.png
+Designer: Wladimir van der Laan
+License: Creative Commons Attribution
+
 Icon: src/qt/res/icons/send.png
 Icon Pack: Vista Style Arrow
 Designer: Icons Land
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
index 3fa123b364..63bb26d8b5 100644
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -5,14 +5,19 @@
         <file alias="quit">res/icons/quit.png</file>
         <file alias="send">res/icons/send.png</file>
         <file alias="toolbar">res/icons/toolbar.png</file>
-        <file alias="connect0">res/icons/connect0_16.png</file>
-        <file alias="connect1">res/icons/connect1_16.png</file>
-        <file alias="connect2">res/icons/connect2_16.png</file>
-        <file alias="connect3">res/icons/connect3_16.png</file>
-        <file alias="connect4">res/icons/connect4_16.png</file>
-        <file alias="transaction0">res/icons/transaction0.png</file>
-        <file alias="transaction1">res/icons/transaction1.png</file>
-        <file alias="transaction2">res/icons/transaction2.png</file>
+        <file alias="connect_0">res/icons/connect0_16.png</file>
+        <file alias="connect_1">res/icons/connect1_16.png</file>
+        <file alias="connect_2">res/icons/connect2_16.png</file>
+        <file alias="connect_3">res/icons/connect3_16.png</file>
+        <file alias="connect_4">res/icons/connect4_16.png</file>
+        <file alias="transaction_0">res/icons/transaction0.png</file>
+        <file>res/icons/transaction1.png</file>
+        <file alias="transaction_confirmed">res/icons/transaction2.png</file>
+        <file alias="transaction_1">res/icons/clock1.png</file>
+        <file alias="transaction_2">res/icons/clock2.png</file>
+        <file alias="transaction_3">res/icons/clock3.png</file>
+        <file alias="transaction_4">res/icons/clock4.png</file>
+        <file alias="transaction_5">res/icons/clock5.png</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="about">res/images/about.png</file>
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index b45a4f9f91..4e9a021351 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -348,11 +348,11 @@ void BitcoinGUI::setNumConnections(int count)
     QString icon;
     switch(count)
     {
-    case 0: icon = ":/icons/connect0"; break;
-    case 1: case 2: icon = ":/icons/connect1"; break;
-    case 3: case 4: icon = ":/icons/connect2"; break;
-    case 5: case 6: icon = ":/icons/connect3"; break;
-    default: icon = ":/icons/connect4"; break;
+    case 0: icon = ":/icons/connect_0"; break;
+    case 1: case 2: case 3: icon = ":/icons/connect_1"; break;
+    case 4: case 5: case 6: icon = ":/icons/connect_2"; break;
+    case 7: case 8: case 9: icon = ":/icons/connect_3"; break;
+    default: icon = ":/icons/connect_4"; break;
     }
     labelConnections->setTextFormat(Qt::RichText);
     labelConnections->setText("<img src=\""+icon+"\"> " + QLocale::system().toString(count)+" "+tr("connection(s)", "", count));
diff --git a/src/qt/res/icons/clock1.png b/src/qt/res/icons/clock1.png
new file mode 100644
index 0000000000..448e47f947
--- /dev/null
+++ b/src/qt/res/icons/clock1.png
diff --git a/src/qt/res/icons/clock2.png b/src/qt/res/icons/clock2.png
new file mode 100644
index 0000000000..c1a6e99f7f
--- /dev/null
+++ b/src/qt/res/icons/clock2.png
diff --git a/src/qt/res/icons/clock3.png b/src/qt/res/icons/clock3.png
new file mode 100644
index 0000000000..e429a402cf
--- /dev/null
+++ b/src/qt/res/icons/clock3.png
diff --git a/src/qt/res/icons/clock4.png b/src/qt/res/icons/clock4.png
new file mode 100644
index 0000000000..ba036f47d3
--- /dev/null
+++ b/src/qt/res/icons/clock4.png
diff --git a/src/qt/res/icons/clock5.png b/src/qt/res/icons/clock5.png
new file mode 100644
index 0000000000..411d7a78a0
--- /dev/null
+++ b/src/qt/res/icons/clock5.png
diff --git a/src/qt/res/icons/transaction0.png b/src/qt/res/icons/transaction0.png
index 6d698b350f..4578666ee4 100644
--- a/src/qt/res/icons/transaction0.png
+++ b/src/qt/res/icons/transaction0.png
diff --git a/src/qt/res/icons/transaction1.png b/src/qt/res/icons/transaction1.png
deleted file mode 100644
index f19450aa9f..0000000000
--- a/src/qt/res/icons/transaction1.png
+++ /dev/null
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index a84b45aee3..eeb948b616 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -412,16 +412,17 @@ QVariant TransactionTableModel::formatTxDecoration(const TransactionRecord *wtx)
     case TransactionStatus::Offline:
         return QColor(192,192,192);
     case TransactionStatus::Unconfirmed:
-        if(wtx->status.depth)
+        switch(wtx->status.depth)
         {
-            return QIcon(":/icons/transaction1");
-        }
-        else
-        {
-            return QIcon(":/icons/transaction0");
-        }
+        case 0: return QIcon(":/icons/transaction_0");
+        case 1: return QIcon(":/icons/transaction_1");
+        case 2: return QIcon(":/icons/transaction_2");
+        case 3: return QIcon(":/icons/transaction_3");
+        case 4: return QIcon(":/icons/transaction_4");
+        default: return QIcon(":/icons/transaction_5");
+        };
     case TransactionStatus::HaveConfirmations:
-        return QIcon(":/icons/transaction2");
+        return QIcon(":/icons/transaction_confirmed");
     }
     return QColor(0,0,0);
 }