[GUI] MN screens ui coded (not connected) + pwidget constructor cleanup.

PIVX-Project · Sep 6, 2019 · 14816c4 · 14816c4
1 parent d8335c4
commit 14816c4
Show file tree

Hide file tree

Showing 24 changed files with 690 additions and 50 deletions.
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -81,6 +81,8 @@ QT_FORMS_UI = \
   qt/pivx/forms/addresslabelrow.ui \
   qt/pivx/forms/contactdropdownrow.ui \
   qt/pivx/forms/optionbutton.ui \
+  qt/pivx/forms/mnrow.ui \
+  qt/pivx/forms/masternodeswidget.ui \
   qt/pivx/forms/myaddressrow.ui \
   qt/pivx/forms/sendchangeaddressdialog.ui \
   qt/pivx/forms/sendconfirmdialog.ui \
@@ -187,6 +189,8 @@ QT_MOC_CPP = \
   qt/pivx/moc_addresslabelrow.cpp \
   qt/pivx/moc_contactdropdownrow.cpp \
   qt/pivx/moc_optionbutton.cpp \
+  qt/pivx/moc_mnrow.cpp \
+  qt/pivx/moc_masternodeswidget.cpp \
   qt/pivx/moc_myaddressrow.cpp \
   qt/pivx/moc_contactsdropdown.cpp \
   qt/pivx/moc_sendchangeaddressdialog.cpp \
@@ -326,6 +330,8 @@ BITCOIN_QT_H = \
   qt/pivx/addresslabelrow.h \
   qt/pivx/contactdropdownrow.h \
   qt/pivx/optionbutton.h \
+  qt/pivx/mnrow.h \
+  qt/pivx/masternodeswidget.h \
   qt/pivx/myaddressrow.h \
   qt/pivx/contactsdropdown.h \
   qt/pivx/sendchangeaddressdialog.h \
@@ -695,6 +701,8 @@ BITCOIN_QT_WALLET_CPP = \
   qt/pivx/contactdropdownrow.cpp \
   qt/pivx/contactsdropdown.cpp \
   qt/pivx/optionbutton.cpp \
+  qt/pivx/mnrow.cpp \
+  qt/pivx/masternodeswidget.cpp \
   qt/pivx/myaddressrow.cpp \
   qt/pivx/sendchangeaddressdialog.cpp \
   qt/pivx/sendconfirmdialog.cpp \

diff --git a/src/qt/pivx/PIVXGUI.cpp b/src/qt/pivx/PIVXGUI.cpp
@@ -116,19 +116,21 @@ PIVXGUI::PIVXGUI(const NetworkStyle* networkStyle, QWidget* parent) :
         baseScreensContainer->addWidget(stackedContainer);
 
         // Init
-        dashboard = new DashboardWidget(this, this);
-        sendWidget = new SendWidget(this, this);
-        receiveWidget = new ReceiveWidget(this,this);
-        addressesWidget = new AddressesWidget(this,this);
-        privacyWidget = new PrivacyWidget(this,this);
-        settingsWidget = new SettingsWidget(this,this);
+        dashboard = new DashboardWidget(this);
+        sendWidget = new SendWidget(this);
+        receiveWidget = new ReceiveWidget(this);
+        addressesWidget = new AddressesWidget(this);
+        privacyWidget = new PrivacyWidget(this);
+        masterNodesWidget = new MasterNodesWidget(this);
+        settingsWidget = new SettingsWidget(this);
 
         // Add to parent
         stackedContainer->addWidget(dashboard);
         stackedContainer->addWidget(sendWidget);
         stackedContainer->addWidget(receiveWidget);
         stackedContainer->addWidget(addressesWidget);
         stackedContainer->addWidget(privacyWidget);
+        stackedContainer->addWidget(masterNodesWidget);
         stackedContainer->addWidget(settingsWidget);
         stackedContainer->setCurrentWidget(dashboard);
 
@@ -180,6 +182,7 @@ void PIVXGUI::connectActions() {
     connect(receiveWidget, &ReceiveWidget::showHide, this, &PIVXGUI::showHide);
     connect(addressesWidget, &AddressesWidget::showHide, this, &PIVXGUI::showHide);
     connect(privacyWidget, &PrivacyWidget::showHide, this, &PIVXGUI::showHide);
+    connect(masterNodesWidget, &MasterNodesWidget::showHide, this, &PIVXGUI::showHide);
     connect(settingsWidget, &SettingsWidget::execDialog, this, &PIVXGUI::execDialog);
 }
 
@@ -406,7 +409,7 @@ void PIVXGUI::goToPrivacy(){
 }
 
 void PIVXGUI::goToMasterNodes(){
-    //showTop(masterNodesWidget);
+    showTop(masterNodesWidget);
 }
 
 void PIVXGUI::goToSettings(){
@@ -499,10 +502,12 @@ bool PIVXGUI::addWallet(const QString& name, WalletModel* walletModel)
     sendWidget->setWalletModel(walletModel);
     addressesWidget->setWalletModel(walletModel);
     privacyWidget->setWalletModel(walletModel);
+    masterNodesWidget->setWalletModel(walletModel);
     settingsWidget->setWalletModel(walletModel);
 
     // Connect actions..
     connect(privacyWidget, &PrivacyWidget::message, this, &PIVXGUI::message);
+    connect(masterNodesWidget, &MasterNodesWidget::message, this, &PIVXGUI::message);
     connect(topBar, &TopBar::message, this, &PIVXGUI::message);
     connect(sendWidget, &SendWidget::message,this, &PIVXGUI::message);
     connect(receiveWidget, &ReceiveWidget::message,this, &PIVXGUI::message);

diff --git a/src/qt/pivx/PIVXGUI.h b/src/qt/pivx/PIVXGUI.h
@@ -21,6 +21,7 @@
 #include "qt/pivx/receivewidget.h"
 #include "qt/pivx/addresseswidget.h"
 #include "qt/pivx/privacywidget.h"
+#include "qt/pivx/masternodeswidget.h"
 #include "qt/pivx/snackbar.h"
 #include "qt/pivx/settings/settingswidget.h"
 #include "qt/rpcconsole.h"
@@ -120,6 +121,7 @@ public slots:
     ReceiveWidget *receiveWidget = nullptr;
     AddressesWidget *addressesWidget = nullptr;
     PrivacyWidget *privacyWidget = nullptr;
+    MasterNodesWidget *masterNodesWidget = nullptr;
     SettingsWidget* settingsWidget = nullptr;
 
     SnackBar *snackBar = nullptr;

diff --git a/src/qt/pivx/addresseswidget.cpp b/src/qt/pivx/addresseswidget.cpp
@@ -14,8 +14,6 @@
 #include <QPainter>
 #include <QSettings>
 #include <QModelIndex>
-#include <QFile>
-#include <QGraphicsDropShadowEffect>
 
 #include <iostream>
 
@@ -56,8 +54,8 @@ class ContactsHolder : public FurListRow<QWidget*>
 
 #include "qt/pivx/moc_addresseswidget.cpp"
 
-AddressesWidget::AddressesWidget(PIVXGUI* _window, QWidget *parent) :
-    PWidget(_window, parent),
+AddressesWidget::AddressesWidget(PIVXGUI* parent) :
+    PWidget(parent),
     ui(new Ui::AddressesWidget)
 {
     ui->setupUi(this);

diff --git a/src/qt/pivx/addresseswidget.h b/src/qt/pivx/addresseswidget.h
@@ -27,7 +27,7 @@ class AddressesWidget : public PWidget
     Q_OBJECT
 
 public:
-    explicit AddressesWidget(PIVXGUI* _window, QWidget *parent = nullptr);
+    explicit AddressesWidget(PIVXGUI* parent);
     ~AddressesWidget();
 
     void loadWalletModel() override;

diff --git a/src/qt/pivx/dashboardwidget.cpp b/src/qt/pivx/dashboardwidget.cpp
@@ -19,8 +19,8 @@
 
 #include "moc_dashboardwidget.cpp"
 
-DashboardWidget::DashboardWidget(PIVXGUI* _window, QWidget *parent) :
-    PWidget(_window, parent),
+DashboardWidget::DashboardWidget(PIVXGUI* parent) :
+    PWidget(parent),
     ui(new Ui::DashboardWidget)
 {
     ui->setupUi(this);

diff --git a/src/qt/pivx/dashboardwidget.h b/src/qt/pivx/dashboardwidget.h
@@ -65,7 +65,7 @@ class DashboardWidget : public PWidget
     Q_OBJECT
 
 public:
-    explicit DashboardWidget(PIVXGUI* _window, QWidget *parent = nullptr);
+    explicit DashboardWidget(PIVXGUI* _window);
     ~DashboardWidget();
 
     void loadWalletModel() override;