ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4930 from JosJuice/sideways-wiimote-name 

Change INI keys containing "Wii Remote" back to "Wiimote"
This commit is contained in:
Anthony 2017-02-23 13:13:43 -08:00 committed by GitHub
parent fb8369d0e0 f5c82adc59
commit e9850382e3
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
View File

@ -297,11 +297,11 @@ Wiimote::Wiimote(const unsigned int index)
std::make_unique<ControllerEmu::ControlGroup::BackgroundInputSetting>( std::make_unique<ControllerEmu::ControlGroup::BackgroundInputSetting>(
_trans("Background Input"))); _trans("Background Input")));
m_options->boolean_settings.emplace_back( m_options->boolean_settings.emplace_back(
std::make_unique<ControllerEmu::ControlGroup::BooleanSetting>(_trans("Sideways Wii Remote"), std::make_unique<ControllerEmu::ControlGroup::BooleanSetting>(
false)); "Sideways Wiimote", _trans("Sideways Wii Remote"), false));
m_options->boolean_settings.emplace_back( m_options->boolean_settings.emplace_back(
std::make_unique<ControllerEmu::ControlGroup::BooleanSetting>(_trans("Upright Wii Remote"), std::make_unique<ControllerEmu::ControlGroup::BooleanSetting>(
false)); "Upright Wiimote", _trans("Upright Wii Remote"), false));
m_options->boolean_settings.emplace_back( m_options->boolean_settings.emplace_back(
std::make_unique<ControllerEmu::ControlGroup::BooleanSetting>( std::make_unique<ControllerEmu::ControlGroup::BooleanSetting>(
_trans("Iterative Input"), false, ControllerEmu::ControlGroup::SettingType::VIRTUAL)); _trans("Iterative Input"), false, ControllerEmu::ControlGroup::SettingType::VIRTUAL));

3
Source/Core/DolphinWX/Input/InputConfigDiag.cpp
View File

@ -144,7 +144,8 @@ void PadSettingExtension::UpdateValue()
PadSettingCheckBox::PadSettingCheckBox(wxWindow* const parent, PadSettingCheckBox::PadSettingCheckBox(wxWindow* const parent,
ControllerEmu::ControlGroup::BooleanSetting* const _setting) ControllerEmu::ControlGroup::BooleanSetting* const _setting)
: PadSetting(new wxCheckBox(parent, wxID_ANY, wxGetTranslation(StrToWxStr(_setting->m_name)))), : PadSetting(
new wxCheckBox(parent, wxID_ANY, wxGetTranslation(StrToWxStr(_setting->m_ui_name)))),
setting(_setting) setting(_setting)
{ {
UpdateGUI(); UpdateGUI();

9
Source/Core/InputCommon/ControllerEmu/ControlGroup/ControlGroup.h
View File

@ -64,9 +64,15 @@ public:
class BooleanSetting class BooleanSetting
{ {
public: public:
BooleanSetting(const std::string& setting_name, const std::string& ui_name,
const bool default_value, const SettingType setting_type = SettingType::NORMAL)
: m_type(setting_type), m_name(setting_name), m_ui_name(ui_name),
m_default_value(default_value)
{
}
BooleanSetting(const std::string& setting_name, const bool default_value, BooleanSetting(const std::string& setting_name, const bool default_value,
const SettingType setting_type = SettingType::NORMAL) const SettingType setting_type = SettingType::NORMAL)
: m_type(setting_type), m_name(setting_name), m_default_value(default_value) : BooleanSetting(setting_name, setting_name, default_value, setting_type)
{ {
} }
virtual ~BooleanSetting(); virtual ~BooleanSetting();
@ -75,6 +81,7 @@ public:
virtual void SetValue(bool value) { m_value = value; } virtual void SetValue(bool value) { m_value = value; }
const SettingType m_type; const SettingType m_type;
const std::string m_name; const std::string m_name;
const std::string m_ui_name;
const bool m_default_value; const bool m_default_value;
bool m_value; bool m_value;
}; };