Merge pull request #468 from crowning-/UI_Enhancements

UI: "Confirm send coins" popup beautified
This commit is contained in:
UdjinM6 2015-08-02 06:18:09 +03:00
commit b8dbdb356a

View File

@ -376,9 +376,11 @@ void SendCoinsDialog::send(QList<SendCoinsRecipient> recipients, QString strFee,
if(u != model->getOptionsModel()->getDisplayUnit()) if(u != model->getOptionsModel()->getDisplayUnit())
alternativeUnits.append(BitcoinUnits::formatHtmlWithUnit(u, totalAmount)); alternativeUnits.append(BitcoinUnits::formatHtmlWithUnit(u, totalAmount));
} }
questionString.append(tr("Total Amount %1 (= %2)")
// Show total amount + all alternative units
questionString.append(tr("Total Amount = <b>%1</b><br />= %2")
.arg(BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), totalAmount)) .arg(BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), totalAmount))
.arg("<br />" + alternativeUnits.join(" " + tr("or") + "<br />"))); .arg(alternativeUnits.join("<br />= ")));
// Limit number of displayed entries // Limit number of displayed entries
int messageEntries = formatted.size(); int messageEntries = formatted.size();