#define COLOR_UNCONFIRMED QColor(128, 128, 128)
/* Transaction list -- negative amount */
#define COLOR_NEGATIVE QColor(255, 0, 0)
+/* Transaction list -- bare address (without label) */
+#define COLOR_BAREADDRESS QColor(140, 140, 140)
#endif // GUICONSTANTS_H
void setMapper(MonitoredDataMapper *mapper);
private:
QValueComboBox *unit;
+ QCheckBox *display_addresses;
signals:
public slots:
QWidget(parent)
{
QVBoxLayout *layout = new QVBoxLayout();
+
QHBoxLayout *unit_hbox = new QHBoxLayout();
unit_hbox->addSpacing(18);
QLabel *unit_label = new QLabel(tr("&Unit to show amounts in: "));
unit_hbox->addWidget(unit);
layout->addLayout(unit_hbox);
+
+ display_addresses = new QCheckBox(tr("Display addresses in transaction list"), this);
+ layout->addWidget(display_addresses);
+
layout->addStretch();
setLayout(layout);
void DisplayOptionsPage::setMapper(MonitoredDataMapper *mapper)
{
mapper->addMapping(unit, OptionsModel::DisplayUnit);
+ mapper->addMapping(display_addresses, OptionsModel::DisplayAddresses);
}
OptionsModel::OptionsModel(CWallet *wallet, QObject *parent) :
QAbstractListModel(parent),
wallet(wallet),
- nDisplayUnit(BitcoinUnits::BTC)
+ nDisplayUnit(BitcoinUnits::BTC),
+ bDisplayAddresses(false)
{
// Read our specific settings from the wallet db
CWalletDB walletdb(wallet->strWalletFile);
walletdb.ReadSetting("nDisplayUnit", nDisplayUnit);
+ walletdb.ReadSetting("bDisplayAddresses", bDisplayAddresses);
}
int OptionsModel::rowCount(const QModelIndex & parent) const
return QVariant(nTransactionFee);
case DisplayUnit:
return QVariant(nDisplayUnit);
+ case DisplayAddresses:
+ return QVariant(bDisplayAddresses);
default:
return QVariant();
}
walletdb.WriteSetting("nDisplayUnit", nDisplayUnit);
emit displayUnitChanged(unit);
}
+ case DisplayAddresses: {
+ bDisplayAddresses = value.toBool();
+ walletdb.WriteSetting("bDisplayAddresses", bDisplayAddresses);
+ }
default:
break;
}
{
return nDisplayUnit;
}
+
+bool OptionsModel::getDisplayAddresses()
+{
+ return bDisplayAddresses;
+}
ProxyPort, // QString
Fee, // qint64
DisplayUnit, // BitcoinUnits::Unit
+ DisplayAddresses, // bool
OptionIDRowCount
};
bool getMinimizeToTray();
bool getMinimizeOnClose();
int getDisplayUnit();
+ bool getDisplayAddresses();
private:
// Wallet stores persistent options
CWallet *wallet;
int nDisplayUnit;
+ bool bDisplayAddresses;
signals:
void displayUnitChanged(int unit);
}
}
-/* 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;
}
return QVariant(description);
}
-QVariant TransactionTableModel::formatTxToAddress(const TransactionRecord *wtx) const
+QVariant TransactionTableModel::formatTxToAddress(const TransactionRecord *wtx, bool tooltip) const
{
QString description;
switch(wtx->type)
{
- case TransactionRecord::RecvWithAddress:
- description = lookupAddress(wtx->address);
- break;
case TransactionRecord::RecvFromIP:
description = QString::fromStdString(wtx->address);
break;
+ case TransactionRecord::RecvWithAddress:
case TransactionRecord::SendToAddress:
- description = lookupAddress(wtx->address);
+ description = lookupAddress(wtx->address, tooltip);
break;
case TransactionRecord::SendToIP:
description = QString::fromStdString(wtx->address);
return QVariant(description);
}
+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;
+ default:
+ break;
+ }
+ return QVariant();
+}
+
QVariant TransactionTableModel::formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed) const
{
QString str = BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), wtx->credit + wtx->debit);
case Type:
return formatTxType(rec);
case ToAddress:
- return formatTxToAddress(rec);
+ return formatTxToAddress(rec, false);
case Amount:
return formatTxAmount(rec);
}
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)
+ switch(index.column())
{
+ case Status:
return formatTxStatus(rec);
+ case ToAddress:
+ return formatTxToAddress(rec, true);
}
}
else if (role == Qt::TextAlignmentRole)
{
return COLOR_NEGATIVE;
}
+ if(index.column() == ToAddress)
+ {
+ return addressColor(rec);
+ }
}
else if (role == TypeRole)
{
QStringList columns;
TransactionTablePriv *priv;
- QString lookupAddress(const std::string &address) const;
+ QString lookupAddress(const std::string &address, bool tooltip) const;
+ QVariant addressColor(const TransactionRecord *wtx) const;
QVariant formatTxStatus(const TransactionRecord *wtx) const;
QVariant formatTxDate(const TransactionRecord *wtx) const;
QVariant formatTxType(const TransactionRecord *wtx) const;
- QVariant formatTxToAddress(const TransactionRecord *wtx) const;
+ QVariant formatTxToAddress(const TransactionRecord *wtx, bool tooltip) const;
QVariant formatTxAmount(const TransactionRecord *wtx, bool showUnconfirmed=true) const;
QVariant formatTxDecoration(const TransactionRecord *wtx) const;