From 89c94b5578e1882f3fd4bfadc9e39b436579563e Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Fri, 17 Jun 2011 17:47:40 +0200 Subject: better icons for confirmations --- src/qt/bitcoin.qrc | 21 +++++++++++++-------- src/qt/bitcoingui.cpp | 10 +++++----- src/qt/res/icons/clock1.png | Bin 0 -> 946 bytes src/qt/res/icons/clock2.png | Bin 0 -> 944 bytes src/qt/res/icons/clock3.png | Bin 0 -> 946 bytes src/qt/res/icons/clock4.png | Bin 0 -> 962 bytes src/qt/res/icons/clock5.png | Bin 0 -> 956 bytes src/qt/res/icons/transaction0.png | Bin 690 -> 569 bytes src/qt/res/icons/transaction1.png | Bin 969 -> 0 bytes src/qt/transactiontablemodel.cpp | 17 +++++++++-------- 10 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 src/qt/res/icons/clock1.png create mode 100644 src/qt/res/icons/clock2.png create mode 100644 src/qt/res/icons/clock3.png create mode 100644 src/qt/res/icons/clock4.png create mode 100644 src/qt/res/icons/clock5.png delete mode 100644 src/qt/res/icons/transaction1.png (limited to 'src') 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 @@ res/icons/quit.png res/icons/send.png res/icons/toolbar.png - res/icons/connect0_16.png - res/icons/connect1_16.png - res/icons/connect2_16.png - res/icons/connect3_16.png - res/icons/connect4_16.png - res/icons/transaction0.png - res/icons/transaction1.png - res/icons/transaction2.png + res/icons/connect0_16.png + res/icons/connect1_16.png + res/icons/connect2_16.png + res/icons/connect3_16.png + res/icons/connect4_16.png + res/icons/transaction0.png + res/icons/transaction1.png + res/icons/transaction2.png + res/icons/clock1.png + res/icons/clock2.png + res/icons/clock3.png + res/icons/clock4.png + res/icons/clock5.png res/images/about.png 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(" " + 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 Binary files /dev/null and b/src/qt/res/icons/clock1.png differ diff --git a/src/qt/res/icons/clock2.png b/src/qt/res/icons/clock2.png new file mode 100644 index 0000000000..c1a6e99f7f Binary files /dev/null and b/src/qt/res/icons/clock2.png differ diff --git a/src/qt/res/icons/clock3.png b/src/qt/res/icons/clock3.png new file mode 100644 index 0000000000..e429a402cf Binary files /dev/null and b/src/qt/res/icons/clock3.png differ diff --git a/src/qt/res/icons/clock4.png b/src/qt/res/icons/clock4.png new file mode 100644 index 0000000000..ba036f47d3 Binary files /dev/null and b/src/qt/res/icons/clock4.png differ diff --git a/src/qt/res/icons/clock5.png b/src/qt/res/icons/clock5.png new file mode 100644 index 0000000000..411d7a78a0 Binary files /dev/null and b/src/qt/res/icons/clock5.png differ diff --git a/src/qt/res/icons/transaction0.png b/src/qt/res/icons/transaction0.png index 6d698b350f..4578666ee4 100644 Binary files a/src/qt/res/icons/transaction0.png and b/src/qt/res/icons/transaction0.png differ diff --git a/src/qt/res/icons/transaction1.png b/src/qt/res/icons/transaction1.png deleted file mode 100644 index f19450aa9f..0000000000 Binary files a/src/qt/res/icons/transaction1.png and /dev/null differ 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); } -- cgit v1.2.3