Browse Source

extend generation descriptions

pull/1/head
Wladimir J. van der Laan 12 years ago
parent
commit
e923f8188d
  1. 1
      gui/include/transactionrecord.h
  2. 1
      gui/src/transactionrecord.cpp
  3. 18
      gui/src/transactiontablemodel.cpp

1
gui/include/transactionrecord.h

@ -17,7 +17,6 @@ public: @@ -17,7 +17,6 @@ public:
{
Immature,
Mature,
MaturesIn,
MaturesWarning, /* Will likely not mature because no nodes have confirmed */
NotAccepted
};

1
gui/src/transactionrecord.cpp

@ -106,7 +106,6 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWalletTx @@ -106,7 +106,6 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWalletTx
if (wtx.IsInMainChain())
{
sub.status.maturity = TransactionStatus::MaturesIn;
sub.status.matures_in = wtx.GetBlocksToMaturity();
// Check if the block was requested by anyone

18
gui/src/transactiontablemodel.cpp

@ -184,8 +184,22 @@ QVariant TransactionTableModel::formatTxDescription(const TransactionRecord *wtx @@ -184,8 +184,22 @@ QVariant TransactionTableModel::formatTxDescription(const TransactionRecord *wtx
description = tr("Payment to yourself");
break;
case TransactionRecord::Generated:
/* TODO: more extensive description */
description = tr("Generated");
switch(wtx->status.maturity)
{
case TransactionStatus::Immature:
description = tr("Generated (matures in %n more blocks)", "",
wtx->status.matures_in);
break;
case TransactionStatus::Mature:
description = tr("Generated");
break;
case TransactionStatus::MaturesWarning:
description = tr("Generated - Warning: This block was not received by any other nodes and will probably not be accepted!");
break;
case TransactionStatus::NotAccepted:
description = tr("Generated (not accepted)");
break;
}
break;
}
return QVariant(description);

Loading…
Cancel
Save