diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-14 07:59:07 +0100 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-14 13:25:24 -0500 |
commit | 9a3d936fc2e98b1e8234bf27e09cf7bc22811bee (patch) | |
tree | 6c04425a46f658ed92568c7a2ede61a6754cbd40 /src/qt/bitcoin.qrc | |
parent | 2b72d46f4232b58835d44aa3abd711df399d4728 (diff) |
qt: GUI for conflicted transactions
- Exclamation mark icon for conflicted transactions
- Show mouseover status for conflicted transactions as "conflicted"
- Don't show inactive transactions on overview page overview
Diffstat (limited to 'src/qt/bitcoin.qrc')
-rw-r--r-- | src/qt/bitcoin.qrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 746b5a4092..7c3a7756b7 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -12,6 +12,7 @@ <file alias="connect_4">res/icons/connect4_16.png</file> <file alias="transaction_0">res/icons/transaction0.png</file> <file alias="transaction_confirmed">res/icons/transaction2.png</file> + <file alias="transaction_conflicted">res/icons/transaction_conflicted.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> |