mirror of
https://github.com/RetroDECK/RetroDECK.git
synced 2024-11-23 06:25:39 +00:00
66 lines
3 KiB
Diff
66 lines
3 KiB
Diff
diff -au1r emulationstation-de/CMake/Packages/FindFFmpeg.cmake emulationstation-de/CMake/Packages/FindFFmpeg.cmake
|
|
--- emulationstation-de/CMake/Packages/FindFFmpeg.cmake 2023-04-12 09:08:12.384935336 -0400
|
|
+++ emulationstation-de/CMake/Packages/FindFFmpeg.cmake 2023-04-19 08:33:48.816378155 -0400
|
|
@@ -29,2 +29,3 @@
|
|
/usr/freeware/include
|
|
+ /app/lib/ffmpeg
|
|
NO_DEFAULT_PATH
|
|
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-04-12 09:08:12.394935336 -0400
|
|
+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 16:25:04.618753274 -0400
|
|
@@ -10,2 +10,3 @@
|
|
#include "guis/GuiMenu.h"
|
|
+#include "utils/PlatformUtil.h"
|
|
|
|
@@ -66,2 +67,4 @@
|
|
|
|
+ addEntry("RETRODECK CONFIGURATOR", 0x777777FF, false, [this] { openRetroDeckConfigurator(); });
|
|
+
|
|
if (!Settings::getInstance()->getBool("ForceKiosk") &&
|
|
@@ -69,3 +72,3 @@
|
|
#if defined(__APPLE__)
|
|
- addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); });
|
|
+ addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); });
|
|
#else
|
|
@@ -74,3 +77,3 @@
|
|
else
|
|
- addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); });
|
|
+ addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); });
|
|
#endif
|
|
@@ -1704,2 +1707,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()
|
|
@@ -1732,3 +1748,3 @@
|
|
});
|
|
- auto quitText = std::make_shared<TextComponent>("QUIT EMULATIONSTATION",
|
|
+ auto quitText = std::make_shared<TextComponent>("QUIT RETRODECK",
|
|
Font::get(FONT_SIZE_MEDIUM), 0x777777FF);
|
|
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-04-12 09:08:12.394935336 -0400
|
|
+++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:33:25.023871033 -0400
|
|
@@ -46,2 +46,3 @@
|
|
void openOtherOptions();
|
|
+ void openRetroDeckConfigurator();
|
|
void openQuitMenu();
|
|
diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp
|
|
--- emulationstation-de/es-core/src/Window.cpp 2023-04-12 09:08:12.398268670 -0400
|
|
+++ emulationstation-de/es-core/src/Window.cpp 2023-04-14 11:03:48.261309278 -0400
|
|
@@ -179,3 +179,3 @@
|
|
progressBarRect.barPosY += borderThickness;
|
|
- progressBarRect.color = 0x79010FFF;
|
|
+ progressBarRect.color = 0xC858E6FF;
|
|
mProgressBarRectangles.emplace_back(progressBarRect);
|