Clean: SettingsWalletOptionsWidget -> SettingsWidget friend class con…

…nection
furszy · Apr 11, 2021 · 71bec54 · random-zebra · Apr 11, 2021 · 71bec54
1 parent a6b14f6
commit 71bec54
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 25 deletions.
diff --git a/src/qt/pivx/settings/settingswalletoptionswidget.cpp b/src/qt/pivx/settings/settingswalletoptionswidget.cpp
@@ -65,7 +65,8 @@ void SettingsWalletOptionsWidget::onResetClicked()
     inform(tr("Options reset succeed"));
 }
 
-void SettingsWalletOptionsWidget::setMapper(QDataWidgetMapper *mapper){
+void SettingsWalletOptionsWidget::setMapper(QDataWidgetMapper *mapper)
+{
     mapper->addMapping(ui->radioButtonSpend, OptionsModel::SpendZeroConfChange);
 
     // Network
@@ -76,10 +77,10 @@ void SettingsWalletOptionsWidget::setMapper(QDataWidgetMapper *mapper){
     mapper->addMapping(ui->lineEditPort, OptionsModel::ProxyPort);
 }
 
-void SettingsWalletOptionsWidget::setWalletModel(WalletModel* model)
+void SettingsWalletOptionsWidget::loadWalletModel()
 {
-    PWidget::setWalletModel(model);
     reloadWalletOptions();
+    connect(walletModel, &WalletModel::notifySSTChanged, this, &SettingsWalletOptionsWidget::setSpinBoxStakeSplitThreshold);
 }
 
 void SettingsWalletOptionsWidget::reloadWalletOptions()
@@ -97,6 +98,28 @@ double SettingsWalletOptionsWidget::getSpinBoxStakeSplitThreshold() const
     return ui->spinBoxStakeSplitThreshold->value();
 }
 
+bool SettingsWalletOptionsWidget::saveWalletOnlyOptions()
+{
+    // stake split threshold
+    const CAmount sstOld = walletModel->getWalletStakeSplitThreshold();
+    const CAmount sstNew = static_cast<CAmount>(getSpinBoxStakeSplitThreshold() * COIN);
+    if (sstNew != sstOld) {
+        const double stakeSplitMinimum = walletModel->getSSTMinimum();
+        if (sstNew != 0 && sstNew < static_cast<CAmount>(stakeSplitMinimum * COIN)) {
+            setSpinBoxStakeSplitThreshold(stakeSplitMinimum);
+            inform(tr("Stake Split too low, it shall be either >= %1 or equal to 0 (to disable stake splitting)").arg(stakeSplitMinimum));
+            return false;
+        }
+        walletModel->setWalletStakeSplitThreshold(sstNew);
+    }
+    return true;
+}
+
+void SettingsWalletOptionsWidget::discardWalletOnlyOptions()
+{
+    reloadWalletOptions();
+}
+
 SettingsWalletOptionsWidget::~SettingsWalletOptionsWidget(){
     delete ui;
 }
diff --git a/src/qt/pivx/settings/settingswalletoptionswidget.h b/src/qt/pivx/settings/settingswalletoptionswidget.h
@@ -12,8 +12,6 @@ namespace Ui {
 class SettingsWalletOptionsWidget;
 }
 
-class SettingsWidget;
-
 class SettingsWalletOptionsWidget : public PWidget
 {
     Q_OBJECT
@@ -22,6 +20,11 @@ class SettingsWalletOptionsWidget : public PWidget
     explicit SettingsWalletOptionsWidget(PIVXGUI* _window, QWidget *parent = nullptr);
     ~SettingsWalletOptionsWidget();
 
+    void setMapper(QDataWidgetMapper *mapper);
+
+    void discardWalletOnlyOptions();
+    bool saveWalletOnlyOptions();
+
 Q_SIGNALS:
     void saveSettings();
     void discardSettings();
@@ -30,12 +33,9 @@ public Q_SLOTS:
     void onResetClicked();
 
 private:
-    friend class SettingsWidget;
-
     Ui::SettingsWalletOptionsWidget *ui;
 
-    void setMapper(QDataWidgetMapper *mapper);
-    void setWalletModel(WalletModel* model);
+    void loadWalletModel() override;
     void reloadWalletOptions();
 
     void setSpinBoxStakeSplitThreshold(double val);

diff --git a/src/qt/pivx/settings/settingswidget.cpp b/src/qt/pivx/settings/settingswidget.cpp
@@ -202,9 +202,6 @@ void SettingsWidget::loadWalletModel()
     this->settingsBitToolWidget->setWalletModel(this->walletModel);
     this->settingsDisplayOptionsWidget->setWalletModel(this->walletModel);
     this->settingsWalletOptionsWidget->setWalletModel(this->walletModel);
-
-    // connect to walletModel signals
-    connect(walletModel, &WalletModel::notifySSTChanged, this->settingsWalletOptionsWidget, &SettingsWalletOptionsWidget::setSpinBoxStakeSplitThreshold);
 }
 
 void SettingsWidget::onResetAction()
@@ -222,18 +219,8 @@ void SettingsWidget::onResetAction()
 
 void SettingsWidget::onSaveOptionsClicked()
 {
-    // stake split threshold
-    const CAmount sstOld = walletModel->getWalletStakeSplitThreshold();
-    const CAmount sstNew = static_cast<CAmount>(settingsWalletOptionsWidget->getSpinBoxStakeSplitThreshold() * COIN);
-    if (sstNew != sstOld) {
-        const double stakeSplitMinimum = walletModel->getSSTMinimum();
-        if (sstNew != 0 && sstNew < static_cast<CAmount>(stakeSplitMinimum * COIN)) {
-            settingsWalletOptionsWidget->setSpinBoxStakeSplitThreshold(stakeSplitMinimum);
-            inform(tr("Stake Split too low, it shall be either >= %1 or equal to 0 (to disable stake splitting)").arg(stakeSplitMinimum));
-            return;
-        }
-        walletModel->setWalletStakeSplitThreshold(sstNew);
-    }
+    // Save settings that are stored inside the wallet only
+    settingsWalletOptionsWidget->saveWalletOnlyOptions();
 
     if (mapper->submit()) {
         OptionsModel* optionsModel = this->clientModel->getOptionsModel();
@@ -414,7 +401,7 @@ void SettingsWidget::onDiscardChanges()
             return;
         clientModel->getOptionsModel()->refreshDataView();
     }
-    settingsWalletOptionsWidget->reloadWalletOptions();
+    settingsWalletOptionsWidget->discardWalletOnlyOptions();
 }
 
 void SettingsWidget::setMapper()