From 7e99d03b7f2d8553ab43f3d960e9e2677255c215 Mon Sep 17 00:00:00 2001 From: aldelaro5 Date: Thu, 10 Nov 2016 22:07:40 -0500 Subject: Add the ability to get partial input group For hotkeys, changed HotkeyManager to allow to get and make partial groups of hotkeys. Also preserved the old configuration naming scheme for the ini, this is done to preserve compatibility with the older groups structure. Add the ability to get GCPad control groups Used like the HotkeyManager methods, this is used for the new GCPad configuration dialog. Add the ability to get groups of Keyboard input Same reasons as the previous ones. Add ability to get groups of Wiimote input Add the ability to get extensions group This needed to pass to 3 classes. Will be used for their respective dialogs. --- Source/Core/InputCommon/ControllerEmu.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Source/Core/InputCommon/ControllerEmu.cpp') diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp index 84f511f822..43ce66412b 100644 --- a/Source/Core/InputCommon/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu.cpp @@ -187,7 +187,14 @@ ControllerEmu::AnalogStick::AnalogStick(const char* const _name, const char* con numeric_settings.emplace_back(std::make_unique(_trans("Dead Zone"), 0, 0, 50)); } -ControllerEmu::Buttons::Buttons(const std::string& _name) : ControlGroup(_name, GROUP_TYPE_BUTTONS) +ControllerEmu::Buttons::Buttons(const std::string& _name) + : ControlGroup(_name, _name, GROUP_TYPE_BUTTONS) +{ + numeric_settings.emplace_back(std::make_unique(_trans("Threshold"), 0.5)); +} + +ControllerEmu::Buttons::Buttons(const std::string& _name, const std::string& _ui_name) + : ControlGroup(_name, _ui_name, GROUP_TYPE_BUTTONS) { numeric_settings.emplace_back(std::make_unique(_trans("Threshold"), 0.5)); } -- cgit v1.2.3 From 00f680b8307a301bceb920aeb57e19b6ab02a0ca Mon Sep 17 00:00:00 2001 From: aldelaro5 Date: Fri, 18 Nov 2016 02:03:06 -0500 Subject: Add flexibility to InputConfigDialog Removed the unecessary forced tabbed layout, removed the layout part of the constructor and remade some method in preparation for tabbed styled input dialog such as the new hotkey configuration one. It breaks every inputconfigDialog, but this will get fixed in the next commits. Also moved to a folder since there will be many more files created in the next commits so it gives better separation. --- Source/Core/InputCommon/ControllerEmu.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/InputCommon/ControllerEmu.cpp') diff --git a/Source/Core/InputCommon/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu.cpp index 43ce66412b..4a7600dca7 100644 --- a/Source/Core/InputCommon/ControllerEmu.cpp +++ b/Source/Core/InputCommon/ControllerEmu.cpp @@ -193,8 +193,8 @@ ControllerEmu::Buttons::Buttons(const std::string& _name) numeric_settings.emplace_back(std::make_unique(_trans("Threshold"), 0.5)); } -ControllerEmu::Buttons::Buttons(const std::string& _name, const std::string& _ui_name) - : ControlGroup(_name, _ui_name, GROUP_TYPE_BUTTONS) +ControllerEmu::Buttons::Buttons(const std::string& ini_name, const std::string& group_name) + : ControlGroup(ini_name, group_name, GROUP_TYPE_BUTTONS) { numeric_settings.emplace_back(std::make_unique(_trans("Threshold"), 0.5)); } -- cgit v1.2.3