diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-11 12:47:04 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-11 12:47:04 +0200 |
| commit | 29220fa09ecb381970923572668e30d30cd7018e (patch) | |
| tree | 84213a4f10bab088b60437db26d3ae4c40a3cc20 /src/model | |
| parent | a2d24558371d8ffce050b90980259a12846abf09 (diff) | |
| parent | 69146567bff3b2a580f56162f4a3635355df902a (diff) | |
| download | monzero-gui-29220fa09ecb381970923572668e30d30cd7018e.tar.gz monzero-gui-29220fa09ecb381970923572668e30d30cd7018e.tar.xz monzero-gui-29220fa09ecb381970923572668e30d30cd7018e.zip | |
Merge pull request #147
6914656 Fix sum of selected transactions being slighty off (moneromooo.monero)
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/TransactionHistoryModel.cpp | 4 | ||||
| -rw-r--r-- | src/model/TransactionHistoryModel.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/model/TransactionHistoryModel.cpp b/src/model/TransactionHistoryModel.cpp index 1ad17944..cf280e99 100644 --- a/src/model/TransactionHistoryModel.cpp +++ b/src/model/TransactionHistoryModel.cpp @@ -68,6 +68,9 @@ QVariant TransactionHistoryModel::data(const QModelIndex &index, int role) const case TransactionDisplayAmountRole: result = tInfo->displayAmount(); break; + case TransactionAtomicAmountRole: + result = tInfo->atomicAmount(); + break; case TransactionFeeRole: result = tInfo->fee(); break; @@ -112,6 +115,7 @@ QHash<int, QByteArray> TransactionHistoryModel::roleNames() const roleNames.insert(TransactionFailedRole, "isFailed"); roleNames.insert(TransactionAmountRole, "amount"); roleNames.insert(TransactionDisplayAmountRole, "displayAmount"); + roleNames.insert(TransactionAtomicAmountRole, "atomicAmount"); roleNames.insert(TransactionFeeRole, "fee"); roleNames.insert(TransactionBlockHeightRole, "blockHeight"); roleNames.insert(TransactionHashRole, "hash"); diff --git a/src/model/TransactionHistoryModel.h b/src/model/TransactionHistoryModel.h index 0960ceae..8b18f887 100644 --- a/src/model/TransactionHistoryModel.h +++ b/src/model/TransactionHistoryModel.h @@ -32,7 +32,8 @@ public: TransactionIsOutRole, // extra roles for date and time (as UI wants date and time separately) TransactionDateRole, - TransactionTimeRole + TransactionTimeRole, + TransactionAtomicAmountRole }; Q_ENUM(TransactionInfoRole) |