some more settings passed to the new saving file

src/common/config.cpp

@@ -86,11 +86,6 @@ std::vector<bool> install_dirs_enabled = {};
 std::filesystem::path settings_addon_install_dir = {};
 std::filesystem::path save_data_path = {};
 u32 mw_themes = 0;
-u32 m_icon_size = 36;
-u32 m_icon_size_grid = 69;
-u32 m_slider_pos = 0;
-u32 m_slider_pos_grid = 0;
-u32 m_table_mode = 0;
 std::vector<std::string> m_elf_viewer;
 std::vector<std::string> m_recent_files;
 std::string emulator_language = "en_US";
@@ -550,26 +545,6 @@ void setMainWindowTheme(u32 theme) {
     mw_themes = theme;
 }
 
-void setIconSize(u32 size) {
-    m_icon_size = size;
-}
-
-void setIconSizeGrid(u32 size) {
-    m_icon_size_grid = size;
-}
-
-void setSliderPosition(u32 pos) {
-    m_slider_pos = pos;
-}
-
-void setSliderPositionGrid(u32 pos) {
-    m_slider_pos_grid = pos;
-}
-
-void setTableMode(u32 mode) {
-    m_table_mode = mode;
-}
-
 void setElfViewer(const std::vector<std::string>& elfList) {
     m_elf_viewer.resize(elfList.size());
     m_elf_viewer = elfList;
@@ -629,26 +604,6 @@ u32 getMainWindowTheme() {
     return mw_themes;
 }
 
-u32 getIconSize() {
-    return m_icon_size;
-}
-
-u32 getIconSizeGrid() {
-    return m_icon_size_grid;
-}
-
-u32 getSliderPosition() {
-    return m_slider_pos;
-}
-
-u32 getSliderPositionGrid() {
-    return m_slider_pos_grid;
-}
-
-u32 getTableMode() {
-    return m_table_mode;
-}
-
 std::vector<std::string> getElfViewer() {
     return m_elf_viewer;
 }
@@ -786,10 +741,6 @@ void load(const std::filesystem::path& path) {
         const toml::value& gui = data.at("GUI");
 
         load_game_size = toml::find_or<bool>(gui, "loadGameSizeEnabled", true);
-        m_icon_size = toml::find_or<int>(gui, "iconSize", 0);
-        m_icon_size_grid = toml::find_or<int>(gui, "iconSizeGrid", 0);
-        m_slider_pos = toml::find_or<int>(gui, "sliderPos", 0);
-        m_slider_pos_grid = toml::find_or<int>(gui, "sliderPosGrid", 0);
         mw_themes = toml::find_or<int>(gui, "theme", 0);
 
         const auto install_dir_array =
@@ -817,7 +768,6 @@ void load(const std::filesystem::path& path) {
         settings_addon_install_dir = toml::find_fs_path_or(gui, "addonInstallDir", {});
         m_elf_viewer = toml::find_or<std::vector<std::string>>(gui, "elfDirs", {});
         m_recent_files = toml::find_or<std::vector<std::string>>(gui, "recentFiles", {});
-        m_table_mode = toml::find_or<int>(gui, "gameTableMode", 0);
         emulator_language = toml::find_or<std::string>(gui, "emulatorLanguage", "en_US");
         backgroundImageOpacity = toml::find_or<int>(gui, "backgroundImageOpacity", 50);
         showBackgroundImage = toml::find_or<bool>(gui, "showBackgroundImage", true);
@@ -1021,11 +971,6 @@ void saveMainWindow(const std::filesystem::path& path) {
     }
 
     data["GUI"]["theme"] = mw_themes;
-    data["GUI"]["iconSize"] = m_icon_size;
-    data["GUI"]["sliderPos"] = m_slider_pos;
-    data["GUI"]["iconSizeGrid"] = m_icon_size_grid;
-    data["GUI"]["sliderPosGrid"] = m_slider_pos_grid;
-    data["GUI"]["gameTableMode"] = m_table_mode;
     data["GUI"]["elfDirs"] = m_elf_viewer;
     data["GUI"]["recentFiles"] = m_recent_files;
 

src/common/config.h

@@ -144,11 +144,6 @@ void removeGameInstallDir(const std::filesystem::path& dir);
 void setGameInstallDirEnabled(const std::filesystem::path& dir, bool enabled);
 void setAddonInstallDir(const std::filesystem::path& dir);
 void setMainWindowTheme(u32 theme);
-void setIconSize(u32 size);
-void setIconSizeGrid(u32 size);
-void setSliderPosition(u32 pos);
-void setSliderPositionGrid(u32 pos);
-void setTableMode(u32 mode);
 void setElfViewer(const std::vector<std::string>& elfList);
 void setRecentFiles(const std::vector<std::string>& recentFiles);
 void setEmulatorLanguage(std::string language);
@@ -157,11 +152,6 @@ const std::vector<std::filesystem::path> getGameInstallDirs();
 const std::vector<bool> getGameInstallDirsEnabled();
 std::filesystem::path getAddonInstallDir();
 u32 getMainWindowTheme();
-u32 getIconSize();
-u32 getIconSizeGrid();
-u32 getSliderPosition();
-u32 getSliderPositionGrid();
-u32 getTableMode();
 std::vector<std::string> getElfViewer();
 std::vector<std::string> getRecentFiles();
 std::string getEmulatorLanguage();

src/qt_gui/game_grid_frame.cpp

@@ -5,11 +5,13 @@
 #include "game_grid_frame.h"
 #include "qt_gui/compatibility_info.h"
 
-GameGridFrame::GameGridFrame(std::shared_ptr<GameInfoClass> game_info_get,
+GameGridFrame::GameGridFrame(std::shared_ptr<gui_settings> gui_settings,
+                             std::shared_ptr<GameInfoClass> game_info_get,
                              std::shared_ptr<CompatibilityInfoClass> compat_info_get,
                              QWidget* parent)
-    : QTableWidget(parent), m_game_info(game_info_get), m_compat_info(compat_info_get) {
+    : QTableWidget(parent), m_gui_settings(std::move(gui_settings)), m_game_info(game_info_get),
-    icon_size = Config::getIconSizeGrid();
+      m_compat_info(compat_info_get) {
+    icon_size = m_gui_settings->GetValue(gui::gg_icon_size).toInt();
     windowWidth = parent->width();
     this->setShowGrid(false);
     this->setEditTriggers(QAbstractItemView::NoEditTriggers);
@@ -91,7 +93,8 @@ void GameGridFrame::PopulateGameGrid(QVector<GameInfo> m_games_search, bool from
     else
         m_games_ = m_game_info->m_games;
     m_games_shared = std::make_shared<QVector<GameInfo>>(m_games_);
-    icon_size = Config::getIconSizeGrid(); // update icon size for resize event.
+    icon_size =
+        m_gui_settings->GetValue(gui::gg_icon_size).toInt(); // update icon size for resize event.
 
     int gamesPerRow = windowWidth / (icon_size + 20); // 2 x cell widget border size.
     int row = 0;
@@ -118,7 +121,7 @@ void GameGridFrame::PopulateGameGrid(QVector<GameInfo> m_games_search, bool from
         layout->addWidget(name_label);
 
         // Resizing of font-size.
-        float fontSize = (Config::getIconSizeGrid() / 5.5f);
+        float fontSize = (m_gui_settings->GetValue(gui::gg_icon_size).toInt() / 5.5f);
         QString styleSheet =
             QString("color: white; font-weight: bold; font-size: %1px;").arg(fontSize);
         name_label->setStyleSheet(styleSheet);

src/qt_gui/game_grid_frame.h

@@ -11,6 +11,7 @@
 #include "game_info.h"
 #include "game_list_utils.h"
 #include "gui_context_menus.h"
+#include "gui_settings.h"
 #include "qt_gui/compatibility_info.h"
 
 class GameGridFrame : public QTableWidget {
@@ -37,9 +38,11 @@ private:
     bool validCellSelected = false;
     int m_last_opacity = -1; // Track last opacity to avoid unnecessary recomputation
     std::filesystem::path m_current_game_path; // Track current game path to detect changes
+    std::shared_ptr<gui_settings> m_gui_settings;
 
 public:
-    explicit GameGridFrame(std::shared_ptr<GameInfoClass> game_info_get,
+    explicit GameGridFrame(std::shared_ptr<gui_settings> gui_settings,
+                           std::shared_ptr<GameInfoClass> game_info_get,
                            std::shared_ptr<CompatibilityInfoClass> compat_info_get,
                            QWidget* parent = nullptr);
     void PopulateGameGrid(QVector<GameInfo> m_games, bool fromSearch);

src/qt_gui/game_list_frame.cpp

@@ -9,11 +9,13 @@
 #include "game_list_frame.h"
 #include "game_list_utils.h"
 
-GameListFrame::GameListFrame(std::shared_ptr<GameInfoClass> game_info_get,
+GameListFrame::GameListFrame(std::shared_ptr<gui_settings> gui_settings,
+                             std::shared_ptr<GameInfoClass> game_info_get,
                              std::shared_ptr<CompatibilityInfoClass> compat_info_get,
                              QWidget* parent)
-    : QTableWidget(parent), m_game_info(game_info_get), m_compat_info(compat_info_get) {
+    : QTableWidget(parent), m_gui_settings(std::move(gui_settings)), m_game_info(game_info_get),
-    icon_size = Config::getIconSize();
+      m_compat_info(compat_info_get) {
+    icon_size = m_gui_settings->GetValue(gui::gl_icon_size).toInt();
     this->setShowGrid(false);
     this->setEditTriggers(QAbstractItemView::NoEditTriggers);
     this->setSelectionBehavior(QAbstractItemView::SelectRows);

src/qt_gui/game_list_frame.h

@@ -17,11 +17,13 @@
 #include "game_info.h"
 #include "game_list_utils.h"
 #include "gui_context_menus.h"
+#include "gui_settings.h"
 
 class GameListFrame : public QTableWidget {
     Q_OBJECT
 public:
-    explicit GameListFrame(std::shared_ptr<GameInfoClass> game_info_get,
+    explicit GameListFrame(std::shared_ptr<gui_settings> gui_settings,
+                           std::shared_ptr<GameInfoClass> game_info_get,
                            std::shared_ptr<CompatibilityInfoClass> compat_info_get,
                            QWidget* parent = nullptr);
 Q_SIGNALS:
@@ -48,6 +50,7 @@ private:
     QTableWidgetItem* m_current_item = nullptr;
     int m_last_opacity = -1; // Track last opacity to avoid unnecessary recomputation
     std::filesystem::path m_current_game_path; // Track current game path to detect changes
+    std::shared_ptr<gui_settings> m_gui_settings;
 
 public:
     void PopulateGameList(bool isInitialPopulation = true);

src/qt_gui/gui_settings.h

@@ -9,10 +9,21 @@
 namespace gui {
 // categories
 const QString main_window = "main_window";
+const QString game_list = "game_list";
+const QString game_grid = "game_grid";
 
-// main window settions
+// main window settings
 const gui_value mw_geometry = gui_value(main_window, "geometry", QByteArray());
 
+// game list settings
+const gui_value gl_mode = gui_value(game_list, "tableMode", 0);
+const gui_value gl_icon_size = gui_value(game_list, "icon_size", 36);
+const gui_value gl_slider_pos = gui_value(game_list, "slider_pos", 0);
+
+// game grid settings
+const gui_value gg_icon_size = gui_value(game_grid, "icon_size", 69);
+const gui_value gg_slider_pos = gui_value(game_grid, "slider_pos", 0);
+
 } // namespace gui
 
 class gui_settings : public settings {

src/qt_gui/main_window.cpp

@@ -299,21 +299,21 @@ void MainWindow::CreateDockWindows() {
     setCentralWidget(phCentralWidget);
 
     m_dock_widget.reset(new QDockWidget(tr("Game List"), this));
-    m_game_list_frame.reset(new GameListFrame(m_game_info, m_compat_info, this));
+    m_game_list_frame.reset(new GameListFrame(m_gui_settings, m_game_info, m_compat_info, this));
     m_game_list_frame->setObjectName("gamelist");
-    m_game_grid_frame.reset(new GameGridFrame(m_game_info, m_compat_info, this));
+    m_game_grid_frame.reset(new GameGridFrame(m_gui_settings, m_game_info, m_compat_info, this));
     m_game_grid_frame->setObjectName("gamegridlist");
     m_elf_viewer.reset(new ElfViewer(this));
     m_elf_viewer->setObjectName("elflist");
 
-    int table_mode = Config::getTableMode();
+    int table_mode = m_gui_settings->GetValue(gui::gl_mode).toInt();
     int slider_pos = 0;
     if (table_mode == 0) { // List
         m_game_grid_frame->hide();
         m_elf_viewer->hide();
         m_game_list_frame->show();
         m_dock_widget->setWidget(m_game_list_frame.data());
-        slider_pos = Config::getSliderPosition();
+        slider_pos = m_gui_settings->GetValue(gui::gl_slider_pos).toInt();
         ui->sizeSlider->setSliderPosition(slider_pos); // set slider pos at start;
         isTableList = true;
     } else if (table_mode == 1) { // Grid
@@ -321,7 +321,7 @@ void MainWindow::CreateDockWindows() {
         m_elf_viewer->hide();
         m_game_grid_frame->show();
         m_dock_widget->setWidget(m_game_grid_frame.data());
-        slider_pos = Config::getSliderPositionGrid();
+        slider_pos = m_gui_settings->GetValue(gui::gg_slider_pos).toInt();
         ui->sizeSlider->setSliderPosition(slider_pos); // set slider pos at start;
         isTableList = false;
     } else {
@@ -390,13 +390,13 @@ void MainWindow::CreateConnects() {
             m_game_list_frame->icon_size =
                 36 + value; // 36 is the minimum icon size to use due to text disappearing.
             m_game_list_frame->ResizeIcons(36 + value);
-            Config::setIconSize(36 + value);
+            m_gui_settings->SetValue(gui::gl_icon_size, 36 + value);
-            Config::setSliderPosition(value);
+            m_gui_settings->SetValue(gui::gl_slider_pos, value);
         } else {
             m_game_grid_frame->icon_size = 69 + value;
             m_game_grid_frame->PopulateGameGrid(m_game_info->m_games, false);
-            Config::setIconSizeGrid(69 + value);
+            m_gui_settings->SetValue(gui::gg_icon_size, 69 + value);
-            Config::setSliderPositionGrid(value);
+            m_gui_settings->SetValue(gui::gg_slider_pos, value);
         }
     });
 
@@ -506,13 +506,13 @@ void MainWindow::CreateConnects() {
             m_game_list_frame->icon_size =
                 36; // 36 is the minimum icon size to use due to text disappearing.
             ui->sizeSlider->setValue(0); // icone_size - 36
-            Config::setIconSize(36);
+            m_gui_settings->SetValue(gui::gl_icon_size, 36);
-            Config::setSliderPosition(0);
+            m_gui_settings->SetValue(gui::gl_slider_pos, 0);
         } else {
             m_game_grid_frame->icon_size = 69;
             ui->sizeSlider->setValue(0); // icone_size - 36
-            Config::setIconSizeGrid(69);
+            m_gui_settings->SetValue(gui::gg_icon_size, 69);
-            Config::setSliderPositionGrid(0);
+            m_gui_settings->SetValue(gui::gg_slider_pos, 9);
             m_game_grid_frame->PopulateGameGrid(m_game_info->m_games, false);
         }
     });
@@ -521,13 +521,13 @@ void MainWindow::CreateConnects() {
         if (isTableList) {
             m_game_list_frame->icon_size = 64;
             ui->sizeSlider->setValue(28);
-            Config::setIconSize(64);
+            m_gui_settings->SetValue(gui::gl_icon_size, 64);
-            Config::setSliderPosition(28);
+            m_gui_settings->SetValue(gui::gl_slider_pos, 28);
         } else {
             m_game_grid_frame->icon_size = 97;
             ui->sizeSlider->setValue(28);
-            Config::setIconSizeGrid(97);
+            m_gui_settings->SetValue(gui::gg_icon_size, 97);
-            Config::setSliderPositionGrid(28);
+            m_gui_settings->SetValue(gui::gg_slider_pos, 28);
             m_game_grid_frame->PopulateGameGrid(m_game_info->m_games, false);
         }
     });
@@ -536,13 +536,13 @@ void MainWindow::CreateConnects() {
         if (isTableList) {
             m_game_list_frame->icon_size = 128;
             ui->sizeSlider->setValue(92);
-            Config::setIconSize(128);
+            m_gui_settings->SetValue(gui::gl_icon_size, 128);
-            Config::setSliderPosition(92);
+            m_gui_settings->SetValue(gui::gl_slider_pos, 92);
         } else {
             m_game_grid_frame->icon_size = 161;
             ui->sizeSlider->setValue(92);
-            Config::setIconSizeGrid(161);
+            m_gui_settings->SetValue(gui::gg_icon_size, 161);
-            Config::setSliderPositionGrid(92);
+            m_gui_settings->SetValue(gui::gg_slider_pos, 92);
             m_game_grid_frame->PopulateGameGrid(m_game_info->m_games, false);
         }
     });
@@ -551,13 +551,13 @@ void MainWindow::CreateConnects() {
         if (isTableList) {
             m_game_list_frame->icon_size = 256;
             ui->sizeSlider->setValue(220);
-            Config::setIconSize(256);
+            m_gui_settings->SetValue(gui::gl_icon_size, 256);
-            Config::setSliderPosition(220);
+            m_gui_settings->SetValue(gui::gl_slider_pos, 220);
         } else {
             m_game_grid_frame->icon_size = 256;
             ui->sizeSlider->setValue(220);
-            Config::setIconSizeGrid(256);
+            m_gui_settings->SetValue(gui::gg_icon_size, 256);
-            Config::setSliderPositionGrid(220);
+            m_gui_settings->SetValue(gui::gg_slider_pos, 220);
             m_game_grid_frame->PopulateGameGrid(m_game_info->m_games, false);
         }
     });
@@ -573,8 +573,8 @@ void MainWindow::CreateConnects() {
             m_game_list_frame->PopulateGameList();
         }
         isTableList = true;
-        Config::setTableMode(0);
+        m_gui_settings->SetValue(gui::gl_mode, 0);
-        int slider_pos = Config::getSliderPosition();
+        int slider_pos = m_gui_settings->GetValue(gui::gl_slider_pos).toInt();
         ui->sizeSlider->setEnabled(true);
         ui->sizeSlider->setSliderPosition(slider_pos);
         ui->mw_searchbar->setText("");
@@ -592,8 +592,8 @@ void MainWindow::CreateConnects() {
             m_game_grid_frame->PopulateGameGrid(m_game_info->m_games, false);
         }
         isTableList = false;
-        Config::setTableMode(1);
+        m_gui_settings->SetValue(gui::gl_mode, 1);
-        int slider_pos_grid = Config::getSliderPositionGrid();
+        int slider_pos_grid = m_gui_settings->GetValue(gui::gg_slider_pos).toInt();
         ui->sizeSlider->setEnabled(true);
         ui->sizeSlider->setSliderPosition(slider_pos_grid);
         ui->mw_searchbar->setText("");
@@ -608,7 +608,7 @@ void MainWindow::CreateConnects() {
         m_elf_viewer->show();
         isTableList = false;
         ui->sizeSlider->setDisabled(true);
-        Config::setTableMode(2);
+        m_gui_settings->SetValue(gui::gl_mode, 2);
         SetLastIconSizeBullet();
     });
 
@@ -850,7 +850,7 @@ void MainWindow::CreateConnects() {
 void MainWindow::StartGame() {
     BackgroundMusicPlayer::getInstance().stopMusic();
     QString gamePath = "";
-    int table_mode = Config::getTableMode();
+    int table_mode = m_gui_settings->GetValue(gui::gl_mode).toInt();
     if (table_mode == 0) {
         if (m_game_list_frame->currentItem()) {
             int itemID = m_game_list_frame->currentItem()->row();
@@ -940,11 +940,12 @@ void MainWindow::ConfigureGuiFromSettings() {
         resize(QGuiApplication::primaryScreen()->availableSize() * 0.7);
     }
     ui->showGameListAct->setChecked(true);
-    if (Config::getTableMode() == 0) {
+    int table_mode = m_gui_settings->GetValue(gui::gl_mode).toInt();
+    if (table_mode == 0) {
         ui->setlistModeListAct->setChecked(true);
-    } else if (Config::getTableMode() == 1) {
+    } else if (table_mode == 1) {
         ui->setlistModeGridAct->setChecked(true);
-    } else if (Config::getTableMode() == 2) {
+    } else if (table_mode == 2) {
         ui->setlistElfAct->setChecked(true);
     }
     BackgroundMusicPlayer::getInstance().setVolume(Config::getBGMvolume());
@@ -1032,8 +1033,8 @@ void MainWindow::SetLastUsedTheme() {
 
 void MainWindow::SetLastIconSizeBullet() {
     // set QAction bullet point if applicable
-    int lastSize = Config::getIconSize();
+    int lastSize = m_gui_settings->GetValue(gui::gl_icon_size).toInt();
-    int lastSizeGrid = Config::getIconSizeGrid();
+    int lastSizeGrid = m_gui_settings->GetValue(gui::gg_icon_size).toInt();
     if (isTableList) {
         switch (lastSize) {
         case 36:
@@ -1203,7 +1204,7 @@ bool MainWindow::eventFilter(QObject* obj, QEvent* event) {
     if (event->type() == QEvent::KeyPress) {
         QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
         if (keyEvent->key() == Qt::Key_Enter || keyEvent->key() == Qt::Key_Return) {
-            auto tblMode = Config::getTableMode();
+            auto tblMode = m_gui_settings->GetValue(gui::gl_mode).toInt();
             if (tblMode != 2 && (tblMode != 1 || m_game_grid_frame->IsValidCellSelected())) {
                 StartGame();
                 return true;