diff --git a/functions.sh b/functions.sh index 00348f35..26a242fe 100644 --- a/functions.sh +++ b/functions.sh @@ -1850,10 +1850,10 @@ finit() { echo "Executing finit" # Internal or SD Card? - choice=$(configurator_destination_choice_dialog "RetroDECK data" "Welcome to the first configuration of RetroDECK.\nThe setup will be quick but please READ CAREFULLY each message in order to avoid misconfigurations.\n\nWhere do you want your RetroDECK data folder to be located?\n\nThis folder will contain all ROMs, BIOSs and scraped data." ) - echo "Choice is $choice" + local finit_dest_choice=$(configurator_destination_choice_dialog "RetroDECK data" "Welcome to the first configuration of RetroDECK.\nThe setup will be quick but please READ CAREFULLY each message in order to avoid misconfigurations.\n\nWhere do you want your RetroDECK data folder to be located?\n\nThis folder will contain all ROMs, BIOSs and scraped data." ) + echo "Choice is $finit_dest_choice" - case $choice in + case $finit_dest_choice in "" ) # Cancel or X button quits echo "Now quitting" @@ -1916,7 +1916,20 @@ finit() { conf_write # Write the new values to retrodeck.cfg - local rpcs_firmware_install=$(configurator_generic_question_dialog "RPCS3 Firmware Install" "Would you like to install the latest PS3 firmware for the RPCS3 emulator?\n\nThis process will take several minutes and requires network access.\nIf you do not plan to emulate PS3 games this can be skipped, and can always be done later through the Configurator.\n\nIf you click Yes, RPCS3 will be launched at the end of the RetroDECK setup process.\nOnce the firmware is installed, please close the emulator to finish the process.") + local finit_options_choices=$(zenity \ + --list --width=1200 --height=720 \ + --checklist --hide-column=4 --ok-label="Confirm Selections" --extra-button="Enable All" \ + --separator=" " --print-column=4 \ + --text="Choose which options to enable:" \ + --column "Enabled?" \ + --column "Option" \ + --column "Description" \ + --column "option_flag" \ + "${finit_options_list[@]}") + + if [[ "$finit_options_choices" =~ (rpcs3_firmware|Enable All) ]]; then # Additional information on the firmware install process, as the emulator needs to be manually closed + configurator_generic_dialog "RPCS3 Firmware Install" "You have chosen to install the RPCS3 firmware during the RetroDECK first setup.\n\nThis process will take several minutes and requires network access.\n\nRPCS3 will be launched automatically at the end of the RetroDECK setup process.\nOnce the firmware is installed, please close the emulator to finish the process.") + fi zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \ @@ -1926,12 +1939,18 @@ finit() { prepare_emulator "reset" "all" tools_init - if [[ $rpcs_firmware_install == "true" ]]; then + # Optional actions based on user choices + if [[ "$finit_options_choices" =~ (rpcs3_firmware|Enable All) ]]; then update_rpcs3_firmware fi + if [[ "$finit_options_choices" =~ (rd_controller_profile|Enable All) ]]; then + rsync -a "/app/retrodeck/binding-icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" + # TODO move controller profile file to where it needs to go + fi # Add packaged extras, after the ROMS folder has been initialized cp /app/retrodeck/extras/doom1.wad "$roms_folder/doom/doom1.wad" # No -f in case the user already has it + ) | zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ diff --git a/global.sh b/global.sh index 79d1ddcd..88696114 100755 --- a/global.sh +++ b/global.sh @@ -32,6 +32,12 @@ helper_files_folder="$emuconfigs/defaults/retrodeck/helper_files" helper_files_list="$emuconfigs/defaults/retrodeck/reference_lists/helper_files_list.cfg" # The list of files to be deployed and where they go rpcs3_firmware="http://dus01.ps3.update.playstation.net/update/ps3/image/us/2023_0228_05fe32f5dc8c78acbcd84d36ee7fdc5b/PS3UPDAT.PUP" +# Options list for users to pick from during finit +# Syntax is "enabled_by_default" "Option name" "Option description" "option_flag_to_be_checked_for" + +finit_options_list=("false" "RPCS3 Firmware Install" "Install firmware needed for PS3 emulation during first install" "rpcs3_firmware" \ + "false" "RetroDECK Controller Profile" "Install custom RetroDECK controller profile (stored in shared Steam directory)" "rd_controller_profile") + # Config files for emulators with single config files cemuconf="/var/config/Cemu/settings.xml" diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b9d01b4b..72e0358c 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1074,6 +1074,7 @@ modules: - cp -f res/splash.svg ${FLATPAK_DEST}/retrodeck/graphics/splash-orig.svg - cp -rf res/extra-splashes/ ${FLATPAK_DEST}/retrodeck/graphics - cp -f res/icon.svg /app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg + - mv -f -t ${FLATPAK_DEST}/retrodeck res/binding-icons # RetroDECK core script - cp retrodeck.sh /app/bin/retrodeck.sh @@ -1116,4 +1117,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: cooker-0.7.0b \ No newline at end of file + branch: cooker-0.7.0b diff --git a/res/binding-icons/RD-applets-screenshooter.png b/res/binding-icons/RD-applets-screenshooter.png new file mode 100644 index 00000000..23b8e8e5 Binary files /dev/null and b/res/binding-icons/RD-applets-screenshooter.png differ diff --git a/res/binding-icons/RD-application-x-iso.png b/res/binding-icons/RD-application-x-iso.png new file mode 100644 index 00000000..cd7cb423 Binary files /dev/null and b/res/binding-icons/RD-application-x-iso.png differ diff --git a/res/binding-icons/RD-battery-full-charging.png b/res/binding-icons/RD-battery-full-charging.png new file mode 100644 index 00000000..c0558ae3 Binary files /dev/null and b/res/binding-icons/RD-battery-full-charging.png differ diff --git a/res/binding-icons/RD-battery-missing.png b/res/binding-icons/RD-battery-missing.png new file mode 100644 index 00000000..2953acb8 Binary files /dev/null and b/res/binding-icons/RD-battery-missing.png differ diff --git a/res/binding-icons/RD-camera-photo.png b/res/binding-icons/RD-camera-photo.png new file mode 100644 index 00000000..64c16ab1 Binary files /dev/null and b/res/binding-icons/RD-camera-photo.png differ diff --git a/res/binding-icons/RD-distributor-logo-netbsd.png b/res/binding-icons/RD-distributor-logo-netbsd.png new file mode 100644 index 00000000..815a2445 Binary files /dev/null and b/res/binding-icons/RD-distributor-logo-netbsd.png differ diff --git a/res/binding-icons/RD-document-save.png b/res/binding-icons/RD-document-save.png new file mode 100644 index 00000000..b6980cbe Binary files /dev/null and b/res/binding-icons/RD-document-save.png differ diff --git a/res/binding-icons/RD-edit-find.png b/res/binding-icons/RD-edit-find.png new file mode 100644 index 00000000..2583ab21 Binary files /dev/null and b/res/binding-icons/RD-edit-find.png differ diff --git a/res/binding-icons/RD-edit-undo.png b/res/binding-icons/RD-edit-undo.png new file mode 100644 index 00000000..b37a6529 Binary files /dev/null and b/res/binding-icons/RD-edit-undo.png differ diff --git a/res/binding-icons/RD-emblem-documents.png b/res/binding-icons/RD-emblem-documents.png new file mode 100644 index 00000000..2596501a Binary files /dev/null and b/res/binding-icons/RD-emblem-documents.png differ diff --git a/res/binding-icons/RD-emblem-downloads.png b/res/binding-icons/RD-emblem-downloads.png new file mode 100644 index 00000000..dde0658b Binary files /dev/null and b/res/binding-icons/RD-emblem-downloads.png differ diff --git a/res/binding-icons/RD-emblem-encrypted-locked.png b/res/binding-icons/RD-emblem-encrypted-locked.png new file mode 100644 index 00000000..1c1f7b51 Binary files /dev/null and b/res/binding-icons/RD-emblem-encrypted-locked.png differ diff --git a/res/binding-icons/RD-emblem-favorite.png b/res/binding-icons/RD-emblem-favorite.png new file mode 100644 index 00000000..a850c5b0 Binary files /dev/null and b/res/binding-icons/RD-emblem-favorite.png differ diff --git a/res/binding-icons/RD-emblem-generic.png b/res/binding-icons/RD-emblem-generic.png new file mode 100644 index 00000000..475bfcb7 Binary files /dev/null and b/res/binding-icons/RD-emblem-generic.png differ diff --git a/res/binding-icons/RD-emblem-new.png b/res/binding-icons/RD-emblem-new.png new file mode 100644 index 00000000..f0d59167 Binary files /dev/null and b/res/binding-icons/RD-emblem-new.png differ diff --git a/res/binding-icons/RD-emblem-synchronizing.png b/res/binding-icons/RD-emblem-synchronizing.png new file mode 100644 index 00000000..812ac184 Binary files /dev/null and b/res/binding-icons/RD-emblem-synchronizing.png differ diff --git a/res/binding-icons/RD-emblem-unlocked.png b/res/binding-icons/RD-emblem-unlocked.png new file mode 100644 index 00000000..5332ef8b Binary files /dev/null and b/res/binding-icons/RD-emblem-unlocked.png differ diff --git a/res/binding-icons/RD-emblem-unreadable.png b/res/binding-icons/RD-emblem-unreadable.png new file mode 100644 index 00000000..0cd3cdfe Binary files /dev/null and b/res/binding-icons/RD-emblem-unreadable.png differ diff --git a/res/binding-icons/RD-folder-applications.png b/res/binding-icons/RD-folder-applications.png new file mode 100644 index 00000000..0e1215e1 Binary files /dev/null and b/res/binding-icons/RD-folder-applications.png differ diff --git a/res/binding-icons/RD-folder-blue-backup.png b/res/binding-icons/RD-folder-blue-backup.png new file mode 100644 index 00000000..f173f08a Binary files /dev/null and b/res/binding-icons/RD-folder-blue-backup.png differ diff --git a/res/binding-icons/RD-folder-blue-games.png b/res/binding-icons/RD-folder-blue-games.png new file mode 100644 index 00000000..67507a69 Binary files /dev/null and b/res/binding-icons/RD-folder-blue-games.png differ diff --git a/res/binding-icons/RD-go-next.png b/res/binding-icons/RD-go-next.png new file mode 100644 index 00000000..279b8b2e Binary files /dev/null and b/res/binding-icons/RD-go-next.png differ diff --git a/res/binding-icons/RD-go-previous.png b/res/binding-icons/RD-go-previous.png new file mode 100644 index 00000000..a00cabc0 Binary files /dev/null and b/res/binding-icons/RD-go-previous.png differ diff --git a/res/binding-icons/RD-godot.png b/res/binding-icons/RD-godot.png new file mode 100644 index 00000000..d29092b3 Binary files /dev/null and b/res/binding-icons/RD-godot.png differ diff --git a/res/binding-icons/RD-icon_circle_2_180x180.png b/res/binding-icons/RD-icon_circle_2_180x180.png new file mode 100644 index 00000000..bab446bb Binary files /dev/null and b/res/binding-icons/RD-icon_circle_2_180x180.png differ diff --git a/res/binding-icons/RD-io.github.antimicrox.antimicrox.png b/res/binding-icons/RD-io.github.antimicrox.antimicrox.png new file mode 100644 index 00000000..a961b0b6 Binary files /dev/null and b/res/binding-icons/RD-io.github.antimicrox.antimicrox.png differ diff --git a/res/binding-icons/RD-list-add.png b/res/binding-icons/RD-list-add.png new file mode 100644 index 00000000..fa48ad3b Binary files /dev/null and b/res/binding-icons/RD-list-add.png differ diff --git a/res/binding-icons/RD-list-remove.png b/res/binding-icons/RD-list-remove.png new file mode 100644 index 00000000..724e8514 Binary files /dev/null and b/res/binding-icons/RD-list-remove.png differ diff --git a/res/binding-icons/RD-media-playback-pause.png b/res/binding-icons/RD-media-playback-pause.png new file mode 100644 index 00000000..3480a713 Binary files /dev/null and b/res/binding-icons/RD-media-playback-pause.png differ diff --git a/res/binding-icons/RD-media-playback-start.png b/res/binding-icons/RD-media-playback-start.png new file mode 100644 index 00000000..375801a7 Binary files /dev/null and b/res/binding-icons/RD-media-playback-start.png differ diff --git a/res/binding-icons/RD-notification-network-ethernet-connected.png b/res/binding-icons/RD-notification-network-ethernet-connected.png new file mode 100644 index 00000000..f61f11d0 Binary files /dev/null and b/res/binding-icons/RD-notification-network-ethernet-connected.png differ diff --git a/res/binding-icons/RD-notification-network-wireless.png b/res/binding-icons/RD-notification-network-wireless.png new file mode 100644 index 00000000..7bc8975e Binary files /dev/null and b/res/binding-icons/RD-notification-network-wireless.png differ diff --git a/res/binding-icons/RD-octopi.png b/res/binding-icons/RD-octopi.png new file mode 100644 index 00000000..746c1bb9 Binary files /dev/null and b/res/binding-icons/RD-octopi.png differ diff --git a/res/binding-icons/RD-org.xfce.session.png b/res/binding-icons/RD-org.xfce.session.png new file mode 100644 index 00000000..1b5febd8 Binary files /dev/null and b/res/binding-icons/RD-org.xfce.session.png differ diff --git a/res/binding-icons/RD-pcsxr-icon.png b/res/binding-icons/RD-pcsxr-icon.png new file mode 100644 index 00000000..118e83b4 Binary files /dev/null and b/res/binding-icons/RD-pcsxr-icon.png differ diff --git a/res/binding-icons/RD-playonlinux.png b/res/binding-icons/RD-playonlinux.png new file mode 100644 index 00000000..e7b383ab Binary files /dev/null and b/res/binding-icons/RD-playonlinux.png differ diff --git a/res/binding-icons/RD-preferences-desktop-accessibility.png b/res/binding-icons/RD-preferences-desktop-accessibility.png new file mode 100644 index 00000000..577cd803 Binary files /dev/null and b/res/binding-icons/RD-preferences-desktop-accessibility.png differ diff --git a/res/binding-icons/RD-preferences-desktop-display.png b/res/binding-icons/RD-preferences-desktop-display.png new file mode 100644 index 00000000..218908f2 Binary files /dev/null and b/res/binding-icons/RD-preferences-desktop-display.png differ diff --git a/res/binding-icons/RD-preferences-desktop-emoticons.png b/res/binding-icons/RD-preferences-desktop-emoticons.png new file mode 100644 index 00000000..279d8c1a Binary files /dev/null and b/res/binding-icons/RD-preferences-desktop-emoticons.png differ diff --git a/res/binding-icons/RD-preferences-desktop-icons.png b/res/binding-icons/RD-preferences-desktop-icons.png new file mode 100644 index 00000000..c6727a37 Binary files /dev/null and b/res/binding-icons/RD-preferences-desktop-icons.png differ diff --git a/res/binding-icons/RD-preferences-desktop-keyboard.png b/res/binding-icons/RD-preferences-desktop-keyboard.png new file mode 100644 index 00000000..2403518f Binary files /dev/null and b/res/binding-icons/RD-preferences-desktop-keyboard.png differ diff --git a/res/binding-icons/RD-preferences-system-search.png b/res/binding-icons/RD-preferences-system-search.png new file mode 100644 index 00000000..e7c60acb Binary files /dev/null and b/res/binding-icons/RD-preferences-system-search.png differ diff --git a/res/binding-icons/RD-preferences-system-windows-actions.png b/res/binding-icons/RD-preferences-system-windows-actions.png new file mode 100644 index 00000000..f4dd7342 Binary files /dev/null and b/res/binding-icons/RD-preferences-system-windows-actions.png differ diff --git a/res/binding-icons/RD-preferences-tweaks-shadows.png b/res/binding-icons/RD-preferences-tweaks-shadows.png new file mode 100644 index 00000000..9966c413 Binary files /dev/null and b/res/binding-icons/RD-preferences-tweaks-shadows.png differ diff --git a/res/binding-icons/RD-process-stop.png b/res/binding-icons/RD-process-stop.png new file mode 100644 index 00000000..d827b134 Binary files /dev/null and b/res/binding-icons/RD-process-stop.png differ diff --git a/res/binding-icons/RD-pvz.png b/res/binding-icons/RD-pvz.png new file mode 100644 index 00000000..2c64757d Binary files /dev/null and b/res/binding-icons/RD-pvz.png differ diff --git a/res/binding-icons/RD-retroarch.png b/res/binding-icons/RD-retroarch.png new file mode 100644 index 00000000..684f8f20 Binary files /dev/null and b/res/binding-icons/RD-retroarch.png differ diff --git a/res/binding-icons/RD-security-low.png b/res/binding-icons/RD-security-low.png new file mode 100644 index 00000000..fd686adb Binary files /dev/null and b/res/binding-icons/RD-security-low.png differ diff --git a/res/binding-icons/RD-steam.png b/res/binding-icons/RD-steam.png new file mode 100644 index 00000000..c0dc9b16 Binary files /dev/null and b/res/binding-icons/RD-steam.png differ diff --git a/res/binding-icons/RD-supertuxkart.png b/res/binding-icons/RD-supertuxkart.png new file mode 100644 index 00000000..417e433d Binary files /dev/null and b/res/binding-icons/RD-supertuxkart.png differ diff --git a/res/binding-icons/RD-system-reboot.png b/res/binding-icons/RD-system-reboot.png new file mode 100644 index 00000000..f3d4b35f Binary files /dev/null and b/res/binding-icons/RD-system-reboot.png differ diff --git a/res/binding-icons/RD-system-switch-user.png b/res/binding-icons/RD-system-switch-user.png new file mode 100644 index 00000000..82d0ecac Binary files /dev/null and b/res/binding-icons/RD-system-switch-user.png differ diff --git a/res/binding-icons/RD-tesseract.png b/res/binding-icons/RD-tesseract.png new file mode 100644 index 00000000..72ccbb57 Binary files /dev/null and b/res/binding-icons/RD-tesseract.png differ diff --git a/res/binding-icons/RD-text-x-generic.png b/res/binding-icons/RD-text-x-generic.png new file mode 100644 index 00000000..58b0fc31 Binary files /dev/null and b/res/binding-icons/RD-text-x-generic.png differ diff --git a/res/binding-icons/RD-tools-check-spelling.png b/res/binding-icons/RD-tools-check-spelling.png new file mode 100644 index 00000000..4d717891 Binary files /dev/null and b/res/binding-icons/RD-tools-check-spelling.png differ diff --git a/res/binding-icons/RD-urbanterror.png b/res/binding-icons/RD-urbanterror.png new file mode 100644 index 00000000..4efb05aa Binary files /dev/null and b/res/binding-icons/RD-urbanterror.png differ diff --git a/res/binding-icons/RD-user-red-home.png b/res/binding-icons/RD-user-red-home.png new file mode 100644 index 00000000..bf924158 Binary files /dev/null and b/res/binding-icons/RD-user-red-home.png differ diff --git a/res/binding-icons/RD-utilities-terminal.png b/res/binding-icons/RD-utilities-terminal.png new file mode 100644 index 00000000..c19c8d16 Binary files /dev/null and b/res/binding-icons/RD-utilities-terminal.png differ diff --git a/res/binding-icons/RD-video-x-generic.png b/res/binding-icons/RD-video-x-generic.png new file mode 100644 index 00000000..5b772904 Binary files /dev/null and b/res/binding-icons/RD-video-x-generic.png differ diff --git a/res/binding-icons/RD-view-refresh.png b/res/binding-icons/RD-view-refresh.png new file mode 100644 index 00000000..69eaf39c Binary files /dev/null and b/res/binding-icons/RD-view-refresh.png differ diff --git a/res/binding-icons/RD-zoom-fit-best.png b/res/binding-icons/RD-zoom-fit-best.png new file mode 100644 index 00000000..f8d1744b Binary files /dev/null and b/res/binding-icons/RD-zoom-fit-best.png differ diff --git a/res/binding-icons/RD-zoom-in.png b/res/binding-icons/RD-zoom-in.png new file mode 100644 index 00000000..6860adeb Binary files /dev/null and b/res/binding-icons/RD-zoom-in.png differ diff --git a/res/binding-icons/RD-zoom-original.png b/res/binding-icons/RD-zoom-original.png new file mode 100644 index 00000000..1be8ca80 Binary files /dev/null and b/res/binding-icons/RD-zoom-original.png differ diff --git a/res/binding-icons/RD-zoom-out.png b/res/binding-icons/RD-zoom-out.png new file mode 100644 index 00000000..fe98a7fd Binary files /dev/null and b/res/binding-icons/RD-zoom-out.png differ