Skip to content

Commit 639d14d

Browse files
furszyfurszy
committed
[GUI] Master nodes wizard creation, only controller flow.
1 parent f83ad71 commit 639d14d

File tree

4 files changed

+35
-368
lines changed

4 files changed

+35
-368
lines changed

‎src/qt/pivx/forms/masternodewizarddialog.ui‎

Lines changed: 3 additions & 280 deletions
Original file line numberDiff line numberDiff line change
@@ -230,107 +230,6 @@
230230
</property>
231231
</widget>
232232
</item>
233-
<item>
234-
<widget class="QStackedWidget" name="stackedIcon2">
235-
<property name="minimumSize">
236-
<size>
237-
<width>22</width>
238-
<height>22</height>
239-
</size>
240-
</property>
241-
<property name="maximumSize">
242-
<size>
243-
<width>22</width>
244-
<height>22</height>
245-
</size>
246-
</property>
247-
<property name="currentIndex">
248-
<number>0</number>
249-
</property>
250-
<widget class="QWidget" name="pageIcon2">
251-
<property name="minimumSize">
252-
<size>
253-
<width>22</width>
254-
<height>22</height>
255-
</size>
256-
</property>
257-
<property name="maximumSize">
258-
<size>
259-
<width>22</width>
260-
<height>22</height>
261-
</size>
262-
</property>
263-
<layout class="QVBoxLayout" name="layoutIcon2">
264-
<property name="spacing">
265-
<number>0</number>
266-
</property>
267-
<property name="leftMargin">
268-
<number>0</number>
269-
</property>
270-
<property name="topMargin">
271-
<number>0</number>
272-
</property>
273-
<property name="rightMargin">
274-
<number>0</number>
275-
</property>
276-
<property name="bottomMargin">
277-
<number>0</number>
278-
</property>
279-
<item alignment="Qt::AlignVCenter">
280-
<widget class="QPushButton" name="pushNumber2">
281-
<property name="minimumSize">
282-
<size>
283-
<width>22</width>
284-
<height>22</height>
285-
</size>
286-
</property>
287-
<property name="maximumSize">
288-
<size>
289-
<width>22</width>
290-
<height>22</height>
291-
</size>
292-
</property>
293-
<property name="text">
294-
<string>2</string>
295-
</property>
296-
<property name="checkable">
297-
<bool>true</bool>
298-
</property>
299-
<property name="checked">
300-
<bool>false</bool>
301-
</property>
302-
<property name="autoExclusive">
303-
<bool>true</bool>
304-
</property>
305-
</widget>
306-
</item>
307-
</layout>
308-
</widget>
309-
<widget class="QWidget" name="page_6"/>
310-
</widget>
311-
</item>
312-
<item>
313-
<widget class="QLabel" name="labelLine2">
314-
<property name="minimumSize">
315-
<size>
316-
<width>0</width>
317-
<height>1</height>
318-
</size>
319-
</property>
320-
<property name="maximumSize">
321-
<size>
322-
<width>16777215</width>
323-
<height>1</height>
324-
</size>
325-
</property>
326-
<property name="styleSheet">
327-
<string notr="true"/>
328-
</property>
329-
<property name="text">
330-
<string/>
331-
</property>
332-
</widget>
333-
</item>
334233
<item>
335234
<widget class="QStackedWidget" name="stackedIcon3">
336235
<property name="minimumSize">
@@ -392,7 +291,7 @@
392291
</size>
393292
</property>
394293
<property name="text">
395-
<string>3</string>
294+
<string>2</string>
396295
</property>
397296
<property name="checkable">
398297
<bool>true</bool>
@@ -493,7 +392,7 @@
493392
</size>
494393
</property>
495394
<property name="text">
496-
<string>4</string>
395+
<string>3</string>
497396
</property>
498397
<property name="checkable">
499398
<bool>true</bool>
@@ -619,44 +518,6 @@
619518
</property>
620519
</widget>
621520
</item>
622-
<item>
623-
<spacer name="horizontalSpacer_4">
624-
<property name="orientation">
625-
<enum>Qt::Horizontal</enum>
626-
</property>
627-
<property name="sizeHint" stdset="0">
628-
<size>
629-
<width>40</width>
630-
<height>20</height>
631-
</size>
632-
</property>
633-
</spacer>
634-
</item>
635-
<item>
636-
<widget class="QPushButton" name="pushName2">
637-
<property name="minimumSize">
638-
<size>
639-
<width>80</width>
640-
<height>0</height>
641-
</size>
642-
</property>
643-
<property name="maximumSize">
644-
<size>
645-
<width>80</width>
646-
<height>16777215</height>
647-
</size>
648-
</property>
649-
<property name="text">
650-
<string>Type</string>
651-
</property>
652-
<property name="checkable">
653-
<bool>true</bool>
654-
</property>
655-
<property name="autoExclusive">
656-
<bool>false</bool>
657-
</property>
658-
</widget>
659-
</item>
660521
<item>
661522
<spacer name="horizontalSpacer_3">
662523
<property name="orientation">
@@ -817,7 +678,7 @@
817678
</size>
818679
</property>
819680
<property name="text">
820-
<string>Create New Master Node</string>
681+
<string>Create New Master Node Controller</string>
821682
</property>
822683
</widget>
823684
</item>
@@ -897,144 +758,6 @@
897758
</item>
898759
</layout>
899760
</widget>
900-
<widget class="QWidget" name="page_2">
901-
<layout class="QVBoxLayout" name="verticalLayout_2">
902-
<property name="leftMargin">
903-
<number>40</number>
904-
</property>
905-
<property name="rightMargin">
906-
<number>40</number>
907-
</property>
908-
<item>
909-
<widget class="QWidget" name="widget_3" native="true">
910-
<layout class="QVBoxLayout" name="verticalLayout_5" stretch="1,1,4">
911-
<property name="spacing">
912-
<number>0</number>
913-
</property>
914-
<property name="leftMargin">
915-
<number>0</number>
916-
</property>
917-
<property name="topMargin">
918-
<number>0</number>
919-
</property>
920-
<property name="rightMargin">
921-
<number>0</number>
922-
</property>
923-
<property name="bottomMargin">
924-
<number>0</number>
925-
</property>
926-
<item alignment="Qt::AlignHCenter">
927-
<widget class="QLabel" name="labelTitle2">
928-
<property name="maximumSize">
929-
<size>
930-
<width>16777215</width>
931-
<height>50</height>
932-
</size>
933-
</property>
934-
<property name="text">
935-
<string>Select Master Node Type</string>
936-
</property>
937-
</widget>
938-
</item>
939-
<item alignment="Qt::AlignHCenter">
940-
<widget class="QLabel" name="labelMessage2">
941-
<property name="text">
942-
<string>There are two possible types:</string>
943-
</property>
944-
</widget>
945-
</item>
946-
<item>
947-
<widget class="QGroupBox" name="groupBox">
948-
<property name="styleSheet">
949-
<string notr="true">border:none;</string>
950-
</property>
951-
<property name="title">
952-
<string/>
953-
</property>
954-
<layout class="QVBoxLayout" name="verticalLayout_8">
955-
<item>
956-
<layout class="QVBoxLayout" name="verticalLayout_3">
957-
<property name="leftMargin">
958-
<number>140</number>
959-
</property>
960-
<property name="rightMargin">
961-
<number>140</number>
962-
</property>
963-
<item alignment="Qt::AlignLeft">
964-
<widget class="QRadioButton" name="radioButtonInWallet">
965-
<property name="sizePolicy">
966-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
967-
<horstretch>0</horstretch>
968-
<verstretch>0</verstretch>
969-
</sizepolicy>
970-
</property>
971-
<property name="text">
972-
<string>Master Node</string>
973-
</property>
974-
<property name="checked">
975-
<bool>true</bool>
976-
</property>
977-
</widget>
978-
</item>
979-
<item>
980-
<widget class="QLabel" name="labelMessage2_3">
981-
<property name="text">
982-
<string>Run a master node on this wallet, must be 24/7 online and have an static ip and open port.</string>
983-
</property>
984-
<property name="alignment">
985-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
986-
</property>
987-
<property name="wordWrap">
988-
<bool>true</bool>
989-
</property>
990-
</widget>
991-
</item>
992-
</layout>
993-
</item>
994-
<item>
995-
<layout class="QVBoxLayout" name="verticalLayout_4">
996-
<property name="leftMargin">
997-
<number>140</number>
998-
</property>
999-
<property name="rightMargin">
1000-
<number>140</number>
1001-
</property>
1002-
<item alignment="Qt::AlignLeft">
1003-
<widget class="QRadioButton" name="radioButtonController">
1004-
<property name="sizePolicy">
1005-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
1006-
<horstretch>0</horstretch>
1007-
<verstretch>0</verstretch>
1008-
</sizepolicy>
1009-
</property>
1010-
<property name="text">
1011-
<string>Master Node Controller</string>
1012-
</property>
1013-
</widget>
1014-
</item>
1015-
<item>
1016-
<widget class="QLabel" name="labelMessage2_4">
1017-
<property name="text">
1018-
<string>Create a Master Node on this wallet, collateral will not leave this wallet and you can have as many as you want.</string>
1019-
</property>
1020-
<property name="alignment">
1021-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
1022-
</property>
1023-
<property name="wordWrap">
1024-
<bool>true</bool>
1025-
</property>
1026-
</widget>
1027-
</item>
1028-
</layout>
1029-
</item>
1030-
</layout>
1031-
</widget>
1032-
</item>
1033-
</layout>
1034-
</widget>
1035-
</item>
1036-
</layout>
1037-
</widget>
1038761
<widget class="QWidget" name="page_3">
1039762
<layout class="QVBoxLayout" name="verticalLayout_10" stretch="0,0,0,0,3">
1040763
<property name="spacing">

‎src/qt/pivx/masternodeswidget.cpp‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
#include <iostream>
2323
#include <fstream>
2424

25-
#include <iostream>
26-
2725
#define DECORATION_SIZE 65
2826
#define NUM_ITEMS 3
2927

@@ -84,12 +82,11 @@ MasterNodesWidget::MasterNodesWidget(PIVXGUI *parent) :
8482

8583
/* Title */
8684
ui->labelTitle->setText(tr("Master Node"));
87-
ui->labelTitle->setProperty("cssClass", "text-title-screen");
85+
setCssTitleScreen(ui->labelTitle);
8886
ui->labelTitle->setFont(fontLight);
8987

90-
/* Subtitle */
9188
ui->labelSubtitle1->setText(tr("Full nodes that incentivize node operators to perform the core consensus functions\nand vote on the treasury system receiving a periodic reward."));
92-
ui->labelSubtitle1->setProperty("cssClass", "text-subtitle");
89+
setCssSubtitleScreen(ui->labelSubtitle1);
9390

9491
/* Buttons */
9592
ui->pushButtonSave->setText(tr("Create Master Node"));
@@ -113,6 +110,7 @@ MasterNodesWidget::MasterNodesWidget(PIVXGUI *parent) :
113110

114111
connect(ui->pushButtonSave, SIGNAL(clicked()), this, SLOT(onCreateMNClicked()));
115112
connect(ui->listMn, SIGNAL(clicked(QModelIndex)), this, SLOT(onMNClicked(QModelIndex)));
113+
connect(ui->btnAbout, SIGNAL(clicked()), window, SLOT(openFAQ()));
116114
}
117115

118116
void MasterNodesWidget::showEvent(QShowEvent *event){
@@ -168,6 +166,11 @@ void MasterNodesWidget::onMNClicked(const QModelIndex &index){
168166
this->index = index;
169167
menu->move(pos);
170168
menu->show();
169+
170+
// Back to regular status
171+
ui->listMn->scrollTo(index);
172+
ui->listMn->clearSelection();
173+
ui->listMn->setFocus();
171174
}
172175

173176
void MasterNodesWidget::onEditMNClicked(){

0 commit comments

Comments
 (0)