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/DolphinWX/ControllerConfigDiag.cpp | 27 ++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) (limited to 'Source/Core/DolphinWX/ControllerConfigDiag.cpp') diff --git a/Source/Core/DolphinWX/ControllerConfigDiag.cpp b/Source/Core/DolphinWX/ControllerConfigDiag.cpp index 62655252e7..06b6dccd74 100644 --- a/Source/Core/DolphinWX/ControllerConfigDiag.cpp +++ b/Source/Core/DolphinWX/ControllerConfigDiag.cpp @@ -33,7 +33,7 @@ #include "DolphinWX/Config/GCAdapterConfigDiag.h" #include "DolphinWX/ControllerConfigDiag.h" #include "DolphinWX/DolphinSlider.h" -#include "DolphinWX/InputConfigDiag.h" +#include "DolphinWX/Input/InputConfigDiag.h" #include "DolphinWX/WxUtils.h" #include "InputCommon/GCAdapter.h" @@ -447,20 +447,24 @@ void ControllerConfigDiag::OnGameCubeConfigButton(wxCommandEvent& event) if (SConfig::GetInstance().m_SIDevice[port_num] == SIDEVICE_GC_KEYBOARD) { - InputConfigDialog config_diag(this, *key_plugin, _("GameCube Keyboard Configuration"), - port_num); + InputConfigDialog config_diag( + this, *key_plugin, + wxString::Format("GameCube Keyboard Configuration Port %i", port_num + 1), port_num); config_diag.ShowModal(); } else if (SConfig::GetInstance().m_SIDevice[port_num] == SIDEVICE_WIIU_ADAPTER) { - GCAdapterConfigDiag config_diag(this, _("Wii U GameCube Controller Adapter Configuration"), - port_num); + GCAdapterConfigDiag config_diag( + this, + wxString::Format("Wii U GameCube Controller Adapter Configuration Port %i", port_num + 1), + port_num); config_diag.ShowModal(); } else { - InputConfigDialog config_diag(this, *pad_plugin, _("GameCube Controller Configuration"), - port_num); + InputConfigDialog config_diag( + this, *pad_plugin, + wxString::Format("GameCube Controller Configuration Port %i", port_num + 1), port_num); config_diag.ShowModal(); } @@ -494,9 +498,12 @@ void ControllerConfigDiag::OnWiimoteConfigButton(wxCommandEvent& ev) HotkeyManagerEmu::Enable(false); - InputConfigDialog m_ConfigFrame(this, *wiimote_plugin, - _("Dolphin Emulated Wii Remote Configuration"), - m_wiimote_index_from_config_id[ev.GetId()]); + int port_num = m_wiimote_index_from_config_id[ev.GetId()]; + + InputConfigDialog m_ConfigFrame( + this, *wiimote_plugin, + wxString::Format("Dolphin Emulated Wii Remote Configuration Port %i", port_num + 1), + port_num); m_ConfigFrame.ShowModal(); HotkeyManagerEmu::Enable(true); -- cgit v1.2.3 From 32a0dae257c0454e38014b97709580175b8895a5 Mon Sep 17 00:00:00 2001 From: aldelaro5 Date: Fri, 18 Nov 2016 19:54:06 -0500 Subject: 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. --- Source/Core/DolphinWX/ControllerConfigDiag.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Source/Core/DolphinWX/ControllerConfigDiag.cpp') 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); -- cgit v1.2.3