From 1214a8cb1d83627a31ae7daf99315dc64213414e Mon Sep 17 00:00:00 2001 From: XargonWan <6771419+XargonWan@users.noreply.github.com> Date: Sat, 21 Oct 2023 22:23:03 +0200 Subject: [PATCH] ES-DE: updated to 2.2.0-beta - fixing ViewController.cpp.patch --- rd-submodules/es-de/ViewController.cpp.patch | 77 ++++++++------------ 1 file changed, 30 insertions(+), 47 deletions(-) diff --git a/rd-submodules/es-de/ViewController.cpp.patch b/rd-submodules/es-de/ViewController.cpp.patch index 2f485a31..77c44b8a 100644 --- a/rd-submodules/es-de/ViewController.cpp.patch +++ b/rd-submodules/es-de/ViewController.cpp.patch @@ -1,22 +1,6 @@ -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-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 " -- "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " -- "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM " -- "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL " -- "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME " -- "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n" -- "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n"; -+ mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. " -+ "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE " -+ "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 @@ +--- /tmp/emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-21 19:46:36.202758979 +0200 ++++ ./patches-tmp/ViewController.cpp 2023-10-21 22:21:04.737925284 +0200 +@@ -195,96 +195,5 @@ mNoGamesMessageBox = new GuiMsgBox( - HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", - [this] { @@ -29,22 +13,24 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - if (Settings::getInstance()->getBool("VirtualKeyboard")) { - mWindow->pushGui(new GuiTextEditKeyboardPopup( - HelpStyle(), 0.0f, "ENTER ROM DIRECTORY PATH", currentROMDirectory, -- [this](const std::string& newROMDirectory) { -- Settings::getInstance()->setString("ROMDirectory", -- Utils::String::trim(newROMDirectory)); -- Settings::getInstance()->saveFile(); +- [this, currentROMDirectory](const std::string& newROMDirectory) { +- if (currentROMDirectory != newROMDirectory) { +- Settings::getInstance()->setString( +- "ROMDirectory", Utils::String::trim(newROMDirectory)); +- Settings::getInstance()->saveFile(); -#if defined(_WIN64) -- mRomDirectory = -- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); +- mRomDirectory = +- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); -#else -- mRomDirectory = FileData::getROMDirectory(); +- mRomDirectory = FileData::getROMDirectory(); -#endif -- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "ROM DIRECTORY SETTING SAVED, RESTART\n" -- "THE APPLICATION TO RESCAN THE SYSTEMS", -- "OK", nullptr, "", nullptr, "", nullptr, -- true, true)); +- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "ROM DIRECTORY SETTING SAVED, RESTART\n" +- "THE APPLICATION TO RESCAN THE SYSTEMS", +- "OK", nullptr, "", nullptr, "", nullptr, +- nullptr, true, true)); +- } - }, - false, "SAVE", "SAVE CHANGES?", "Currently configured path:", - currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", @@ -68,7 +54,7 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - "ROM DIRECTORY SETTING SAVED, RESTART\n" - "THE APPLICATION TO RESCAN THE SYSTEMS", - "OK", nullptr, "", nullptr, "", nullptr, -- true)); +- nullptr, true)); - }, - false, "SAVE", "SAVE CHANGES?", "Currently configured path:", - currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", @@ -82,9 +68,8 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - "THIS WILL CREATE DIRECTORIES FOR ALL THE\n" - "GAME SYSTEMS DEFINED IN es_systems.xml\n\n" - "THIS MAY CREATE A LOT OF FOLDERS SO IT'S\n" -- "ADVICED TO REMOVE THE ONES YOU DON'T NEED\n\n" -- "PROCEED?", -- "YES", +- "ADVICED TO REMOVE THE ONES YOU DON'T NEED", +- "PROCEED", - [this] { - if (!SystemData::createSystemDirectories()) { - mWindow->pushGui(new GuiMsgBox(HelpStyle(), @@ -92,7 +77,7 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - "GENERATED, EXIT THE APPLICATION AND PLACE\n" - "YOUR GAMES IN THE NEWLY CREATED FOLDERS", - "OK", nullptr, "", nullptr, "", nullptr, -- true)); +- nullptr, true)); - } - else { - mWindow->pushGui(new GuiMsgBox(HelpStyle(), @@ -100,19 +85,17 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - "PERMISSION PROBLEMS OR DISK FULL?\n\n" - "SEE THE LOG FILE FOR MORE DETAILS", - "OK", nullptr, "", nullptr, "", nullptr, -- true)); +- nullptr, true)); - } - }, -- "NO", nullptr, "", nullptr, true)); +- "CANCEL", nullptr, "", nullptr, nullptr, true)); - }, - "QUIT", + HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", [] { -@@ -272,3 +183,3 @@ - }, -- true, false, -+ "", nullptr, "", nullptr, true, false, - (mRenderer->getIsVerticalOrientation() ? -@@ -1446 +1357,2 @@ - } -+ +- SDL_Event quit; +- quit.type = SDL_QUIT; +- SDL_PushEvent(&quit); +- }, ++ }, + nullptr, true, false,