Merge pull request #6287 from spycrab/qt_gamecube

 Qt/Settings: Implement "GameCube pane"

Source/Core/DolphinQt2/CMakeLists.txt

@@ -52,6 +52,7 @@ set(SRCS
   Config/LogConfigWidget.cpp
   Config/LogWidget.cpp
   Config/Mapping/GCKeyboardEmu.cpp
+  Config/Mapping/GCMicrophone.cpp
   Config/Mapping/GCPadEmu.cpp
   Config/Mapping/GCPadWiiUConfigDialog.cpp
   Config/Mapping/Hotkey3D.cpp
@@ -96,6 +97,7 @@ set(SRCS
   QtUtils/WindowActivationEventFilter.cpp
   Settings/AdvancedPane.cpp
   Settings/AudioPane.cpp
+  Settings/GameCubePane.cpp
   Settings/GeneralPane.cpp
   Settings/InterfacePane.cpp
   Settings/PathPane.cpp

Source/Core/DolphinQt2/Config/Mapping/GCMicrophone.cpp

@@ -0,0 +1,45 @@
+// Copyright 2018 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include <QFormLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+
+#include "DolphinQt2/Config/Mapping/GCMicrophone.h"
+
+#include "InputCommon/InputConfig.h"
+
+#include "Core/HW/GCPad.h"
+#include "Core/HW/GCPadEmu.h"
+
+GCMicrophone::GCMicrophone(MappingWindow* window) : MappingWidget(window)
+{
+  CreateMainLayout();
+}
+
+void GCMicrophone::CreateMainLayout()
+{
+  m_main_layout = new QHBoxLayout();
+
+  m_main_layout->addWidget(
+      CreateGroupBox(tr("Microphone"), Pad::GetGroup(GetPort(), PadGroup::Mic)));
+
+  setLayout(m_main_layout);
+}
+
+void GCMicrophone::LoadSettings()
+{
+  Pad::LoadConfig();
+}
+
+void GCMicrophone::SaveSettings()
+{
+  Pad::GetConfig()->SaveConfig();
+}
+
+InputConfig* GCMicrophone::GetConfig()
+{
+  return Pad::GetConfig();
+}

Source/Core/DolphinQt2/Config/Mapping/GCMicrophone.h

@@ -0,0 +1,29 @@
+// Copyright 2018 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "DolphinQt2/Config/Mapping/MappingWidget.h"
+
+class QCheckBox;
+class QFormLayout;
+class QGroupBox;
+class QHBoxLayout;
+class QLabel;
+class QVBoxLayout;
+
+class GCMicrophone final : public MappingWidget
+{
+public:
+  explicit GCMicrophone(MappingWindow* window);
+
+  InputConfig* GetConfig() override;
+
+private:
+  void LoadSettings() override;
+  void SaveSettings() override;
+  void CreateMainLayout();
+
+  QHBoxLayout* m_main_layout;
+};

Source/Core/DolphinQt2/Config/Mapping/MappingWindow.cpp

@@ -19,6 +19,7 @@
 #include "Common/StringUtil.h"
 #include "Core/Core.h"
 #include "DolphinQt2/Config/Mapping/GCKeyboardEmu.h"
+#include "DolphinQt2/Config/Mapping/GCMicrophone.h"
 #include "DolphinQt2/Config/Mapping/GCPadEmu.h"
 #include "DolphinQt2/Config/Mapping/Hotkey3D.h"
 #include "DolphinQt2/Config/Mapping/HotkeyGeneral.h"
@@ -254,6 +255,12 @@ void MappingWindow::SetMappingType(MappingWindow::Type type)
     setWindowTitle(tr("GameCube Controller at Port %1").arg(GetPort() + 1));
     AddWidget(tr("GameCube Controller"), widget);
     break;
+  case Type::MAPPING_GC_MICROPHONE:
+    widget = new GCMicrophone(this);
+    setWindowTitle(tr("GameCube Microphone Slot %1")
+                       .arg(GetPort() == 0 ? QStringLiteral("A") : QStringLiteral("B")));
+    AddWidget(tr("Microphone"), widget);
+    break;
   case Type::MAPPING_WIIMOTE_EMU:
   case Type::MAPPING_WIIMOTE_HYBRID:
   {

Source/Core/DolphinQt2/Config/Mapping/MappingWindow.h

@@ -38,6 +38,7 @@ class MappingWindow final : public QDialog
     MAPPING_GC_KEYBOARD,
     MAPPING_GCPAD,
     MAPPING_GC_STEERINGWHEEL,
+    MAPPING_GC_MICROPHONE,
     // Wii
     MAPPING_WIIMOTE_EMU,
     MAPPING_WIIMOTE_HYBRID,

Source/Core/DolphinQt2/Config/SettingsWindow.cpp

@@ -12,6 +12,7 @@
 #include "DolphinQt2/Settings.h"
 #include "DolphinQt2/Settings/AdvancedPane.h"
 #include "DolphinQt2/Settings/AudioPane.h"
+#include "DolphinQt2/Settings/GameCubePane.h"
 #include "DolphinQt2/Settings/GeneralPane.h"
 #include "DolphinQt2/Settings/InterfacePane.h"
 #include "DolphinQt2/Settings/PathPane.h"
@@ -42,6 +43,7 @@ SettingsWindow::SettingsWindow(QWidget* parent) : QDialog(parent)
   m_general_pane_index = AddTab(m_tabs, tr("General"), new GeneralPane(), "config");
   AddTab(m_tabs, tr("Interface"), new InterfacePane(), "browse");
   m_audio_pane_index = AddTab(m_tabs, tr("Audio"), new AudioPane(), "play");
+  AddTab(m_tabs, tr("GameCube"), new GameCubePane(), "gcpad");
   AddTab(m_tabs, tr("Paths"), new PathPane(), "browse");
   AddTab(m_tabs, tr("Advanced"), new AdvancedPane(), "config");
 

Source/Core/DolphinQt2/DolphinQt2.vcxproj

@@ -192,6 +192,7 @@
     <ClCompile Include="Config\Graphics\SoftwareRendererWidget.cpp" />
     <ClCompile Include="Config\InfoWidget.cpp" />
     <ClCompile Include="Config\Mapping\GCKeyboardEmu.cpp" />
+    <ClCompile Include="Config\Mapping\GCMicrophone.cpp" />
     <ClCompile Include="Config\Mapping\GCPadEmu.cpp" />
     <ClCompile Include="Config\Mapping\GCPadWiiUConfigDialog.cpp" />
     <ClCompile Include="Config\Mapping\Hotkey3D.cpp" />
@@ -248,6 +249,7 @@
     <ClCompile Include="Settings.cpp" />
     <ClCompile Include="Settings\AdvancedPane.cpp" />
     <ClCompile Include="Settings\AudioPane.cpp" />
+    <ClCompile Include="Settings\GameCubePane.cpp" />
     <ClCompile Include="Settings\GeneralPane.cpp" />
     <ClCompile Include="Settings\InterfacePane.cpp" />
     <ClCompile Include="Settings\PathPane.cpp" />
@@ -258,6 +260,7 @@
   <!--Put standard C/C++ headers here-->
   <ItemGroup>
     <ClInclude Include="Config\Mapping\GCKeyboardEmu.h" />
+    <ClInclude Include="Config\Mapping\GCMicrophone.h" />
     <ClInclude Include="Config\Mapping\GCPadEmu.h" />
     <ClInclude Include="Config\Mapping\GCPadWiiU.h" />
     <ClInclude Include="Config\Mapping\Hotkey3D.h" />
@@ -279,6 +282,7 @@
     <ClInclude Include="QtUtils\ElidedButton.h" />
     <ClInclude Include="QtUtils\ListTabWidget.h" />
     <ClInclude Include="Resources.h" />
+    <ClInclude Include="Settings\GameCubePane.h" />
     <ClInclude Include="Settings\PathPane.h" />
     <ClInclude Include="Translation.h" />
     <ClInclude Include="WiiUpdate.h" />