[Qt] Change RBF checkbox to reflect -walletrbf setting

ryanofsky · ryanofsky · commit c4e4792c537b · 2017-01-25T12:51:06.000-05:00
Before this commit, the checkbox would always start off unchecked. After this
commit it will respect the -walletrbf setting (which is currently false by
default).
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
@@ -112,6 +112,7 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle *_platformStyle, QWidget *p
     ui->groupCustomFee->button((int)std::max(0, std::min(1, settings.value("nCustomFeeRadio").toInt())))->setChecked(true);
     ui->customFee->setValue(settings.value("nTransactionFee").toLongLong());
     ui->checkBoxMinimumFee->setChecked(settings.value("fPayOnlyMinFee").toBool());
+    ui->optInRBF->setCheckState(model->getDefaultWalletRbf() ? Qt::Checked : Qt::Unchecked);
     minimizeFeeSection(settings.value("fFeeSectionMinimized").toBool());
 }
 
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -706,3 +706,8 @@ int WalletModel::getDefaultConfirmTarget() const
 {
     return nTxConfirmTarget;
 }
+
+bool WalletModel::getDefaultWalletRbf() const
+{
+    return fWalletRbf;
+}
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
@@ -213,6 +213,8 @@ class WalletModel : public QObject
 
     int getDefaultConfirmTarget() const;
 
+    bool getDefaultWalletRbf() const;
+
 private:
     CWallet *wallet;
     bool fHaveWatchOnly;

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,7 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle _platformStyle, QWidget p`
`112`	`112`	`ui->groupCustomFee->button((int)std::max(0, std::min(1, settings.value("nCustomFeeRadio").toInt())))->setChecked(true);`
`113`	`113`	`ui->customFee->setValue(settings.value("nTransactionFee").toLongLong());`
`114`	`114`	`ui->checkBoxMinimumFee->setChecked(settings.value("fPayOnlyMinFee").toBool());`
	`115`	`+ ui->optInRBF->setCheckState(model->getDefaultWalletRbf() ? Qt::Checked : Qt::Unchecked);`
`115`	`116`	`minimizeFeeSection(settings.value("fFeeSectionMinimized").toBool());`
`116`	`117`	`}`
`117`	`118`
Original file line number	Diff line number	Diff line change
`@@ -706,3 +706,8 @@ int WalletModel::getDefaultConfirmTarget() const`
`706`	`706`	`{`
`707`	`707`	`return nTxConfirmTarget;`
`708`	`708`	`}`
	`709`	`+`
	`710`	`+bool WalletModel::getDefaultWalletRbf() const`
	`711`	`+{`
	`712`	`+ return fWalletRbf;`
	`713`	`+}`