dashboard inherit from correct abstract class now + uri dialog fix in send screen.

furszy · furszy · commit 3f126cebd94b · 2019-08-28T02:49:03.000-03:00
diff --git a/src/qt/pivx/dashboardwidget.cpp b/src/qt/pivx/dashboardwidget.cpp
@@ -33,9 +33,8 @@
 #include "moc_dashboardwidget.cpp"
 
 DashboardWidget::DashboardWidget(PIVXGUI* _window, QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::DashboardWidget),
-    window(_window)
+    PWidget(_window, parent),
+    ui(new Ui::DashboardWidget)
 {
     ui->setupUi(this);
 
@@ -276,12 +275,15 @@ void DashboardWidget::changeChartColors(){
      */
 }
 
-void DashboardWidget::setWalletModel(WalletModel* model){
-    walletModel = model;
-    if (model && model->getOptionsModel()) {
-        txModel = model->getTransactionTableModel();
+void DashboardWidget::loadWalletModel(){
+    if (walletModel && walletModel->getOptionsModel()) {
+        txModel = walletModel->getTransactionTableModel();
         // Set up transaction list
         filter = new TransactionFilterProxy();
+        filter->setDynamicSortFilter(true);
+        filter->setSortCaseSensitivity(Qt::CaseInsensitive);
+        filter->setFilterCaseSensitivity(Qt::CaseInsensitive);
+
         filter->setSourceModel(txModel);
         filter->sort(TransactionTableModel::Date, Qt::DescendingOrder);
         txHolder->setFilter(filter);
@@ -301,7 +303,7 @@ void DashboardWidget::setWalletModel(WalletModel* model){
 }
 
 void DashboardWidget::openFAQ(){
-    window->showHide(true);
+    showHideOp(true);
     SettingsFaqWidget* dialog = new SettingsFaqWidget(window);
     openDialogWithOpaqueBackgroundFullScreen(dialog, window);
 }
diff --git a/src/qt/pivx/dashboardwidget.h b/src/qt/pivx/dashboardwidget.h
@@ -1,6 +1,7 @@
 #ifndef DASHBOARDWIDGET_H
 #define DASHBOARDWIDGET_H
 
+#include "qt/pivx/pwidget.h"
 #include "qt/pivx/furabstractlistitemdelegate.h"
 #include "qt/pivx/furlistrow.h"
 #include "transactiontablemodel.h"
@@ -45,15 +46,15 @@ QT_BEGIN_NAMESPACE
 class QModelIndex;
 QT_END_NAMESPACE
 
-class DashboardWidget : public QWidget
+class DashboardWidget : public PWidget
 {
     Q_OBJECT
 
 public:
     explicit DashboardWidget(PIVXGUI* _window, QWidget *parent = nullptr);
     ~DashboardWidget();
 
-    void setWalletModel(WalletModel *model);
+    void loadWalletModel() override ;
     void loadChart();
 private slots:
     void handleTransactionClicked(const QModelIndex &index);
@@ -67,13 +68,10 @@ private slots:
     void openFAQ();
 private:
     Ui::DashboardWidget *ui;
-    PIVXGUI* window;
     // Painter delegate
     FurAbstractListItemDelegate* txViewDelegate;
     TransactionFilterProxy* filter;
     TxViewHolder* txHolder;
-    // Model
-    WalletModel* walletModel;
     TransactionTableModel* txModel;
     int nDisplayUnit = -1;
 
diff --git a/src/qt/pivx/navmenuwidget.cpp b/src/qt/pivx/navmenuwidget.cpp
@@ -3,6 +3,7 @@
 #include <QFile>
 #include "qt/pivx/PIVXGUI.h"
 #include "qt/pivx/qtutils.h"
+#include "clientversion.h"
 
 NavMenuWidget::NavMenuWidget(PIVXGUI *mainWindow, QWidget *parent) :
     QWidget(parent),
@@ -18,7 +19,7 @@ NavMenuWidget::NavMenuWidget(PIVXGUI *mainWindow, QWidget *parent) :
     ui->imgLogo->setProperty("cssClass", "img-nav-logo");
 
     // App version
-    ui->labelVersion->setText("v 1.0.0");
+    ui->labelVersion->setText("v 4.0.0");//QString(tr("v %1")).arg(QString::fromStdString(FormatFullVersion())));
     ui->labelVersion->setProperty("cssClass", "text-title-white");
 
     // Buttons
diff --git a/src/qt/pivx/send.cpp b/src/qt/pivx/send.cpp
@@ -558,7 +558,7 @@ void SendWidget::onChangeAddressClicked(){
 
 void SendWidget::onOpenUriClicked(){
     showHideOp(true);
-    OpenURIDialog *dlg = new OpenURIDialog(this);
+    OpenURIDialog *dlg = new OpenURIDialog(window);
     if (openDialogWithOpaqueBackgroundY(dlg, window, 3, 5)) {
         emit receivedURI(dlg->getURI());
     }

Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ void SendWidget::onChangeAddressClicked(){`
`558`	`558`
`559`	`559`	`void SendWidget::onOpenUriClicked(){`
`560`	`560`	`showHideOp(true);`
`561`		`- OpenURIDialog *dlg = new OpenURIDialog(this);`
	`561`	`+ OpenURIDialog *dlg = new OpenURIDialog(window);`
`562`	`562`	`if (openDialogWithOpaqueBackgroundY(dlg, window, 3, 5)) {`
`563`	`563`	`emit receivedURI(dlg->getURI());`
`564`	`564`	`}`