|
|
|
@ -176,15 +176,17 @@ void SendCoinsDialog::setModel(WalletModel *_model)
@@ -176,15 +176,17 @@ void SendCoinsDialog::setModel(WalletModel *_model)
|
|
|
|
|
connect(ui->checkBoxMinimumFee, SIGNAL(stateChanged(int)), this, SLOT(setMinimumFee())); |
|
|
|
|
connect(ui->checkBoxMinimumFee, SIGNAL(stateChanged(int)), this, SLOT(updateFeeSectionControls())); |
|
|
|
|
connect(ui->checkBoxMinimumFee, SIGNAL(stateChanged(int)), this, SLOT(coinControlUpdateLabels())); |
|
|
|
|
connect(ui->optInRBF, SIGNAL(stateChanged(int)), this, SLOT(updateSmartFeeLabel())); |
|
|
|
|
connect(ui->optInRBF, SIGNAL(stateChanged(int)), this, SLOT(coinControlUpdateLabels())); |
|
|
|
|
// Litecoin: Disabled RBF UI
|
|
|
|
|
// connect(ui->optInRBF, SIGNAL(stateChanged(int)), this, SLOT(updateSmartFeeLabel()));
|
|
|
|
|
// connect(ui->optInRBF, SIGNAL(stateChanged(int)), this, SLOT(coinControlUpdateLabels()));
|
|
|
|
|
ui->customFee->setSingleStep(CWallet::GetRequiredFee(1000)); |
|
|
|
|
updateFeeSectionControls(); |
|
|
|
|
updateMinFeeLabel(); |
|
|
|
|
updateSmartFeeLabel(); |
|
|
|
|
|
|
|
|
|
// set default rbf checkbox state
|
|
|
|
|
ui->optInRBF->setCheckState(model->getDefaultWalletRbf() ? Qt::Checked : Qt::Unchecked); |
|
|
|
|
// Litecoin: Disabled RBF UI
|
|
|
|
|
//ui->optInRBF->setCheckState(model->getDefaultWalletRbf() ? Qt::Checked : Qt::Unchecked);
|
|
|
|
|
|
|
|
|
|
// set the smartfee-sliders default value (wallets default conf.target or last stored value)
|
|
|
|
|
QSettings settings; |
|
|
|
@ -342,12 +344,15 @@ void SendCoinsDialog::on_sendButton_clicked()
@@ -342,12 +344,15 @@ void SendCoinsDialog::on_sendButton_clicked()
|
|
|
|
|
questionString.append(QString("<span style='font-size:10pt;font-weight:normal;'><br />(=%2)</span>") |
|
|
|
|
.arg(alternativeUnits.join(" " + tr("or") + "<br />"))); |
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Litecoin: Disabled RBF UI |
|
|
|
|
if (ui->optInRBF->isChecked()) |
|
|
|
|
{ |
|
|
|
|
questionString.append("<hr /><span>"); |
|
|
|
|
questionString.append(tr("This transaction signals replaceability (optin-RBF).")); |
|
|
|
|
questionString.append("</span>"); |
|
|
|
|
} |
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
SendConfirmationDialog confirmationDialog(tr("Confirm send coins"), |
|
|
|
|
questionString.arg(formatted.join("<br />")), SEND_CONFIRM_DELAY, this); |
|
|
|
@ -647,7 +652,8 @@ void SendCoinsDialog::updateCoinControlState(CCoinControl& ctrl)
@@ -647,7 +652,8 @@ void SendCoinsDialog::updateCoinControlState(CCoinControl& ctrl)
|
|
|
|
|
// Avoid using global defaults when sending money from the GUI
|
|
|
|
|
// Either custom fee will be used or if not selected, the confirmation target from dropdown box
|
|
|
|
|
ctrl.m_confirm_target = getConfTargetForIndex(ui->confTargetSelector->currentIndex()); |
|
|
|
|
ctrl.signalRbf = ui->optInRBF->isChecked(); |
|
|
|
|
// Litecoin: Disabled RBF UI
|
|
|
|
|
//ctrl.signalRbf = ui->optInRBF->isChecked();
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void SendCoinsDialog::updateSmartFeeLabel() |
|
|
|
|