Merge pull request #411 from icenine451/cooker-0.7.0b-icenine451

Cooker 0.7.0b icenine451
This commit is contained in:
icenine451 2023-06-02 10:26:05 -04:00 committed by GitHub
commit 1a4a5ba440
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 130 additions and 129 deletions

View file

@ -1,6 +1,6 @@
# The proper format for this file is # The proper format for this file is
# ACTION^PLACEHOLDERTEXT^URL^REPO(Optional) # ACTION^PLACEHOLDERTEXT^URL^REPO(Optional)
hash^DOOMSHAPLACEHOLDER^https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip # hash^DOOMSHAPLACEHOLDER^https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip
hash^VITASHAPLACEHOLDER^https://github.com/Vita3K/Vita3K/releases/download/continuous/ubuntu-latest.zip hash^VITASHAPLACEHOLDER^https://github.com/Vita3K/Vita3K/releases/download/continuous/ubuntu-latest.zip
hash^DUCKSTATIONSHAPLACEHOLDER^https://github.com/stenzek/duckstation/releases/download/preview/DuckStation-x64.AppImage hash^DUCKSTATIONSHAPLACEHOLDER^https://github.com/stenzek/duckstation/releases/download/preview/DuckStation-x64.AppImage
hash^SAMEDUCKSHAPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/latest/sameduck_libretro.so.zip hash^SAMEDUCKSHAPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/latest/sameduck_libretro.so.zip

View file

@ -1,18 +1,18 @@
"controller_mappings" "controller_mappings"
{ {
"version" "3" "version" "3"
"revision" "1556" "revision" "1581"
"title" "RetroDECK: Official Layout - v.0.7b" "title" "RetroDECK: Official Layout - v0.7b"
"description" "The Official RetroDECK Layout" "description" "The Official RetroDECK Layout""
"creator" "" "creator" ""
"progenitor" "" "progenitor" ""
"url" "autosave:///home/deck/.local/share/Steam/steamapps/common/Steam Controller Configs/25233020/config/retrodeck/controller_neptune.vdf" "url" ""
"export_type" "template" "export_type" "personal_cloud"
"controller_type" "controller_neptune" "controller_type" "controller_neptune"
"controller_caps" "23117823" "controller_caps" "23117823"
"major_revision" "0" "major_revision" "0"
"minor_revision" "0" "minor_revision" "0"
"Timestamp" "-999421760" "Timestamp" "-1230584288"
"actions" "actions"
{ {
"Default" "Default"
@ -708,14 +708,6 @@
"binding" "key_press RETURN, FULLSCREEN TOGGLE, , " "binding" "key_press RETURN, FULLSCREEN TOGGLE, , "
} }
} }
"Full_Press"
{
"bindings"
{
"binding" "key_press LEFT_ALT, , "
"binding" "key_press RETURN, , "
}
}
} }
"disabled_activators" "disabled_activators"
{ {
@ -1561,14 +1553,6 @@
"binding" "key_press RETURN, Fullscreen On/Off, RD-zoom-fit-best.png, #232323 #FFFFFF" "binding" "key_press RETURN, Fullscreen On/Off, RD-zoom-fit-best.png, #232323 #FFFFFF"
} }
} }
"Full_Press"
{
"bindings"
{
"binding" "key_press LEFT_ALT, , "
"binding" "key_press RETURN, , "
}
}
} }
"disabled_activators" "disabled_activators"
{ {
@ -2748,14 +2732,6 @@
"binding" "key_press RETURN, Fullscreen On/Off, RD-zoom-fit-best.png, " "binding" "key_press RETURN, Fullscreen On/Off, RD-zoom-fit-best.png, "
} }
} }
"Full_Press"
{
"bindings"
{
"binding" "key_press LEFT_ALT, , "
"binding" "key_press RETURN, , "
}
}
} }
"disabled_activators" "disabled_activators"
{ {
@ -2803,8 +2779,8 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press LEFT_ALT, Change Dual-Screenlayout, RD-preferences-system-windows-actions.png, " "binding" "key_press LEFT_CONTROL, Change Dual-Screenlayout, RD-preferences-system-windows-actions.png, "
"binding" "key_press 0, Change Dual-Screenlayout, RD-preferences-system-windows-actions.png, " "binding" "key_press L, Change Dual-Screenlayout, RD-preferences-system-windows-actions.png, "
} }
} }
} }
@ -3183,8 +3159,8 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press LEFT_CONTROL, Open Menu, RD-preferences-desktop-icons.png, " "binding" "key_press LEFT_CONTROL, Exit / Quit Emulator, RD-process-stop.png, "
"binding" "key_press M, Open Menu, RD-preferences-desktop-icons.png, " "binding" "key_press ESCAPE, Exit / Quit Emulator, RD-process-stop.png, "
} }
} }
} }
@ -3200,8 +3176,8 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press LEFT_CONTROL, Exit / Quit Emulator, RD-process-stop.png, " "binding" "key_press LEFT_CONTROL, Open Menu, RD-preferences-desktop-icons.png, "
"binding" "key_press ESCAPE, Exit / Quit Emulator, RD-process-stop.png, " "binding" "key_press M, Open Menu, RD-preferences-desktop-icons.png, "
} }
} }
} }
@ -3748,7 +3724,7 @@
"bindings" "bindings"
{ {
"binding" "key_press LEFT_ALT, ALT + F4, RD-F4.png, " "binding" "key_press LEFT_ALT, ALT + F4, RD-F4.png, "
"binding" "controller_action empty_sub_command, ALT + F4, RD-F4.png, " "binding" "key_press F4, ALT + F4, RD-F4.png, "
} }
} }
} }

View file

@ -27,58 +27,64 @@ check_desktop_mode() {
check_for_version_update() { check_for_version_update() {
# This function will perform a basic online version check and alert the user if there is a new version available. # This function will perform a basic online version check and alert the user if there is a new version available.
local online_version=$(curl --silent "https://api.github.com/repos/XargonWan/$update_repo/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') wget -q --spider "https://api.github.com/repos/XargonWan/$update_repo/releases/latest"
if [[ ! "$update_ignore" == "$online_version" ]]; then if [ $? -eq 0 ]; then
if [[ "$update_repo" == "RetroDECK" ]] && [[ $(sed -e 's/[\.a-z]//g' <<< $version) -le $(sed -e 's/[\.a-z]//g' <<< $online_version) ]]; then local online_version=$(curl --silent "https://api.github.com/repos/XargonWan/$update_repo/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Yes" --extra-button="No" --extra-button="Ignore this version" \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ if [[ ! "$update_ignore" == "$online_version" ]]; then
--title "RetroDECK Update Available" \ if [[ "$update_repo" == "RetroDECK" ]] && [[ $(sed -e 's/[\.a-z]//g' <<< $version) -le $(sed -e 's/[\.a-z]//g' <<< $online_version) ]]; then
--text="There is a new version of RetroDECK available!\nYou are running version $hard_version, the latest is $online_version.\n\nIf you would like to update to the new version now, click \"Yes\".\nIf you would like to skip reminders about this version, click \"Ignore this version\".\nYou will be reminded again at the next version update.\n\nIf you would like to disable these update notifications entirely, disable Online Update Checks in the Configurator.") choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Yes" --extra-button="No" --extra-button="Ignore this version" \
rc=$? # Capture return code, as "Yes" button has no text value --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked --title "RetroDECK Update Available" \
if [[ $choice == "Ignore this version" ]]; then --text="There is a new version of RetroDECK available!\nYou are running version $hard_version, the latest is $online_version.\n\nIf you would like to update to the new version now, click \"Yes\".\nIf you would like to skip reminders about this version, click \"Ignore this version\".\nYou will be reminded again at the next version update.\n\nIf you would like to disable these update notifications entirely, disable Online Update Checks in the Configurator.")
set_setting_value $rd_conf "update_ignore" "$online_version" retrodeck "options" # Store version to ignore for future checks rc=$? # Capture return code, as "Yes" button has no text value
if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked
if [[ $choice == "Ignore this version" ]]; then
set_setting_value $rd_conf "update_ignore" "$online_version" retrodeck "options" # Store version to ignore for future checks
fi
else # User clicked "Yes"
configurator_generic_dialog "RetroDECK Online Update" "The update process may take several minutes.\n\nAfter the update is complete, RetroDECK will close. When you run it again you will be using the latest version."
(
flatpak-spawn --host flatpak update --noninteractive -y net.retrodeck.retrodeck
) |
zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Updater" \
--text="RetroDECK is updating to the latest version, please wait."
configurator_generic_dialog "RetroDECK Online Update" "The update process is now complete!\n\nPlease restart RetroDECK to keep the fun going."
exit 1
fi fi
else # User clicked "Yes" elif [[ "$update_repo" == "RetroDECK-cooker" ]] && [[ ! $version == $online_version ]]; then
configurator_generic_dialog "RetroDECK Online Update" "The update process may take several minutes.\n\nAfter the update is complete, RetroDECK will close. When you run it again you will be using the latest version." choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Yes" --extra-button="No" --extra-button="Ignore this version" \
( --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
flatpak-spawn --host flatpak update --noninteractive -y net.retrodeck.retrodeck --title "RetroDECK Update Available" \
) | --text="There is a more recent build of the RetroDECK cooker branch.\nYou are running version $hard_version, the latest is $online_version.\n\nWould you like to update to it?\nIf you would like to skip reminders about this version, click \"Ignore this version\".\nYou will be reminded again at the next version update.\n\nIf you would like to disable these update notifications entirely, disable Online Update Checks in the Configurator.")
zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ rc=$? # Capture return code, as "Yes" button has no text value
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked
--title "RetroDECK Updater" \ if [[ $choice == "Ignore this version" ]]; then
--text="RetroDECK is updating to the latest version, please wait." set_setting_value $rd_conf "update_ignore" "$online_version" retrodeck "options" # Store version to ignore for future checks.
configurator_generic_dialog "RetroDECK Online Update" "The update process is now complete!\n\nPlease restart RetroDECK to keep the fun going." fi
exit 1 else # User clicked "Yes"
fi configurator_generic_dialog "RetroDECK Online Update" "The update process may take several minutes.\n\nAfter the update is complete, RetroDECK will close. When you run it again you will be using the latest version."
elif [[ "$update_repo" == "RetroDECK-cooker" ]] && [[ ! $version == $online_version ]]; then (
choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Yes" --extra-button="No" --extra-button="Ignore this version" \ local latest_cooker_download=$(curl --silent https://api.github.com/repos/XargonWan/$update_repo/releases/latest | grep '"browser_download_url":' | sed -E 's/.*"([^"]+)".*/\1/')
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ mkdir -p "$rdhome/RetroDECK_Updates"
--title "RetroDECK Update Available" \ wget -P "$rdhome/RetroDECK_Updates" $latest_cooker_download
--text="There is a more recent build of the RetroDECK cooker branch.\nYou are running version $hard_version, the latest is $online_version.\n\nWould you like to update to it?\nIf you would like to skip reminders about this version, click \"Ignore this version\".\nYou will be reminded again at the next version update.\n\nIf you would like to disable these update notifications entirely, disable Online Update Checks in the Configurator.") flatpak-spawn --host flatpak install --user --bundle --noninteractive -y "$rdhome/RetroDECK_Updates/RetroDECK.flatpak"
rc=$? # Capture return code, as "Yes" button has no text value rm -rf "$rdhome/RetroDECK_Updates" # Cleanup old bundles to save space
if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked ) |
if [[ $choice == "Ignore this version" ]]; then zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \
set_setting_value $rd_conf "update_ignore" "$online_version" retrodeck "options" # Store version to ignore for future checks. --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Updater" \
--text="RetroDECK is updating to the latest version, please wait."
configurator_generic_dialog "RetroDECK Online Update" "The update process is now complete!\n\nPlease restart RetroDECK to keep the fun going."
exit 1
fi fi
else # User clicked "Yes"
configurator_generic_dialog "RetroDECK Online Update" "The update process may take several minutes.\n\nAfter the update is complete, RetroDECK will close. When you run it again you will be using the latest version."
(
local latest_cooker_download=$(curl --silent https://api.github.com/repos/XargonWan/$update_repo/releases/latest | grep '"browser_download_url":' | sed -E 's/.*"([^"]+)".*/\1/')
mkdir -p "$rdhome/RetroDECK_Updates"
wget -P "$rdhome/RetroDECK_Updates" $latest_cooker_download
flatpak-spawn --host flatpak install --user --bundle --noninteractive -y "$rdhome/RetroDECK_Updates/RetroDECK.flatpak"
rm -rf "$rdhome/RetroDECK_Updates" # Cleanup old bundles to save space
) |
zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Updater" \
--text="RetroDECK is updating to the latest version, please wait."
configurator_generic_dialog "RetroDECK Online Update" "The update process is now complete!\n\nPlease restart RetroDECK to keep the fun going."
exit 1
fi fi
fi fi
else # Unable to reach the GitHub API for some reason
configurator_generic_dialog "RetroDECK Online Update" "RetroDECK is unable to reach the GitHub API to perform a version check.\nIt's possible that location is being blocked by your network or ISP.\n\nIf the problem continues, you will need to disable internal checks through the Configurator\nand perform updates manually through the Discover store."
fi fi
} }

View file

@ -75,6 +75,7 @@ post_update() {
# - Expose ES-DE gamelists folder to user at ~/retrodeck/gamelists # - Expose ES-DE gamelists folder to user at ~/retrodeck/gamelists
# - Copy new borders into RA config location # - Copy new borders into RA config location
# - Copy new RetroArch control remaps into RA config location # - Copy new RetroArch control remaps into RA config location
# - Add shipped Amiga bios if it doesn't already exist
# - Update RPCS3 vfs file contents. migrate from old location if needed # - Update RPCS3 vfs file contents. migrate from old location if needed
# - Disable ESDE update checks for existing installs # - Disable ESDE update checks for existing installs
# - Move Duckstation saves and states to new locations # - Move Duckstation saves and states to new locations
@ -129,9 +130,9 @@ post_update() {
rsync -a --mkpath "$emuconfigs/defaults/retrodeck/presets/remaps/" "/var/config/retroarch/config/remaps/" rsync -a --mkpath "$emuconfigs/defaults/retrodeck/presets/remaps/" "/var/config/retroarch/config/remaps/"
# if [[ $(configurator_generic_question_dialog "RetroDECK Starter Pack" "The RetroDECK creators have put together a collection of classic retro games you might enjoy!\n\nWould you like to have them automatically added to your library?\n\nThis can always be done later through the Configurator.") == "true" ]]; then if [[ ! -f "$bios_folder/capsimg.so" ]]; then
# install_retrodeck_starterpack cp -f "/app/retrodeck/extras/Amiga/capsimg.so" "$bios_folder/capsimg.so"
# fi fi
cp -f $emuconfigs/rpcs3/vfs.yml /var/config/rpcs3/vfs.yml cp -f $emuconfigs/rpcs3/vfs.yml /var/config/rpcs3/vfs.yml
sed -i 's^\^$(EmulatorDir): .*^$(EmulatorDir): '"$bios_folder/rpcs3/"'^' "$rpcs3vfsconf" sed -i 's^\^$(EmulatorDir): .*^$(EmulatorDir): '"$bios_folder/rpcs3/"'^' "$rpcs3vfsconf"
@ -211,6 +212,11 @@ post_update() {
set_setting_value "$ppssppconf" "AutoLoadSaveState" "0" "ppsspp" "General" set_setting_value "$ppssppconf" "AutoLoadSaveState" "0" "ppsspp" "General"
prepare_emulator "reset" "cemu" prepare_emulator "reset" "cemu"
configurator_generic_dialog "RetroDECK 0.7.0b Upgrade" "As part of this update, we are offering a new official RetroDECK controller profile!\nIt is an optional component that helps you get the most out of RetroDECK with a new in-game radial menu for unified hotkeys across emulators.\n\nThe files need to be installed outside of the normal ~/retrodeck folder AND REQUIRES A FULL RESET OF ALL EMULATORS, so we wanted your permission before proceeding.\nIf you decide to not install the profile now, it can always be done later through the Configurator.\n\nAny custom changes you have made to the emulator configurations will be reset if you choose to proceed!"
if [[ $(configurator_generic_question_dialog "RetroDECK Official Controller Profile" "Would you like to install the official RetroDECK controller profile?") == "true" ]]; then
install_retrodeck_controller_profile
fi
fi fi
# The following commands are run every time. # The following commands are run every time.

View file

@ -106,6 +106,12 @@ prepare_emulator() {
echo "-----------------------------------------------------------" echo "-----------------------------------------------------------"
cp -rf "/app/retrodeck/extras/MSX/Databases" "$bios_folder/Databases" cp -rf "/app/retrodeck/extras/MSX/Databases" "$bios_folder/Databases"
cp -rf "/app/retrodeck/extras/MSX/Machines" "$bios_folder/Machines" cp -rf "/app/retrodeck/extras/MSX/Machines" "$bios_folder/Machines"
# AMIGA
echo "-----------------------------------------------------------"
echo "Initializing AMIGA LIBRETRO"
echo "-----------------------------------------------------------"
cp -f "/app/retrodeck/extras/Amiga/capsimg.so" "$bios_folder/capsimg.so"
dir_prep "$texture_packs_folder/RetroArch-Mesen" "/var/config/retroarch/system/HdPacks" dir_prep "$texture_packs_folder/RetroArch-Mesen" "/var/config/retroarch/system/HdPacks"
dir_prep "$texture_packs_folder/RetroArch-Mupen64Plus/cache" "/var/config/retroarch/system/Mupen64plus/cache" dir_prep "$texture_packs_folder/RetroArch-Mupen64Plus/cache" "/var/config/retroarch/system/Mupen64plus/cache"

View file

@ -41,6 +41,7 @@ change_preset_dialog() {
local rc=$? local rc=$?
if [[ ! -z $choice || "$rc" == 0 ]]; then if [[ ! -z $choice || "$rc" == 0 ]]; then
(
IFS="," read -ra choices <<< "$choice" IFS="," read -ra choices <<< "$choice"
for emulator in "${all_systems[@]}"; do for emulator in "${all_systems[@]}"; do
if [[ " ${choices[*]} " =~ " ${emulator} " && ! " ${current_enabled_systems[*]} " =~ " ${emulator} " ]]; then if [[ " ${choices[*]} " =~ " ${emulator} " && ! " ${current_enabled_systems[*]} " =~ " ${emulator} " ]]; then
@ -70,6 +71,11 @@ change_preset_dialog() {
for emulator in "${changed_systems[@]}"; do for emulator in "${changed_systems[@]}"; do
build_preset_config $emulator ${changed_presets[*]} build_preset_config $emulator ${changed_presets[*]}
done done
) |
zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Configurator Utility - Presets Configuration" \
--text="Setting up your presets, please wait..."
else else
echo "No choices made" echo "No choices made"
fi fi

View file

@ -485,15 +485,16 @@ modules:
sha256: MSXBIOSHASHPLACEHOLDER sha256: MSXBIOSHASHPLACEHOLDER
strip-components: 0 strip-components: 0
- name: doom-shareware - name: amiga-bios
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- mkdir -p ${FLATPAK_DEST}/retrodeck/extras - mkdir -p ${FLATPAK_DEST}/retrodeck/extras/Amiga
- cp doom1.wad ${FLATPAK_DEST}/retrodeck/extras/ - cp -f Linux/x86-64/capsimg.so ${FLATPAK_DEST}/retrodeck/extras/Amiga/capsimg.so
sources: sources:
- type: archive - type: archive
url: https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip url: https://github.com/rsn8887/capsimg/releases/download/1.1/Capsimg_for_Retroarch.zip
sha256: DOOMSHAPLACEHOLDER sha256: 16c1b511b8e1374a2b6461a66bb6f07b7d2627eb4e941fd1497a432330acaad1
strip-components: 0
# PPSSPP - START # PPSSPP - START
# https://github.com/flathub/org.ppsspp.PPSSPP # https://github.com/flathub/org.ppsspp.PPSSPP

View file

@ -17,7 +17,6 @@ source /app/libexec/global.sh
# - RetroAchievements: Logout # - RetroAchievements: Logout
# - RetroAchievements: Hardcore Mode # - RetroAchievements: Hardcore Mode
# - Swap A/B and X/Y Buttons # - Swap A/B and X/Y Buttons
# - RetroDECK: Change Update Check Setting
# - RetroArch: Presets & Settings # - RetroArch: Presets & Settings
# - Borders: Enable/Disable # - Borders: Enable/Disable
# - Rewind: Enable/Disable # - Rewind: Enable/Disable
@ -58,6 +57,7 @@ source /app/libexec/global.sh
# - Compress All Games # - Compress All Games
# - Install: RetroDECK SD Controller Profile # - Install: RetroDECK SD Controller Profile
# - Install: PS3 firmware # - Install: PS3 firmware
# - RetroDECK: Change Update Setting
# - Troubleshooting # - Troubleshooting
# - Backup: RetroDECK Userdata # - Backup: RetroDECK Userdata
# - Check & Verify: BIOS # - Check & Verify: BIOS
@ -185,8 +185,7 @@ configurator_global_presets_and_settings_dialog() {
"RetroAchievements: Login" "Log into the RetroAchievements service in supported systems" \ "RetroAchievements: Login" "Log into the RetroAchievements service in supported systems" \
"RetroAchievements: Logout" "Disable RetroAchievements service in ALL supported systems" \ "RetroAchievements: Logout" "Disable RetroAchievements service in ALL supported systems" \
"RetroAchievements: Hardcore Mode" "Enable RetroAchievements hardcore mode (no cheats, rewind, save states etc.) in supported emulators" \ "RetroAchievements: Hardcore Mode" "Enable RetroAchievements hardcore mode (no cheats, rewind, save states etc.) in supported emulators" \
"Swap A/B and X/Y Buttons" "Enable or disable a swapped A/B and X/Y button layout in supported systems" \ "Swap A/B and X/Y Buttons" "Enable or disable a swapped A/B and X/Y button layout in supported systems" )
"RetroDECK: Change Update Check Setting" "Enable or disable online checks for new versions of RetroDECK" )
case $choice in case $choice in
@ -233,10 +232,6 @@ configurator_global_presets_and_settings_dialog() {
configurator_global_presets_and_settings_dialog configurator_global_presets_and_settings_dialog
;; ;;
"RetroDECK: Change Update Check Setting" )
configurator_online_update_setting_dialog
;;
"" ) # No selection made or Back button clicked "" ) # No selection made or Back button clicked
configurator_presets_and_settings_dialog configurator_presets_and_settings_dialog
;; ;;
@ -244,34 +239,6 @@ configurator_global_presets_and_settings_dialog() {
esac esac
} }
configurator_online_update_setting_dialog() {
if [[ $(get_setting_value $rd_conf "update_check" retrodeck "options") == "true" ]]; then
zenity --question \
--no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Configurator - RetroDECK Online Update Check" \
--text="Online update checks for RetroDECK are currently enabled.\n\nDo you want to disable them?"
if [ $? == 0 ] # User clicked "Yes"
then
set_setting_value $rd_conf "update_check" "false" retrodeck "options"
else # User clicked "Cancel"
configurator_global_presets_and_settings_dialog
fi
else
zenity --question \
--no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Configurator - RetroDECK Online Update Check" \
--text="Online update checks for RetroDECK are currently disabled.\n\nDo you want to enable them?"
if [ $? == 0 ] # User clicked "Yes"
then
set_setting_value $rd_conf "update_check" "true" retrodeck "options"
else # User clicked "Cancel"
configurator_global_presets_and_settings_dialog
fi
fi
}
configurator_retroarch_presets_and_settings_dialog() { configurator_retroarch_presets_and_settings_dialog() {
choice=$(zenity --list --title="RetroDECK Configurator Utility - RetroArch: Presets & Settings" --cancel-label="Back" \ 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 \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \
@ -533,7 +500,8 @@ configurator_retrodeck_tools_dialog() {
"Tool: Move Folders" "Move RetroDECK folders between internal/SD card or to a custom location" \ "Tool: Move Folders" "Move RetroDECK folders between internal/SD card or to a custom location" \
"Tool: Compress Games" "Compress games for systems that support it" \ "Tool: Compress Games" "Compress games for systems that support it" \
"Install: RetroDECK SD Controller Profile" "Install the custom RetroDECK controller layout for the Steam Deck" \ "Install: RetroDECK SD Controller Profile" "Install the custom RetroDECK controller layout for the Steam Deck" \
"Install: PS3 Firmware" "Download and install PS3 firmware for use with the RPCS3 emulator" ) "Install: PS3 Firmware" "Download and install PS3 firmware for use with the RPCS3 emulator" \
"RetroDECK: Change Update Setting" "Enable or disable online checks for new versions of RetroDECK" )
case $choice in case $choice in
@ -573,6 +541,10 @@ configurator_retrodeck_tools_dialog() {
fi fi
;; ;;
"RetroDECK: Change Update Check Setting" )
configurator_online_update_setting_dialog
;;
"" ) # No selection made or Back button clicked "" ) # No selection made or Back button clicked
configurator_welcome_dialog configurator_welcome_dialog
;; ;;
@ -859,6 +831,34 @@ configurator_compression_cleanup_dialog() {
fi fi
} }
configurator_online_update_setting_dialog() {
if [[ $(get_setting_value $rd_conf "update_check" retrodeck "options") == "true" ]]; then
zenity --question \
--no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Configurator - RetroDECK Online Update Check" \
--text="Online update checks for RetroDECK are currently enabled.\n\nDo you want to disable them?"
if [ $? == 0 ] # User clicked "Yes"
then
set_setting_value $rd_conf "update_check" "false" retrodeck "options"
else # User clicked "Cancel"
configurator_retrodeck_tools_dialog
fi
else
zenity --question \
--no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Configurator - RetroDECK Online Update Check" \
--text="Online update checks for RetroDECK are currently disabled.\n\nDo you want to enable them?"
if [ $? == 0 ] # User clicked "Yes"
then
set_setting_value $rd_conf "update_check" "true" retrodeck "options"
else # User clicked "Cancel"
configurator_retrodeck_tools_dialog
fi
fi
}
configurator_retrodeck_troubleshooting_dialog() { configurator_retrodeck_troubleshooting_dialog() {
choice=$(zenity --list --title="RetroDECK Configurator Utility - RetroDECK: Troubleshooting" --cancel-label="Back" \ choice=$(zenity --list --title="RetroDECK Configurator Utility - RetroDECK: Troubleshooting" --cancel-label="Back" \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \