2023-06-26 13:43:31 +00:00
|
|
|
diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp
|
2023-08-23 12:41:54 +00:00
|
|
|
--- 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
|
2023-07-17 14:07:28 +00:00
|
|
|
@@ -164,9 +164,7 @@
|
2023-06-26 13:43:31 +00:00
|
|
|
{
|
|
|
|
- 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";
|
2023-08-23 12:41:54 +00:00
|
|
|
|
2023-07-17 14:07:28 +00:00
|
|
|
@@ -179,90 +177,3 @@
|
2023-06-26 13:43:31 +00:00
|
|
|
mNoGamesMessageBox = new GuiMsgBox(
|
|
|
|
- HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY",
|
|
|
|
- [this] {
|
|
|
|
- std::string currentROMDirectory;
|
|
|
|
-#if defined(_WIN64)
|
|
|
|
- currentROMDirectory = Utils::String::replace(FileData::getROMDirectory(), "/", "\\");
|
|
|
|
-#else
|
|
|
|
- currentROMDirectory = FileData::getROMDirectory();
|
|
|
|
-#endif
|
|
|
|
- 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();
|
|
|
|
-#if defined(_WIN64)
|
|
|
|
- mRomDirectory =
|
|
|
|
- Utils::String::replace(FileData::getROMDirectory(), "/", "\\");
|
|
|
|
-#else
|
|
|
|
- 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));
|
|
|
|
- },
|
|
|
|
- false, "SAVE", "SAVE CHANGES?", "Currently configured path:",
|
|
|
|
- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH",
|
|
|
|
- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)"));
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- mWindow->pushGui(new GuiTextEditPopup(
|
|
|
|
- HelpStyle(), "ENTER ROM DIRECTORY PATH", currentROMDirectory,
|
|
|
|
- [this](const std::string& newROMDirectory) {
|
|
|
|
- Settings::getInstance()->setString("ROMDirectory",
|
|
|
|
- Utils::String::trim(newROMDirectory));
|
|
|
|
- Settings::getInstance()->saveFile();
|
|
|
|
-#if defined(_WIN64)
|
|
|
|
- mRomDirectory =
|
|
|
|
- Utils::String::replace(FileData::getROMDirectory(), "/", "\\");
|
|
|
|
-#else
|
|
|
|
- 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));
|
|
|
|
- },
|
|
|
|
- false, "SAVE", "SAVE CHANGES?", "Currently configured path:",
|
|
|
|
- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH",
|
|
|
|
- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)"));
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
- "CREATE DIRECTORIES",
|
|
|
|
- [this] {
|
|
|
|
- mWindow->pushGui(new GuiMsgBox(
|
|
|
|
- HelpStyle(),
|
|
|
|
- "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",
|
|
|
|
- [this] {
|
|
|
|
- if (!SystemData::createSystemDirectories()) {
|
|
|
|
- mWindow->pushGui(new GuiMsgBox(HelpStyle(),
|
|
|
|
- "THE SYSTEM DIRECTORIES WERE SUCCESSFULLY\n"
|
|
|
|
- "GENERATED, EXIT THE APPLICATION AND PLACE\n"
|
|
|
|
- "YOUR GAMES IN THE NEWLY CREATED FOLDERS",
|
|
|
|
- "OK", nullptr, "", nullptr, "", nullptr,
|
|
|
|
- true));
|
|
|
|
- }
|
|
|
|
- else {
|
|
|
|
- mWindow->pushGui(new GuiMsgBox(HelpStyle(),
|
|
|
|
- "ERROR CREATING THE SYSTEM DIRECTORIES,\n"
|
|
|
|
- "PERMISSION PROBLEMS OR DISK FULL?\n\n"
|
|
|
|
- "SEE THE LOG FILE FOR MORE DETAILS",
|
|
|
|
- "OK", nullptr, "", nullptr, "", nullptr,
|
|
|
|
- true));
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
- "NO", nullptr, "", nullptr, true));
|
|
|
|
- },
|
|
|
|
- "QUIT",
|
|
|
|
+ HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT",
|
|
|
|
[] {
|
2023-07-17 14:07:28 +00:00
|
|
|
@@ -272,3 +183,3 @@
|
|
|
|
},
|
|
|
|
- true, false,
|
|
|
|
+ "", nullptr, "", nullptr, true, false,
|
|
|
|
(mRenderer->getIsVerticalOrientation() ?
|
2023-08-23 12:41:54 +00:00
|
|
|
@@ -1446 +1357,2 @@
|
|
|
|
}
|
|
|
|
+
|