Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-25 15:35:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ES-DE: updated to 2.2.0-beta - fixing ViewController.cpp.patch

Browse source
This commit is contained in:
XargonWan 2023-10-21 22:23:03 +02:00
parent 9f99076331
commit 1214a8cb1d
1 changed files with 30 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
rd-submodules/es-de/ViewController.cpp.patch
View file

@ -1,22 +1,6 @@
diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp --- /tmp/emulationstation-de/es-app/src/views/ViewController.cpp 2023-10-21 19:46:36.202758979 +0200
--- emulationstation-de/es-app/src/views/ViewController.cpp 2023-08-23 13:12:15.625292630 +0200 +++ ./patches-tmp/ViewController.cpp 2023-10-21 22:21:04.737925284 +0200
+++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-08-23 14:29:23.547223951 +0200 @@ -195,96 +195,5 @@
@@ -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 @@
mNoGamesMessageBox = new GuiMsgBox( mNoGamesMessageBox = new GuiMsgBox(
- HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", - HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY",
- [this] { - [this] {
@ -29,9 +13,10 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat
- if (Settings::getInstance()->getBool("VirtualKeyboard")) { - if (Settings::getInstance()->getBool("VirtualKeyboard")) {
- mWindow->pushGui(new GuiTextEditKeyboardPopup( - mWindow->pushGui(new GuiTextEditKeyboardPopup(
- HelpStyle(), 0.0f, "ENTER ROM DIRECTORY PATH", currentROMDirectory, - HelpStyle(), 0.0f, "ENTER ROM DIRECTORY PATH", currentROMDirectory,
- [this](const std::string& newROMDirectory) { - [this, currentROMDirectory](const std::string& newROMDirectory) {
- Settings::getInstance()->setString("ROMDirectory", - if (currentROMDirectory != newROMDirectory) {
- Utils::String::trim(newROMDirectory)); - Settings::getInstance()->setString(
- "ROMDirectory", Utils::String::trim(newROMDirectory));
- Settings::getInstance()->saveFile(); - Settings::getInstance()->saveFile();
-#if defined(_WIN64) -#if defined(_WIN64)
- mRomDirectory = - mRomDirectory =
@ -44,7 +29,8 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat
- "ROM DIRECTORY SETTING SAVED, RESTART\n" - "ROM DIRECTORY SETTING SAVED, RESTART\n"
- "THE APPLICATION TO RESCAN THE SYSTEMS", - "THE APPLICATION TO RESCAN THE SYSTEMS",
- "OK", nullptr, "", nullptr, "", nullptr, - "OK", nullptr, "", nullptr, "", nullptr,
- true, true)); - nullptr, true, true));
- }
- }, - },
- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", - false, "SAVE", "SAVE CHANGES?", "Currently configured path:",
- currentROMDirectory, "LOAD 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" - "ROM DIRECTORY SETTING SAVED, RESTART\n"
- "THE APPLICATION TO RESCAN THE SYSTEMS", - "THE APPLICATION TO RESCAN THE SYSTEMS",
- "OK", nullptr, "", nullptr, "", nullptr, - "OK", nullptr, "", nullptr, "", nullptr,
- true)); - nullptr, true));
- }, - },
- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", - false, "SAVE", "SAVE CHANGES?", "Currently configured path:",
- currentROMDirectory, "LOAD 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" - "THIS WILL CREATE DIRECTORIES FOR ALL THE\n"
- "GAME SYSTEMS DEFINED IN es_systems.xml\n\n" - "GAME SYSTEMS DEFINED IN es_systems.xml\n\n"
- "THIS MAY CREATE A LOT OF FOLDERS SO IT'S\n" - "THIS MAY CREATE A LOT OF FOLDERS SO IT'S\n"
- "ADVICED TO REMOVE THE ONES YOU DON'T NEED\n\n" - "ADVICED TO REMOVE THE ONES YOU DON'T NEED",
- "PROCEED?", - "PROCEED",
- "YES",
- [this] { - [this] {
- if (!SystemData::createSystemDirectories()) { - if (!SystemData::createSystemDirectories()) {
- mWindow->pushGui(new GuiMsgBox(HelpStyle(), - 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" - "GENERATED, EXIT THE APPLICATION AND PLACE\n"
- "YOUR GAMES IN THE NEWLY CREATED FOLDERS", - "YOUR GAMES IN THE NEWLY CREATED FOLDERS",
- "OK", nullptr, "", nullptr, "", nullptr, - "OK", nullptr, "", nullptr, "", nullptr,
- true)); - nullptr, true));
- } - }
- else { - else {
- mWindow->pushGui(new GuiMsgBox(HelpStyle(), - 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" - "PERMISSION PROBLEMS OR DISK FULL?\n\n"
- "SEE THE LOG FILE FOR MORE DETAILS", - "SEE THE LOG FILE FOR MORE DETAILS",
- "OK", nullptr, "", nullptr, "", nullptr, - "OK", nullptr, "", nullptr, "", nullptr,
- true)); - nullptr, true));
- } - }
- }, - },
- "NO", nullptr, "", nullptr, true)); - "CANCEL", nullptr, "", nullptr, nullptr, true));
- }, - },
- "QUIT", - "QUIT",
+ HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", + HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT",
[] { [] {
@@ -272,3 +183,3 @@ - SDL_Event quit;
}, - quit.type = SDL_QUIT;
- true, false, - SDL_PushEvent(&quit);
+ "", nullptr, "", nullptr, true, false, - },
(mRenderer->getIsVerticalOrientation() ? + },
@@ -1446 +1357,2 @@ nullptr, true, false,
}
+