Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gui: Remove transaction fee setting #1780

Merged
merged 1 commit into from
Jul 6, 2020
Merged

gui: Remove transaction fee setting #1780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 0 additions & 46 deletions src/qt/forms/optionsdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,52 +30,6 @@
<string>&amp;Main</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_Main">
<item>
<widget class="QLabel" name="transactionFeeInfoLabel">
<property name="text">
<string>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB. Fee 0.01 recommended.</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayoutFee">
<item>
<widget class="QLabel" name="transactionFeeLabel">
<property name="text">
<string>Pa&amp;y transaction fee</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="buddy">
<cstring>transactionFee</cstring>
</property>
</widget>
</item>
<item>
<widget class="BitcoinAmountField" name="transactionFee"/>
</item>
<item>
<spacer name="horizontalSpacerFee">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="reserveBalanceInfoLabel">
<property name="text">
Expand Down
5 changes: 2 additions & 3 deletions src/qt/optionsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ void OptionsDialog::setModel(OptionsModel *model)
void OptionsDialog::setMapper()
{
/* Main */
mapper->addMapping(ui->transactionFee, OptionsModel::Fee);
mapper->addMapping(ui->reserveBalance, OptionsModel::ReserveBalance);
mapper->addMapping(ui->gridcoinAtStartup, OptionsModel::StartAtStartup);
mapper->addMapping(ui->disableUpdateCheck, OptionsModel::DisableUpdateCheck);
Expand Down Expand Up @@ -222,8 +221,8 @@ void OptionsDialog::updateDisplayUnit()
{
if(model)
{
/* Update transactionFee with the current unit */
ui->transactionFee->setDisplayUnit(model->getDisplayUnit());
/* Update reserveBalance with the current unit */
ui->reserveBalance->setDisplayUnit(model->getDisplayUnit());
}
}

Expand Down
8 changes: 0 additions & 8 deletions src/qt/optionsmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ void OptionsModel::Init()
bDisplayAddresses = settings.value("bDisplayAddresses", false).toBool();
fMinimizeOnClose = settings.value("fMinimizeOnClose", false).toBool();
fCoinControlFeatures = settings.value("fCoinControlFeatures", false).toBool();
nTransactionFee = settings.value("nTransactionFee").toLongLong();
nReserveBalance = settings.value("nReserveBalance").toLongLong();
language = settings.value("language", "").toString();
walletStylesheet = settings.value("walletStylesheet", "light").toString();
Expand Down Expand Up @@ -104,8 +103,6 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
}
case ProxySocksVersion:
return settings.value("nSocksVersion", 5);
case Fee:
return QVariant((qint64) nTransactionFee);
case ReserveBalance:
return QVariant((qint64) nReserveBalance);
case DisplayUnit:
Expand Down Expand Up @@ -190,11 +187,6 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
successful = ApplyProxySettings();
}
break;
case Fee:
nTransactionFee = value.toLongLong();
settings.setValue("nTransactionFee", (qint64) nTransactionFee);
emit transactionFeeChanged(nTransactionFee);
break;
case ReserveBalance:
nReserveBalance = value.toLongLong();
settings.setValue("nReserveBalance", (qint64) nReserveBalance);
Expand Down
2 changes: 0 additions & 2 deletions src/qt/optionsmodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ class OptionsModel : public QAbstractListModel
ProxyIP, // QString
ProxyPort, // int
ProxySocksVersion, // int
Fee, // qint64
ReserveBalance, // qint64
DisplayUnit, // BitcoinUnits::Unit
DisplayAddresses, // bool
Expand Down Expand Up @@ -67,7 +66,6 @@ class OptionsModel : public QAbstractListModel

signals:
void displayUnitChanged(int unit);
void transactionFeeChanged(qint64);
void reserveBalanceChanged(qint64);
void coinControlFeaturesChanged(bool);
void walletStylesheetChanged(QString);
Expand Down
1 change: 0 additions & 1 deletion src/qt/sendcoinsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ void SendCoinsDialog::setModel(WalletModel *model)
// Coin Control
connect(model->getOptionsModel(), SIGNAL(displayUnitChanged(int)), this, SLOT(coinControlUpdateLabels()));
connect(model->getOptionsModel(), SIGNAL(coinControlFeaturesChanged(bool)), this, SLOT(coinControlFeatureChanged(bool)));
connect(model->getOptionsModel(), SIGNAL(transactionFeeChanged(qint64)), this, SLOT(coinControlUpdateLabels()));
ui->frameCoinControl->setVisible(model->getOptionsModel()->getCoinControlFeatures());
coinControlUpdateLabels();

Expand Down