Changed the PlayStation 3 controller type to PlayStation 1/2/3

es-app/src/guis/GuiMenu.cpp

@@ -1087,7 +1087,7 @@ void GuiMenu::openInputDeviceOptions()
     std::string selectedPlayer {Settings::getInstance()->getString("InputControllerType")};
     inputControllerType->add("XBOX", "xbox", selectedPlayer == "xbox");
     inputControllerType->add("XBOX 360", "xbox360", selectedPlayer == "xbox360");
-    inputControllerType->add("PLAYSTATION 3", "ps3", selectedPlayer == "ps3");
+    inputControllerType->add("PLAYSTATION 1/2/3", "ps123", selectedPlayer == "ps123");
     inputControllerType->add("PLAYSTATION 4", "ps4", selectedPlayer == "ps4");
     inputControllerType->add("PLAYSTATION 5", "ps5", selectedPlayer == "ps5");
     inputControllerType->add("SWITCH PRO", "switchpro", selectedPlayer == "switchpro");

es-core/src/HelpStyle.cpp

@@ -140,10 +140,10 @@ void HelpStyle::applyTheme(const std::shared_ptr<ThemeData>& theme, const std::s
         mCustomButtons.button_x_PS = elem->get<std::string>(PREFIX "button_x_PS");
     if (elem->has(PREFIX "button_y_PS"))
         mCustomButtons.button_y_PS = elem->get<std::string>(PREFIX "button_y_PS");
-    if (elem->has(PREFIX "button_back_PS3"))
+    if (elem->has(PREFIX "button_back_PS123"))
-        mCustomButtons.button_back_PS3 = elem->get<std::string>(PREFIX "button_back_PS3");
+        mCustomButtons.button_back_PS123 = elem->get<std::string>(PREFIX "button_back_PS123");
-    if (elem->has(PREFIX "button_start_PS3"))
+    if (elem->has(PREFIX "button_start_PS123"))
-        mCustomButtons.button_start_PS3 = elem->get<std::string>(PREFIX "button_start_PS3");
+        mCustomButtons.button_start_PS123 = elem->get<std::string>(PREFIX "button_start_PS123");
     if (elem->has(PREFIX "button_back_PS4"))
         mCustomButtons.button_back_PS4 = elem->get<std::string>(PREFIX "button_back_PS4");
     if (elem->has(PREFIX "button_start_PS4"))

es-core/src/HelpStyle.h

@@ -65,8 +65,8 @@ struct HelpStyle {
         std::string button_b_PS;
         std::string button_x_PS;
         std::string button_y_PS;
-        std::string button_back_PS3;
+        std::string button_back_PS123;
-        std::string button_start_PS3;
+        std::string button_start_PS123;
         std::string button_back_PS4;
         std::string button_start_PS4;
         std::string button_back_PS5;

es-core/src/components/HelpComponent.cpp

@@ -101,7 +101,7 @@ void HelpComponent::assignIcons()
                                     ":/graphics/help/button_start_switch.svg" :
                                     mStyle.mCustomButtons.button_start_switch;
     }
-    else if (controllerType == "ps3") {
+    else if (controllerType == "ps123") {
         sIconPathMap["a"] = mStyle.mCustomButtons.button_a_PS.empty() ?
                                 ":/graphics/help/button_a_PS.svg" :
                                 mStyle.mCustomButtons.button_a_PS;
@@ -114,12 +114,12 @@ void HelpComponent::assignIcons()
         sIconPathMap["y"] = mStyle.mCustomButtons.button_y_PS.empty() ?
                                 ":/graphics/help/button_y_PS.svg" :
                                 mStyle.mCustomButtons.button_y_PS;
-        sIconPathMap["back"] = mStyle.mCustomButtons.button_back_PS3.empty() ?
+        sIconPathMap["back"] = mStyle.mCustomButtons.button_back_PS123.empty() ?
-                                   ":/graphics/help/button_back_PS3.svg" :
+                                   ":/graphics/help/button_back_PS123.svg" :
-                                   mStyle.mCustomButtons.button_back_PS3;
+                                   mStyle.mCustomButtons.button_back_PS123;
-        sIconPathMap["start"] = mStyle.mCustomButtons.button_start_PS3.empty() ?
+        sIconPathMap["start"] = mStyle.mCustomButtons.button_start_PS123.empty() ?
-                                    ":/graphics/help/button_start_PS3.svg" :
+                                    ":/graphics/help/button_start_PS123.svg" :
-                                    mStyle.mCustomButtons.button_start_PS3;
+                                    mStyle.mCustomButtons.button_start_PS123;
     }
     else if (controllerType == "ps4") {
         sIconPathMap["a"] = mStyle.mCustomButtons.button_a_PS.empty() ?

es-core/src/guis/GuiInputConfig.cpp

@@ -218,9 +218,9 @@ void GuiInputConfig::populateConfigList()
         sGuiInputConfigList[9] = {"X",     true,  "X",         ":/graphics/help/mbuttons_x_switch.svg"};
         sGuiInputConfigList[8] = {"Y",     true,  "Y",         ":/graphics/help/mbuttons_y_switch.svg"};
     }
-    else if (controllerType == "ps3") {
+    else if (controllerType == "ps123") {
-        sGuiInputConfigList[4] = {"Back",  false, "SELECT",    ":/graphics/help/button_back_PS3.svg"};
+        sGuiInputConfigList[4] = {"Back",  false, "SELECT",    ":/graphics/help/button_back_PS123.svg"};
-        sGuiInputConfigList[5] = {"Start", false, "START",     ":/graphics/help/button_start_PS3.svg"};
+        sGuiInputConfigList[5] = {"Start", false, "START",     ":/graphics/help/button_start_PS123.svg"};
         sGuiInputConfigList[6] = {"A",     false, "CROSS",     ":/graphics/help/mbuttons_a_PS.svg"};
         sGuiInputConfigList[7] = {"B",     false, "CIRCLE",    ":/graphics/help/mbuttons_b_PS.svg"};
         sGuiInputConfigList[8] = {"X",     true,  "SQUARE",    ":/graphics/help/mbuttons_x_PS.svg"};