Move update check change to Tools section

Add progress dialog to presets change process
This commit is contained in:
icenine451 2023-06-02 09:52:29 -04:00
parent 1bc98a1713
commit f5c50e0825
2 changed files with 42 additions and 36 deletions

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

@ -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 \