diff options
Diffstat (limited to 'Source/Core/InputCommon')
13 files changed, 40 insertions, 35 deletions
diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp index 3f5d00d822..7ea3ec27d5 100644 --- a/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp +++ b/Source/Core/InputCommon/ControllerEmu/Control/Control.cpp @@ -9,14 +9,14 @@ namespace ControllerEmu { -Control::Control(std::unique_ptr<ControlReference> ref, const std::string& name_, +Control::Control(std::unique_ptr<ControlReference> ref, bool translate_, const std::string& name_, const std::string& ui_name_) - : control_ref(std::move(ref)), name(name_), ui_name(ui_name_) + : control_ref(std::move(ref)), translate(translate_), name(name_), ui_name(ui_name_) { } -Control::Control(std::unique_ptr<ControlReference> ref, const std::string& name_) - : Control(std::move(ref), name_, name_) +Control::Control(std::unique_ptr<ControlReference> ref, bool translate_, const std::string& name_) + : Control(std::move(ref), translate_, name_, name_) { } diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Control.h b/Source/Core/InputCommon/ControllerEmu/Control/Control.h index b34c843c5d..f5c2e394ea 100644 --- a/Source/Core/InputCommon/ControllerEmu/Control/Control.h +++ b/Source/Core/InputCommon/ControllerEmu/Control/Control.h @@ -17,12 +17,13 @@ public: virtual ~Control(); std::unique_ptr<ControlReference> const control_ref; + const bool translate; const std::string name; const std::string ui_name; protected: - Control(std::unique_ptr<ControlReference> ref, const std::string& name, + Control(std::unique_ptr<ControlReference> ref, bool translate, const std::string& name, const std::string& ui_name); - Control(std::unique_ptr<ControlReference> ref, const std::string& name); + Control(std::unique_ptr<ControlReference> ref, bool translate, const std::string& name); }; } // namespace ControllerEmu diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp index a213916a83..ca872b5cbd 100644 --- a/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp +++ b/Source/Core/InputCommon/ControllerEmu/Control/Input.cpp @@ -10,12 +10,13 @@ namespace ControllerEmu { -Input::Input(const std::string& name_, const std::string& ui_name_) - : Control(std::make_unique<InputReference>(), name_, ui_name_) +Input::Input(bool translate_, const std::string& name_, const std::string& ui_name_) + : Control(std::make_unique<InputReference>(), translate_, name_, ui_name_) { } -Input::Input(const std::string& name_) : Control(std::make_unique<InputReference>(), name_) +Input::Input(bool translate_, const std::string& name_) + : Control(std::make_unique<InputReference>(), translate_, name_) { } } // namespace ControllerEmu diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Input.h b/Source/Core/InputCommon/ControllerEmu/Control/Input.h index dad90ed12e..1782249026 100644 --- a/Source/Core/InputCommon/ControllerEmu/Control/Input.h +++ b/Source/Core/InputCommon/ControllerEmu/Control/Input.h @@ -12,7 +12,7 @@ namespace ControllerEmu class Input : public Control { public: - Input(const std::string& name, const std::string& ui_name); - explicit Input(const std::string& name); + Input(bool translate, const std::string& name, const std::string& ui_name); + Input(bool translate, const std::string& name); }; } // namespace ControllerEmu diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp b/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp index a031893410..9089b15b7f 100644 --- a/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp +++ b/Source/Core/InputCommon/ControllerEmu/Control/Output.cpp @@ -10,7 +10,8 @@ namespace ControllerEmu { -Output::Output(const std::string& name_) : Control(std::make_unique<OutputReference>(), name_) +Output::Output(bool translate, const std::string& name_) + : Control(std::make_unique<OutputReference>(), translate, name_) { } } // namespace ControllerEmu diff --git a/Source/Core/InputCommon/ControllerEmu/Control/Output.h b/Source/Core/InputCommon/ControllerEmu/Control/Output.h index 415c67f7d9..74aa85e165 100644 --- a/Source/Core/InputCommon/ControllerEmu/Control/Output.h +++ b/Source/Core/InputCommon/ControllerEmu/Control/Output.h @@ -12,6 +12,6 @@ namespace ControllerEmu class Output : public Control { public: - explicit Output(const std::string& name); + Output(bool translate, const std::string& name); }; } // namespace ControllerEmu diff --git a/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp b/Source/Core/InputCommon/ControllerEmu/ControlGroup/AnalogStick.cpp index 2b7430dcbf..9ca3a70eb2 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>(named_direction)); + controls.emplace_back(std::make_unique<Input>(true, named_direction)); - controls.emplace_back(std::make_unique<Input>(_trans("Modifier"))); + controls.emplace_back(std::make_unique<Input>(true, _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 3467205ccf..2ee8e146f4 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>(named_direction)); + controls.emplace_back(std::make_unique<Input>(true, named_direction)); - controls.emplace_back(std::make_unique<Input>(_trans("Forward"))); - controls.emplace_back(std::make_unique<Input>(_trans("Backward"))); - controls.emplace_back(std::make_unique<Input>(_trans("Hide"))); - controls.emplace_back(std::make_unique<Input>(_trans("Recenter"))); + 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"))); 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 a825ce51c9..c620bd787a 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>(_trans("Up"))); - controls.emplace_back(std::make_unique<Input>(_trans("Down"))); - controls.emplace_back(std::make_unique<Input>(_trans("Left"))); - controls.emplace_back(std::make_unique<Input>(_trans("Right"))); - controls.emplace_back(std::make_unique<Input>(_trans("Forward"))); - controls.emplace_back(std::make_unique<Input>(_trans("Backward"))); + 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"))); 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 a534b7904f..943a0bae85 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(new Input(std::move(button_name))); + controls.emplace_back(std::make_unique<Input>(true, 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 b5e7ff5a1a..f04508e011 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>("Left")); - controls.emplace_back(std::make_unique<Input>("Right")); + controls.emplace_back(std::make_unique<Input>(true, _trans("Left"))); + controls.emplace_back(std::make_unique<Input>(true, _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 72bc258976..94d3538685 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>(_trans("Forward"))); - controls.emplace_back(std::make_unique<Input>(_trans("Backward"))); - controls.emplace_back(std::make_unique<Input>(_trans("Left"))); - controls.emplace_back(std::make_unique<Input>(_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>(true, _trans("Left"))); + controls.emplace_back(std::make_unique<Input>(true, _trans("Right"))); - controls.emplace_back(std::make_unique<Input>(_trans("Modifier"))); + controls.emplace_back(std::make_unique<Input>(true, _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)); diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h index 8b7925f7df..4f734e2824 100644 --- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h +++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.h @@ -9,6 +9,7 @@ #include <string> #include <vector> +#include "Common/Common.h" #include "Common/IniFile.h" #include "InputCommon/ControllerInterface/Device.h" @@ -16,7 +17,8 @@ class ControllerInterface; #define sign(x) ((x) ? (x) < 0 ? -1 : 1 : 0) -const char* const named_directions[] = {"Up", "Down", "Left", "Right"}; +const char* const named_directions[] = {_trans("Up"), _trans("Down"), _trans("Left"), + _trans("Right")}; namespace ControllerEmu { |