twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-23 21:14:42 +00:00
Code Issues Projects Releases Wiki Activity

improve tooltip over transactions

Browse Source
This commit is contained in:
Wladimir J. van der Laan 2011-08-05 15:35:52 +02:00
parent ffccb56914
commit 126185aaa7
3 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/transactionfilterproxy.cpp
View File

@ -28,7 +28,7 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &
QDateTime datetime = index.data(TransactionTableModel::DateRole).toDateTime(); QDateTime datetime = index.data(TransactionTableModel::DateRole).toDateTime();
QString address = index.data(TransactionTableModel::AddressRole).toString(); QString address = index.data(TransactionTableModel::AddressRole).toString();
QString label = index.data(TransactionTableModel::LabelRole).toString(); QString label = index.data(TransactionTableModel::LabelRole).toString();
qint64 amount = index.data(TransactionTableModel::AbsoluteAmountRole).toLongLong(); qint64 amount = llabs(index.data(TransactionTableModel::AmountRole).toLongLong());
if(!(TYPE(type) & typeFilter)) if(!(TYPE(type) & typeFilter))
return false; return false;

40
src/qt/transactiontablemodel.cpp
View File

@ -265,7 +265,7 @@ int TransactionTableModel::columnCount(const QModelIndex &parent) const
return columns.length(); return columns.length();
} }
QVariant TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) const QString TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) const
{ {
QString status; QString status;
@ -289,7 +289,7 @@ QVariant TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) con
} }
if(wtx->type == TransactionRecord::Generated) if(wtx->type == TransactionRecord::Generated)
{ {
status += "\n\n"; status += "\n";
switch(wtx->status.maturity) switch(wtx->status.maturity)
{ {
case TransactionStatus::Immature: case TransactionStatus::Immature:
@ -307,18 +307,18 @@ QVariant TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) con
} }
} }
return QVariant(status); return status;
} }
QVariant TransactionTableModel::formatTxDate(const TransactionRecord *wtx) const QString TransactionTableModel::formatTxDate(const TransactionRecord *wtx) const
{ {
if(wtx->time) if(wtx->time)
{ {
return QVariant(GUIUtil::DateTimeStr(wtx->time)); return GUIUtil::DateTimeStr(wtx->time);
} }
else else
{ {
return QVariant(); return QString();
} }
} }
@ -418,7 +418,7 @@ QVariant TransactionTableModel::addressColor(const TransactionRecord *wtx) const
return QVariant(); return QVariant();
} }
QVariant TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed) const QString TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed) const
{ {
QString str = BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), wtx->credit + wtx->debit); QString str = BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), wtx->credit + wtx->debit);
if(showUnconfirmed) if(showUnconfirmed)
@ -428,10 +428,10 @@ QVariant TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, boo
str = QString("[") + str + QString("]"); 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) if(wtx->type == TransactionRecord::Generated)
{ {
@ -476,6 +476,18 @@ QVariant TransactionTableModel::formatTxDecoration(const TransactionRecord *wtx)
return QColor(0,0,0); return QColor(0,0,0);
} }
QString TransactionTableModel::formatTooltip(const TransactionRecord *rec) const
{
QString tooltip = formatTxType(rec);
if(rec->type==TransactionRecord::RecvFromIP || rec->type==TransactionRecord::SendToIP ||
rec->type==TransactionRecord::SendToAddress || rec->type==TransactionRecord::RecvWithAddress)
{
tooltip += QString(" ") + formatTxToAddress(rec, true);
}
tooltip += QString("\n") + formatTxStatus(rec);
return tooltip;
}
QVariant TransactionTableModel::data(const QModelIndex &index, int role) const QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
{ {
if(!index.isValid()) if(!index.isValid())
@ -487,7 +499,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
switch(index.column()) switch(index.column())
{ {
case Status: case Status:
return formatTxDecoration(rec); return txStatusDecoration(rec);
case ToAddress: case ToAddress:
return txAddressDecoration(rec); return txAddressDecoration(rec);
} }
@ -530,8 +542,8 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
{ {
case Status: case Status:
return formatTxStatus(rec); return formatTxStatus(rec);
case ToAddress: default:
return formatTxType(rec) + QString(" ") + formatTxToAddress(rec, true); return formatTooltip(rec);
} }
} }
else if (role == Qt::TextAlignmentRole) else if (role == Qt::TextAlignmentRole)
@ -574,10 +586,6 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
{ {
return walletModel->getAddressTableModel()->labelForAddress(QString::fromStdString(rec->address)); return walletModel->getAddressTableModel()->labelForAddress(QString::fromStdString(rec->address));
} }
else if (role == AbsoluteAmountRole)
{
return llabs(rec->credit + rec->debit);
}
else if (role == AmountRole) else if (role == AmountRole)
{ {
return rec->credit + rec->debit; return rec->credit + rec->debit;

11
src/qt/transactiontablemodel.h
View File

@ -37,8 +37,6 @@ public:
AddressRole, AddressRole,
// Label of address related to transaction // Label of address related to transaction
LabelRole, LabelRole,
// Absolute net amount of transaction, for filtering
AbsoluteAmountRole,
// Net amount of transaction // Net amount of transaction
AmountRole, AmountRole,
// Unique identifier // Unique identifier
@ -63,12 +61,13 @@ private:
QString lookupAddress(const std::string &address, bool tooltip) const; QString lookupAddress(const std::string &address, bool tooltip) const;
QVariant addressColor(const TransactionRecord *wtx) const; QVariant addressColor(const TransactionRecord *wtx) const;
QVariant formatTxStatus(const TransactionRecord *wtx) const; QString formatTxStatus(const TransactionRecord *wtx) const;
QVariant formatTxDate(const TransactionRecord *wtx) const; QString formatTxDate(const TransactionRecord *wtx) const;
QString formatTxType(const TransactionRecord *wtx) const; QString formatTxType(const TransactionRecord *wtx) const;
QString formatTxToAddress(const TransactionRecord *wtx, bool tooltip) const; QString formatTxToAddress(const TransactionRecord *wtx, bool tooltip) const;
QVariant formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed=true) const; QString formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed=true) const;
QVariant formatTxDecoration(const TransactionRecord *wtx) const; QString formatTooltip(const TransactionRecord *rec) const;
QVariant txStatusDecoration(const TransactionRecord *wtx) const;
QVariant txAddressDecoration(const TransactionRecord *wtx) const; QVariant txAddressDecoration(const TransactionRecord *wtx) const;
private slots: private slots: