diff --git a/emu-configs/defaults/retrodeck/presets/example.txt b/emu-configs/defaults/retrodeck/presets/example.txt index 6fe1f93b..53d031a4 100644 --- a/emu-configs/defaults/retrodeck/presets/example.txt +++ b/emu-configs/defaults/retrodeck/presets/example.txt @@ -8,4 +8,4 @@ change^borders^overlay_file^/var/config/retroarch/overlays/borders/snes.cfg # Th OTHER NOTES: - The name of the presets configuration file for any given system MUST be _presets.cfg - The is whatever name is given to this system in retrodeck.cfg, it is not tied to the actual emulator name. -- Whatever name is given to a system in retrodeck.cfg is how it will appear in the dialogs, so make it look nice. It also must match exactly in any preset sections it appears in! +- The name given to the system in retrodeck.cfg will be translated to a "nice looking" format for user dialogs through the file at emu-configs/defaults/retrodeck/reference_lists/pretty_system_names.cfg but will be used internally as-is diff --git a/emu-configs/defaults/retrodeck/reference_lists/finit_options_list.cfg b/emu-configs/defaults/retrodeck/reference_lists/finit_options_list.cfg index f14433ae..0c1eb4f1 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/finit_options_list.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/finit_options_list.cfg @@ -1,3 +1,2 @@ false^RPCS3 Firmware Install^Install firmware needed for PS3 emulation^rpcs3_firmware false^RetroDECK Controller Profile^Install custom RetroDECK controller profile^rd_controller_profile -false^RetroDECK Prepackaged Games^Install freely availble games that are packaged with RetroDECK^rd_prepacks diff --git a/tools/configurator.sh b/tools/configurator.sh index afbf5588..f0fe8ada 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -11,11 +11,11 @@ source /app/libexec/global.sh # Welcome # - Presets & Settings # - Global: Presets & Settings -# - Enable/Disable borders # - Enable/Disable widescreen # - Log in to RetroAchievements # - Enable/Disable RetroAchievements Hardcore Mode # - RetroArch: Presets & Settings +# - Enable/Disable borders # - Enable/Disable Rewind Setting # - Wii & GameCube: Presets & Settings # - Dolphin Textures: Universal Dynamic Input @@ -176,7 +176,6 @@ configurator_global_presets_and_settings_dialog() { choice=$(zenity --list --title="RetroDECK Configurator Utility - Global: Presets & Settings" --cancel-label="Back" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \ --column="Choice" --column="Action" \ - "Enable/Disable Borders" "Enable or disable borders in supported systems" \ "Enable/Disable Widescreen" "Enable or disable widescreen in supported systems" \ "RetroAchievements Login" "Log into the RetroAchievements service in supported systems" \ "RetroAchievements Logout" "Disable RetroAchievements service in supported systems" \ @@ -185,11 +184,6 @@ configurator_global_presets_and_settings_dialog() { case $choice in - "Enable/Disable Borders" ) - change_preset_dialog "borders" - configurator_global_presets_and_settings_dialog - ;; - "Enable/Disable Widescreen" ) change_preset_dialog "widescreen" configurator_global_presets_and_settings_dialog @@ -233,10 +227,16 @@ configurator_retroarch_presets_and_settings_dialog() { choice=$(zenity --list --title="RetroDECK Configurator Utility - RetroArch: Presets & Settings" --cancel-label="Back" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \ --column="Choice" --column="Action" \ + "Enable/Disable Borders" "Enable or disable borders in supported systems" \ "Enable/Disable Rewind" "Enable or disable the Rewind function in RetroArch." ) case $choice in + "Enable/Disable Borders" ) + change_preset_dialog "borders" + configurator_retroarch_presets_and_settings_dialog + ;; + "Enable/Disable Rewind" ) configurator_retroarch_rewind_dialog ;;