From 7c316be1b4c045cd27a4c29d67d050abbc112b5c Mon Sep 17 00:00:00 2001
From: Pokechu22 <Pokechu022@gmail.com>
Date: Sat, 27 Jul 2019 16:57:14 -0700
Subject: [PATCH] Add proper emulated balance board option to the interface

---
 .../Config/WiimoteControllersWidget.cpp       | 27 +++++++++----------
 .../Config/WiimoteControllersWidget.h         |  9 +++----
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp b/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp
index 9159402be2..bc893b2bd7 100644
--- a/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp
+++ b/Source/Core/DolphinQt/Config/WiimoteControllersWidget.cpp
@@ -111,7 +111,6 @@ void WiimoteControllersWidget::CreateLayout()
   m_wiimote_pt_labels[1] = new QLabel(tr("Reset all saved Wii Remote pairings"));
   m_wiimote_emu = new QRadioButton(tr("Emulate the Wii's Bluetooth adapter"));
   m_wiimote_continuous_scanning = new QCheckBox(tr("Continuous Scanning"));
-  m_wiimote_real_balance_board = new QCheckBox(tr("Real Balance Board"));
   m_wiimote_speaker_data = new QCheckBox(tr("Enable Speaker Data"));
   m_wiimote_ciface = new QCheckBox(tr("Connect Wii Remotes for Emulated Controllers"));
 
@@ -136,12 +135,22 @@ void WiimoteControllersWidget::CreateLayout()
 
   for (size_t i = 0; i < m_wiimote_groups.size(); i++)
   {
-    auto* wm_label = m_wiimote_labels[i] = new QLabel(tr("Wii Remote %1").arg(i + 1));
+    auto text = (i == WIIMOTE_BALANCE_BOARD ? tr("Balance Board") : tr("Wii Remote %1").arg(i + 1));
+    auto* wm_label = m_wiimote_labels[i] = new QLabel(text);
     auto* wm_box = m_wiimote_boxes[i] = new QComboBox();
     auto* wm_button = m_wiimote_buttons[i] = new NonDefaultQPushButton(tr("Configure"));
 
-    for (const auto& item : {tr("None"), tr("Emulated Wii Remote"), tr("Real Wii Remote")})
-      wm_box->addItem(item);
+    wm_box->addItem(tr("None"));
+    if (i == WIIMOTE_BALANCE_BOARD)
+    {
+      wm_box->addItem(tr("Emulated Balance Board"));
+      wm_box->addItem(tr("Real Balance Board"));
+    }
+    else
+    {
+      wm_box->addItem(tr("Emulated Wii Remote"));
+      wm_box->addItem(tr("Real Wii Remote"));
+    }
 
     int wm_row = m_wiimote_layout->rowCount();
     m_wiimote_layout->addWidget(wm_label, wm_row, 1);
@@ -149,7 +158,6 @@ void WiimoteControllersWidget::CreateLayout()
     m_wiimote_layout->addWidget(wm_button, wm_row, 3);
   }
 
-  m_wiimote_layout->addWidget(m_wiimote_real_balance_board, m_wiimote_layout->rowCount(), 1, 1, -1);
   m_wiimote_layout->addWidget(m_wiimote_speaker_data, m_wiimote_layout->rowCount(), 1, 1, -1);
 
   m_wiimote_layout->addWidget(m_wiimote_ciface, m_wiimote_layout->rowCount(), 0, 1, -1);
@@ -185,8 +193,6 @@ void WiimoteControllersWidget::ConnectWidgets()
     LoadSettings(Core::GetState(Core::System::GetInstance()));
   });
 
-  connect(m_wiimote_real_balance_board, &QCheckBox::toggled, this,
-          &WiimoteControllersWidget::SaveSettings);
   connect(m_wiimote_speaker_data, &QCheckBox::toggled, this,
           &WiimoteControllersWidget::SaveSettings);
   connect(m_wiimote_sync, &QPushButton::clicked, this,
@@ -274,8 +280,6 @@ void WiimoteControllersWidget::LoadSettings(Core::State state)
     SignalBlocking(m_wiimote_boxes[i])
         ->setCurrentIndex(int(Config::Get(Config::GetInfoForWiimoteSource(int(i)))));
   }
-  SignalBlocking(m_wiimote_real_balance_board)
-      ->setChecked(Config::Get(Config::WIIMOTE_BB_SOURCE) == WiimoteSource::Real);
   SignalBlocking(m_wiimote_speaker_data)
       ->setChecked(Config::Get(Config::MAIN_WIIMOTE_ENABLE_SPEAKER));
   SignalBlocking(m_wiimote_ciface)
@@ -319,7 +323,6 @@ void WiimoteControllersWidget::LoadSettings(Core::State state)
                                      static_cast<int>(i) < num_local_wiimotes);
   }
 
-  m_wiimote_real_balance_board->setEnabled(enable_emu_bt && !running_netplay);
   m_wiimote_speaker_data->setEnabled(enable_emu_bt && !running_netplay);
 
   const bool ciface_wiimotes = m_wiimote_ciface->isChecked();
@@ -342,10 +345,6 @@ void WiimoteControllersWidget::SaveSettings()
     Config::SetBaseOrCurrent(Config::MAIN_BLUETOOTH_PASSTHROUGH_ENABLED,
                              m_wiimote_passthrough->isChecked());
 
-    const WiimoteSource bb_source =
-        m_wiimote_real_balance_board->isChecked() ? WiimoteSource::Real : WiimoteSource::None;
-    Config::SetBaseOrCurrent(Config::WIIMOTE_BB_SOURCE, bb_source);
-
     for (size_t i = 0; i < m_wiimote_groups.size(); i++)
     {
       const int index = m_wiimote_boxes[i]->currentIndex();
diff --git a/Source/Core/DolphinQt/Config/WiimoteControllersWidget.h b/Source/Core/DolphinQt/Config/WiimoteControllersWidget.h
index d81e6f0653..7d1033b3cf 100644
--- a/Source/Core/DolphinQt/Config/WiimoteControllersWidget.h
+++ b/Source/Core/DolphinQt/Config/WiimoteControllersWidget.h
@@ -42,10 +42,10 @@ private:
 
   QGroupBox* m_wiimote_box;
   QGridLayout* m_wiimote_layout;
-  std::array<QLabel*, 4> m_wiimote_labels;
-  std::array<QComboBox*, 4> m_wiimote_boxes;
-  std::array<QPushButton*, 4> m_wiimote_buttons;
-  std::array<QHBoxLayout*, 4> m_wiimote_groups;
+  std::array<QLabel*, 5> m_wiimote_labels;
+  std::array<QComboBox*, 5> m_wiimote_boxes;
+  std::array<QPushButton*, 5> m_wiimote_buttons;
+  std::array<QHBoxLayout*, 5> m_wiimote_groups;
   std::array<QLabel*, 2> m_wiimote_pt_labels;
 
   QRadioButton* m_wiimote_emu;
@@ -53,7 +53,6 @@ private:
   QPushButton* m_wiimote_sync;
   QPushButton* m_wiimote_reset;
   QCheckBox* m_wiimote_continuous_scanning;
-  QCheckBox* m_wiimote_real_balance_board;
   QCheckBox* m_wiimote_speaker_data;
   QCheckBox* m_wiimote_ciface;
   QPushButton* m_wiimote_refresh;