Browse Source

better icons for confirmations

pull/1/head
Wladimir J. van der Laan 11 years ago
parent
commit
89c94b5578
  1. 4
      doc/assets-attribution.txt
  2. 21
      src/qt/bitcoin.qrc
  3. 10
      src/qt/bitcoingui.cpp
  4. BIN
      src/qt/res/icons/clock1.png
  5. BIN
      src/qt/res/icons/clock2.png
  6. BIN
      src/qt/res/icons/clock3.png
  7. BIN
      src/qt/res/icons/clock4.png
  8. BIN
      src/qt/res/icons/clock5.png
  9. BIN
      src/qt/res/icons/transaction0.png
  10. BIN
      src/qt/res/icons/transaction1.png
  11. 17
      src/qt/transactiontablemodel.cpp

4
doc/assets-attribution.txt

@ -1,3 +1,7 @@ @@ -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

21
src/qt/bitcoin.qrc

@ -5,14 +5,19 @@ @@ -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>

10
src/qt/bitcoingui.cpp

@ -348,11 +348,11 @@ void BitcoinGUI::setNumConnections(int count) @@ -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));

BIN
src/qt/res/icons/clock1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 946 B

BIN
src/qt/res/icons/clock2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 944 B

BIN
src/qt/res/icons/clock3.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 946 B

BIN
src/qt/res/icons/clock4.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 962 B

BIN
src/qt/res/icons/clock5.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 956 B

BIN
src/qt/res/icons/transaction0.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 690 B

After

Width:  |  Height:  |  Size: 569 B

BIN
src/qt/res/icons/transaction1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 969 B

17
src/qt/transactiontablemodel.cpp

@ -412,16 +412,17 @@ QVariant TransactionTableModel::formatTxDecoration(const TransactionRecord *wtx) @@ -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);
}

Loading…
Cancel
Save