neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge #919: Add option to hide warning about low keys

Browse Source 
b4647b5 Add option to hide warning about low keys before creating autobackup (but still warn if backup fails)
This commit is contained in:
UdjinM6 2016-07-29 12:36:49 +04:00 committed by Holger Schinzel
parent 8f9544c46e
commit 66fb11c964
5 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/forms/optionsdialog.ui
View File

@ -173,6 +173,16 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="lowKeysWarning">
<property name="toolTip">
<string>Show warning dialog when PrivateSend detects that wallet has very low number of keys left.</string>
</property>
<property name="text">
<string>Warn if PrivateSend is running out of keys</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="privateSendMultiSession">
<property name="toolTip">

1
src/qt/optionsdialog.cpp
View File

@ -201,6 +201,7 @@ void OptionsDialog::setMapper()
mapper->addMapping(ui->coinControlFeatures, OptionsModel::CoinControlFeatures);
mapper->addMapping(ui->privateSendRounds, OptionsModel::PrivateSendRounds);
mapper->addMapping(ui->privateSendAmount, OptionsModel::PrivateSendAmount);
mapper->addMapping(ui->lowKeysWarning, OptionsModel::LowKeysWarning);
mapper->addMapping(ui->privateSendMultiSession, OptionsModel::PrivateSendMultiSession);
/* Network */

8
src/qt/optionsmodel.cpp
View File

@ -88,6 +88,9 @@ void OptionsModel::Init(bool resetSettings)
settings.setValue("fShowAdvancedPSUI", false);
fShowAdvancedPSUI = settings.value("fShowAdvancedPSUI", false).toBool();
if (!settings.contains("fLowKeysWarning"))
settings.setValue("fLowKeysWarning", true);
// These are shared with the core or have a command-line parameter
// and we want command-line parameters to overwrite the GUI settings.
//
@ -251,6 +254,8 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
return settings.value("bSpendZeroConfChange");
case ShowAdvancedPSUI:
return fShowAdvancedPSUI;
case LowKeysWarning:
return settings.value("fLowKeysWarning");
case PrivateSendRounds:
return settings.value("nPrivateSendRounds");
case PrivateSendAmount:
@ -386,6 +391,9 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
settings.setValue("fShowAdvancedPSUI", fShowAdvancedPSUI);
Q_EMIT advancedPSUIChanged(fShowAdvancedPSUI);
break;
case LowKeysWarning:
settings.setValue("fLowKeysWarning", value);
break;
case PrivateSendRounds:
if (settings.value("nPrivateSendRounds") != value)
{

1
src/qt/optionsmodel.h
View File

@ -47,6 +47,7 @@ public:
DatabaseCache, // int
SpendZeroConfChange, // bool
ShowAdvancedPSUI, // bool
LowKeysWarning, // bool
PrivateSendRounds, // int
PrivateSendAmount, // int
ShowMasternodesTab, // bool

19
src/qt/overviewpage.cpp
View File

@ -463,13 +463,18 @@ void OverviewPage::privateSendStatus()
// Warn user that wallet is running out of keys
if (nWalletBackups > 0 && pwalletMain->nKeysLeftSinceAutoBackup < PS_KEYS_THRESHOLD_WARNING) {
QString strWarn = tr("Very low number of keys left since last automatic backup!") + "<br><br>" +
tr("We are about to create a new automatic backup for you, however "
"<span style='color:red;'> you should always make sure you have backups "
"saved in some safe place</span>!");
ui->labelPrivateSendEnabled->setToolTip(strWarn);
LogPrintf("OverviewPage::privateSendStatus - Very low number of keys left since last automatic backup, warning user and trying to create new backup...\n");
QMessageBox::warning(this, tr("PrivateSend"), strWarn, QMessageBox::Ok, QMessageBox::Ok);
QSettings settings;
if(settings.value("fLowKeysWarning").toBool()) {
QString strWarn = tr("Very low number of keys left since last automatic backup!") + "<br><br>" +
tr("We are about to create a new automatic backup for you, however "
"<span style='color:red;'> you should always make sure you have backups "
"saved in some safe place</span>!") + "<br><br>" +
tr("Note: You turn this message off in options.");
ui->labelPrivateSendEnabled->setToolTip(strWarn);
LogPrintf("OverviewPage::privateSendStatus -- Very low number of keys left since last automatic backup, warning user and trying to create new backup...\n");
QMessageBox::warning(this, tr("PrivateSend"), strWarn, QMessageBox::Ok, QMessageBox::Ok);
} else
LogPrintf("OverviewPage::privateSendStatus -- Very low number of keys left since last automatic backup, skipping warning and trying to create new backup...\n");
std::string warningString;
std::string errorString;