Skip to content

Commit 281e778

Browse files
committed
GUI: MN creation wizard, get default port number from the client model.
1 parent 7799bdb commit 281e778

File tree

5 files changed

+17
-14
lines changed

5 files changed

+17
-14
lines changed

src/qt/clientmodel.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@ int ClientModel::getNumBlocksAtStartup()
113113
return numBlocksAtStartup;
114114
}
115115

116+
unsigned int ClientModel::getNetworkPort()
117+
{
118+
return Params().GetDefaultPort();
119+
}
120+
116121
quint64 ClientModel::getTotalBytesRecv() const
117122
{
118123
if(!g_connman)

src/qt/clientmodel.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ class ClientModel : public QObject
6262
int getNumConnections(unsigned int flags = CONNECTIONS_ALL) const;
6363
int getNumBlocksAtStartup();
6464

65+
unsigned int getNetworkPort();
66+
6567
// from cached block index
6668
int getNumBlocks();
6769
QDateTime getLastBlockDate() const;

src/qt/pivx/masternodeswidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ void MasterNodesWidget::onCreateMNClicked()
412412
.arg(GUIUtil::formatBalance(mnCollateralAmount, BitcoinUnits::PIV)));
413413
return;
414414
}
415-
MasterNodeWizardDialog* dialog = new MasterNodeWizardDialog(walletModel, mnModel, window);
415+
MasterNodeWizardDialog* dialog = new MasterNodeWizardDialog(walletModel, mnModel, clientModel, window);
416416
connect(dialog, &MasterNodeWizardDialog::message, this, &PWidget::emitMessage);
417417
do {
418418
showHideOp(true);

src/qt/pivx/masternodewizarddialog.cpp

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,12 @@ static void setCardShadow(QWidget* edit)
5959
edit->setGraphicsEffect(shadowEffect);
6060
}
6161

62-
MasterNodeWizardDialog::MasterNodeWizardDialog(WalletModel* model, MNModel* _mnModel, QWidget *parent) :
62+
MasterNodeWizardDialog::MasterNodeWizardDialog(WalletModel* model, MNModel* _mnModel, ClientModel* _clientModel, QWidget *parent) :
6363
FocusedDialog(parent),
6464
ui(new Ui::MasterNodeWizardDialog),
6565
walletModel(model),
66-
mnModel(_mnModel)
66+
mnModel(_mnModel),
67+
clientModel(_clientModel)
6768
{
6869
ui->setupUi(this);
6970
setStyleSheet(parent->styleSheet());
@@ -145,17 +146,9 @@ void MasterNodeWizardDialog::initServicePage()
145146
initCssEditLine(ui->lineEditIpAddress);
146147
initCssEditLine(ui->lineEditPort);
147148
ui->stackedWidget->setCurrentIndex(pos);
148-
if (walletModel->isRegTestNetwork()) {
149-
ui->lineEditPort->setEnabled(true);
150-
ui->lineEditPort->setText("51476");
151-
} else {
152-
ui->lineEditPort->setEnabled(false); // fixed to default port number
153-
if (walletModel->isTestNetwork()) {
154-
ui->lineEditPort->setText("51474");
155-
} else {
156-
ui->lineEditPort->setText("51472");
157-
}
158-
}
149+
// Fixed to default port number for mainnet and testnet.
150+
ui->lineEditPort->setEnabled(walletModel->isRegTestNetwork());
151+
ui->lineEditPort->setText(QString::number(clientModel->getNetworkPort()));
159152
}
160153

161154
void MasterNodeWizardDialog::initOwnerPage()

src/qt/pivx/masternodewizarddialog.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "masternodeconfig.h"
1111
#include "qt/pivx/pwidget.h"
1212

13+
class ClientModel;
1314
class ContactsDropdown;
1415
class MNModel;
1516
class QLineEdit;
@@ -61,6 +62,7 @@ enum Pages {
6162
public:
6263
explicit MasterNodeWizardDialog(WalletModel* walletMode,
6364
MNModel* mnModel,
65+
ClientModel* clientModel,
6466
QWidget *parent = nullptr);
6567
~MasterNodeWizardDialog() override;
6668
void showEvent(QShowEvent *event) override;
@@ -100,6 +102,7 @@ private Q_SLOTS:
100102

101103
WalletModel* walletModel{nullptr};
102104
MNModel* mnModel{nullptr};
105+
ClientModel* clientModel{nullptr};
103106

104107
void initIntroPage(const QString& collateralAmountStr);
105108
void initCollateralPage(const QString& collateralAmountStr);

0 commit comments

Comments
 (0)