combine rda into preferences dialog

diff --git a/include/widgets/preferencesdialog.h b/include/widgets/preferencesdialog.h
index 644a54f848e70e7fe847138871b66ac928d89b86..666b06191971097d3c8a6a84f724dbbcea92167b 100644 (file)
--- a/include/widgets/preferencesdialog.h
+++ b/include/widgets/preferencesdialog.h
@@ -3,14 +3,17 @@
 
 #include <QDialog>
 
+#include "db/foodrepository.h"
+
 class QLabel;
 class QTabWidget;
+class RDASettingsWidget;
 
 class PreferencesDialog : public QDialog {
     Q_OBJECT
 
 public:
-    explicit PreferencesDialog(QWidget* parent = nullptr);
+    explicit PreferencesDialog(FoodRepository& repository, QWidget* parent = nullptr);
 
 private:
     void setupUi();
@@ -30,6 +33,8 @@ private:
     QLabel* lblUsdaSize;
     QLabel* lblUserSize;
     QLabel* lblBackupSize;
+
+    FoodRepository& m_repository;
 };
 
 #endif  // PREFERENCESDIALOG_H

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 26e54104865e6b480164624ab9dbdd9c789f6caf..ae410263f1ad1ad6a4f1205c650f81dbf195658d 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -46,15 +46,10 @@ void MainWindow::setupUi() {
 
     // Edit Menu
     QMenu* editMenu = menuBar()->addMenu("Edit");
-    QAction* rdaAction = editMenu->addAction("RDA Settings");
-    connect(rdaAction, &QAction::triggered, this, [this]() {
-        RDASettingsWidget dlg(repository, this);
-        dlg.exec();
-    });
 
     QAction* preferencesAction = editMenu->addAction("Preferences");
     connect(preferencesAction, &QAction::triggered, this, [this]() {
-        PreferencesDialog dlg(this);
+        PreferencesDialog dlg(repository, this);
         dlg.exec();
     });
 

diff --git a/src/widgets/preferencesdialog.cpp b/src/widgets/preferencesdialog.cpp
index eba3c4af3473fa63eccd478862511ff54ad5887d..638ff2e99d92264e4892279ea060f0fd90b2716f 100644 (file)
--- a/src/widgets/preferencesdialog.cpp
+++ b/src/widgets/preferencesdialog.cpp
@@ -4,16 +4,19 @@
 #include <QFileInfo>
 #include <QFormLayout>
 #include <QGroupBox>
+#include <QHeaderView>
 #include <QLabel>
 #include <QSqlQuery>
 #include <QTabWidget>
 #include <QVBoxLayout>
 
 #include "db/databasemanager.h"
+#include "widgets/rdasettingswidget.h"
 
-PreferencesDialog::PreferencesDialog(QWidget* parent) : QDialog(parent) {
+PreferencesDialog::PreferencesDialog(FoodRepository& repository, QWidget* parent)
+    : QDialog(parent), m_repository(repository) {
     setWindowTitle("Preferences");
-    setMinimumSize(450, 400);
+    setMinimumSize(550, 450);
     setupUi();
     loadStatistics();
 }
@@ -73,6 +76,10 @@ void PreferencesDialog::setupUi() {
 
     tabWidget->addTab(statsWidget, "Usage Statistics");
 
+    // === RDA Settings Tab ===
+    auto* rdaWidget = new RDASettingsWidget(m_repository, this);
+    tabWidget->addTab(rdaWidget, "RDA Settings");
+
     mainLayout->addWidget(tabWidget);
 }