No OneTemporary
Actions

Size

25 KB

Subscribers

None

View Options

	diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
	index 35d48581e..07be9c520 100644
	--- a/src/qt/overviewpage.cpp
	+++ b/src/qt/overviewpage.cpp
	@@ -1,194 +1,200 @@
	#include "overviewpage.h"
	#include "ui_overviewpage.h"

	#include "walletmodel.h"
	#include "bitcoinunits.h"
	#include "optionsmodel.h"
	#include "transactiontablemodel.h"
	#include "transactionfilterproxy.h"
	#include "guiutil.h"
	#include "guiconstants.h"

	#include <QAbstractItemDelegate>
	#include <QPainter>

	#define DECORATION_SIZE 64
	#define NUM_ITEMS 3

	class TxViewDelegate : public QAbstractItemDelegate
	{
	Q_OBJECT
	public:
	TxViewDelegate(): QAbstractItemDelegate(), unit(BitcoinUnits::BTC)
	{

	}

	inline void paint(QPainter *painter, const QStyleOptionViewItem &option,
	const QModelIndex &index ) const
	{
	painter->save();

	QIcon icon = qvariant_cast<QIcon>(index.data(Qt::DecorationRole));
	QRect mainRect = option.rect;
	QRect decorationRect(mainRect.topLeft(), QSize(DECORATION_SIZE, DECORATION_SIZE));
	int xspace = DECORATION_SIZE + 8;
	int ypad = 6;
	int halfheight = (mainRect.height() - 2*ypad)/2;
	QRect amountRect(mainRect.left() + xspace, mainRect.top()+ypad, mainRect.width() - xspace, halfheight);
	QRect addressRect(mainRect.left() + xspace, mainRect.top()+ypad+halfheight, mainRect.width() - xspace, halfheight);
	icon.paint(painter, decorationRect);

	QDateTime date = index.data(TransactionTableModel::DateRole).toDateTime();
	QString address = index.data(Qt::DisplayRole).toString();
	qint64 amount = index.data(TransactionTableModel::AmountRole).toLongLong();
	bool confirmed = index.data(TransactionTableModel::ConfirmedRole).toBool();
	QVariant value = index.data(Qt::ForegroundRole);
	QColor foreground = option.palette.color(QPalette::Text);
	if(qVariantCanConvert<QColor>(value))
	{
	foreground = qvariant_cast<QColor>(value);
	}

	painter->setPen(foreground);
	painter->drawText(addressRect, Qt::AlignLeft\|Qt::AlignVCenter, address);

	if(amount < 0)
	{
	foreground = COLOR_NEGATIVE;
	}
	else if(!confirmed)
	{
	foreground = COLOR_UNCONFIRMED;
	}
	else
	{
	foreground = option.palette.color(QPalette::Text);
	}
	painter->setPen(foreground);
	QString amountText = BitcoinUnits::formatWithUnit(unit, amount, true);
	if(!confirmed)
	{
	amountText = QString("[") + amountText + QString("]");
	}
	painter->drawText(amountRect, Qt::AlignRight\|Qt::AlignVCenter, amountText);

	painter->setPen(option.palette.color(QPalette::Text));
	painter->drawText(amountRect, Qt::AlignLeft\|Qt::AlignVCenter, GUIUtil::dateTimeStr(date));

	painter->restore();
	}

	inline QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
	{
	return QSize(DECORATION_SIZE, DECORATION_SIZE);
	}

	int unit;

	};
	#include "overviewpage.moc"

	OverviewPage::OverviewPage(QWidget *parent) :
	QWidget(parent),
	ui(new Ui::OverviewPage),
	currentBalance(-1),
	currentUnconfirmedBalance(-1),
	currentImmatureBalance(-1),
	txdelegate(new TxViewDelegate()),
	filter(0)
	{
	ui->setupUi(this);

	// Recent transactions
	ui->listTransactions->setItemDelegate(txdelegate);
	ui->listTransactions->setIconSize(QSize(DECORATION_SIZE, DECORATION_SIZE));
	ui->listTransactions->setMinimumHeight(NUM_ITEMS * (DECORATION_SIZE + 2));
	ui->listTransactions->setAttribute(Qt::WA_MacShowFocusRect, false);

	connect(ui->listTransactions, SIGNAL(clicked(QModelIndex)), this, SLOT(handleTransactionClicked(QModelIndex)));

	// init "out of sync" warning labels
	ui->labelWalletStatus->setText("(" + tr("out of sync") + ")");
	ui->labelTransactionsStatus->setText("(" + tr("out of sync") + ")");

	// start with displaying the "out of sync" warnings
	showOutOfSyncWarning(true);
	}

	void OverviewPage::handleTransactionClicked(const QModelIndex &index)
	{
	if(filter)
	emit transactionClicked(filter->mapToSource(index));
	}

	OverviewPage::~OverviewPage()
	{
	delete ui;
	}

	void OverviewPage::setBalance(qint64 balance, qint64 unconfirmedBalance, qint64 immatureBalance)
	{
	int unit = model->getOptionsModel()->getDisplayUnit();
	currentBalance = balance;
	currentUnconfirmedBalance = unconfirmedBalance;
	currentImmatureBalance = immatureBalance;
	ui->labelBalance->setText(BitcoinUnits::formatWithUnit(unit, balance));
	ui->labelUnconfirmed->setText(BitcoinUnits::formatWithUnit(unit, unconfirmedBalance));
	ui->labelImmature->setText(BitcoinUnits::formatWithUnit(unit, immatureBalance));

	// only show immature (newly mined) balance if it's non-zero, so as not to complicate things
	// for the non-mining users
	bool showImmature = immatureBalance != 0;
	ui->labelImmature->setVisible(showImmature);
	ui->labelImmatureText->setVisible(showImmature);
	}

	void OverviewPage::setNumTransactions(int count)
	{
	ui->labelNumTransactions->setText(QLocale::system().toString(count));
	}

	void OverviewPage::setModel(WalletModel *model)
	{
	this->model = model;
	- if(model)
	+ if(model && model->getOptionsModel())
	{
	// Set up transaction list
	filter = new TransactionFilterProxy();
	filter->setSourceModel(model->getTransactionTableModel());
	filter->setLimit(NUM_ITEMS);
	filter->setDynamicSortFilter(true);
	filter->setSortRole(Qt::EditRole);
	filter->sort(TransactionTableModel::Status, Qt::DescendingOrder);

	ui->listTransactions->setModel(filter);
	ui->listTransactions->setModelColumn(TransactionTableModel::ToAddress);

	// Keep up to date with wallet
	setBalance(model->getBalance(), model->getUnconfirmedBalance(), model->getImmatureBalance());
	connect(model, SIGNAL(balanceChanged(qint64, qint64, qint64)), this, SLOT(setBalance(qint64, qint64, qint64)));

	setNumTransactions(model->getNumTransactions());
	connect(model, SIGNAL(numTransactionsChanged(int)), this, SLOT(setNumTransactions(int)));

	- connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(displayUnitChanged()));
	+ connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
	}
	+
	+ // update the display unit, to not use the default ("BTC")
	+ updateDisplayUnit();
	}

	-void OverviewPage::displayUnitChanged()
	+void OverviewPage::updateDisplayUnit()
	{
	- if(!model \|\| !model->getOptionsModel())
	- return;
	- if(currentBalance != -1)
	- setBalance(currentBalance, currentUnconfirmedBalance, currentImmatureBalance);
	+ if(model && model->getOptionsModel())
	+ {
	+ if(currentBalance != -1)
	+ setBalance(currentBalance, currentUnconfirmedBalance, currentImmatureBalance);

	- txdelegate->unit = model->getOptionsModel()->getDisplayUnit();
	- ui->listTransactions->update();
	+ // Update txdelegate->unit with the current unit
	+ txdelegate->unit = model->getOptionsModel()->getDisplayUnit();
	+
	+ ui->listTransactions->update();
	+ }
	}

	void OverviewPage::showOutOfSyncWarning(bool fShow)
	{
	ui->labelWalletStatus->setVisible(fShow);
	ui->labelTransactionsStatus->setVisible(fShow);
	}
	diff --git a/src/qt/overviewpage.h b/src/qt/overviewpage.h
	index c7d3a4242..00048cc8f 100644
	--- a/src/qt/overviewpage.h
	+++ b/src/qt/overviewpage.h
	@@ -1,51 +1,51 @@
	#ifndef OVERVIEWPAGE_H
	#define OVERVIEWPAGE_H

	#include <QWidget>

	QT_BEGIN_NAMESPACE
	class QModelIndex;
	QT_END_NAMESPACE

	namespace Ui {
	class OverviewPage;
	}
	class WalletModel;
	class TxViewDelegate;
	class TransactionFilterProxy;

	/** Overview ("home") page widget */
	class OverviewPage : public QWidget
	{
	Q_OBJECT

	public:
	explicit OverviewPage(QWidget *parent = 0);
	~OverviewPage();

	void setModel(WalletModel *model);
	void showOutOfSyncWarning(bool fShow);

	public slots:
	void setBalance(qint64 balance, qint64 unconfirmedBalance, qint64 immatureBalance);
	void setNumTransactions(int count);

	signals:
	void transactionClicked(const QModelIndex &index);

	private:
	Ui::OverviewPage *ui;
	WalletModel *model;
	qint64 currentBalance;
	qint64 currentUnconfirmedBalance;
	qint64 currentImmatureBalance;

	TxViewDelegate *txdelegate;
	TransactionFilterProxy *filter;

	private slots:
	- void displayUnitChanged();
	+ void updateDisplayUnit();
	void handleTransactionClicked(const QModelIndex &index);
	};

	#endif // OVERVIEWPAGE_H
	diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
	index 76952e44e..86c2b01fe 100644
	--- a/src/qt/sendcoinsdialog.cpp
	+++ b/src/qt/sendcoinsdialog.cpp
	@@ -1,291 +1,301 @@
	#include "sendcoinsdialog.h"
	#include "ui_sendcoinsdialog.h"
	#include "walletmodel.h"
	#include "bitcoinunits.h"
	#include "addressbookpage.h"
	#include "optionsmodel.h"
	#include "sendcoinsentry.h"
	#include "guiutil.h"
	#include "askpassphrasedialog.h"

	#include <QMessageBox>
	#include <QLocale>
	#include <QTextDocument>
	#include <QScrollBar>

	SendCoinsDialog::SendCoinsDialog(QWidget *parent) :
	QDialog(parent),
	ui(new Ui::SendCoinsDialog),
	model(0)
	{
	ui->setupUi(this);

	#ifdef Q_WS_MAC // Icons on push buttons are very uncommon on Mac
	ui->addButton->setIcon(QIcon());
	ui->clearButton->setIcon(QIcon());
	ui->sendButton->setIcon(QIcon());
	#endif

	addEntry();

	connect(ui->addButton, SIGNAL(clicked()), this, SLOT(addEntry()));
	connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clear()));

	fNewRecipientAllowed = true;
	}

	void SendCoinsDialog::setModel(WalletModel *model)
	{
	this->model = model;

	for(int i = 0; i < ui->entries->count(); ++i)
	{
	SendCoinsEntry entry = qobject_cast<SendCoinsEntry>(ui->entries->itemAt(i)->widget());
	if(entry)
	{
	entry->setModel(model);
	}
	}
	- if(model)
	+ if(model && model->getOptionsModel())
	{
	setBalance(model->getBalance(), model->getUnconfirmedBalance(), model->getImmatureBalance());
	connect(model, SIGNAL(balanceChanged(qint64, qint64, qint64)), this, SLOT(setBalance(qint64, qint64, qint64)));
	+ connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
	}
	}

	SendCoinsDialog::~SendCoinsDialog()
	{
	delete ui;
	}

	void SendCoinsDialog::on_sendButton_clicked()
	{
	QList<SendCoinsRecipient> recipients;
	bool valid = true;

	if(!model)
	return;

	for(int i = 0; i < ui->entries->count(); ++i)
	{
	SendCoinsEntry entry = qobject_cast<SendCoinsEntry>(ui->entries->itemAt(i)->widget());
	if(entry)
	{
	if(entry->validate())
	{
	recipients.append(entry->getValue());
	}
	else
	{
	valid = false;
	}
	}
	}

	if(!valid \|\| recipients.isEmpty())
	{
	return;
	}

	// Format confirmation message
	QStringList formatted;
	foreach(const SendCoinsRecipient &rcp, recipients)
	{
	formatted.append(tr("<b>%1</b> to %2 (%3)").arg(BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, rcp.amount), Qt::escape(rcp.label), rcp.address));
	}

	fNewRecipientAllowed = false;

	QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm send coins"),
	tr("Are you sure you want to send %1?").arg(formatted.join(tr(" and "))),
	QMessageBox::Yes\|QMessageBox::Cancel,
	QMessageBox::Cancel);

	if(retval != QMessageBox::Yes)
	{
	fNewRecipientAllowed = true;
	return;
	}

	WalletModel::UnlockContext ctx(model->requestUnlock());
	if(!ctx.isValid())
	{
	// Unlock wallet was cancelled
	fNewRecipientAllowed = true;
	return;
	}

	WalletModel::SendCoinsReturn sendstatus = model->sendCoins(recipients);
	switch(sendstatus.status)
	{
	case WalletModel::InvalidAddress:
	QMessageBox::warning(this, tr("Send Coins"),
	tr("The recepient address is not valid, please recheck."),
	QMessageBox::Ok, QMessageBox::Ok);
	break;
	case WalletModel::InvalidAmount:
	QMessageBox::warning(this, tr("Send Coins"),
	tr("The amount to pay must be larger than 0."),
	QMessageBox::Ok, QMessageBox::Ok);
	break;
	case WalletModel::AmountExceedsBalance:
	QMessageBox::warning(this, tr("Send Coins"),
	tr("The amount exceeds your balance."),
	QMessageBox::Ok, QMessageBox::Ok);
	break;
	case WalletModel::AmountWithFeeExceedsBalance:
	QMessageBox::warning(this, tr("Send Coins"),
	tr("The total exceeds your balance when the %1 transaction fee is included.").
	arg(BitcoinUnits::formatWithUnit(BitcoinUnits::BTC, sendstatus.fee)),
	QMessageBox::Ok, QMessageBox::Ok);
	break;
	case WalletModel::DuplicateAddress:
	QMessageBox::warning(this, tr("Send Coins"),
	tr("Duplicate address found, can only send to each address once per send operation."),
	QMessageBox::Ok, QMessageBox::Ok);
	break;
	case WalletModel::TransactionCreationFailed:
	QMessageBox::warning(this, tr("Send Coins"),
	tr("Error: Transaction creation failed."),
	QMessageBox::Ok, QMessageBox::Ok);
	break;
	case WalletModel::TransactionCommitFailed:
	QMessageBox::warning(this, tr("Send Coins"),
	tr("Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here."),
	QMessageBox::Ok, QMessageBox::Ok);
	break;
	case WalletModel::Aborted: // User aborted, nothing to do
	break;
	case WalletModel::OK:
	accept();
	break;
	}
	fNewRecipientAllowed = true;
	}

	void SendCoinsDialog::clear()
	{
	// Remove entries until only one left
	while(ui->entries->count())
	{
	delete ui->entries->takeAt(0)->widget();
	}
	addEntry();

	updateRemoveEnabled();

	ui->sendButton->setDefault(true);
	}

	void SendCoinsDialog::reject()
	{
	clear();
	}

	void SendCoinsDialog::accept()
	{
	clear();
	}

	SendCoinsEntry *SendCoinsDialog::addEntry()
	{
	SendCoinsEntry *entry = new SendCoinsEntry(this);
	entry->setModel(model);
	ui->entries->addWidget(entry);
	connect(entry, SIGNAL(removeEntry(SendCoinsEntry)), this, SLOT(removeEntry(SendCoinsEntry)));

	updateRemoveEnabled();

	// Focus the field, so that entry can start immediately
	entry->clear();
	entry->setFocus();
	ui->scrollAreaWidgetContents->resize(ui->scrollAreaWidgetContents->sizeHint());
	QCoreApplication::instance()->processEvents();
	QScrollBar* bar = ui->scrollArea->verticalScrollBar();
	- if (bar)
	+ if(bar)
	bar->setSliderPosition(bar->maximum());
	return entry;
	}

	void SendCoinsDialog::updateRemoveEnabled()
	{
	// Remove buttons are enabled as soon as there is more than one send-entry
	bool enabled = (ui->entries->count() > 1);
	for(int i = 0; i < ui->entries->count(); ++i)
	{
	SendCoinsEntry entry = qobject_cast<SendCoinsEntry>(ui->entries->itemAt(i)->widget());
	if(entry)
	{
	entry->setRemoveEnabled(enabled);
	}
	}
	setupTabChain(0);
	}

	void SendCoinsDialog::removeEntry(SendCoinsEntry* entry)
	{
	delete entry;
	updateRemoveEnabled();
	}

	QWidget SendCoinsDialog::setupTabChain(QWidget prev)
	{
	for(int i = 0; i < ui->entries->count(); ++i)
	{
	SendCoinsEntry entry = qobject_cast<SendCoinsEntry>(ui->entries->itemAt(i)->widget());
	if(entry)
	{
	prev = entry->setupTabChain(prev);
	}
	}
	QWidget::setTabOrder(prev, ui->addButton);
	QWidget::setTabOrder(ui->addButton, ui->sendButton);
	return ui->sendButton;
	}

	void SendCoinsDialog::pasteEntry(const SendCoinsRecipient &rv)
	{
	- if (!fNewRecipientAllowed)
	+ if(!fNewRecipientAllowed)
	return;

	SendCoinsEntry *entry = 0;
	// Replace the first entry if it is still unused
	if(ui->entries->count() == 1)
	{
	SendCoinsEntry first = qobject_cast<SendCoinsEntry>(ui->entries->itemAt(0)->widget());
	if(first->isClear())
	{
	entry = first;
	}
	}
	if(!entry)
	{
	entry = addEntry();
	}

	entry->setValue(rv);
	}

	bool SendCoinsDialog::handleURI(const QString &uri)
	{
	SendCoinsRecipient rv;
	// URI has to be valid
	if (GUIUtil::parseBitcoinURI(uri, &rv))
	{
	pasteEntry(rv);
	return true;
	}

	return false;
	}

	void SendCoinsDialog::setBalance(qint64 balance, qint64 unconfirmedBalance, qint64 immatureBalance)
	{
	Q_UNUSED(unconfirmedBalance);
	Q_UNUSED(immatureBalance);
	if(!model \|\| !model->getOptionsModel())
	return;

	int unit = model->getOptionsModel()->getDisplayUnit();
	ui->labelBalance->setText(BitcoinUnits::formatWithUnit(unit, balance));
	}
	+
	+void SendCoinsDialog::updateDisplayUnit()
	+{
	+ if(model && model->getOptionsModel())
	+ {
	+ // Update labelBalance with the current balance and the current unit
	+ ui->labelBalance->setText(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), model->getBalance()));
	+ }
	+}
	diff --git a/src/qt/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
	index 915b7ad46..def2f83c3 100644
	--- a/src/qt/sendcoinsdialog.h
	+++ b/src/qt/sendcoinsdialog.h
	@@ -1,54 +1,54 @@
	#ifndef SENDCOINSDIALOG_H
	#define SENDCOINSDIALOG_H

	#include <QDialog>

	namespace Ui {
	class SendCoinsDialog;
	}
	class WalletModel;
	class SendCoinsEntry;
	class SendCoinsRecipient;

	QT_BEGIN_NAMESPACE
	class QUrl;
	QT_END_NAMESPACE

	/** Dialog for sending bitcoins */
	class SendCoinsDialog : public QDialog
	{
	Q_OBJECT

	public:
	explicit SendCoinsDialog(QWidget *parent = 0);
	~SendCoinsDialog();

	void setModel(WalletModel *model);

	/** Set up the tab chain manually, as Qt messes up the tab chain by default in some cases (issue http://bugreports.qt.nokia.com/browse/QTBUG-10907).
	*/
	QWidget setupTabChain(QWidget prev);

	void pasteEntry(const SendCoinsRecipient &rv);
	bool handleURI(const QString &uri);

	public slots:
	void clear();
	void reject();
	void accept();
	SendCoinsEntry *addEntry();
	void updateRemoveEnabled();
	void setBalance(qint64 balance, qint64 unconfirmedBalance, qint64 immatureBalance);

	private:
	Ui::SendCoinsDialog *ui;
	WalletModel *model;
	bool fNewRecipientAllowed;

	private slots:
	void on_sendButton_clicked();
	-
	void removeEntry(SendCoinsEntry* entry);
	+ void updateDisplayUnit();
	};

	#endif // SENDCOINSDIALOG_H
	diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
	index 5960597c7..71891e79c 100644
	--- a/src/qt/sendcoinsentry.cpp
	+++ b/src/qt/sendcoinsentry.cpp
	@@ -1,162 +1,172 @@
	#include "sendcoinsentry.h"
	#include "ui_sendcoinsentry.h"
	#include "guiutil.h"
	#include "bitcoinunits.h"
	#include "addressbookpage.h"
	#include "walletmodel.h"
	#include "optionsmodel.h"
	#include "addresstablemodel.h"

	#include <QApplication>
	#include <QClipboard>

	SendCoinsEntry::SendCoinsEntry(QWidget *parent) :
	QFrame(parent),
	ui(new Ui::SendCoinsEntry),
	model(0)
	{
	ui->setupUi(this);

	#ifdef Q_WS_MAC
	ui->payToLayout->setSpacing(4);
	#endif
	#if QT_VERSION >= 0x040700
	/* Do not move this to the XML file, Qt before 4.7 will choke on it */
	ui->addAsLabel->setPlaceholderText(tr("Enter a label for this address to add it to your address book"));
	ui->payTo->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
	#endif
	setFocusPolicy(Qt::TabFocus);
	setFocusProxy(ui->payTo);

	GUIUtil::setupAddressWidget(ui->payTo, this);
	}

	SendCoinsEntry::~SendCoinsEntry()
	{
	delete ui;
	}

	void SendCoinsEntry::on_pasteButton_clicked()
	{
	// Paste text from clipboard into recipient field
	ui->payTo->setText(QApplication::clipboard()->text());
	}

	void SendCoinsEntry::on_addressBookButton_clicked()
	{
	if(!model)
	return;
	AddressBookPage dlg(AddressBookPage::ForSending, AddressBookPage::SendingTab, this);
	dlg.setModel(model->getAddressTableModel());
	if(dlg.exec())
	{
	ui->payTo->setText(dlg.getReturnValue());
	ui->payAmount->setFocus();
	}
	}

	void SendCoinsEntry::on_payTo_textChanged(const QString &address)
	{
	if(!model)
	return;
	// Fill in label from address book, if address has an associated label
	QString associatedLabel = model->getAddressTableModel()->labelForAddress(address);
	if(!associatedLabel.isEmpty())
	ui->addAsLabel->setText(associatedLabel);
	}

	void SendCoinsEntry::setModel(WalletModel *model)
	{
	this->model = model;
	+
	+ if(model && model->getOptionsModel())
	+ connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit()));
	+
	clear();
	}

	void SendCoinsEntry::setRemoveEnabled(bool enabled)
	{
	ui->deleteButton->setEnabled(enabled);
	}

	void SendCoinsEntry::clear()
	{
	ui->payTo->clear();
	ui->addAsLabel->clear();
	ui->payAmount->clear();
	ui->payTo->setFocus();
	- if(model && model->getOptionsModel())
	- {
	- ui->payAmount->setDisplayUnit(model->getOptionsModel()->getDisplayUnit());
	- }
	+ // update the display unit, to not use the default ("BTC")
	+ updateDisplayUnit();
	}

	void SendCoinsEntry::on_deleteButton_clicked()
	{
	emit removeEntry(this);
	}

	bool SendCoinsEntry::validate()
	{
	// Check input validity
	bool retval = true;

	if(!ui->payAmount->validate())
	{
	retval = false;
	}
	else
	{
	if(ui->payAmount->value() <= 0)
	{
	// Cannot send 0 coins or less
	ui->payAmount->setValid(false);
	retval = false;
	}
	}

	if(!ui->payTo->hasAcceptableInput() \|\|
	(model && !model->validateAddress(ui->payTo->text())))
	{
	ui->payTo->setValid(false);
	retval = false;
	}

	return retval;
	}

	SendCoinsRecipient SendCoinsEntry::getValue()
	{
	SendCoinsRecipient rv;

	rv.address = ui->payTo->text();
	rv.label = ui->addAsLabel->text();
	rv.amount = ui->payAmount->value();

	return rv;
	}

	QWidget SendCoinsEntry::setupTabChain(QWidget prev)
	{
	QWidget::setTabOrder(prev, ui->payTo);
	QWidget::setTabOrder(ui->payTo, ui->addressBookButton);
	QWidget::setTabOrder(ui->addressBookButton, ui->pasteButton);
	QWidget::setTabOrder(ui->pasteButton, ui->deleteButton);
	QWidget::setTabOrder(ui->deleteButton, ui->addAsLabel);
	return ui->payAmount->setupTabChain(ui->addAsLabel);
	}

	void SendCoinsEntry::setValue(const SendCoinsRecipient &value)
	{
	ui->payTo->setText(value.address);
	ui->addAsLabel->setText(value.label);
	ui->payAmount->setValue(value.amount);
	}

	bool SendCoinsEntry::isClear()
	{
	return ui->payTo->text().isEmpty();
	}

	void SendCoinsEntry::setFocus()
	{
	ui->payTo->setFocus();
	}

	+void SendCoinsEntry::updateDisplayUnit()
	+{
	+ if(model && model->getOptionsModel())
	+ {
	+ // Update payAmount with the current unit
	+ ui->payAmount->setDisplayUnit(model->getOptionsModel()->getDisplayUnit());
	+ }
	+}
	diff --git a/src/qt/sendcoinsentry.h b/src/qt/sendcoinsentry.h
	index cdbf89326..db6cba0d8 100644
	--- a/src/qt/sendcoinsentry.h
	+++ b/src/qt/sendcoinsentry.h
	@@ -1,54 +1,55 @@
	#ifndef SENDCOINSENTRY_H
	#define SENDCOINSENTRY_H

	#include <QFrame>

	namespace Ui {
	class SendCoinsEntry;
	}
	class WalletModel;
	class SendCoinsRecipient;

	/** A single entry in the dialog for sending bitcoins. */
	class SendCoinsEntry : public QFrame
	{
	Q_OBJECT

	public:
	explicit SendCoinsEntry(QWidget *parent = 0);
	~SendCoinsEntry();

	void setModel(WalletModel *model);
	bool validate();
	SendCoinsRecipient getValue();

	/** Return whether the entry is still empty and unedited */
	bool isClear();

	void setValue(const SendCoinsRecipient &value);

	/** Set up the tab chain manually, as Qt messes up the tab chain by default in some cases (issue http://bugreports.qt.nokia.com/browse/QTBUG-10907).
	*/
	QWidget setupTabChain(QWidget prev);

	void setFocus();

	public slots:
	void setRemoveEnabled(bool enabled);
	void clear();

	signals:
	void removeEntry(SendCoinsEntry *entry);

	private slots:
	void on_deleteButton_clicked();
	void on_payTo_textChanged(const QString &address);
	void on_addressBookButton_clicked();
	void on_pasteButton_clicked();
	+ void updateDisplayUnit();

	private:
	Ui::SendCoinsEntry *ui;
	WalletModel *model;
	};

	#endif // SENDCOINSENTRY_H

File Metadata

Mime Type: text/x-diff
Expires: Sun, Mar 2, 10:52 (1 d, 11 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 5187362
Default Alt Text: (25 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions