Skip to content

Commit 9e4ee65

Browse files
committed
merge bitcoin-core/gui#617: Reset options, notify user about backup creation
1 parent cc2df46 commit 9e4ee65

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

src/qt/bitcoingui.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,6 +1416,7 @@ void BitcoinGUI::openOptionsDialogWithTab(OptionsDialog::Tab tab)
14161416
auto dlg = new OptionsDialog(this, enableWallet);
14171417
connect(dlg, &OptionsDialog::quitOnReset, this, &BitcoinGUI::quitRequested);
14181418
dlg->setCurrentTab(tab);
1419+
dlg->setClientModel(clientModel);
14191420
dlg->setModel(clientModel->getOptionsModel());
14201421
connect(dlg, &OptionsDialog::appearanceChanged, [this]() {
14211422
updateWidth();

src/qt/optionsdialog.cpp

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include <qt/appearancewidget.h>
1313
#include <qt/bitcoinunits.h>
14+
#include <qt/clientmodel.h>
1415
#include <qt/guiconstants.h>
1516
#include <qt/guiutil.h>
1617
#include <qt/optionsmodel.h>
@@ -215,6 +216,11 @@ OptionsDialog::~OptionsDialog()
215216
delete ui;
216217
}
217218

219+
void OptionsDialog::setClientModel(ClientModel* client_model)
220+
{
221+
m_client_model = client_model;
222+
}
223+
218224
void OptionsDialog::setModel(OptionsModel *_model)
219225
{
220226
this->model = _model;
@@ -393,14 +399,15 @@ void OptionsDialog::setOkButtonState(bool fState)
393399

394400
void OptionsDialog::on_resetButton_clicked()
395401
{
396-
if(model)
397-
{
402+
if (model) {
398403
// confirmation dialog
399404
QMessageBox::StandardButton btnRetVal = QMessageBox::question(this, tr("Confirm options reset"),
400-
tr("Client restart required to activate changes.") + "<br><br>" + tr("Client will be shut down. Do you want to proceed?"),
405+
tr("Client restart required to activate changes.") + "<br><br>" +
406+
tr("Current settings will be backed up at \"%1\".").arg(m_client_model->dataDir()) + "<br><br>" +
407+
tr("Client will be shut down. Do you want to proceed?"),
401408
QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel);
402409

403-
if(btnRetVal == QMessageBox::Cancel)
410+
if (btnRetVal == QMessageBox::Cancel)
404411
return;
405412

406413
/* reset all options and close GUI */

src/qt/optionsdialog.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <QValidator>
1010

1111
class AppearanceWidget;
12+
class ClientModel;
1213
class OptionsModel;
1314
class QValidatedLineEdit;
1415

@@ -51,6 +52,7 @@ class OptionsDialog : public QDialog
5152
TAB_APPEARANCE,
5253
};
5354

55+
void setClientModel(ClientModel* client_model);
5456
void setModel(OptionsModel *model);
5557
void setMapper();
5658
void setCurrentTab(OptionsDialog::Tab tab);
@@ -86,6 +88,7 @@ private Q_SLOTS:
8688

8789
private:
8890
Ui::OptionsDialog *ui;
91+
ClientModel* m_client_model{nullptr};
8992
OptionsModel *model;
9093
QDataWidgetMapper *mapper;
9194
QButtonGroup* pageButtons;

0 commit comments

Comments
 (0)