|
|
|
@ -62,7 +62,7 @@ void MainWindow::setupSendTab() { |
|
|
|
// Disable custom fees if settings say no
|
|
|
|
ui->minerFeeAmt->setReadOnly(!Settings::getInstance()->getAllowCustomFees()); |
|
|
|
QObject::connect(ui->minerFeeAmt, &QLineEdit::textChanged, [=](auto txt) { |
|
|
|
ui->lblMinerFeeUSD->setText(Settings::getUSDFromhushAmount(txt.toDouble())); |
|
|
|
ui->lblMinerFeeUSD->setText(Settings::getUSDFormat(txt.toDouble())); |
|
|
|
}); |
|
|
|
ui->minerFeeAmt->setText(Settings::getDecimalString(Settings::getMinerFee())); |
|
|
|
|
|
|
|
@ -70,7 +70,7 @@ void MainWindow::setupSendTab() { |
|
|
|
QObject::connect(ui->tabWidget, &QTabWidget::currentChanged, [=] (int pos) { |
|
|
|
if (pos == 1) { |
|
|
|
QString txt = ui->minerFeeAmt->text(); |
|
|
|
ui->lblMinerFeeUSD->setText(Settings::getUSDFromhushAmount(txt.toDouble())); |
|
|
|
ui->lblMinerFeeUSD->setText(Settings::getUSDFormat(txt.toDouble())); |
|
|
|
} |
|
|
|
}); |
|
|
|
|
|
|
|
@ -228,7 +228,7 @@ void MainWindow::inputComboTextChanged(int index) { |
|
|
|
auto balFmt = Settings::gethushDisplayFormat(bal); |
|
|
|
|
|
|
|
ui->sendAddressBalance->setText(balFmt); |
|
|
|
ui->sendAddressBalanceUSD->setText(Settings::getUSDFromhushAmount(bal)); |
|
|
|
ui->sendAddressBalanceUSD->setText(Settings::getUSDFormat(bal)); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -341,7 +341,7 @@ void MainWindow::addressChanged(int itemNumber, const QString& text) { |
|
|
|
|
|
|
|
void MainWindow::amountChanged(int item, const QString& text) { |
|
|
|
auto usd = ui->sendToWidgets->findChild<QLabel*>(QString("AmtUSD") % QString::number(item)); |
|
|
|
usd->setText(Settings::getUSDFromhushAmount(text.toDouble())); |
|
|
|
usd->setText(Settings::getUSDFormat(text.toDouble())); |
|
|
|
|
|
|
|
// If there is a recurring payment, update the info there as well
|
|
|
|
if (sendTxRecurringInfo != nullptr) { |
|
|
|
@ -545,7 +545,7 @@ Tx MainWindow::createTxFromSendPage() { |
|
|
|
|
|
|
|
if (Settings::getDecimalString(change) != "0") { |
|
|
|
QString changeMemo = tr("Change from ") + tx.fromAddr; |
|
|
|
tx.toAddrs.push_back(ToFields{ *saplingAddr, change, changeMemo }); |
|
|
|
tx.toAddrs.push_back(ToFields{ *saplingAddr, change, changeMemo}); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -639,7 +639,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) { |
|
|
|
// Amount (USD)
|
|
|
|
auto AmtUSD = new QLabel(confirm.sendToAddrs); |
|
|
|
AmtUSD->setObjectName(QString("AmtUSD") % QString::number(i + 1)); |
|
|
|
AmtUSD->setText(Settings::getUSDFromhushAmount(toAddr.amount)); |
|
|
|
AmtUSD->setText(Settings::getUSDFormat(toAddr.amount)); |
|
|
|
AmtUSD->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter); |
|
|
|
confirm.gridLayout->addWidget(AmtUSD, row, 2, 1, 1); |
|
|
|
|
|
|
|
@ -690,7 +690,7 @@ bool MainWindow::confirmTx(Tx tx, RecurringPaymentInfo* rpi) { |
|
|
|
minerFeeUSD->setObjectName(QStringLiteral("minerFeeUSD")); |
|
|
|
minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
|
|
|
confirm.gridLayout->addWidget(minerFeeUSD, row, 2, 1, 1); |
|
|
|
minerFeeUSD->setText(Settings::getUSDFromhushAmount(tx.fee)); |
|
|
|
minerFeeUSD->setText(Settings::getUSDFormat(tx.fee)); |
|
|
|
|
|
|
|
if (Settings::getInstance()->getAllowCustomFees() && tx.fee != Settings::getMinerFee()) { |
|
|
|
confirm.warningLabel->setVisible(true); |
|
|
|
|
DenioD
5 years ago