aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
authorPhilip Kaufmann <phil.kaufmann@t-online.de>2014-08-09 15:26:40 +0200
committerPhilip Kaufmann <phil.kaufmann@t-online.de>2014-08-28 23:14:10 +0200
commit21f15164681ae57c3f0b4fa6e6771b4f4fb00a1a (patch)
tree6bf405850272d21f13ba472faa9f287f1d7385bf /src/qt
parent3ed668dbe220168198e651f0cef38d29bd9bbbb0 (diff)
downloadbitcoin-21f15164681ae57c3f0b4fa6e6771b4f4fb00a1a.tar.xz
[Qt] add all used colors in txtablemodel to guiconstants
- add colors used in TX status decoration
Diffstat (limited to 'src/qt')
-rw-r--r--src/qt/guiconstants.h6
-rw-r--r--src/qt/transactiontablemodel.cpp7
2 files changed, 10 insertions, 3 deletions
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
index 5ae4bc833d..4c8a67b663 100644
--- a/src/qt/guiconstants.h
+++ b/src/qt/guiconstants.h
@@ -23,6 +23,12 @@ static const int STATUSBAR_ICONSIZE = 16;
#define COLOR_NEGATIVE QColor(255, 0, 0)
/* Transaction list -- bare address (without label) */
#define COLOR_BAREADDRESS QColor(140, 140, 140)
+/* Transaction list -- TX status decoration - open until date */
+#define COLOR_TX_STATUS_OPENUNTILDATE QColor(64, 64, 255)
+/* Transaction list -- TX status decoration - offline */
+#define COLOR_TX_STATUS_OFFLINE QColor(192, 192, 192)
+/* Transaction list -- TX status decoration - default color */
+#define COLOR_BLACK QColor(0, 0, 0)
/* Tooltips longer than this (in characters) are converted into rich text,
so that they can be word-wrapped.
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index 1a1f726bf8..98812b6f80 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -450,9 +450,9 @@ QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx)
{
case TransactionStatus::OpenUntilBlock:
case TransactionStatus::OpenUntilDate:
- return QColor(64,64,255);
+ return COLOR_TX_STATUS_OPENUNTILDATE;
case TransactionStatus::Offline:
- return QColor(192,192,192);
+ return COLOR_TX_STATUS_OFFLINE;
case TransactionStatus::Unconfirmed:
return QIcon(":/icons/transaction_0");
case TransactionStatus::Confirming:
@@ -476,8 +476,9 @@ QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx)
case TransactionStatus::MaturesWarning:
case TransactionStatus::NotAccepted:
return QIcon(":/icons/transaction_0");
+ default:
+ return COLOR_BLACK;
}
- return QColor(0,0,0);
}
QVariant TransactionTableModel::txWatchonlyDecoration(const TransactionRecord *wtx) const