diff options
| author | JosJuice <josjuice@gmail.com> | 2018-04-10 17:22:30 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2018-04-13 13:04:26 +0200 |
| commit | 7ed28297b237779f0e4b6d7045cd27e10a8cfb0e (patch) | |
| tree | bca5d06f1fddf59b5e8b9f38af7f745b40f3beb9 /Source/Core/InputCommon/ControllerEmu/ControlGroup | |
| parent | 3f13dbe0878523b65d158efddc3eff37d59ca3a2 (diff) | |
ControllerEmu: Use enum instead of bool for translatability
Diffstat (limited to 'Source/Core/InputCommon/ControllerEmu/ControlGroup')
6 files changed, 21 insertions, 21 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp index 9ca3a70eb2..3317da427c 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp @@ -28,9 +28,9 @@ AnalogStick::AnalogStick(const char* const name_, const char* const ui_name_, : ControlGroup(name_, ui_name_, GroupType::Stick) { for (auto& named_direction : named_directions) - controls.emplace_back(std::make_unique<Input>(true, named_direction)); + controls.emplace_back(std::make_unique<Input>(Translate, named_direction)); - controls.emplace_back(std::make_unique<Input>(true, _trans("Modifier"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Modifier"))); numeric_settings.emplace_back( std::make_unique<NumericSetting>(_trans("Radius"), default_radius, 0, 100)); numeric_settings.emplace_back(std::make_unique<NumericSetting>(_trans("Dead Zone"), 0, 0, 50)); diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp index 2ee8e146f4..a300a249f7 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Cursor.cpp @@ -24,12 +24,12 @@ namespace ControllerEmu Cursor::Cursor(const std::string& name_) : ControlGroup(name_, GroupType::Cursor) { for (auto& named_direction : named_directions) - controls.emplace_back(std::make_unique<Input>(true, named_direction)); + controls.emplace_back(std::make_unique<Input>(Translate, named_direction)); - controls.emplace_back(std::make_unique<Input>(true, _trans("Forward"))); - controls.emplace_back(std::make_unique<Input>(true, _trans("Backward"))); - controls.emplace_back(std::make_unique<Input>(true, _trans("Hide"))); - controls.emplace_back(std::make_unique<Input>(true, _trans("Recenter"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Forward"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Backward"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Hide"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Recenter"))); numeric_settings.emplace_back(std::make_unique<NumericSetting>(_trans("Center"), 0.5)); numeric_settings.emplace_back(std::make_unique<NumericSetting>(_trans("Width"), 0.5)); diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp index c620bd787a..46dbd63c49 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Force.cpp @@ -19,12 +19,12 @@ namespace ControllerEmu { Force::Force(const std::string& name_) : ControlGroup(name_, GroupType::Force) { - controls.emplace_back(std::make_unique<Input>(true, _trans("Up"))); - controls.emplace_back(std::make_unique<Input>(true, _trans("Down"))); - controls.emplace_back(std::make_unique<Input>(true, _trans("Left"))); - controls.emplace_back(std::make_unique<Input>(true, _trans("Right"))); - controls.emplace_back(std::make_unique<Input>(true, _trans("Forward"))); - controls.emplace_back(std::make_unique<Input>(true, _trans("Backward"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Up"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Down"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Left"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Right"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Forward"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Backward"))); numeric_settings.emplace_back(std::make_unique<NumericSetting>(_trans("Dead Zone"), 0, 0, 50)); } diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp index 943a0bae85..268d239f0b 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/ModifySettingsButton.cpp @@ -27,7 +27,7 @@ ModifySettingsButton::ModifySettingsButton(std::string button_name) void ModifySettingsButton::AddInput(std::string button_name, bool toggle) { - controls.emplace_back(std::make_unique<Input>(true, std::move(button_name))); + controls.emplace_back(std::make_unique<Input>(Translate, std::move(button_name))); threshold_exceeded.emplace_back(false); associated_settings.emplace_back(false); 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 f04508e011..6784f6e24e 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Slider.cpp @@ -20,8 +20,8 @@ namespace ControllerEmu Slider::Slider(const std::string& name_, const std::string& ui_name_) : ControlGroup(name_, ui_name_, GroupType::Slider) { - controls.emplace_back(std::make_unique<Input>(true, _trans("Left"))); - controls.emplace_back(std::make_unique<Input>(true, _trans("Right"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Left"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Right"))); numeric_settings.emplace_back(std::make_unique<NumericSetting>(_trans("Dead Zone"), 0, 0, 50)); } diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp index 94d3538685..2785f56ba5 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp +++ b/Source/Core/InputCommon/ControllerEmu/ControlGroup/Tilt.cpp @@ -19,12 +19,12 @@ namespace ControllerEmu { Tilt::Tilt(const std::string& name_) : ControlGroup(name_, GroupType::Tilt) { - controls.emplace_back(std::make_unique<Input>(true, _trans("Forward"))); - controls.emplace_back(std::make_unique<Input>(true, _trans("Backward"))); - controls.emplace_back(std::make_unique<Input>(true, _trans("Left"))); - controls.emplace_back(std::make_unique<Input>(true, _trans("Right"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Forward"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Backward"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Left"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Right"))); - controls.emplace_back(std::make_unique<Input>(true, _trans("Modifier"))); + controls.emplace_back(std::make_unique<Input>(Translate, _trans("Modifier"))); numeric_settings.emplace_back(std::make_unique<NumericSetting>(_trans("Dead Zone"), 0, 0, 50)); numeric_settings.emplace_back(std::make_unique<NumericSetting>(_trans("Circle Stick"), 0)); |
