archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-08 16:01:19 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make controller button names translatable and deduplicate code

Browse source
This commit is contained in:
Fs00 2022-09-10 15:10:52 +02:00
parent 4c6f22ba39
commit 13aa0a4fd0
13 changed files with 162 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/input/emulated/ClassicController.cpp
View file

@ -3,6 +3,7 @@
#include "input/api/Controller.h"
#include "input/api/SDL/SDLController.h"
#include <wx/intl.h>
ClassicController::ClassicController(size_t player_index)
: WPADController(player_index, kDataFormat_CLASSIC)
@ -69,22 +70,22 @@ std::string_view ClassicController::get_button_name(ButtonId id)
case kButtonId_Plus: return "+";
case kButtonId_Minus: return "-";
case kButtonId_Home: return "home";
case kButtonId_Home: return wxTRANSLATE("home");
case kButtonId_Up: return "up";
case kButtonId_Down: return "down";
case kButtonId_Left: return "left";
case kButtonId_Right: return "right";
case kButtonId_Up: return wxTRANSLATE("up");
case kButtonId_Down: return wxTRANSLATE("down");
case kButtonId_Left: return wxTRANSLATE("left");
case kButtonId_Right: return wxTRANSLATE("right");
case kButtonId_StickL_Up: return "up";
case kButtonId_StickL_Down: return "down";
case kButtonId_StickL_Left: return "left";
case kButtonId_StickL_Right: return "right";
case kButtonId_StickL_Up: return wxTRANSLATE("up");
case kButtonId_StickL_Down: return wxTRANSLATE("down");
case kButtonId_StickL_Left: return wxTRANSLATE("left");
case kButtonId_StickL_Right: return wxTRANSLATE("right");
case kButtonId_StickR_Up: return "up";
case kButtonId_StickR_Down: return "down";
case kButtonId_StickR_Left: return "left";
case kButtonId_StickR_Right: return "right";
case kButtonId_StickR_Up: return wxTRANSLATE("up");
case kButtonId_StickR_Down: return wxTRANSLATE("down");
case kButtonId_StickR_Left: return wxTRANSLATE("left");
case kButtonId_StickR_Right: return wxTRANSLATE("right");
default:
return "";

32
src/input/emulated/ProController.cpp
View file

@ -3,6 +3,8 @@
#include "input/api/Controller.h"
#include "input/api/SDL/SDLController.h"
#include <wx/intl.h>
ProController::ProController(size_t player_index)
: WPADController(player_index, kDataFormat_URCC)
{
@ -73,21 +75,21 @@ std::string_view ProController::get_button_name(ButtonId id)
case kButtonId_ZR: return "ZR";
case kButtonId_Plus: return "+";
case kButtonId_Minus: return "-";
case kButtonId_Up: return "up";
case kButtonId_Down: return "down";
case kButtonId_Left: return "left";
case kButtonId_Right: return "right";
case kButtonId_StickL: return "click";
case kButtonId_StickR: return "click";
case kButtonId_StickL_Up: return "up";
case kButtonId_StickL_Down: return "down";
case kButtonId_StickL_Left: return "left";
case kButtonId_StickL_Right: return "right";
case kButtonId_StickR_Up: return "up";
case kButtonId_StickR_Down: return "down";
case kButtonId_StickR_Left: return "left";
case kButtonId_StickR_Right: return "right";
case kButtonId_Home: return "home";
case kButtonId_Up: return wxTRANSLATE("up");
case kButtonId_Down: return wxTRANSLATE("down");
case kButtonId_Left: return wxTRANSLATE("left");
case kButtonId_Right: return wxTRANSLATE("right");
case kButtonId_StickL: return wxTRANSLATE("click");
case kButtonId_StickR: return wxTRANSLATE("click");
case kButtonId_StickL_Up: return wxTRANSLATE("up");
case kButtonId_StickL_Down: return wxTRANSLATE("down");
case kButtonId_StickL_Left: return wxTRANSLATE("left");
case kButtonId_StickL_Right: return wxTRANSLATE("right");
case kButtonId_StickR_Up: return wxTRANSLATE("up");
case kButtonId_StickR_Down: return wxTRANSLATE("down");
case kButtonId_StickR_Left: return wxTRANSLATE("left");
case kButtonId_StickR_Right: return wxTRANSLATE("right");
case kButtonId_Home: return wxTRANSLATE("home");
default:
cemu_assert_debug(false);
return "";

31
src/input/emulated/VPADController.cpp
View file

@ -5,6 +5,7 @@
#include "input/InputManager.h"
#include "Cafe/HW/Latte/Core/Latte.h"
#include "Cafe/CafeSystem.h"
#include <wx/intl.h>
enum ControllerVPADMapping2 : uint32
{
@ -366,21 +367,21 @@ std::string_view VPADController::get_button_name(ButtonId id)
case kButtonId_ZR: return "ZR";
case kButtonId_Plus: return "+";
case kButtonId_Minus: return "-";
case kButtonId_Up: return "up";
case kButtonId_Down: return "down";
case kButtonId_Left: return "left";
case kButtonId_Right: return "right";
case kButtonId_StickL: return "click";
case kButtonId_StickR: return "click";
case kButtonId_StickL_Up: return "up";
case kButtonId_StickL_Down: return "down";
case kButtonId_StickL_Left: return "left";
case kButtonId_StickL_Right: return "right";
case kButtonId_StickR_Up: return "up";
case kButtonId_StickR_Down: return "down";
case kButtonId_StickR_Left: return "left";
case kButtonId_StickR_Right: return "right";
case kButtonId_Home: return "home";
case kButtonId_Up: return wxTRANSLATE("up");
case kButtonId_Down: return wxTRANSLATE("down");
case kButtonId_Left: return wxTRANSLATE("left");
case kButtonId_Right: return wxTRANSLATE("right");
case kButtonId_StickL: return wxTRANSLATE("click");
case kButtonId_StickR: return wxTRANSLATE("click");
case kButtonId_StickL_Up: return wxTRANSLATE("up");
case kButtonId_StickL_Down: return wxTRANSLATE("down");
case kButtonId_StickL_Left: return wxTRANSLATE("left");
case kButtonId_StickL_Right: return wxTRANSLATE("right");
case kButtonId_StickR_Up: return wxTRANSLATE("up");
case kButtonId_StickR_Down: return wxTRANSLATE("down");
case kButtonId_StickR_Left: return wxTRANSLATE("left");
case kButtonId_StickR_Right: return wxTRANSLATE("right");
case kButtonId_Home: return wxTRANSLATE("home");
default:
cemu_assert_debug(false);
return "";

20
src/input/emulated/WiimoteController.cpp
View file

@ -2,7 +2,7 @@
#include "input/api/Controller.h"
#include "input/api/Wiimote/NativeWiimoteController.h"
#include <wx/intl.h>
WiimoteController::WiimoteController(size_t player_index)
: WPADController(player_index, kDataFormat_CORE_ACC_DPD)
@ -159,22 +159,22 @@ std::string_view WiimoteController::get_button_name(ButtonId id)
case kButtonId_1: return "1";
case kButtonId_2: return "2";
case kButtonId_Home: return "home";
case kButtonId_Home: return wxTRANSLATE("home");
case kButtonId_Plus: return "+";
case kButtonId_Minus: return "-";
case kButtonId_Up: return "up";
case kButtonId_Down: return "down";
case kButtonId_Left: return "left";
case kButtonId_Right: return "right";
case kButtonId_Up: return wxTRANSLATE("up");
case kButtonId_Down: return wxTRANSLATE("down");
case kButtonId_Left: return wxTRANSLATE("left");
case kButtonId_Right: return wxTRANSLATE("right");
case kButtonId_Nunchuck_Z: return "Z";
case kButtonId_Nunchuck_C: return "C";
case kButtonId_Nunchuck_Up: return "up";
case kButtonId_Nunchuck_Down: return "down";
case kButtonId_Nunchuck_Left: return "left";
case kButtonId_Nunchuck_Right: return "right";
case kButtonId_Nunchuck_Up: return wxTRANSLATE("up");
case kButtonId_Nunchuck_Down: return wxTRANSLATE("down");
case kButtonId_Nunchuck_Left: return wxTRANSLATE("left");
case kButtonId_Nunchuck_Right: return wxTRANSLATE("right");
default:
return "";

1
src/input/emulated/WiimoteController.h
View file

@ -1,7 +1,6 @@
#pragma once
#include "input/emulated/WPADController.h"
#include "gui/input/panels/WiimoteInputPanel.h"
class WiimoteController : public WPADController
{