Redo the Classic controller configuration dialog

Same layout.
dolphin-emu · Nov 20, 2016 · 415ec20 · 415ec20
1 parent 7178dd4
commit 415ec20
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 0 deletions.
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
@@ -55,6 +55,7 @@ set(GUI_SRCS
 	GCKeyboardInputConfigDiag
 	WiimoteInputConfigDiag
 	NunchukInputConfigDiag
+	ClassicInputConfigDiag
 	LogConfigWindow.cpp
 	LogWindow.cpp
 	Main.cpp

diff --git a/Source/Core/DolphinWX/ClassicInputConfigDiag.cpp b/Source/Core/DolphinWX/ClassicInputConfigDiag.cpp
@@ -0,0 +1,54 @@
+// Copyright 2016 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <wx/notebook.h>
+#include <wx/panel.h>
+
+#include "DolphinWX/ClassicInputConfigDiag.h"
+
+#include "Core/HW/Wiimote.h"
+#include "Core/HW/WiimoteEmu/Attachment/Classic.h"
+#include "Core/HW/WiimoteEmu/WiimoteEmu.h"
+
+ClassicInputConfigDialog::ClassicInputConfigDialog(wxWindow* const parent, InputConfig& config,
+                                                   const wxString& name, const int port_num)
+    : InputConfigDialog(parent, config, name, port_num)
+{
+  const int space5 = FromDIP(5);
+
+  ControlGroupBox* group_box_buttons =
+      new ControlGroupBox(Wiimote::GetClassicGroup(port_num, CLASSICGP_BUTTONS), this, this);
+  ControlGroupBox* group_box_dpad =
+      new ControlGroupBox(Wiimote::GetClassicGroup(port_num, CLASSICGP_DPAD), this, this);
+  ControlGroupBox* group_left_stick =
+      new ControlGroupBox(Wiimote::GetClassicGroup(port_num, CLASSICGP_LEFT_STICK), this, this);
+  ControlGroupBox* group_right_stick =
+      new ControlGroupBox(Wiimote::GetClassicGroup(port_num, CLASSICGP_RIGHT_STICK), this, this);
+  ControlGroupBox* group_box_triggers =
+      new ControlGroupBox(Wiimote::GetClassicGroup(port_num, CLASSICGP_TRIGGERS), this, this);
+
+  wxBoxSizer* controls_sizer = new wxBoxSizer(wxHORIZONTAL);
+  controls_sizer->AddSpacer(space5);
+  controls_sizer->Add(group_box_buttons, 0, wxEXPAND);
+  controls_sizer->AddSpacer(space5);
+  controls_sizer->Add(group_box_dpad, 0, wxEXPAND);
+  controls_sizer->AddSpacer(space5);
+  controls_sizer->Add(group_left_stick, 0, wxEXPAND);
+  controls_sizer->AddSpacer(space5);
+  controls_sizer->Add(group_right_stick, 0, wxEXPAND);
+  controls_sizer->AddSpacer(space5);
+  controls_sizer->Add(group_box_triggers, 0, wxEXPAND);
+  controls_sizer->AddSpacer(space5);
+
+  wxBoxSizer* szr_main = new wxBoxSizer(wxVERTICAL);
+  szr_main->AddSpacer(space5);
+  szr_main->Add(controls_sizer, 1, wxEXPAND | wxLEFT | wxRIGHT, space5);
+  szr_main->AddSpacer(space5);
+  szr_main->Add(CreateButtonSizer(wxCLOSE | wxNO_DEFAULT), 0, wxEXPAND | wxLEFT | wxRIGHT, space5);
+  szr_main->AddSpacer(space5);
+
+  SetSizerAndFit(szr_main);
+  Center();
+  UpdateGUI();
+}
diff --git a/Source/Core/DolphinWX/ClassicInputConfigDiag.h b/Source/Core/DolphinWX/ClassicInputConfigDiag.h
@@ -0,0 +1,14 @@
+// Copyright 2016 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "DolphinWX/InputConfigDiag.h"
+
+class ClassicInputConfigDialog : public InputConfigDialog
+{
+public:
+  ClassicInputConfigDialog(wxWindow* const parent, InputConfig& config, const wxString& name,
+                           const int port_num = 0);
+};
diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj
@@ -107,6 +107,7 @@
     <ClCompile Include="GCKeyboardInputConfigDiag.cpp" />
     <ClCompile Include="WiimoteInputConfigDiag.cpp" />
     <ClCompile Include="NunchukInputConfigDiag.cpp" />
+    <ClCompile Include="ClassicInputConfigDiag.cpp" />
     <ClCompile Include="ISOFile.cpp" />
     <ClCompile Include="ISOProperties.cpp" />
     <ClCompile Include="LogConfigWindow.cpp" />
@@ -181,6 +182,7 @@
     <ClInclude Include="GCKeyboardInputConfigDiag.h" />
     <ClInclude Include="WiimoteInputConfigDiag.h" />
     <ClInclude Include="NunchukInputConfigDiag.h" />
+    <ClInclude Include="ClassicInputConfigDiag.h" />
     <ClInclude Include="ISOFile.h" />
     <ClInclude Include="ISOProperties.h" />
     <ClInclude Include="LogConfigWindow.h" />

diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj.filters b/Source/Core/DolphinWX/DolphinWX.vcxproj.filters
@@ -125,6 +125,9 @@
     <ClCompile Include="NunchukInputConfigDiag.cpp">
       <Filter>GUI\InputConfig</Filter>
     </ClCompile>
+    <ClCompile Include="ClassicInputConfigDiag.cpp">
+      <Filter>GUI\InputConfig</Filter>
+    </ClCompile>
     <ClCompile Include="Debugger\DebuggerPanel.cpp">
       <Filter>GUI\Video</Filter>
     </ClCompile>
@@ -323,6 +326,9 @@
     <ClInclude Include="NunchukInputConfigDiag.h">
       <Filter>GUI\InputConfig</Filter>
     </ClInclude>
+    <ClInclude Include="ClassicInputConfigDiag.h">
+      <Filter>GUI\InputConfig</Filter>
+    </ClInclude>
     <ClInclude Include="Debugger\DebuggerPanel.h">
       <Filter>GUI\Video</Filter>
     </ClInclude>

diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp
@@ -43,6 +43,7 @@
 #include "Core/HW/GCPad.h"
 #include "Core/HW/Wiimote.h"
 #include "Core/HotkeyManager.h"
+#include "DolphinWX/ClassicInputConfigDiag.h"
 #include "DolphinWX/DolphinSlider.h"
 #include "DolphinWX/InputConfigDiag.h"
 #include "DolphinWX/NunchukInputConfigDiag.h"
@@ -69,6 +70,8 @@ void InputConfigDialog::ConfigExtension(wxCommandEvent& event)
   }
   else if (extension_type == EXT_ClASSIC)
   {
+    ClassicInputConfigDialog dlg(this, m_config, "Classic Controller Configuration", m_port_num);
+    dlg.ShowModal();
   }
   else if (extension_type == EXT_GUITAR)
   {