consolidate settings menu/dialog

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 496a51bb4fe0d4050ce0bc13428b93ec4a663607..79c14e461f620fc44f141b044ac67ffcdc829790 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -235,15 +235,6 @@ void MainWindow::initStatusBar() {
     m_actionPauseSync->setChecked(conf()->get(Config::syncPaused).toBool());
     m_statusLabelStatus->addAction(m_actionPauseSync);
 
-    m_actionScanMempoolWhenPaused = new QAction(tr("Scan mempool when paused"), this);
-    m_actionScanMempoolWhenPaused->setCheckable(true);
-    m_actionScanMempoolWhenPaused->setChecked(conf()->get(Config::scanMempoolWhenPaused).toBool());
-    m_statusLabelStatus->addAction(m_actionScanMempoolWhenPaused);
-
-    connect(m_actionScanMempoolWhenPaused, &QAction::toggled, this, [](bool checked) {
-        conf()->set(Config::scanMempoolWhenPaused, checked);
-    });
-
     m_actionEnableWebsocket = new QAction(tr("Enable Websocket"), this);
     m_actionEnableWebsocket->setCheckable(true);
     m_actionEnableWebsocket->setChecked(!conf()->get(Config::disableWebsocket).toBool());

diff --git a/src/MainWindow.h b/src/MainWindow.h
index 51d44c9c47d4fb04fe4c4d778dc94c3c0ee9a4d7..5164c147486d233e1d5c9d755d98286126e51d43 100644 (file)
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -240,7 +240,6 @@ private:
     QPointer<QAction> m_updateNetworkInfoAction;
     QPointer<QAction> m_actionEnableWebsocket;
     QPointer<QAction> m_actionPauseSync;
-    QPointer<QAction> m_actionScanMempoolWhenPaused;
 
     QDateTime m_lastSyncStatusUpdate;
     QDateTime m_lastNetInfoUpdate;

diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
index f15ef7ec9e85a6b9f7136488f2eac71161624d08..0211fb1a8f962951eaa2c896aebb5274b19e699e 100644 (file)
--- a/src/SettingsDialog.cpp
+++ b/src/SettingsDialog.cpp
@@ -178,14 +178,7 @@ void Settings::setupNetworkTab() {
     };
     setupNodeWidget();
 
-    connect(cbDataSaver, &QCheckBox::toggled, [](bool checked){
-        conf()->set(Config::syncPaused, checked);
-    });
 
-    // Add to Node tab layout
-    if (auto *layout = qobject_cast<QVBoxLayout*>(ui->Node->layout())) {
-        layout->insertWidget(0, cbDataSaver);
-    }
 
     // Proxy
     connect(ui->proxyWidget, &NetworkProxyWidget::proxySettingsChanged, this, &Settings::onProxySettingsChanged);
@@ -206,10 +199,7 @@ void Settings::setupNetworkTab() {
         this->enableWebsocket(checked);
     });
 
-    // Sync (Data Saving Mode)
-    QCheckBox *cbDataSaver = new QCheckBox("Data Saving Mode (Pause Sync on startup)", this);
-    cbDataSaver->setChecked(conf()->get(Config::syncPaused).toBool());
-    cbDataSaver->setToolTip("Prevents the wallet from automatically connecting to nodes on startup.");
+
 
     QComboBox *comboSyncInterval = new QComboBox(this);
     comboSyncInterval->setEditable(true);
@@ -282,6 +272,26 @@ void Settings::setupNetworkTab() {
     // Add to Node tab
     if (auto *layout = qobject_cast<QVBoxLayout*>(ui->Node->layout())) {
         layout->addLayout(hLayoutSync);
+
+        // Sync (Data Saving Mode)
+        QCheckBox *cbDataSaver = new QCheckBox("Data Saving Mode (Pause Sync on startup)", this);
+        cbDataSaver->setChecked(conf()->get(Config::syncPaused).toBool());
+        cbDataSaver->setToolTip("Prevents the wallet from automatically connecting to nodes on startup.");
+
+        connect(cbDataSaver, &QCheckBox::toggled, [](bool checked){
+            conf()->set(Config::syncPaused, checked);
+        });
+        layout->addWidget(cbDataSaver);
+
+        // Scan mempool when paused
+        QCheckBox *cbScanMempool = new QCheckBox("Scan mempool and network info when paused", this);
+        cbScanMempool->setChecked(conf()->get(Config::scanMempoolWhenPaused).toBool());
+        cbScanMempool->setToolTip("Periodically updates the network status and mempool (pending transactions) even when synchronization is paused.");
+
+        connect(cbScanMempool, &QCheckBox::toggled, [](bool checked){
+            conf()->set(Config::scanMempoolWhenPaused, checked);
+        });
+        layout->addWidget(cbScanMempool);
     }
 }