diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-08-23 21:22:50 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-08-23 21:22:50 +0200 |
| commit | c04417d37b80752e4f4e6b2ea1d6c702aeabd18a (patch) | |
| tree | c9096a2df37aa38d2995a3fb4e2603263b55dc8a /src/model | |
| parent | 7521472325f430995e694df7823f43a383909489 (diff) | |
| parent | a7f52db61386e1af24ce3aa3836f6991decebae3 (diff) | |
| download | monzero-gui-c04417d37b80752e4f4e6b2ea1d6c702aeabd18a.tar.gz monzero-gui-c04417d37b80752e4f4e6b2ea1d6c702aeabd18a.tar.xz monzero-gui-c04417d37b80752e4f4e6b2ea1d6c702aeabd18a.zip | |
Merge pull request #807
a7f52db History: Support coinbase txs requires #2247 (Jaquee)
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/TransactionHistoryModel.cpp | 4 | ||||
| -rw-r--r-- | src/model/TransactionHistoryModel.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/model/TransactionHistoryModel.cpp b/src/model/TransactionHistoryModel.cpp index 2e232259..c1f61fa1 100644 --- a/src/model/TransactionHistoryModel.cpp +++ b/src/model/TransactionHistoryModel.cpp @@ -85,6 +85,9 @@ QVariant TransactionHistoryModel::data(const QModelIndex &index, int role) const case TransactionConfirmationsRole: result = tInfo->confirmations(); break; + case TransactionConfirmationsRequiredRole: + result = (tInfo->blockHeight() < tInfo->unlockTime()) ? tInfo->unlockTime() - tInfo->blockHeight() : 0; + break; case TransactionHashRole: result = tInfo->hash(); break; @@ -130,6 +133,7 @@ QHash<int, QByteArray> TransactionHistoryModel::roleNames() const roleNames.insert(TransactionFeeRole, "fee"); roleNames.insert(TransactionBlockHeightRole, "blockHeight"); roleNames.insert(TransactionConfirmationsRole, "confirmations"); + roleNames.insert(TransactionConfirmationsRequiredRole, "confirmationsRequired"); roleNames.insert(TransactionHashRole, "hash"); roleNames.insert(TransactionTimeStampRole, "timeStamp"); roleNames.insert(TransactionPaymentIdRole, "paymentId"); diff --git a/src/model/TransactionHistoryModel.h b/src/model/TransactionHistoryModel.h index 449d8003..a2dbd967 100644 --- a/src/model/TransactionHistoryModel.h +++ b/src/model/TransactionHistoryModel.h @@ -26,6 +26,7 @@ public: TransactionFeeRole, TransactionBlockHeightRole, TransactionConfirmationsRole, + TransactionConfirmationsRequiredRole, TransactionHashRole, TransactionTimeStampRole, TransactionPaymentIdRole, |