From 6c3f4b524a4b919dde9b44414863e05446c151e3 Mon Sep 17 00:00:00 2001 From: Shane Jaroch Date: Wed, 21 Jan 2026 16:30:32 -0500 Subject: [PATCH] combine rda into preferences dialog --- include/widgets/preferencesdialog.h | 7 ++++++- src/mainwindow.cpp | 7 +------ src/widgets/preferencesdialog.cpp | 11 +++++++++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/include/widgets/preferencesdialog.h b/include/widgets/preferencesdialog.h index 644a54f..666b061 100644 --- a/include/widgets/preferencesdialog.h +++ b/include/widgets/preferencesdialog.h @@ -3,14 +3,17 @@ #include +#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 26e5410..ae41026 100644 --- 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 eba3c4a..638ff2e 100644 --- a/src/widgets/preferencesdialog.cpp +++ b/src/widgets/preferencesdialog.cpp @@ -4,16 +4,19 @@ #include #include #include +#include #include #include #include #include #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); } -- 2.52.0