From 79bda1d812663a1cf3949ec9581a57d68fa11e93 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Wed, 31 Jul 2024 16:28:51 +0900
Subject: [PATCH] Grouping ES-DE configurations in a dedicated menu

---
 es-app/src/guis/GuiMenu.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp
index 358891110..2f69e5fb0 100644
--- a/es-app/src/guis/GuiMenu.cpp
+++ b/es-app/src/guis/GuiMenu.cpp
@@ -56,27 +56,26 @@ GuiMenu::GuiMenu()
     if (isFullUI)
         addEntry("SCRAPER", mMenuColorPrimary, true, [this] { openScraperOptions(); });
 
-    if (isFullUI)
-        addEntry("UI SETTINGS", mMenuColorPrimary, true, [this] { openUIOptions(); });
-
-    addEntry("SOUND SETTINGS", mMenuColorPrimary, true, [this] { openSoundOptions(); });
+    addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); });
 
     if (isFullUI)
-        addEntry("INPUT DEVICE SETTINGS", mMenuColorPrimary, true,
-                 [this] { openInputDeviceOptions(); });
+    {
+        addEntry("ES-DE CONFIGURATIONS", mMenuColorPrimary, true, [this]
+        {
+            auto configMenu = new GuiMenu(mWindow);
 
-    if (isFullUI)
-        addEntry("GAME COLLECTION SETTINGS", mMenuColorPrimary, true,
-                 [this] { openCollectionSystemOptions(); });
+            configMenu->addEntry("UI SETTINGS", mMenuColorPrimary, true, [this] { openUIOptions(); });
+            configMenu->addEntry("SOUND SETTINGS", mMenuColorPrimary, true, [this] { openSoundOptions(); });
+            configMenu->addEntry("INPUT DEVICE SETTINGS", mMenuColorPrimary, true, [this] { openInputDeviceOptions(); });
+            configMenu->addEntry("OTHER SETTINGS", mMenuColorPrimary, true, [this] { openOtherOptions(); });
 
-    if (isFullUI)
-        addEntry("OTHER SETTINGS", mMenuColorPrimary, true, [this] { openOtherOptions(); });
+            mWindow->pushGui(configMenu);
+        });
+    }
 
     if (isFullUI)
         addEntry("UTILITIES", mMenuColorPrimary, true, [this] { openUtilities(); });
 
-    addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); });
-
     if (!Settings::getInstance()->getBool("ForceKiosk") &&
         Settings::getInstance()->getString("UIMode") != "kiosk") {
 #if defined(__APPLE__)