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

Merge pull request #437 from icenine451/cooker-0.7.1b-icenine451

Browse source 
Cooker 0.7.1b icenine451
This commit is contained in:
icenine451 2023-07-17 10:08:50 -04:00 committed by GitHub
parent 6e5071a969 8128651b37
commit aae52f8342
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 166 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
functions/functions.sh
View file

@ -464,7 +464,7 @@ install_retrodeck_controller_profile() {
# BIGGER NOTE: As part of this process, all emulators will need to have their configs hard-reset to match the controller mappings of the profile # BIGGER NOTE: As part of this process, all emulators will need to have their configs hard-reset to match the controller mappings of the profile
# USAGE: install_retrodeck_controller_profile # USAGE: install_retrodeck_controller_profile
if [[ -d "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" && -d "$HOME/.steam/steam/controller_base/templates/" ]]; then if [[ -d "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" && -d "$HOME/.steam/steam/controller_base/templates/" ]]; then
rsync -rlD "/app/retrodeck/binding_icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" rsync -rlD --mkpath "/app/retrodeck/binding_icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/"
cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf"
else else
configurator_generic_dialog "RetroDECK Controller Profile Install" "The target directories for the controller profile do not exist.\n\nThis may happen if you do not have Steam installed or the location is does not have permission to be read." configurator_generic_dialog "RetroDECK Controller Profile Install" "The target directories for the controller profile do not exist.\n\nThis may happen if you do not have Steam installed or the location is does not have permission to be read."
@ -483,8 +483,7 @@ update_splashscreens() {
# USAGE: update_splashscreens # USAGE: update_splashscreens
rm -rf /var/config/emulationstation/.emulationstation/resources/graphics rm -rf /var/config/emulationstation/.emulationstation/resources/graphics
mkdir -p /var/config/emulationstation/.emulationstation/resources/graphics rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/emulationstation/.emulationstation/resources/graphics/"
cp -rf /app/retrodeck/graphics/* /var/config/emulationstation/.emulationstation/resources/graphics
} }
deploy_helper_files() { deploy_helper_files() {

7
functions/post_update.sh
View file

@ -127,7 +127,7 @@ post_update() {
dir_prep "$rdhome/gamelists" "/var/config/emulationstation/.emulationstation/gamelists" dir_prep "$rdhome/gamelists" "/var/config/emulationstation/.emulationstation/gamelists"
dir_prep "$borders_folder" "/var/config/retroarch/overlays/borders" dir_prep "$borders_folder" "/var/config/retroarch/overlays/borders"
rsync -rlD "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/overlays/borders/" rsync -rlD --mkpath "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/overlays/borders/"
rsync -rlD --mkpath "$emuconfigs/defaults/retrodeck/presets/remaps/" "/var/config/retroarch/config/remaps/" rsync -rlD --mkpath "$emuconfigs/defaults/retrodeck/presets/remaps/" "/var/config/retroarch/config/remaps/"
@ -226,14 +226,15 @@ post_update() {
# The following commands are run every time. # The following commands are run every time.
if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled
rsync -rlD "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/" rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/"
fi fi
if [[ -d "/var/data/primehack/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled if [[ -d "/var/data/primehack/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled
rsync -rlD "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/" rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/"
fi fi
if [[ -f "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" ]]; then # If RetroDECK controller profile has been previously installed if [[ -f "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" ]]; then # If RetroDECK controller profile has been previously installed
cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf"
rsync -rlD --mkpath "/app/retrodeck/binding_icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/"
fi fi
update_splashscreens update_splashscreens

28
net.retrodeck.retrodeck.yml
View file

@ -291,19 +291,19 @@ modules:
tag: v1.6.3 tag: v1.6.3
# Needed from ES-DE 2.1.0+ # Needed from ES-DE 2.1.0+
# - name: libpoppler-glib - name: libpoppler-glib
# buildsystem: cmake-ninja buildsystem: cmake-ninja
# config-opts: config-opts:
# - -DENABLE_BOOST=OFF - -DENABLE_BOOST=OFF
# sources: sources:
# - type: archive - type: archive
# url: https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2 url: https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2
# sha256: b8f618d5c62030034d5c8da4d3f6a740260b7620b9a31021679ce1914d327f81 sha256: b8f618d5c62030034d5c8da4d3f6a740260b7620b9a31021679ce1914d327f81
# cleanup: cleanup:
# - /lib/pkgconfig - /lib/pkgconfig
# - /include - /include
# - '*.a' - '*.a'
# - '*.la' - '*.la'
# When updating this module remember to check those: # When updating this module remember to check those:
# https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/unix/es_find_rules.xml # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/unix/es_find_rules.xml
@ -318,7 +318,7 @@ modules:
sources: sources:
- type: git - type: git
url: https://gitlab.com/es-de/emulationstation-de url: https://gitlab.com/es-de/emulationstation-de
branch: 7a1e420c9df3b801a65e9bcdc0ac92e2d708836e branch: c78e215d13b02132762b9fbf45ec7b861d50601b
- type: shell - type: shell
commands: commands:
- sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK

169
rd-submodules/es-de/es-de-retrodeck-mods.patch
View file

@ -1,27 +1,27 @@
diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp 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-07-14 08:44:25.788696841 -0400
+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 16:25:04.618753274 -0400 +++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:48:23.574196859 -0400
@@ -10,2 +10,3 @@ @@ -10,2 +10,3 @@
#include "guis/GuiMenu.h" #include "guis/GuiMenu.h"
+#include "utils/PlatformUtil.h" +#include "utils/PlatformUtil.h"
@@ -66,2 +67,4 @@ @@ -67,2 +68,4 @@
+ addEntry("RETRODECK CONFIGURATOR", 0x777777FF, false, [this] { openRetroDeckConfigurator(); }); + addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); });
+ +
if (!Settings::getInstance()->getBool("ForceKiosk") && if (!Settings::getInstance()->getBool("ForceKiosk") &&
@@ -69,3 +72,3 @@ @@ -70,3 +73,3 @@
#if defined(__APPLE__) #if defined(__APPLE__)
- addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); }); - addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); });
+ addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); + addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); });
#else #else
@@ -74,3 +77,3 @@ @@ -75,3 +78,3 @@
else else
- addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); }); - addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); });
+ addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); + addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); });
#endif #endif
@@ -1704,2 +1707,15 @@ @@ -1729,2 +1732,15 @@
+void GuiMenu::openRetroDeckConfigurator() +void GuiMenu::openRetroDeckConfigurator()
+{ +{
+ // Launch the configurator.sh script + // Launch the configurator.sh script
@ -36,23 +36,138 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/e
+} +}
+ +
void GuiMenu::openQuitMenu() void GuiMenu::openQuitMenu()
@@ -1732,3 +1748,3 @@ @@ -1758,3 +1774,3 @@
}); auto quitText = std::make_shared<TextComponent>(
- auto quitText = std::make_shared<TextComponent>("QUIT EMULATIONSTATION", - "QUIT EMULATIONSTATION", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary);
+ auto quitText = std::make_shared<TextComponent>("QUIT RETRODECK", + "QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary);
Font::get(FONT_SIZE_MEDIUM), 0x777777FF); quitText->setSelectable(true);
diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h 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-07-14 08:44:25.788696841 -0400
+++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:33:25.023871033 -0400 +++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:49:05.851991859 -0400
@@ -46,2 +46,3 @@ @@ -46,2 +46,3 @@
void openOtherOptions(); void openOtherOptions();
+ void openRetroDeckConfigurator(); + void openRetroDeckConfigurator();
void openQuitMenu(); 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
@@ -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(
- 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",
[] {
@@ -272,3 +183,3 @@
},
- true, false,
+ "", nullptr, "", nullptr, true, false,
(mRenderer->getIsVerticalOrientation() ?
diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp 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-07-14 08:44:25.805371841 -0400
+++ emulationstation-de/es-core/src/Window.cpp 2023-04-14 11:03:48.261309278 -0400 +++ emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:52:32.335181878 -0400
@@ -179,3 +179,3 @@ @@ -165,3 +165,3 @@
progressBarRect.barPosY += borderThickness; progressBarRect.barPosY = mSplashTextPositions.y + (progressBarRect.barHeight * 2.0f);
- progressBarRect.color = 0x79010FFF; - progressBarRect.color = 0x777777FF;
+ progressBarRect.color = 0xC858E6FF; + progressBarRect.color = 0xC858E6FF;
mProgressBarRectangles.emplace_back(progressBarRect); mProgressBarRectangles.emplace_back(progressBarRect);

2
rd-submodules/retroarch

@ -1 +1 @@
Subproject commit fbfdda61b3da092a71cc53999dd3e7b909f244e2 Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409

2
rd-submodules/shared-modules

@ -1 +1 @@
Subproject commit 50314360ded6fa3b9f0b602513b1164b7a6636ed Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42

4
tools/configurator.sh
View file

@ -344,7 +344,7 @@ configurator_dolphin_input_textures_dialog() {
set_setting_value $dolphingfxconf "HiresTextures" "True" dolphin set_setting_value $dolphingfxconf "HiresTextures" "True" dolphin
( (
mkdir "/var/data/dolphin-emu/Load/DynamicInputTextures" mkdir "/var/data/dolphin-emu/Load/DynamicInputTextures"
rsync -rlD "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/" rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/"
) | ) |
zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
@ -382,7 +382,7 @@ configurator_primehack_input_textures_dialog() {
set_setting_value $primehackgfxconf "HiresTextures" "True" primehack set_setting_value $primehackgfxconf "HiresTextures" "True" primehack
( (
mkdir "/var/data/primehack/Load/DynamicInputTextures" mkdir "/var/data/primehack/Load/DynamicInputTextures"
rsync -rlD "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/" rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/"
) | ) |
zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \