diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 416b9164..8c32c480 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -326,7 +326,13 @@ modules: v'$(cat ${FLATPAK_DEST}/retrodeck/version)', ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g' es-app/src/guis/GuiMenu.cpp - type: patch - path: rd-submodules/es-de/es-de-retrodeck-mods.patch + path: rd-submodules/es-de/GuiMenu.cpp.patch + - type: patch + path: rd-submodules/es-de/GuiMenu.h.patch + - type: patch + path: rd-submodules/es-de/ViewController.cpp.patch + - type: patch + path: rd-submodules/es-de/Window.cpp.patch # ES-DE - END diff --git a/rd-submodules/es-de/GuiMenu.cpp.patch b/rd-submodules/es-de/GuiMenu.cpp.patch new file mode 100644 index 00000000..080f8922 --- /dev/null +++ b/rd-submodules/es-de/GuiMenu.cpp.patch @@ -0,0 +1,38 @@ +diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp +--- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-08-23 13:12:15.617292576 +0200 ++++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-08-23 13:44:10.736412006 +0200 +@@ -67,2 +67,4 @@ + ++ addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); }); ++ + if (!Settings::getInstance()->getBool("ForceKiosk") && +@@ -70,3 +72,3 @@ + #if defined(__APPLE__) +- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); ++ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); + #else +@@ -75,3 +77,3 @@ + else +- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); ++ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); + #endif +@@ -1758,3 +1760,3 @@ + auto quitText = std::make_shared( +- "QUIT EMULATIONSTATION", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); ++ "QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); + quitText->setSelectable(true); +@@ -1910 +1912,14 @@ + } ++ +++void GuiMenu::openRetroDeckConfigurator() +++{ +++ // Launch the configurator.sh script +++ std::string command; +++ std::string startDirectory; +++ bool runInBackground; +++ command = "bash /app/tools/configurator.sh"; +++ startDirectory = "/app/tools"; +++ runInBackground = false; +++ int result = Utils::Platform::launchGameUnix(command, startDirectory, runInBackground); +++ // You can add any checks for the script's outcome here. +++} diff --git a/rd-submodules/es-de/GuiMenu.h.patch b/rd-submodules/es-de/GuiMenu.h.patch new file mode 100644 index 00000000..13a6b687 --- /dev/null +++ b/rd-submodules/es-de/GuiMenu.h.patch @@ -0,0 +1,10 @@ +diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h +--- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-08-23 13:12:15.617292576 +0200 ++++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-08-23 13:50:20.978700234 +0200 +@@ -46,2 +46,3 @@ + void openOtherOptions(); ++ void openRetroDeckConfigurator(); + void openQuitMenu(); +@@ -54 +55,2 @@ + #endif // ES_APP_GUIS_GUI_MENU_H ++ diff --git a/rd-submodules/es-de/es-de-retrodeck-mods.patch b/rd-submodules/es-de/ViewController.cpp.patch similarity index 70% rename from rd-submodules/es-de/es-de-retrodeck-mods.patch rename to rd-submodules/es-de/ViewController.cpp.patch index fd17ccf9..2f485a31 100644 --- a/rd-submodules/es-de/es-de-retrodeck-mods.patch +++ b/rd-submodules/es-de/ViewController.cpp.patch @@ -1,56 +1,6 @@ -diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp ---- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:44:25.788696841 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:48:23.574196859 -0400 -@@ -10,2 +10,3 @@ - #include "guis/GuiMenu.h" -+#include "utils/PlatformUtil.h" - -@@ -67,2 +68,4 @@ - -+ addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); }); -+ - if (!Settings::getInstance()->getBool("ForceKiosk") && -@@ -70,3 +73,3 @@ - #if defined(__APPLE__) -- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); - #else -@@ -75,3 +78,3 @@ - else -- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); - #endif -@@ -1729,2 +1732,15 @@ - -+void GuiMenu::openRetroDeckConfigurator() -+{ -+ // Launch the configurator.sh script -+ std::string command; -+ std::string startDirectory; -+ bool runInBackground; -+ command = "bash /app/tools/configurator.sh"; -+ startDirectory = "/app/tools"; -+ runInBackground = false; -+ int result = Utils::Platform::launchGameUnix(command, startDirectory, runInBackground); -+ // You can add any checks for the script's outcome here. -+} -+ - void GuiMenu::openQuitMenu() -@@ -1758,3 +1774,3 @@ - auto quitText = std::make_shared( -- "QUIT EMULATIONSTATION", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); -+ "QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); - quitText->setSelectable(true); -diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h ---- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:44:25.788696841 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:49:05.851991859 -0400 -@@ -46,2 +46,3 @@ - void openOtherOptions(); -+ void openRetroDeckConfigurator(); - void openQuitMenu(); diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp ---- emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-14 08:44:25.788696841 -0400 -+++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-17 09:58:26.862373622 -0400 +--- emulationstation-de/es-app/src/views/ViewController.cpp 2023-08-23 13:12:15.625292630 +0200 ++++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-08-23 14:29:23.547223951 +0200 @@ -164,9 +164,7 @@ { - mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " @@ -65,7 +15,7 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat + "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " + "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" + "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; - + @@ -179,90 +177,3 @@ mNoGamesMessageBox = new GuiMsgBox( - HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", @@ -163,11 +113,6 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - true, false, + "", nullptr, "", nullptr, true, false, (mRenderer->getIsVerticalOrientation() ? -diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp ---- emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:44:25.805371841 -0400 -+++ emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:52:32.335181878 -0400 -@@ -165,3 +165,3 @@ - progressBarRect.barPosY = mSplashTextPositions.y + (progressBarRect.barHeight * 2.0f); -- progressBarRect.color = 0x777777FF; -+ progressBarRect.color = 0xC858E6FF; - mProgressBarRectangles.emplace_back(progressBarRect); +@@ -1446 +1357,2 @@ + } ++ diff --git a/rd-submodules/es-de/Window.cpp.patch b/rd-submodules/es-de/Window.cpp.patch new file mode 100644 index 00000000..6c9301ea --- /dev/null +++ b/rd-submodules/es-de/Window.cpp.patch @@ -0,0 +1,22 @@ +diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp +--- emulationstation-de/es-core/src/Window.cpp 2023-08-23 13:12:15.625292630 +0200 ++++ emulationstation-de/es-core/src/Window.cpp 2023-08-23 14:04:13.393435463 +0200 +@@ -140,7 +140,7 @@ + mSplashTextScanning = std::unique_ptr( +- mDefaultFonts.at(1)->buildTextCache("Searching for games...", 0.0f, 0.0f, 0x777777FF)); ++ mDefaultFonts.at(1)->buildTextCache("Searching for games...", 0.0f, 0.0f, 0xC858E6FF)); + mSplashTextPopulating = std::unique_ptr( +- mDefaultFonts.at(1)->buildTextCache("Loading systems...", 0.0f, 0.0f, 0x777777FF)); ++ mDefaultFonts.at(1)->buildTextCache("Loading systems...", 0.0f, 0.0f, 0xC858E6FF)); + mSplashTextReloading = std::unique_ptr( +- mDefaultFonts.at(1)->buildTextCache("Reloading...", 0.0f, 0.0f, 0x777777FF)); ++ mDefaultFonts.at(1)->buildTextCache("Reloading...", 0.0f, 0.0f, 0xC858E6FF)); + +@@ -165,3 +165,3 @@ + progressBarRect.barPosY = mSplashTextPositions.y + (progressBarRect.barHeight * 2.0f); +- progressBarRect.color = 0x777777FF; ++ progressBarRect.color = 0xC858E6FF; + mProgressBarRectangles.emplace_back(progressBarRect); +@@ -978 +978,2 @@ + } ++ diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch index 0b1cfb79..fbfdda61 160000 --- a/rd-submodules/retroarch +++ b/rd-submodules/retroarch @@ -1 +1 @@ -Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 +Subproject commit fbfdda61b3da092a71cc53999dd3e7b909f244e2 diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules index a2441b96..50314360 160000 --- a/rd-submodules/shared-modules +++ b/rd-submodules/shared-modules @@ -1 +1 @@ -Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42 +Subproject commit 50314360ded6fa3b9f0b602513b1164b7a6636ed