diff options
| author | aldelaro5 <aldelaro5@gmail.com> | 2016-11-18 19:54:06 -0500 |
|---|---|---|
| committer | aldelaro5 <aldelaro5@gmail.com> | 2016-11-28 08:26:34 -0500 |
| commit | 32a0dae257c0454e38014b97709580175b8895a5 (patch) | |
| tree | 45c447491d43108b88bfd1ed41c2262781cfc1a1 /Source/Core/DolphinWX/ControllerConfigDiag.cpp | |
| parent | 03e0cae9b7151cf60c26b6ef0385398fa81ab733 (diff) | |
Completely redo All configuration dialog
Hotkeys
Make a new class that inherits from InputConfigDialog with a specialised constructor. The changes are mainly the top portion and it now uses tabs to categorise the hotkeys.
Redo the GCPad configuration dialog
The layout is similar, but it now allows flexibility to change it more easily.
Redo the GC Keyboard configuration dialog
Same layout.
Redo completely the Wiimote configuration dialog
Separated the controls into 2 tabs to make them less imposing overall.
Redo the Nunchuk configuration dialog
Similar layout, except for 2 control group sizers.
Redo the Classic controller configuration dialog
Same layout.
Redo the Guitar input configuration dialog
Stacked 2 sets of group together.
Redo the Turntable configuration dialog
More stacked groups and the window is much less wide.
Diffstat (limited to 'Source/Core/DolphinWX/ControllerConfigDiag.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/ControllerConfigDiag.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index 06b6dccd74..427e078449 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -33,7 +33,10 @@ #include "DolphinWX/Config/GCAdapterConfigDiag.h" #include "DolphinWX/ControllerConfigDiag.h" #include "DolphinWX/DolphinSlider.h" +#include "DolphinWX/Input/GCKeyboardInputConfigDiag.h" +#include "DolphinWX/Input/GCPadInputConfigDiag.h" #include "DolphinWX/Input/InputConfigDiag.h" +#include "DolphinWX/Input/WiimoteInputConfigDiag.h" #include "DolphinWX/WxUtils.h" #include "InputCommon/GCAdapter.h" @@ -447,7 +450,7 @@ void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event) if (SConfig::GetInstance().m_SIDevice[port_num] == SIDEVICE_GC_KEYBOARD) { - InputConfigDialog config_diag( + GCKeyboardInputConfigDialog config_diag( this, *key_plugin, wxString::Format("GameCube Keyboard Configuration Port %i", port_num + 1), port_num); config_diag.ShowModal(); @@ -462,7 +465,7 @@ void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event) } else { - InputConfigDialog config_diag( + GCPadInputConfigDialog config_diag( this, *pad_plugin, wxString::Format("GameCube Controller Configuration Port %i", port_num + 1), port_num); config_diag.ShowModal(); @@ -498,9 +501,9 @@ void ControllerConfigDiag::OnWiimoteConfigButton(wxCommandEvent& ev) HotkeyManagerEmu::Enable(false); - int port_num = m_wiimote_index_from_config_id[ev.GetId()]; + const int port_num = m_wiimote_index_from_config_id[ev.GetId()]; - InputConfigDialog m_ConfigFrame( + WiimoteInputConfigDialog m_ConfigFrame( this, *wiimote_plugin, wxString::Format("Dolphin Emulated Wii Remote Configuration Port %i", port_num + 1), port_num); |