More Dolphin input textures fixes

automation_tools/automation_task_list.cfg

@@ -3,3 +3,4 @@
 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^DUCKSTATIONSHAPLACEHOLDER^https://github.com/stenzek/duckstation/releases/download/preview/DuckStation-x64.AppImage
+latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main

net.retrodeck.retrodeck.yml

@@ -696,8 +696,8 @@ modules:
   - name: universal_dynamic_input
     buildsystem: simple
     build-commands:
-      - mkdir -p ${FLATPAKD_DEST}/retrodeck/extras/UniversalDynamicInput
+      - mkdir -p ${FLATPAK_DEST}/retrodeck/extras/DynamicInputTextures
-      - cp -r * ${FLATPAKD_DEST}/retrodeck/extras/UniversalDynamicInput/
+      - cp -r * ${FLATPAK_DEST}/retrodeck/extras/DynamicInputTextures/
     sources:
       - type: git
         url: https://github.com/Venomalia/UniversalDynamicInput.git

post_update.sh

@@ -114,6 +114,10 @@ post_update() {
 
   # The following commands are run every time.
 
+  if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled
+    cp -rf "/app/retrodeck/extras/DynamicInputTextures/*" "/var/data/dolphin-emu/Load/DynamicInputTextures/"
+  fi
+
   tools_init
   update_splashscreens
   update_rd_conf

tools/configurator.sh

@@ -15,6 +15,8 @@ source /app/libexec/functions.sh
 #         - Enable/Disable Rewind
 #       - RetroAchivement Login
 #         - Login prompt
+#     - Dolphin Presets
+#       - Enable/Disable Custom Input Textures
 #     - Emulator Options (Behind one-time power user warning dialog)
 #       - Launch RetroArch
 #       - Launch Cemu
@@ -291,7 +293,7 @@ configurator_retroarch_rewind_dialog() {
       set_setting_value $raconf "rewind_enable" "false" retroarch
       configurator_process_complete_dialog "disabling Rewind"
     else
-      configurator_retroarch_options_dialog
+      configurator_retroarch_presets_dialog
     fi
   else
     zenity --question \
@@ -304,12 +306,12 @@ configurator_retroarch_rewind_dialog() {
       set_setting_value $raconf "rewind_enable" "true" retroarch
       configurator_process_complete_dialog "enabling Rewind"
     else
-      configurator_retroarch_options_dialog
+      configurator_retroarch_presets_dialog
     fi
   fi
 }
 
-configurator_retroarch_options_dialog() {
+configurator_retroarch_presets_dialog() {
   choice=$(zenity --list --title="RetroDECK Configurator Utility - RetroArch Options" --cancel-label="Back" \
   --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \
   --column="Choice" --column="Action" \
@@ -333,6 +335,63 @@ configurator_retroarch_options_dialog() {
   esac
 }
 
+configurator_dolphin_presets_dialog() {
+  choice=$(zenity --list --title="RetroDECK Configurator Utility - Dolphin Options" --cancel-label="Back" \
+  --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \
+  --column="Choice" --column="Action" \
+  "Change Custom Input Textures Setting" "Enable or disable custom input textures for supported games in Dolphin." )
+
+  case $choice in
+
+  "Change Custom Input Textures Setting" )
+    configurator_dolphin_input_textures_dialog
+  ;;
+
+  "" ) # No selection made or Back button clicked
+    configurator_welcome_dialog
+  ;;
+
+  esac
+}
+
+configurator_dolphin_input_textures_dialog() {
+  if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then
+    zenity --question \
+    --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+    --title "RetroDECK Configurator - Dolphin Custom Input Textures" \
+    --text="Custom input textures are currently enabled. Do you want to disable them?."
+
+    if [ $? == 0 ]
+    then
+      set_setting_value $dolphingfxconf "HiresTextures" "False" dolphin
+      rm -rf "/var/data/dolphin-emu/Load/DynamicInputTextures"
+      configurator_process_complete_dialog "disabling Dolphin custom input textures"
+    else
+      configurator_dolphin_presets_dialog
+    fi
+  else
+    zenity --question \
+    --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+    --title "RetroDECK Configurator - Dolphin Custom Input Textures" \
+    --text="Custom input textures are currently disabled. Do you want to enable them?.\n\nThis process may take several minutes to complete."
+
+    if [ $? == 0 ]
+    then
+      set_setting_value $dolphingfxconf "HiresTextures" "True" dolphin
+      (
+        mkdir "/var/data/dolphin-emu/Load/DynamicInputTextures"
+        cp -rf "/app/retrodeck/extras/DynamicInputTextures/*" "/var/data/dolphin-emu/Load/DynamicInputTextures/"
+      ) |
+      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 - Dolphin Custom Input Textures Install"
+      configurator_process_complete_dialog "enabling Dolphin custom input textures"
+    else
+      configurator_dolphin_presets_dialog
+    fi
+  fi
+}
+
 configurator_compress_single_game_dialog() {
   local file=$(file_browse "Game to compress")
   if [[ ! -z "$file" ]]; then
@@ -969,7 +1028,7 @@ configurator_move_retrodeck_dialog() {
     bios_folder="$rdhome/bios"
     media_folder="$rdhome/downloaded_media"
     themes_folder="$rdhome/themes"
-    emulator_post_move
+    prepare_emulator "all" "postmove"
     conf_write
     configurator_generic_dialog "RetroDECK data folder now configured at $rdhome. Please start the moving process again."
     configurator_move_retrodeck_dialog
@@ -1115,7 +1174,11 @@ configurator_welcome_dialog() {
   case $choice in
 
   "RetroArch Presets" )
-    configurator_retroarch_options_dialog
+    configurator_retroarch_presets_dialog
+  ;;
+
+  "Dolphin Presets" )
+    configurator_dolphin_presets_dialog
   ;;
 
   "Emulator Options" )