Skip to content

Commit 1b4d660

Browse files
committed
Merge bitcoin-core/gui#617: Reset options, notify user about backup creation
ac4fb3b gui: reset options, notify user about the backup creation (furszy) Pull request description: Quick follow-up to first point of bitcoin-core/gui#602 (review) ACKs for top commit: ryanofsky: Code review ACK ac4fb3b, just fixing displayed backup directory since last review jarolrod: tACK ac4fb3b Tree-SHA512: cfeca5cd6d6d3d69bbd81211cf1bfd490de13ac96bf53be081a5ceb88611afa57dff2be35f8e0a41b1088b7b892f75a21a9abf47f2e1d77e9e316467eb7c12be
2 parents 480d806 + ac4fb3b commit 1b4d660

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
@@ -999,6 +999,7 @@ void BitcoinGUI::openOptionsDialogWithTab(OptionsDialog::Tab tab)
999999
auto dlg = new OptionsDialog(this, enableWallet);
10001000
connect(dlg, &OptionsDialog::quitOnReset, this, &BitcoinGUI::quitRequested);
10011001
dlg->setCurrentTab(tab);
1002+
dlg->setClientModel(clientModel);
10021003
dlg->setModel(clientModel->getOptionsModel());
10031004
GUIUtil::ShowModalDialogAsynchronously(dlg);
10041005
}

src/qt/optionsdialog.cpp

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <qt/forms/ui_optionsdialog.h>
1111

1212
#include <qt/bitcoinunits.h>
13+
#include <qt/clientmodel.h>
1314
#include <qt/guiconstants.h>
1415
#include <qt/guiutil.h>
1516
#include <qt/optionsmodel.h>
@@ -168,6 +169,11 @@ OptionsDialog::~OptionsDialog()
168169
delete ui;
169170
}
170171

172+
void OptionsDialog::setClientModel(ClientModel* client_model)
173+
{
174+
m_client_model = client_model;
175+
}
176+
171177
void OptionsDialog::setModel(OptionsModel *_model)
172178
{
173179
this->model = _model;
@@ -278,14 +284,15 @@ void OptionsDialog::setOkButtonState(bool fState)
278284

279285
void OptionsDialog::on_resetButton_clicked()
280286
{
281-
if(model)
282-
{
287+
if (model) {
283288
// confirmation dialog
284289
QMessageBox::StandardButton btnRetVal = QMessageBox::question(this, tr("Confirm options reset"),
285-
tr("Client restart required to activate changes.") + "<br><br>" + tr("Client will be shut down. Do you want to proceed?"),
290+
tr("Client restart required to activate changes.") + "<br><br>" +
291+
tr("Current settings will be backed up at \"%1\".").arg(m_client_model->dataDir()) + "<br><br>" +
292+
tr("Client will be shut down. Do you want to proceed?"),
286293
QMessageBox::Yes | QMessageBox::Cancel, QMessageBox::Cancel);
287294

288-
if(btnRetVal == QMessageBox::Cancel)
295+
if (btnRetVal == QMessageBox::Cancel)
289296
return;
290297

291298
/* reset all options and close GUI */

src/qt/optionsdialog.h

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

11+
class ClientModel;
1112
class OptionsModel;
1213
class QValidatedLineEdit;
1314

@@ -45,6 +46,7 @@ class OptionsDialog : public QDialog
4546
TAB_NETWORK,
4647
};
4748

49+
void setClientModel(ClientModel* client_model);
4850
void setModel(OptionsModel *model);
4951
void setMapper();
5052
void setCurrentTab(OptionsDialog::Tab tab);
@@ -72,6 +74,7 @@ private Q_SLOTS:
7274

7375
private:
7476
Ui::OptionsDialog *ui;
77+
ClientModel* m_client_model{nullptr};
7578
OptionsModel *model;
7679
QDataWidgetMapper *mapper;
7780
};

0 commit comments

Comments
 (0)