sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 21:12:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Status column reorganization

Browse Source
This commit is contained in:
Wladimir J. van der Laan 2011-06-13 09:05:48 +02:00
parent 92ab03afc8
commit 249300aebe
3 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/bitcoingui.cpp
View File

@ -261,7 +261,7 @@ void BitcoinGUI::setTabsModel(QAbstractItemModel *transaction_model)
transaction_table->verticalHeader()->hide(); transaction_table->verticalHeader()->hide();
transaction_table->horizontalHeader()->resizeSection( transaction_table->horizontalHeader()->resizeSection(
TransactionTableModel::Status, 120); TransactionTableModel::Status, 145);
transaction_table->horizontalHeader()->resizeSection( transaction_table->horizontalHeader()->resizeSection(
TransactionTableModel::Date, 120); TransactionTableModel::Date, 120);
transaction_table->horizontalHeader()->setResizeMode( transaction_table->horizontalHeader()->setResizeMode(

40
src/qt/transactiontablemodel.cpp
View File

@ -274,13 +274,13 @@ QVariant TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) con
status = tr("Open until ") + GUIUtil::DateTimeStr(wtx->status.open_for); status = tr("Open until ") + GUIUtil::DateTimeStr(wtx->status.open_for);
break; break;
case TransactionStatus::Offline: case TransactionStatus::Offline:
status = tr("%1/offline").arg(wtx->status.depth); status = tr("Offline (%1)").arg(wtx->status.depth);
break; break;
case TransactionStatus::Unconfirmed: case TransactionStatus::Unconfirmed:
status = tr("%1/unconfirmed").arg(wtx->status.depth); status = tr("Unconfirmed (%1)").arg(wtx->status.depth);
break; break;
case TransactionStatus::HaveConfirmations: case TransactionStatus::HaveConfirmations:
status = tr("%1 confirmations").arg(wtx->status.depth); status = tr("Confirmed (%1)").arg(wtx->status.depth);
break; break;
} }
@ -400,13 +400,45 @@ QVariant TransactionTableModel::formatTxCredit(const TransactionRecord *wtx) con
} }
} }
QVariant TransactionTableModel::formatTxDecoration(const TransactionRecord *wtx) const
{
switch(wtx->status.status)
{
case TransactionStatus::OpenUntilBlock:
case TransactionStatus::OpenUntilDate:
return QColor(64,64,255);
break;
case TransactionStatus::Offline:
return QColor(192,192,192);
case TransactionStatus::Unconfirmed:
if(wtx->status.depth)
{
return QColor(255,0,0);
}
else
{
return QColor(192,192,192);
}
case TransactionStatus::HaveConfirmations:
return QColor(0,255,0);
}
return QColor(0,0,0);
}
QVariant TransactionTableModel::data(const QModelIndex &index, int role) const QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
{ {
if(!index.isValid()) if(!index.isValid())
return QVariant(); return QVariant();
TransactionRecord *rec = static_cast<TransactionRecord*>(index.internalPointer()); TransactionRecord *rec = static_cast<TransactionRecord*>(index.internalPointer());
if(role == Qt::DisplayRole) if(role == Qt::DecorationRole)
{
if(index.column() == Status)
{
return formatTxDecoration(rec);
}
}
else if(role == Qt::DisplayRole)
{ {
/* Delegate to specific column handlers */ /* Delegate to specific column handlers */
switch(index.column()) switch(index.column())

1
src/qt/transactiontablemodel.h
View File

@ -47,6 +47,7 @@ private:
QVariant formatTxDescription(const TransactionRecord *wtx) const; QVariant formatTxDescription(const TransactionRecord *wtx) const;
QVariant formatTxDebit(const TransactionRecord *wtx) const; QVariant formatTxDebit(const TransactionRecord *wtx) const;
QVariant formatTxCredit(const TransactionRecord *wtx) const; QVariant formatTxCredit(const TransactionRecord *wtx) const;
QVariant formatTxDecoration(const TransactionRecord *wtx) const;
private slots: private slots:
void update(); void update();