[UI] Forced reset to activate the settings options custom values connected.

furszy · furszy · commit e40ea1192fa5 · 2019-09-06T11:56:09.000-03:00
diff --git a/src/qt/pivx/PIVXGUI.cpp b/src/qt/pivx/PIVXGUI.cpp
@@ -283,28 +283,7 @@ void PIVXGUI::createTrayIconMenu() {
     // Configuration of the tray icon (or dock icon) icon menu
     trayIconMenu->addAction(toggleHideAction);
     trayIconMenu->addSeparator();
-    /*
-    trayIconMenu->addAction(sendCoinsAction);
-    trayIconMenu->addAction(receiveCoinsAction);
-    trayIconMenu->addAction(privacyAction);
-    trayIconMenu->addSeparator();
-    trayIconMenu->addAction(signMessageAction);
-    trayIconMenu->addAction(verifyMessageAction);
-    trayIconMenu->addAction(bip38ToolAction);
-    trayIconMenu->addSeparator();
-    trayIconMenu->addAction(optionsAction);
-    trayIconMenu->addSeparator();
-    trayIconMenu->addAction(openInfoAction);
-    trayIconMenu->addAction(openRPCConsoleAction);
-    trayIconMenu->addAction(openNetworkAction);
-    trayIconMenu->addAction(openPeersAction);
-    trayIconMenu->addAction(openRepairAction);
-    trayIconMenu->addSeparator();
-    trayIconMenu->addAction(openConfEditorAction);
-    trayIconMenu->addAction(openMNConfEditorAction);
-    trayIconMenu->addAction(showBackupsAction);
-    trayIconMenu->addAction(openBlockExplorerAction);
-     */
+
 #ifndef Q_OS_MAC // This is built-in on Mac
     trayIconMenu->addSeparator();
     trayIconMenu->addAction(quitAction);
diff --git a/src/qt/pivx/settings/settingsdisplayoptionswidget.cpp b/src/qt/pivx/settings/settingsdisplayoptionswidget.cpp
@@ -96,8 +96,7 @@ SettingsDisplayOptionsWidget::SettingsDisplayOptionsWidget(PIVXGUI* _window, QWi
     setCssBtnSecondary(ui->pushButtonClean);
 
     initLanguages();
-    connect(ui->comboBoxLanguage, SIGNAL(currentIndexChanged()), this, SLOT(showRestartWarning(bool)));
-    connect(ui->comboBoxLanguage ,SIGNAL(currentIndexChanged(const QString&)),this, SLOT(languageChanged(const QString&)));
+    connect(ui->pushButtonSave, SIGNAL(clicked()), parent, SLOT(onSaveOptionsClicked()));
     connect(ui->pushButtonReset, SIGNAL(clicked()), this, SLOT(onResetClicked()));
     connect(ui->pushButtonClean, SIGNAL(clicked()), parent, SLOT(onDiscardChanges()));
 }
@@ -122,32 +121,6 @@ void SettingsDisplayOptionsWidget::initLanguages(){
     }
 }
 
-void SettingsDisplayOptionsWidget::languageChanged(const QString& newValue){
-    QString sel = ui->comboBoxLanguage->currentData().toString();
-    QSettings settings;
-    if (settings.value("language") != sel){
-        settings.setValue("language", sel);
-        //emit onLanguageSelected();
-    }
-}
-
-void SettingsDisplayOptionsWidget::showRestartWarning(bool fPersistent){
-
-    // TODO: Add warning..
-    /*
-    ui->statusLabel->setStyleSheet("QLabel { color: red; }");
-
-    if (fPersistent) {
-        ui->statusLabel->setText(tr("Client restart required to activate changes."));
-    } else {
-        ui->statusLabel->setText(tr("This change would require a client restart."));
-        // clear non-persistent status label after 10 seconds
-        // Todo: should perhaps be a class attribute, if we extend the use of statusLabel
-        QTimer::singleShot(10000, this, SLOT(clearStatusLabel()));
-    }
-     */
-}
-
 void SettingsDisplayOptionsWidget::onResetClicked() {
     if (clientModel) {
         OptionsModel *optionsModel = clientModel->getOptionsModel();
diff --git a/src/qt/pivx/settings/settingsdisplayoptionswidget.h b/src/qt/pivx/settings/settingsdisplayoptionswidget.h
@@ -26,8 +26,6 @@ class SettingsDisplayOptionsWidget : public PWidget
     void loadClientModel() override;
 
 public slots:
-    void showRestartWarning(bool fPersistent);
-    void languageChanged(const QString& newValue);
     void onResetClicked();
 
 private:
diff --git a/src/qt/pivx/settings/settingswalletrepairwidget.cpp b/src/qt/pivx/settings/settingswalletrepairwidget.cpp
@@ -165,7 +165,7 @@ void SettingsWalletRepairWidget::buildParameterlist(QString arg)
     // Append repair parameter to command line.
     args.append(arg);
 
-    // Send command-line arguments to BitcoinGUI::handleRestart()
+    // Send command-line arguments to PIVXGUI::handleRestart()
     emit handleRestart(args);
 }
 
diff --git a/src/qt/pivx/settings/settingswidget.cpp b/src/qt/pivx/settings/settingswidget.cpp
@@ -14,6 +14,7 @@
 #include "qt/pivx/settings/settingsinformationwidget.h"
 #include "qt/pivx/settings/settingsconsolewidget.h"
 #include "qt/pivx/qtutils.h"
+#include "qt/pivx/defaultdialog.h"
 #include "optionsmodel.h"
 #include "clientmodel.h"
 #include "utilitydialog.h"
@@ -202,9 +203,17 @@ void SettingsWidget::onResetAction(){
 }
 
 void SettingsWidget::onSaveOptionsClicked(){
-    mapper->submit();
-    pwalletMain->MarkDirty();
-    inform(tr("Options stored"));
+    if(mapper->submit()) {
+        pwalletMain->MarkDirty();
+        if (this->clientModel->getOptionsModel()->isRestartRequired()) {
+            openStandardDialog(tr("Restart required"), tr("You wallet will be restarted to apply the changes\n"), tr("OK"));
+            emit handleRestart(QStringList());
+        } else {
+            inform(tr("Options stored"));
+        }
+    } else {
+        inform(tr("Options store failed"));
+    }
 }
 
 void SettingsWidget::onFileClicked() {
@@ -384,6 +393,15 @@ void SettingsWidget::setMapper(){
     settingsDisplayOptionsWidget->setMapper(mapper);
 }
 
+void SettingsWidget::openStandardDialog(QString title, QString body, QString okBtn, QString cancelBtn){
+    showHideOp(true);
+    DefaultDialog *confirmDialog = new DefaultDialog(window);
+    confirmDialog->setText(title, body, okBtn, cancelBtn);
+    confirmDialog->adjustSize();
+    openDialogWithOpaqueBackground(confirmDialog, window);
+    confirmDialog->deleteLater();
+}
+
 SettingsWidget::~SettingsWidget(){
     delete ui;
 }
diff --git a/src/qt/pivx/settings/settingswidget.h b/src/qt/pivx/settings/settingswidget.h
@@ -95,6 +95,7 @@ private slots:
     QList<QPushButton*> options;
 
     void selectOption(QPushButton* option);
+    void openStandardDialog(QString title = "", QString body = "", QString okBtn = "OK", QString cancelBtn = "");
 };
 
 #endif // SETTINGSWIDGET_H

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ void SettingsWalletRepairWidget::buildParameterlist(QString arg)`
`165`	`165`	`// Append repair parameter to command line.`
`166`	`166`	`args.append(arg);`
`167`	`167`
`168`		`- // Send command-line arguments to BitcoinGUI::handleRestart()`
	`168`	`+ // Send command-line arguments to PIVXGUI::handleRestart()`
`169`	`169`	`emit handleRestart(args);`
`170`	`170`	`}`
`171`	`171`