From 1d271e93036246b3b7fe045107e61c5b9b5f4d70 Mon Sep 17 00:00:00 2001
From: gugueU <gugue_u@hotmail.com>
Date: Thu, 9 Mar 2023 21:13:41 +0100
Subject: [PATCH] feat(retroarch menu): allow swap valid cancel buttons

---
 projects/configgen/configgen/Emulator.py                 | 9 +++++++--
 .../configgen/generators/libretro/libretroRetroarch.py   | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/projects/configgen/configgen/Emulator.py b/projects/configgen/configgen/Emulator.py
index dac4a460c5..4bb0f529f5 100644
--- a/projects/configgen/configgen/Emulator.py
+++ b/projects/configgen/configgen/Emulator.py
@@ -67,6 +67,7 @@ class Emulator:
         self._smooth: bool = True
         self._rewind: bool = False
         self._autoSave: bool = False
+        self._menuSwapValidCancel: bool = True
         self._integerScale: bool = False
         self._quitTwice: bool = False
         self._recalboxOverlays: bool = True
@@ -80,7 +81,7 @@ class Emulator:
         self._configArgs: str = ""  # Extra parameters from recalbox.conf
         self._args: List[str] = [] # Array representation of ExtraArgs + ConfigArgs
 
-        # Vars straight from recalbox.conf
+    # Vars straight from recalbox.conf
         self._netplayNick: str = "Recalbox Anonymous"
         self._netplayMITM: str = ""
         self._specialKeys: str = ""
@@ -89,7 +90,7 @@ class Emulator:
         self._retroachievementsNickname: str = ""
         self._retroachievementsPassword: str = ""
         self._recalboxexperimental: str = ""
-        self._updatestype : str = "stable"
+        self._updatestype: str = "stable"
 
         # Vars from arguments
         self._hash: str = "default"
@@ -158,6 +159,7 @@ class Emulator:
         self._retroachievementsPassword = recalboxOptions.getString('global.retroachievements.password', self._retroachievementsPassword)
         self._recalboxexperimental      = recalboxOptions.getString('global.experimental', self._recalboxexperimental)
         self._updatestype               = recalboxOptions.getString('updates.type', self._updatestype)
+        self._menuSwapValidCancel       = recalboxOptions.getBool('controllers.swapvalidateandcancel', self._menuSwapValidCancel)
 
 
         # Vars from arguments
@@ -331,6 +333,9 @@ class Emulator:
     @property
     def AutoSave(self) -> bool: return self._autoSave
 
+    @property
+    def MenuSwapValidCancel(self) -> bool: return self._menuSwapValidCancel
+
     @property
     def Translate(self) -> bool: return self._translate
 
diff --git a/projects/configgen/configgen/generators/libretro/libretroRetroarch.py b/projects/configgen/configgen/generators/libretro/libretroRetroarch.py
index 67ae1682a0..eae40e4954 100755
--- a/projects/configgen/configgen/generators/libretro/libretroRetroarch.py
+++ b/projects/configgen/configgen/generators/libretro/libretroRetroarch.py
@@ -283,6 +283,9 @@ class LibretroRetroarch:
         settings.setString("savestate_directory", recalboxFiles.savesDir + self.system.Name) \
                 .setString("savefile_directory", recalboxFiles.savesDir + self.system.Name)
 
+        # swap valid cancel button ?  True is west | False is japanese
+        settings.setBool("menu_swap_ok_cancel_buttons", not self.system.MenuSwapValidCancel)
+
         # Extend Controller configurations
         for i in range(0, 11):
             settings.setInt("input_libretro_device_p{}".format(i), 1)
-- 
GitLab