Browse Source

Merge pull request #3273

fb0507f qt: show all units in send confirmation (Wladimir J. van der Laan)
0.10
Wladimir J. van der Laan 11 years ago
parent
commit
be5d37c597
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 15
      src/qt/sendcoinsdialog.cpp

15
src/qt/sendcoinsdialog.cpp

@ -216,12 +216,19 @@ void SendCoinsDialog::on_sendButton_clicked() @@ -216,12 +216,19 @@ void SendCoinsDialog::on_sendButton_clicked()
questionString.append("</span> ");
questionString.append(tr("added as transaction fee"));
}
if(txFee > 0 || recipients.count() > 1)
{
// add total amount string if there are more then one recipients or a fee is required
// add total amount in all subdivision units
questionString.append("<hr />");
questionString.append(tr("Total Amount %1").arg(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), currentTransaction.getTotalTransactionAmount()+txFee)));
qint64 totalAmount = currentTransaction.getTotalTransactionAmount() + txFee;
QStringList alternativeUnits;
foreach(BitcoinUnits::Unit u, BitcoinUnits::availableUnits())
{
if(u != model->getOptionsModel()->getDisplayUnit())
alternativeUnits.append(BitcoinUnits::formatWithUnit(u, totalAmount));
}
questionString.append(tr("Total Amount %1 (= %2)")
.arg(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), totalAmount))
.arg(alternativeUnits.join(" "+tr("or")+" ")));
QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm send coins"),
questionString.arg(formatted.join("<br />")),

Loading…
Cancel
Save