#include "guiconstants.h"
#include "transactiondesc.h"
#include "walletmodel.h"
+#include "optionsmodel.h"
#include "addresstablemodel.h"
#include "bitcoinunits.h"
-#include "headers.h"
+#include "wallet.h"
#include <QLocale>
-#include <QDebug>
#include <QList>
#include <QColor>
#include <QTimer>
#include <QDateTime>
#include <QtAlgorithms>
-// Credit and Debit columns are right-aligned as they contain numbers
+// Amount column is right-aligned it contains numbers
static int column_alignments[] = {
Qt::AlignLeft|Qt::AlignVCenter,
Qt::AlignLeft|Qt::AlignVCenter,
};
// Private implementation
-struct TransactionTablePriv
+class TransactionTablePriv
{
+public:
TransactionTablePriv(CWallet *wallet, TransactionTableModel *parent):
wallet(wallet),
parent(parent)
qDebug() << "refreshWallet";
#endif
cachedWallet.clear();
- CRITICAL_BLOCK(wallet->cs_mapWallet)
{
+ LOCK(wallet->cs_wallet);
for(std::map<uint256, CWalletTx>::iterator it = wallet->mapWallet.begin(); it != wallet->mapWallet.end(); ++it)
{
cachedWallet.append(TransactionRecord::decomposeTransaction(wallet, it->second));
QList<uint256> updated_sorted = updated;
qSort(updated_sorted);
- CRITICAL_BLOCK(wallet->cs_mapWallet)
{
+ LOCK(wallet->cs_wallet);
for(int update_idx = updated_sorted.size()-1; update_idx >= 0; --update_idx)
{
const uint256 &hash = updated_sorted.at(update_idx);
- /* Find transaction in wallet */
+ // Find transaction in wallet
std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(hash);
bool inWallet = mi != wallet->mapWallet.end();
- /* Find bounds of this transaction in model */
+ // Find bounds of this transaction in model
QList<TransactionRecord>::iterator lower = qLowerBound(
cachedWallet.begin(), cachedWallet.end(), hash, TxLessThan());
QList<TransactionRecord>::iterator upper = qUpperBound(
// simply re-use the cached status.
if(rec->statusUpdateNeeded())
{
- CRITICAL_BLOCK(wallet->cs_mapWallet)
{
+ LOCK(wallet->cs_wallet);
std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(rec->hash);
if(mi != wallet->mapWallet.end())
QString describe(TransactionRecord *rec)
{
- CRITICAL_BLOCK(wallet->cs_mapWallet)
{
+ LOCK(wallet->cs_wallet);
std::map<uint256, CWalletTx>::iterator mi = wallet->mapWallet.find(rec->hash);
if(mi != wallet->mapWallet.end())
{
- return QString::fromStdString(TransactionDesc::toHTML(wallet, mi->second));
+ return TransactionDesc::toHTML(wallet, mi->second);
}
}
return QString("");
QList<uint256> updated;
// Check if there are changes to wallet map
- TRY_CRITICAL_BLOCK(wallet->cs_mapWallet)
{
- if(!wallet->vWalletUpdated.empty())
+ TRY_LOCK(wallet->cs_wallet, lockWallet);
+ if (lockWallet && !wallet->vWalletUpdated.empty())
{
BOOST_FOREACH(uint256 hash, wallet->vWalletUpdated)
{
return columns.length();
}
-QVariant TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) const
+QString TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) const
{
QString status;
status = tr("Open for %n block(s)","",wtx->status.open_for);
break;
case TransactionStatus::OpenUntilDate:
- status = tr("Open until %1").arg(GUIUtil::DateTimeStr(wtx->status.open_for));
+ status = tr("Open until %1").arg(GUIUtil::dateTimeStr(wtx->status.open_for));
break;
case TransactionStatus::Offline:
status = tr("Offline (%1 confirmations)").arg(wtx->status.depth);
break;
case TransactionStatus::Unconfirmed:
- status = tr("Unconfirmed (%1 of %2 confirmations required)").arg(wtx->status.depth).arg(TransactionRecord::NumConfirmations);
+ status = tr("Unconfirmed (%1 of %2 confirmations)").arg(wtx->status.depth).arg(TransactionRecord::NumConfirmations);
break;
case TransactionStatus::HaveConfirmations:
status = tr("Confirmed (%1 confirmations)").arg(wtx->status.depth);
}
if(wtx->type == TransactionRecord::Generated)
{
- status += "\n\n";
switch(wtx->status.maturity)
{
case TransactionStatus::Immature:
- status += tr("Mined balance will be available in %n more blocks", "",
+ status += "\n" + tr("Mined balance will be available in %n more blocks", "",
wtx->status.matures_in);
break;
case TransactionStatus::Mature:
break;
case TransactionStatus::MaturesWarning:
- status += tr("This block was not received by any other nodes and will probably not be accepted!");
+ status += "\n" + tr("This block was not received by any other nodes and will probably not be accepted!");
break;
case TransactionStatus::NotAccepted:
- status += tr("Generated but not accepted");
+ status += "\n" + tr("Generated but not accepted");
break;
}
}
- return QVariant(status);
+ return status;
}
-QVariant TransactionTableModel::formatTxDate(const TransactionRecord *wtx) const
+QString TransactionTableModel::formatTxDate(const TransactionRecord *wtx) const
{
if(wtx->time)
{
- return QVariant(GUIUtil::DateTimeStr(wtx->time));
+ return GUIUtil::dateTimeStr(wtx->time);
}
else
{
- return QVariant();
+ return QString();
}
}
-/* Look up address in address book, if found return
- address (label)
- otherwise just return address
+/* Look up address in address book, if found return label (address)
+ otherwise just return (address)
*/
-QString TransactionTableModel::lookupAddress(const std::string &address) const
+QString TransactionTableModel::lookupAddress(const std::string &address, bool tooltip) const
{
QString label = walletModel->getAddressTableModel()->labelForAddress(QString::fromStdString(address));
QString description;
- if(label.isEmpty())
+ if(!label.isEmpty())
{
- description = QString::fromStdString(address);
+ description += label + QString(" ");
}
- else
+ if(label.isEmpty() || walletModel->getOptionsModel()->getDisplayAddresses() || tooltip)
{
- description = label + QString(" (") + QString::fromStdString(address) + QString(")");
+ description += QString("(") + QString::fromStdString(address) + QString(")");
}
return description;
}
-QVariant TransactionTableModel::formatTxType(const TransactionRecord *wtx) const
+QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const
{
- QString description;
-
switch(wtx->type)
{
case TransactionRecord::RecvWithAddress:
- description = tr("Received with");
- break;
- case TransactionRecord::RecvFromIP:
- description = tr("Received from IP");
- break;
+ return tr("Received with");
+ case TransactionRecord::RecvFromOther:
+ return tr("Received from");
case TransactionRecord::SendToAddress:
- description = tr("Sent to");
- break;
- case TransactionRecord::SendToIP:
- description = tr("Sent to IP");
- break;
+ case TransactionRecord::SendToOther:
+ return tr("Sent to");
case TransactionRecord::SendToSelf:
- description = tr("Payment to yourself");
- break;
+ return tr("Payment to yourself");
case TransactionRecord::Generated:
- description = tr("Mined");
- break;
+ return tr("Mined");
+ default:
+ return QString();
}
- return QVariant(description);
}
-QVariant TransactionTableModel::formatTxToAddress(const TransactionRecord *wtx) const
+QVariant TransactionTableModel::txAddressDecoration(const TransactionRecord *wtx) const
{
- QString description;
+ switch(wtx->type)
+ {
+ case TransactionRecord::Generated:
+ return QIcon(":/icons/tx_mined");
+ case TransactionRecord::RecvWithAddress:
+ case TransactionRecord::RecvFromOther:
+ return QIcon(":/icons/tx_input");
+ case TransactionRecord::SendToAddress:
+ case TransactionRecord::SendToOther:
+ return QIcon(":/icons/tx_output");
+ default:
+ return QIcon(":/icons/tx_inout");
+ }
+ return QVariant();
+}
+QString TransactionTableModel::formatTxToAddress(const TransactionRecord *wtx, bool tooltip) const
+{
switch(wtx->type)
{
+ case TransactionRecord::RecvFromOther:
+ return QString::fromStdString(wtx->address);
case TransactionRecord::RecvWithAddress:
- description = lookupAddress(wtx->address);
- break;
- case TransactionRecord::RecvFromIP:
- description = QString::fromStdString(wtx->address);
- break;
case TransactionRecord::SendToAddress:
- description = lookupAddress(wtx->address);
- break;
- case TransactionRecord::SendToIP:
- description = QString::fromStdString(wtx->address);
- break;
+ return lookupAddress(wtx->address, tooltip);
+ case TransactionRecord::SendToOther:
+ return QString::fromStdString(wtx->address);
case TransactionRecord::SendToSelf:
- description = QString();
- break;
case TransactionRecord::Generated:
- description = QString();
+ default:
+ return tr("(n/a)");
+ }
+}
+
+QVariant TransactionTableModel::addressColor(const TransactionRecord *wtx) const
+{
+ // Show addresses without label in a less visible color
+ switch(wtx->type)
+ {
+ case TransactionRecord::RecvWithAddress:
+ case TransactionRecord::SendToAddress:
+ {
+ QString label = walletModel->getAddressTableModel()->labelForAddress(QString::fromStdString(wtx->address));
+ if(label.isEmpty())
+ return COLOR_BAREADDRESS;
+ } break;
+ case TransactionRecord::SendToSelf:
+ case TransactionRecord::Generated:
+ return COLOR_BAREADDRESS;
+ default:
break;
}
- return QVariant(description);
+ return QVariant();
}
-QVariant TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed) const
+QString TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed) const
{
- QString str = BitcoinUnits::format(BitcoinUnits::BTC, wtx->credit + wtx->debit);
+ QString str = BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), wtx->credit + wtx->debit);
if(showUnconfirmed)
{
if(!wtx->status.confirmed || wtx->status.maturity != TransactionStatus::Mature)
str = QString("[") + str + QString("]");
}
}
- return QVariant(str);
+ return QString(str);
}
-QVariant TransactionTableModel::formatTxDecoration(const TransactionRecord *wtx) const
+QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx) const
{
if(wtx->type == TransactionRecord::Generated)
{
return QColor(0,0,0);
}
+QString TransactionTableModel::formatTooltip(const TransactionRecord *rec) const
+{
+ QString tooltip = formatTxStatus(rec) + QString("\n") + formatTxType(rec);
+ if(rec->type==TransactionRecord::RecvFromOther || rec->type==TransactionRecord::SendToOther ||
+ rec->type==TransactionRecord::SendToAddress || rec->type==TransactionRecord::RecvWithAddress)
+ {
+ tooltip += QString(" ") + formatTxToAddress(rec, true);
+ }
+ return tooltip;
+}
+
QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
{
if(!index.isValid())
return QVariant();
TransactionRecord *rec = static_cast<TransactionRecord*>(index.internalPointer());
- if(role == Qt::DecorationRole)
+ switch(role)
{
- if(index.column() == Status)
+ case Qt::DecorationRole:
+ switch(index.column())
{
- return formatTxDecoration(rec);
+ case Status:
+ return txStatusDecoration(rec);
+ case ToAddress:
+ return txAddressDecoration(rec);
}
- }
- else if(role == Qt::DisplayRole)
- {
- // Delegate to specific column handlers
+ break;
+ case Qt::DisplayRole:
switch(index.column())
{
case Date:
case Type:
return formatTxType(rec);
case ToAddress:
- return formatTxToAddress(rec);
+ return formatTxToAddress(rec, false);
case Amount:
return formatTxAmount(rec);
}
- }
- else if(role == Qt::EditRole)
- {
- // Edit role is used for sorting so return the real values
+ break;
+ case Qt::EditRole:
+ // Edit role is used for sorting, so return the unformatted values
switch(index.column())
{
case Status:
case Type:
return formatTxType(rec);
case ToAddress:
- return formatTxToAddress(rec);
+ return formatTxToAddress(rec, true);
case Amount:
return rec->credit + rec->debit;
}
- }
- else if (role == Qt::ToolTipRole)
- {
- if(index.column() == Status)
- {
- return formatTxStatus(rec);
- }
- }
- else if (role == Qt::TextAlignmentRole)
- {
+ break;
+ case Qt::ToolTipRole:
+ return formatTooltip(rec);
+ case Qt::TextAlignmentRole:
return column_alignments[index.column()];
- }
- else if (role == Qt::ForegroundRole)
- {
- /* Non-confirmed transactions are grey */
+ case Qt::ForegroundRole:
+ // Non-confirmed transactions are grey
if(!rec->status.confirmed)
{
return COLOR_UNCONFIRMED;
{
return COLOR_NEGATIVE;
}
- }
- else if (role == TypeRole)
- {
+ if(index.column() == ToAddress)
+ {
+ return addressColor(rec);
+ }
+ break;
+ case TypeRole:
return rec->type;
- }
- else if (role == DateRole)
- {
+ case DateRole:
return QDateTime::fromTime_t(static_cast<uint>(rec->time));
- }
- else if (role == LongDescriptionRole)
- {
+ case LongDescriptionRole:
return priv->describe(rec);
- }
- else if (role == AddressRole)
- {
+ case AddressRole:
return QString::fromStdString(rec->address);
- }
- else if (role == LabelRole)
- {
+ case LabelRole:
return walletModel->getAddressTableModel()->labelForAddress(QString::fromStdString(rec->address));
- }
- else if (role == AbsoluteAmountRole)
- {
- return llabs(rec->credit + rec->debit);
- }
- else if (role == TxIDRole)
- {
+ case AmountRole:
+ return rec->credit + rec->debit;
+ case TxIDRole:
return QString::fromStdString(rec->getTxID());
- }
- else if (role == ConfirmedRole)
- {
- return rec->status.status == TransactionStatus::HaveConfirmations;
- }
- else if (role == FormattedAmountRole)
- {
+ case ConfirmedRole:
+ // Return True if transaction counts for balance
+ return rec->status.confirmed && !(rec->type == TransactionRecord::Generated &&
+ rec->status.maturity != TransactionStatus::Mature);
+ case FormattedAmountRole:
return formatTxAmount(rec, false);
}
return QVariant();
return QVariant();
}
-Qt::ItemFlags TransactionTableModel::flags(const QModelIndex &index) const
-{
- return QAbstractTableModel::flags(index);
-}
-
QModelIndex TransactionTableModel::index(int row, int column, const QModelIndex &parent) const
{
Q_UNUSED(parent);
git://git.novaco.in / novacoin.git / blobdiff