summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerEmu/ControlGroup
diff options
context:
space:
mode:
authorDentomologist <dentomologist@gmail.com>2023-05-29 16:31:19 -0700
committerDentomologist <dentomologist@gmail.com>2023-06-12 18:11:04 -0700
commit527f8e783c915886985ae38b580d33744435de58 (patch)
treec20322d6ab1de267610f128352e76f15cf80a53b /Source/Core/InputCommon/ControllerEmu/ControlGroup
parentc8559a79332aa81e4060389d82cd8df885147972 (diff)
ControllerEmu: Convert Translatability to enum class
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup')
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp4
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp8
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp18
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp12
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp12
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp2
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp4
-rw-r--r--Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp10
9 files changed, 36 insertions, 36 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
index 0f30b50f63..c26f143f1c 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp
@@ -27,9 +27,9 @@ AnalogStick::AnalogStick(const char* const name_, const char* const ui_name_,
: ReshapableInput(name_, ui_name_, GroupType::Stick), m_stick_gate(std::move(stick_gate))
{
for (auto& named_direction : named_directions)
- AddInput(Translate, named_direction);
+ AddInput(Translatability::Translate, named_direction);
- AddInput(Translate, _trans("Modifier"));
+ AddInput(Translatability::Translate, _trans("Modifier"));
}
AnalogStick::ReshapeData AnalogStick::GetReshapableState(bool adjusted) const
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
index 7359a4e66d..98784c00ae 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp
@@ -25,12 +25,12 @@ Cursor::Cursor(std::string name_, std::string ui_name_)
m_last_update(Clock::now())
{
for (auto& named_direction : named_directions)
- AddInput(Translate, named_direction);
+ AddInput(Translatability::Translate, named_direction);
- AddInput(Translate, _trans("Hide"));
- AddInput(Translate, _trans("Recenter"));
+ AddInput(Translatability::Translate, _trans("Hide"));
+ AddInput(Translatability::Translate, _trans("Recenter"));
- AddInput(Translate, _trans("Relative Input Hold"));
+ AddInput(Translatability::Translate, _trans("Relative Input Hold"));
// Default values chosen to reach screen edges in most games including the Wii Menu.
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp
index fd6d99b93f..8ff82e2b33 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp
@@ -17,12 +17,12 @@ namespace ControllerEmu
{
Force::Force(const std::string& name_) : ReshapableInput(name_, name_, GroupType::Force)
{
- AddInput(Translate, _trans("Up"));
- AddInput(Translate, _trans("Down"));
- AddInput(Translate, _trans("Left"));
- AddInput(Translate, _trans("Right"));
- AddInput(Translate, _trans("Forward"));
- AddInput(Translate, _trans("Backward"));
+ AddInput(Translatability::Translate, _trans("Up"));
+ AddInput(Translatability::Translate, _trans("Down"));
+ AddInput(Translatability::Translate, _trans("Left"));
+ AddInput(Translatability::Translate, _trans("Right"));
+ AddInput(Translatability::Translate, _trans("Forward"));
+ AddInput(Translatability::Translate, _trans("Backward"));
AddSetting(&m_distance_setting,
{_trans("Distance"),
@@ -126,11 +126,11 @@ Shake::Shake(const std::string& name_, ControlState default_intensity_scale)
: ControlGroup(name_, name_, GroupType::Shake)
{
// i18n: Refers to a 3D axis (used when mapping motion controls)
- AddInput(ControllerEmu::Translate, _trans("X"));
+ AddInput(Translatability::Translate, _trans("X"));
// i18n: Refers to a 3D axis (used when mapping motion controls)
- AddInput(ControllerEmu::Translate, _trans("Y"));
+ AddInput(Translatability::Translate, _trans("Y"));
// i18n: Refers to a 3D axis (used when mapping motion controls)
- AddInput(ControllerEmu::Translate, _trans("Z"));
+ AddInput(Translatability::Translate, _trans("Z"));
AddDeadzoneSetting(&m_deadzone_setting, 50);
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp
index b9f6b6dca0..dfd282d533 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUAccelerometer.cpp
@@ -15,12 +15,12 @@ namespace ControllerEmu
IMUAccelerometer::IMUAccelerometer(std::string name_, std::string ui_name_)
: ControlGroup(std::move(name_), std::move(ui_name_), GroupType::IMUAccelerometer)
{
- AddInput(Translate, _trans("Up"));
- AddInput(Translate, _trans("Down"));
- AddInput(Translate, _trans("Left"));
- AddInput(Translate, _trans("Right"));
- AddInput(Translate, _trans("Forward"));
- AddInput(Translate, _trans("Backward"));
+ AddInput(Translatability::Translate, _trans("Up"));
+ AddInput(Translatability::Translate, _trans("Down"));
+ AddInput(Translatability::Translate, _trans("Left"));
+ AddInput(Translatability::Translate, _trans("Right"));
+ AddInput(Translatability::Translate, _trans("Forward"));
+ AddInput(Translatability::Translate, _trans("Backward"));
}
bool IMUAccelerometer::AreInputsBound() const
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp
index d7ff228a19..713ad59cc5 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUCursor.cpp
@@ -26,7 +26,7 @@ IMUCursor::IMUCursor(std::string name_, std::string ui_name_)
ControlGroup::DefaultValue::Enabled)
#endif
{
- AddInput(Translate, _trans("Recenter"));
+ AddInput(Translatability::Translate, _trans("Recenter"));
// Default values chosen to reach screen edges in most games including the Wii Menu.
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
index dd5ca110d9..2e8c4bb18c 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/IMUGyroscope.cpp
@@ -26,12 +26,12 @@ static constexpr auto WORST_ACCEPTABLE_CALIBRATION_UPDATE_FREQUENCY = 25;
IMUGyroscope::IMUGyroscope(std::string name_, std::string ui_name_)
: ControlGroup(std::move(name_), std::move(ui_name_), GroupType::IMUGyroscope)
{
- AddInput(Translate, _trans("Pitch Up"));
- AddInput(Translate, _trans("Pitch Down"));
- AddInput(Translate, _trans("Roll Left"));
- AddInput(Translate, _trans("Roll Right"));
- AddInput(Translate, _trans("Yaw Left"));
- AddInput(Translate, _trans("Yaw Right"));
+ AddInput(Translatability::Translate, _trans("Pitch Up"));
+ AddInput(Translatability::Translate, _trans("Pitch Down"));
+ AddInput(Translatability::Translate, _trans("Roll Left"));
+ AddInput(Translatability::Translate, _trans("Roll Right"));
+ AddInput(Translatability::Translate, _trans("Yaw Left"));
+ AddInput(Translatability::Translate, _trans("Yaw Right"));
AddSetting(&m_deadzone_setting,
{_trans("Dead Zone"),
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp
index 13d8edf216..570c5451fc 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp
@@ -24,7 +24,7 @@ ModifySettingsButton::ModifySettingsButton(std::string button_name)
void ModifySettingsButton::AddInput(std::string button_name, bool toggle)
{
- ControlGroup::AddInput(Translate, std::move(button_name));
+ ControlGroup::AddInput(Translatability::Translate, std::move(button_name));
m_threshold_exceeded.emplace_back(false);
m_associated_settings.emplace_back(false);
m_associated_settings_toggle.emplace_back(toggle);
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
index 708831a4c3..c764b0214b 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp
@@ -18,8 +18,8 @@ namespace ControllerEmu
Slider::Slider(const std::string& name_, const std::string& ui_name_)
: ControlGroup(name_, ui_name_, GroupType::Slider)
{
- AddInput(Translate, _trans("Left"));
- AddInput(Translate, _trans("Right"));
+ AddInput(Translatability::Translate, _trans("Left"));
+ AddInput(Translatability::Translate, _trans("Right"));
AddDeadzoneSetting(&m_deadzone_setting, 50);
}
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp
index 69a3038b42..a59ffb0eb9 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp
@@ -17,12 +17,12 @@ namespace ControllerEmu
{
Tilt::Tilt(const std::string& name_) : ReshapableInput(name_, name_, GroupType::Tilt)
{
- AddInput(Translate, _trans("Forward"));
- AddInput(Translate, _trans("Backward"));
- AddInput(Translate, _trans("Left"));
- AddInput(Translate, _trans("Right"));
+ AddInput(Translatability::Translate, _trans("Forward"));
+ AddInput(Translatability::Translate, _trans("Backward"));
+ AddInput(Translatability::Translate, _trans("Left"));
+ AddInput(Translatability::Translate, _trans("Right"));
- AddInput(Translate, _trans("Modifier"));
+ AddInput(Translatability::Translate, _trans("Modifier"));
AddSetting(&m_max_angle_setting,
{_trans("Angle"),