Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions src/qt/forms/optionsdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,19 @@
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="checkBoxZeromintEnable">
<property name="toolTip">
<string>Enable automatic minting of PIV units to zPIV</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="text">
<string>Enable zPIV Automint</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
Expand Down
2 changes: 2 additions & 0 deletions src/qt/optionsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ void OptionsDialog::setMapper()
mapper->addMapping(ui->bitcoinAtStartup, OptionsModel::StartAtStartup);
mapper->addMapping(ui->threadsScriptVerif, OptionsModel::ThreadsScriptVerif);
mapper->addMapping(ui->databaseCache, OptionsModel::DatabaseCache);
// Zeromint Enabled
mapper->addMapping(ui->checkBoxZeromintEnable, OptionsModel::ZeromintEnable);
// Zerocoin mint percentage
mapper->addMapping(ui->zeromintPercentage, OptionsModel::ZeromintPercentage);
// Zerocoin preferred denomination
Expand Down
20 changes: 17 additions & 3 deletions src/qt/optionsmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "main.h"
#include "net.h"
#include "txdb.h" // for -dbcache defaults
#include "util.h"

#ifdef ENABLE_WALLET
#include "masternodeconfig.h"
Expand Down Expand Up @@ -72,12 +73,15 @@ void OptionsModel::Init()
settings.setValue("fCoinControlFeatures", false);
fCoinControlFeatures = settings.value("fCoinControlFeatures", false).toBool();

if (!settings.contains("nPreferredDenom"))
settings.setValue("nPreferredDenom", 0);
nPreferredDenom = settings.value("nPreferredDenom", "0").toLongLong();
if (!settings.contains("fZeromintEnable"))
settings.setValue("fZeromintEnable", true);
fEnableZeromint = settings.value("fZeromintEnable").toBool();
if (!settings.contains("nZeromintPercentage"))
settings.setValue("nZeromintPercentage", 10);
nZeromintPercentage = settings.value("nZeromintPercentage").toLongLong();
if (!settings.contains("nPreferredDenom"))
settings.setValue("nPreferredDenom", 0);
nPreferredDenom = settings.value("nPreferredDenom", "0").toLongLong();

if (!settings.contains("nAnonymizePivxAmount"))
settings.setValue("nAnonymizePivxAmount", 1000);
Expand Down Expand Up @@ -147,6 +151,8 @@ void OptionsModel::Init()
if (!SoftSetArg("-lang", settings.value("language").toString().toStdString()))
addOverriddenOption("-lang");

if (settings.contains("fZeromintEnable"))
SoftSetBoolArg("-enablezeromint", settings.value("fZeromintEnable").toBool());
if (settings.contains("nZeromintPercentage"))
SoftSetArg("-zeromintpercentage", settings.value("nZeromintPercentage").toString().toStdString());
if (settings.contains("nPreferredDenom"))
Expand Down Expand Up @@ -215,6 +221,7 @@ QVariant OptionsModel::data(const QModelIndex& index, int role) const
return settings.value("fShowMasternodesTab");
#endif
case DisplayUnit:

return nDisplayUnit;
case ThirdPartyTxUrls:
return strThirdPartyTxUrls;
Expand All @@ -230,6 +237,8 @@ QVariant OptionsModel::data(const QModelIndex& index, int role) const
return settings.value("nDatabaseCache");
case ThreadsScriptVerif:
return settings.value("nThreadsScriptVerif");
case ZeromintEnable:
return QVariant(fEnableZeromint);
case ZeromintPercentage:
return QVariant(nZeromintPercentage);
case ZeromintPrefDenom:
Expand Down Expand Up @@ -339,6 +348,11 @@ bool OptionsModel::setData(const QModelIndex& index, const QVariant& value, int
setRestartRequired(true);
}
break;
case ZeromintEnable:
fEnableZeromint = value.toBool();
settings.setValue("fZeromintEnable", fEnableZeromint);
emit zeromintEnableChanged(fEnableZeromint);
break;
case ZeromintPercentage:
nZeromintPercentage = value.toInt();
settings.setValue("nZeromintPercentage", nZeromintPercentage);
Expand Down
2 changes: 2 additions & 0 deletions src/qt/optionsmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class OptionsModel : public QAbstractListModel
ThreadsScriptVerif, // int
DatabaseCache, // int
SpendZeroConfChange, // bool
ZeromintEnable, // bool
ZeromintPercentage, // int
ZeromintPrefDenom, // int
AnonymizePivxAmount, //int
Expand Down Expand Up @@ -90,6 +91,7 @@ class OptionsModel : public QAbstractListModel

signals:
void displayUnitChanged(int unit);
void zeromintEnableChanged(bool);
void zeromintPercentageChanged(int);
void preferredDenomChanged(int);
void anonymizePivxAmountChanged(int);
Expand Down