Skip to content

Commit 707ce77

Browse files
kwvgkwvg
committed
refactor: qt/proposalwizard.{cpp,h} -> qt/proposalcreate.{cpp,h}
We are no longer using the wizard format so the name is a misnomer, the logic is also relatively simplified (as now half of it is in `qt/proposalresume.{cpp,h}`)
1 parent ce94c3e commit 707ce77

File tree

9 files changed

+67
-67
lines changed

9 files changed

+67
-67
lines changed

‎src/Makefile.qt.include‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ QT_FORMS_UI = \
3232
qt/forms/openuridialog.ui \
3333
qt/forms/optionsdialog.ui \
3434
qt/forms/overviewpage.ui \
35+
qt/forms/proposalcreate.ui \
3536
qt/forms/proposalresume.ui \
36-
qt/forms/proposalwizard.ui \
3737
qt/forms/psbtoperationsdialog.ui \
3838
qt/forms/qrdialog.ui \
3939
qt/forms/receivecoinsdialog.ui \
@@ -79,8 +79,8 @@ QT_MOC_CPP = \
7979
qt/moc_peertablemodel.cpp \
8080
qt/moc_peertablesortproxy.cpp \
8181
qt/moc_proposalmodel.cpp \
82+
qt/moc_proposalcreate.cpp \
8283
qt/moc_proposalresume.cpp \
83-
qt/moc_proposalwizard.cpp \
8484
qt/moc_psbtoperationsdialog.cpp \
8585
qt/moc_qrdialog.cpp \
8686
qt/moc_qrimagewidget.cpp \
@@ -162,9 +162,9 @@ BITCOIN_QT_H = \
162162
qt/paymentserver.h \
163163
qt/peertablemodel.h \
164164
qt/peertablesortproxy.h \
165+
qt/proposalcreate.h \
165166
qt/proposalmodel.h \
166167
qt/proposalresume.h \
167-
qt/proposalwizard.h \
168168
qt/psbtoperationsdialog.h \
169169
qt/qrdialog.h \
170170
qt/qrimagewidget.h \
@@ -284,9 +284,9 @@ BITCOIN_QT_WALLET_CPP = \
284284
qt/openuridialog.cpp \
285285
qt/overviewpage.cpp \
286286
qt/paymentserver.cpp \
287+
qt/proposalcreate.cpp \
287288
qt/proposalmodel.cpp \
288289
qt/proposalresume.cpp \
289-
qt/proposalwizard.cpp \
290290
qt/psbtoperationsdialog.cpp \
291291
qt/qrdialog.cpp \
292292
qt/qrimagewidget.cpp \

src/qt/forms/proposalwizard.ui renamed to src/qt/forms/proposalcreate.ui

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ui version="4.0">
3-
<class>ProposalWizard</class>
4-
<widget class="QDialog" name="ProposalWizard">
3+
<class>ProposalCreate</class>
4+
<widget class="QDialog" name="ProposalCreate">
55
<property name="geometry">
66
<rect>
77
<x>0</x>
@@ -447,5 +447,3 @@
447447
<resources/>
448448
<connections/>
449449
</ui>
450-
451-

‎src/qt/governancelist.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#include <qt/descriptiondialog.h>
1414
#include <qt/governancelist.h>
1515
#include <qt/guiutil_font.h>
16+
#include <qt/proposalcreate.h>
1617
#include <qt/proposalmodel.h>
1718
#include <qt/proposalresume.h>
18-
#include <qt/proposalwizard.h>
1919

2020
#include <chainparams.h>
2121
#include <interfaces/node.h>
@@ -362,18 +362,18 @@ void GovernanceList::showCreateProposalDialog()
362362
QMessageBox::warning(this, tr("Unavailable"), tr("A synced node and an unlocked wallet are required."));
363363
return;
364364
}
365-
ProposalWizard* proposalWizard = new ProposalWizard(this->walletModel, this);
365+
ProposalCreate* proposalCreate = new ProposalCreate(this->walletModel, this);
366366
// Ensure closing the dialog actually destroys it so a fresh flow starts next time
367-
proposalWizard->setAttribute(Qt::WA_DeleteOnClose, true);
367+
proposalCreate->setAttribute(Qt::WA_DeleteOnClose, true);
368368
// Modeless window that does not block the parent
369-
proposalWizard->setWindowModality(Qt::NonModal);
370-
proposalWizard->setModal(false);
371-
proposalWizard->setWindowFlag(Qt::Window, true);
369+
proposalCreate->setWindowModality(Qt::NonModal);
370+
proposalCreate->setModal(false);
371+
proposalCreate->setWindowFlag(Qt::Window, true);
372372
// Auto-open Resume dialog after successful creation and refresh the governance list
373-
connect(proposalWizard, &QDialog::accepted, this, [this] { handleProposalListChanged(/*force=*/true); });
374-
connect(proposalWizard, &QDialog::accepted, this, &GovernanceList::updateProposalButtons);
375-
connect(proposalWizard, &QDialog::accepted, this, &GovernanceList::showResumeProposalDialog);
376-
proposalWizard->show();
373+
connect(proposalCreate, &QDialog::accepted, this, [this] { handleProposalListChanged(/*force=*/true); });
374+
connect(proposalCreate, &QDialog::accepted, this, &GovernanceList::updateProposalButtons);
375+
connect(proposalCreate, &QDialog::accepted, this, &GovernanceList::showResumeProposalDialog);
376+
proposalCreate->show();
377377
}
378378

379379
void GovernanceList::showResumeProposalDialog()

‎src/qt/governancelist.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ inline constexpr int GOVERNANCELIST_UPDATE_SECONDS = 10;
2828
class ClientModel;
2929
class ProposalModel;
3030
class WalletModel;
31-
class ProposalWizard;
31+
class ProposalCreate;
3232
class CDeterministicMNList;
3333
enum vote_outcome_enum_t : int;
3434
namespace Governance {

src/qt/proposalwizard.cpp renamed to src/qt/proposalcreate.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#include <qt/proposalwizard.h>
6-
#include <qt/forms/ui_proposalwizard.h>
5+
#include <qt/proposalcreate.h>
6+
#include <qt/forms/ui_proposalcreate.h>
77

88
#include <governance/object.h>
99
#include <governance/validators.h>
@@ -31,10 +31,10 @@
3131

3232
#include <algorithm>
3333

34-
ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
34+
ProposalCreate::ProposalCreate(WalletModel* walletModel, QWidget* parent) :
3535
QDialog(parent),
3636
m_walletModel(walletModel),
37-
m_ui(new Ui::ProposalWizard)
37+
m_ui(new Ui::ProposalCreate)
3838
{
3939
m_ui->setupUi(this);
4040
m_ui->labelError->setStyleSheet(GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_ERROR));
@@ -70,33 +70,33 @@ ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
7070
// Initialize total amount display (formatted with current unit)
7171
updateDisplayUnit();
7272

73-
connect(m_ui->btnViewJson, &QPushButton::clicked, this, &ProposalWizard::onViewJson);
74-
connect(m_ui->btnViewPayload, &QPushButton::clicked, this, &ProposalWizard::onViewPayload);
75-
connect(m_ui->editName, &QLineEdit::textChanged, this, &ProposalWizard::validateFields);
76-
connect(m_ui->editUrl, &QLineEdit::textChanged, this, &ProposalWizard::validateFields);
77-
connect(m_ui->editPayAddr, &QLineEdit::textChanged, this, &ProposalWizard::validateFields);
78-
connect(m_ui->spinPayments, QOverload<int>::of(&QSpinBox::valueChanged), this, &ProposalWizard::updateLabels);
79-
connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalWizard::updateLabels);
80-
connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalWizard::validateFields);
81-
connect(m_ui->btnCreate, &QPushButton::clicked, this, &ProposalWizard::onCreate);
73+
connect(m_ui->btnViewJson, &QPushButton::clicked, this, &ProposalCreate::onViewJson);
74+
connect(m_ui->btnViewPayload, &QPushButton::clicked, this, &ProposalCreate::onViewPayload);
75+
connect(m_ui->editName, &QLineEdit::textChanged, this, &ProposalCreate::validateFields);
76+
connect(m_ui->editUrl, &QLineEdit::textChanged, this, &ProposalCreate::validateFields);
77+
connect(m_ui->editPayAddr, &QLineEdit::textChanged, this, &ProposalCreate::validateFields);
78+
connect(m_ui->spinPayments, QOverload<int>::of(&QSpinBox::valueChanged), this, &ProposalCreate::updateLabels);
79+
connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalCreate::updateLabels);
80+
connect(m_ui->paymentAmount, &BitcoinAmountField::valueChanged, this, &ProposalCreate::validateFields);
81+
connect(m_ui->btnCreate, &QPushButton::clicked, this, &ProposalCreate::onCreate);
8282

8383
// Update fee labels on display unit change
8484
if (m_walletModel && m_walletModel->getOptionsModel()) {
8585
connect(m_walletModel->getOptionsModel(), &OptionsModel::displayUnitChanged, this,
86-
&ProposalWizard::updateDisplayUnit);
86+
&ProposalCreate::updateDisplayUnit);
8787
}
8888

8989
GUIUtil::disableMacFocusRect(this);
9090
GUIUtil::updateFonts();
9191
setFixedSize(size());
9292
}
9393

94-
ProposalWizard::~ProposalWizard()
94+
ProposalCreate::~ProposalCreate()
9595
{
9696
delete m_ui;
9797
}
9898

99-
void ProposalWizard::buildJsonAndHex()
99+
void ProposalCreate::buildJsonAndHex()
100100
{
101101
const int64_t multiplier = std::numeric_limits<int64_t>::max() / std::max<int64_t>(1, m_target_spacing);
102102

@@ -139,7 +139,7 @@ void ProposalWizard::buildJsonAndHex()
139139
m_hex = QString::fromStdString(HexStr(json));
140140
}
141141

142-
void ProposalWizard::onViewJson()
142+
void ProposalCreate::onViewJson()
143143
{
144144
buildJsonAndHex();
145145
const QString html = QString("<code style=\"white-space: pre-wrap;\">%1</code>").arg(m_json.toHtmlEscaped());
@@ -150,7 +150,7 @@ void ProposalWizard::onViewJson()
150150
dlg->show();
151151
}
152152

153-
void ProposalWizard::onViewPayload()
153+
void ProposalCreate::onViewPayload()
154154
{
155155
buildJsonAndHex();
156156
const QString html = QString("<code style=\"word-wrap: break-word;\">%1</code>").arg(m_hex.toHtmlEscaped());
@@ -161,7 +161,7 @@ void ProposalWizard::onViewPayload()
161161
dlg->show();
162162
}
163163

164-
void ProposalWizard::onCreate()
164+
void ProposalCreate::onCreate()
165165
{
166166
// Validate fields first
167167
if (m_ui->editName->text().trimmed().isEmpty() || m_ui->editUrl->text().trimmed().isEmpty() ||
@@ -216,7 +216,7 @@ void ProposalWizard::onCreate()
216216
accept(); // Close the wizard
217217
}
218218

219-
void ProposalWizard::updateLabels()
219+
void ProposalCreate::updateLabels()
220220
{
221221
if (m_walletModel && m_walletModel->getOptionsModel()) {
222222
const auto unit = m_walletModel->getOptionsModel()->getDisplayUnit();
@@ -235,15 +235,15 @@ void ProposalWizard::updateLabels()
235235
}
236236
}
237237

238-
void ProposalWizard::updateDisplayUnit()
238+
void ProposalCreate::updateDisplayUnit()
239239
{
240240
if (m_walletModel && m_walletModel->getOptionsModel()) {
241241
m_ui->paymentAmount->setDisplayUnit(m_walletModel->getOptionsModel()->getDisplayUnit());
242242
}
243243
updateLabels();
244244
}
245245

246-
void ProposalWizard::validateFields()
246+
void ProposalCreate::validateFields()
247247
{
248248
if (m_ui->editName->text().trimmed().isEmpty() && m_ui->editUrl->text().trimmed().isEmpty() &&
249249
m_ui->editPayAddr->text().trimmed().isEmpty() && m_ui->paymentAmount->value() == 0)

src/qt/proposalwizard.h renamed to src/qt/proposalcreate.h

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,25 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5-
#ifndef BITCOIN_QT_PROPOSALWIZARD_H
6-
#define BITCOIN_QT_PROPOSALWIZARD_H
7-
8-
#include <qt/forms/ui_proposalwizard.h>
5+
#ifndef BITCOIN_QT_PROPOSALCREATE_H
6+
#define BITCOIN_QT_PROPOSALCREATE_H
97

108
#include <QByteArray>
119
#include <QDialog>
1210
#include <QString>
1311

1412
class WalletModel;
1513

16-
class ProposalWizard : public QDialog
14+
namespace Ui {
15+
class ProposalCreate;
16+
} // namespace Ui
17+
18+
class ProposalCreate : public QDialog
1719
{
1820
Q_OBJECT
1921
public:
20-
explicit ProposalWizard(WalletModel* walletModel, QWidget* parent = nullptr);
21-
~ProposalWizard();
22+
explicit ProposalCreate(WalletModel* walletModel, QWidget* parent = nullptr);
23+
~ProposalCreate();
2224

2325
private Q_SLOTS:
2426
void onCreate();
@@ -31,7 +33,7 @@ private Q_SLOTS:
3133

3234
private:
3335
WalletModel* m_walletModel;
34-
Ui::ProposalWizard* m_ui;
36+
Ui::ProposalCreate* m_ui;
3537

3638
// State
3739
int m_relay_confs{0};
@@ -44,4 +46,4 @@ private Q_SLOTS:
4446
void buildJsonAndHex();
4547
};
4648

47-
#endif // BITCOIN_QT_PROPOSALWIZARD_H
49+
#endif // BITCOIN_QT_PROPOSALCREATE_H

‎src/qt/res/css/dark.css‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton,
406406
QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton,
407407
QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM,
408408
QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM,
409-
QDialog#ProposalWizard QPushButton#btnViewJson,
410-
QDialog#ProposalWizard QPushButton#btnViewPayload {
409+
QDialog#ProposalCreate QPushButton#btnViewJson,
410+
QDialog#ProposalCreate QPushButton#btnViewPayload {
411411
background-color: #c7c7c7;
412412
color: #333;
413413
}
@@ -426,8 +426,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover,
426426
QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover,
427427
QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover,
428428
QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover,
429-
QDialog#ProposalWizard QPushButton#btnViewJson:hover,
430-
QDialog#ProposalWizard QPushButton#btnViewPayload:hover {
429+
QDialog#ProposalCreate QPushButton#btnViewJson:hover,
430+
QDialog#ProposalCreate QPushButton#btnViewPayload:hover {
431431
background-color: #818181;
432432
color: #2d2d2e;
433433
}
@@ -446,8 +446,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed,
446446
QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed,
447447
QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed,
448448
QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed,
449-
QDialog#ProposalWizard QPushButton#btnViewJson:pressed,
450-
QDialog#ProposalWizard QPushButton#btnViewPayload:pressed {
449+
QDialog#ProposalCreate QPushButton#btnViewJson:pressed,
450+
QDialog#ProposalCreate QPushButton#btnViewPayload:pressed {
451451
background-color: #f6f6f6;
452452
color: #585858;
453453
}
@@ -466,8 +466,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:disabled,
466466
QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled,
467467
QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled,
468468
QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled,
469-
QDialog#ProposalWizard QPushButton#btnViewJson:disabled,
470-
QDialog#ProposalWizard QPushButton#btnViewPayload:disabled {
469+
QDialog#ProposalCreate QPushButton#btnViewJson:disabled,
470+
QDialog#ProposalCreate QPushButton#btnViewPayload:disabled {
471471
background-color: #39393b;
472472
border-color: #585858;
473473
color: #585858;

‎src/qt/res/css/light.css‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton,
389389
QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton,
390390
QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM,
391391
QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM,
392-
QDialog#ProposalWizard QPushButton#btnViewJson,
393-
QDialog#ProposalWizard QPushButton#btnViewPayload {
392+
QDialog#ProposalCreate QPushButton#btnViewJson,
393+
QDialog#ProposalCreate QPushButton#btnViewPayload {
394394
background-color: #c7c7c7;
395395
color: #555;
396396
}
@@ -409,8 +409,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover,
409409
QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover,
410410
QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover,
411411
QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover,
412-
QDialog#ProposalWizard QPushButton#btnViewJson:hover,
413-
QDialog#ProposalWizard QPushButton#btnViewPayload:hover {
412+
QDialog#ProposalCreate QPushButton#btnViewJson:hover,
413+
QDialog#ProposalCreate QPushButton#btnViewPayload:hover {
414414
background-color: #a7a7a7;
415415
color: #555;
416416
}
@@ -429,8 +429,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed,
429429
QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed,
430430
QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed,
431431
QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed,
432-
QDialog#ProposalWizard QPushButton#btnViewJson:pressed,
433-
QDialog#ProposalWizard QPushButton#btnViewPayload:pressed {
432+
QDialog#ProposalCreate QPushButton#btnViewJson:pressed,
433+
QDialog#ProposalCreate QPushButton#btnViewPayload:pressed {
434434
background-color: #c7c7c7;
435435
color: #555;
436436
}
@@ -449,8 +449,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:disabled,
449449
QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled,
450450
QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled,
451451
QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled,
452-
QDialog#ProposalWizard QPushButton#btnViewJson:disabled,
453-
QDialog#ProposalWizard QPushButton#btnViewPayload:disabled {
452+
QDialog#ProposalCreate QPushButton#btnViewJson:disabled,
453+
QDialog#ProposalCreate QPushButton#btnViewPayload:disabled {
454454
background-color: #eaeaec;
455455
border-color: #d2d2d2;
456456
color: #d2d2d2;

‎test/util/data/non-backported.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ src/qt/guiutil_font.*
3434
src/qt/masternodelist.*
3535
src/qt/masternodemodel.*
3636
src/qt/mnemonicverificationdialog.*
37+
src/qt/proposalcreate.*
3738
src/qt/proposalmodel.*
3839
src/qt/proposalresume.*
39-
src/qt/proposalwizard.*
4040
src/rpc/coinjoin.cpp
4141
src/rpc/evo.cpp
4242
src/rpc/evo_util.*

0 commit comments

Comments
 (0)