diff options
| author | J Ross Nicoll <[email protected]> | 2015-09-06 09:28:29 +0100 |
|---|---|---|
| committer | J Ross Nicoll <[email protected]> | 2015-10-31 14:49:41 +0000 |
| commit | 61b4078a6abf9812e661d560cf5fb513661485b1 (patch) | |
| tree | 00d7ee4876c6d3a1c3e8107a1cb5f7b409b1e4e4 /src | |
| parent | Add Dogecoin Core copyright line to splash screen (diff) | |
| download | discoin-61b4078a6abf9812e661d560cf5fb513661485b1.tar.xz discoin-61b4078a6abf9812e661d560cf5fb513661485b1.zip | |
Disable UI elements for selecting zero-fee
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/forms/sendcoinsdialog.ui | 2 | ||||
| -rw-r--r-- | src/qt/sendcoinsdialog.cpp | 19 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index 99b8befc4..baab73001 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -1167,6 +1167,7 @@ </item> </layout> </item> + <!-- <item> <layout class="QHBoxLayout" name="horizontalLayoutFee5" stretch="0,0,0"> <property name="spacing"> @@ -1207,6 +1208,7 @@ </item> </layout> </item> + --> <item> <spacer name="verticalSpacerFee2"> <property name="orientation"> diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 72758407a..a1da6a481 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -103,8 +103,9 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle *platformStyle, QWidget *pa settings.setValue("nTransactionFee", (qint64)DEFAULT_TRANSACTION_FEE); if (!settings.contains("fPayOnlyMinFee")) settings.setValue("fPayOnlyMinFee", false); - if (!settings.contains("fSendFreeTransactions")) - settings.setValue("fSendFreeTransactions", false); + // Dogecoin: Disable free transactions + /* if (!settings.contains("fSendFreeTransactions")) + settings.setValue("fSendFreeTransactions", false); */ ui->groupFee->setId(ui->radioSmartFee, 0); ui->groupFee->setId(ui->radioCustomFee, 1); ui->groupFee->button((int)std::max(0, std::min(1, settings.value("nFeeRadio").toInt())))->setChecked(true); @@ -114,7 +115,8 @@ SendCoinsDialog::SendCoinsDialog(const PlatformStyle *platformStyle, QWidget *pa ui->sliderSmartFee->setValue(settings.value("nSmartFeeSliderPosition").toInt()); ui->customFee->setValue(settings.value("nTransactionFee").toLongLong()); ui->checkBoxMinimumFee->setChecked(settings.value("fPayOnlyMinFee").toBool()); - ui->checkBoxFreeTx->setChecked(settings.value("fSendFreeTransactions").toBool()); + // Dogecoin: Disable free transactions + // ui->checkBoxFreeTx->setChecked(settings.value("fSendFreeTransactions").toBool()); minimizeFeeSection(settings.value("fFeeSectionMinimized").toBool()); } @@ -169,8 +171,9 @@ void SendCoinsDialog::setModel(WalletModel *model) connect(ui->checkBoxMinimumFee, SIGNAL(stateChanged(int)), this, SLOT(updateFeeSectionControls())); connect(ui->checkBoxMinimumFee, SIGNAL(stateChanged(int)), this, SLOT(updateGlobalFeeVariables())); connect(ui->checkBoxMinimumFee, SIGNAL(stateChanged(int)), this, SLOT(coinControlUpdateLabels())); - connect(ui->checkBoxFreeTx, SIGNAL(stateChanged(int)), this, SLOT(updateGlobalFeeVariables())); - connect(ui->checkBoxFreeTx, SIGNAL(stateChanged(int)), this, SLOT(coinControlUpdateLabels())); + // Dogecoin: Disable free transactions + // connect(ui->checkBoxFreeTx, SIGNAL(stateChanged(int)), this, SLOT(updateGlobalFeeVariables())); + // connect(ui->checkBoxFreeTx, SIGNAL(stateChanged(int)), this, SLOT(coinControlUpdateLabels())); ui->customFee->setSingleStep(CWallet::minTxFee.GetFeePerK()); updateFeeSectionControls(); updateMinFeeLabel(); @@ -188,7 +191,8 @@ SendCoinsDialog::~SendCoinsDialog() settings.setValue("nSmartFeeSliderPosition", ui->sliderSmartFee->value()); settings.setValue("nTransactionFee", (qint64)ui->customFee->value()); settings.setValue("fPayOnlyMinFee", ui->checkBoxMinimumFee->isChecked()); - settings.setValue("fSendFreeTransactions", ui->checkBoxFreeTx->isChecked()); + // Dogecoin: Disable free transactions + // settings.setValue("fSendFreeTransactions", ui->checkBoxFreeTx->isChecked()); delete ui; } @@ -601,7 +605,8 @@ void SendCoinsDialog::updateGlobalFeeVariables() fPayAtLeastCustomFee = ui->radioCustomAtLeast->isChecked(); } - fSendFreeTransactions = ui->checkBoxFreeTx->isChecked(); + // Dogecoin: Disable free transactions + // fSendFreeTransactions = ui->checkBoxFreeTx->isChecked(); } void SendCoinsDialog::updateFeeMinimizedLabel() |