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.

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

Expose -privatesendmultisession to GUI options #891

Merged
merged 1 commit into from
Jun 21, 2016
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
10 changes: 10 additions & 0 deletions src/qt/forms/optionsdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,16 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="privateSendMultiSession">
<property name="toolTip">
<string>Whether to use experimental PrivateSend mode with multiple mixing sessions per block.&lt;br/&gt;Note: You must use this feature carefully.&lt;br/&gt;Make sure you always have recent wallet (auto)backup in a safe place!</string>
</property>
<property name="text">
<string>Enable PrivateSend &amp;multi-session</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="spendZeroConfChange">
<property name="toolTip">
Expand Down
1 change: 1 addition & 0 deletions src/qt/optionsdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ void OptionsDialog::setMapper()
mapper->addMapping(ui->coinControlFeatures, OptionsModel::CoinControlFeatures);
mapper->addMapping(ui->privateSendRounds, OptionsModel::PrivateSendRounds);
mapper->addMapping(ui->anonymizeDash, OptionsModel::AnonymizeDashAmount);
mapper->addMapping(ui->privateSendMultiSession, OptionsModel::PrivateSendMultiSession);

/* Network */
mapper->addMapping(ui->mapPortUpnp, OptionsModel::MapPortUPnP);
Expand Down
15 changes: 15 additions & 0 deletions src/qt/optionsmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,12 @@ void OptionsModel::Init(bool resetSettings)
if (!SoftSetArg("-anonymizedashamount", settings.value("nAnonymizeDashAmount").toString().toStdString()))
addOverriddenOption("-anonymizedashamount");
nAnonymizeDashAmount = settings.value("nAnonymizeDashAmount").toInt();

if (!settings.contains("fPrivateSendMultiSession"))
settings.setValue("fPrivateSendMultiSession", fPrivateSendMultiSession);
if (!SoftSetBoolArg("-privatesendmultisession", settings.value("fPrivateSendMultiSession").toBool()))
addOverriddenOption("-privatesendmultisession");
fPrivateSendMultiSession = settings.value("fPrivateSendMultiSession").toBool();
#endif

// Network
Expand Down Expand Up @@ -251,6 +257,8 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
return settings.value("nAnonymizeDashAmount");
case ShowMasternodesTab:
return settings.value("fShowMasternodesTab");
case PrivateSendMultiSession:
return settings.value("fPrivateSendMultiSession");
#endif
case DisplayUnit:
return nDisplayUnit;
Expand Down Expand Up @@ -400,6 +408,13 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
setRestartRequired(true);
}
break;
case PrivateSendMultiSession:
if (settings.value("fPrivateSendMultiSession") != value)
{
fPrivateSendMultiSession = value.toBool();
settings.setValue("fPrivateSendMultiSession", fPrivateSendMultiSession);
}
break;
#endif
case DisplayUnit:
setDisplayUnit(value);
Expand Down
1 change: 1 addition & 0 deletions src/qt/optionsmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class OptionsModel : public QAbstractListModel
PrivateSendRounds, // int
AnonymizeDashAmount, // int
ShowMasternodesTab, // bool
PrivateSendMultiSession,// bool
Listen, // bool
OptionIDRowCount,
};
Expand Down