aboutsummaryrefslogtreecommitdiff
path: root/src/qt/transactionrecord.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2014-02-14 07:59:07 +0100
committerGavin Andresen <[email protected]>2014-02-14 13:25:24 -0500
commit9a3d936fc2e98b1e8234bf27e09cf7bc22811bee (patch)
tree6c04425a46f658ed92568c7a2ede61a6754cbd40 /src/qt/transactionrecord.h
parentHandle "conflicted" transactions properly (diff)
downloaddiscoin-9a3d936fc2e98b1e8234bf27e09cf7bc22811bee.tar.xz
discoin-9a3d936fc2e98b1e8234bf27e09cf7bc22811bee.zip
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/transactionrecord.h')
-rw-r--r--src/qt/transactionrecord.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
index 8a7c9044e..d7be0bc43 100644
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -36,7 +36,8 @@ public:
OpenUntilBlock,
Offline,
Unconfirmed,
- HaveConfirmations
+ HaveConfirmations,
+ Conflicted
};
bool confirmed;