diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/qt/sendcoinsdialog.cpp | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 647be8f2e6..df94438954 100644 --- a/configure.ac +++ b/configure.ac @@ -243,7 +243,7 @@ case $host in bdb_prefix=`$BREW --prefix berkeley-db4` export PKG_CONFIG_PATH="$openssl_prefix/lib/pkgconfig:$PKG_CONFIG_PATH" CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include" - LIBS="$LIBS -L/$bdb_prefix/lib" + LIBS="$LIBS -L$bdb_prefix/lib" fi fi diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 0adf24691e..fa8da1c8dd 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -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 in all subdivision units + questionString.append("<hr />"); + qint64 totalAmount = currentTransaction.getTotalTransactionAmount() + txFee; + QStringList alternativeUnits; + foreach(BitcoinUnits::Unit u, BitcoinUnits::availableUnits()) { - // add total amount string if there are more then one recipients or a fee is required - questionString.append("<hr />"); - questionString.append(tr("Total Amount %1").arg(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), currentTransaction.getTotalTransactionAmount()+txFee))); + 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 />")), |