DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Revert "Formatting, spelling, comment fixes."

Browse Source 
This reverts commit 7a19efe040.
This commit is contained in:
Wladimir J. van der Laan
2014-07-17 14:08:07 +02:00
parent cd057bfd41
commit ad26dc9c31
6 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/qt/transactionrecord.h
View File

@@ -19,17 +19,10 @@ class TransactionStatus
{
public:
TransactionStatus():
countsForBalance(false),
sortKey(""),
matures_in(0),
status(Offline),
hasConflicting(false),
depth(0),
open_for(0),
cur_num_blocks(-1),
countsForBalance(false), sortKey(""),
matures_in(0), status(Offline), hasConflicting(false), depth(0), open_for(0), cur_num_blocks(-1),
cur_num_conflicts(-1)
{
}
{ }
enum Status {
Confirmed, /**< Have 6 or more confirmations (normal tx) or fully mature (mined tx) **/

4
src/qt/transactiontablemodel.cpp
View File

@@ -546,9 +546,9 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
case Qt::TextAlignmentRole:
return column_alignments[index.column()];
case Qt::BackgroundColorRole:
if (rec->status.hasConflicting)
if (rec->status.hasConflicting)
return COLOR_HASCONFLICTING_BG;
break;
break;
case Qt::ForegroundRole:
if (rec->status.hasConflicting)
return COLOR_HASCONFLICTING;

14
src/qt/walletmodel.cpp
View File

@@ -164,13 +164,13 @@ void WalletModel::checkBalanceChanged()
void WalletModel::updateTransaction(const QString &hash, int status)
{
if (status == CT_GOT_CONFLICT)
{
emit message(tr("Conflict Received"),
tr("WARNING: Transaction may never be confirmed. Its input was seen being spent by another transaction on the network. Wait for confirmation!"),
CClientUIInterface::MSG_WARNING);
return;
}
if (status == CT_GOT_CONFLICT)
{
emit message(tr("Conflict Received"),
tr("WARNING: Transaction may never be confirmed. Its input was seen being spent by another transaction on the network. Wait for confirmation!"),
CClientUIInterface::MSG_WARNING);
return;
}
if(transactionTableModel)
transactionTableModel->updateTransaction(hash, status);