diff options
| author | iwubcode <iwubcode@users.noreply.github.com> | 2021-01-23 12:44:21 -0600 |
|---|---|---|
| committer | iwubcode <iwubcode@users.noreply.github.com> | 2021-01-27 12:02:39 -0600 |
| commit | 780360b92193ea5a7a0b7ad261d88e5b153d40fd (patch) | |
| tree | 3d17b3b3d7cb9080ecdd50d88ee0add24bece725 /Source/Core/DolphinQt/Config/ControllersWindow.cpp | |
| parent | 920dd812ad822b34a360a4bca33c72118a6fc5aa (diff) | |
DolphinQt: Move gamecube controller ui logic to its own widget
Diffstat (limited to 'Source/Core/DolphinQt/Config/ControllersWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/ControllersWindow.cpp | 189 |
1 files changed, 3 insertions, 186 deletions
diff --git a/Source/Core/DolphinQt/Config/ControllersWindow.cpp b/Source/Core/DolphinQt/Config/ControllersWindow.cpp index f368ac9a72..1a4edce284 100644 --- a/Source/Core/DolphinQt/Config/ControllersWindow.cpp +++ b/Source/Core/DolphinQt/Config/ControllersWindow.cpp @@ -4,107 +4,32 @@ #include "DolphinQt/Config/ControllersWindow.h" -#include <QApplication> -#include <QBoxLayout> -#include <QCheckBox> -#include <QComboBox> -#include <QDialog> #include <QDialogButtonBox> -#include <QGridLayout> -#include <QGroupBox> -#include <QLabel> -#include <QLineEdit> -#include <QPushButton> -#include <QRadioButton> -#include <QScreen> #include <QVBoxLayout> -#include <map> -#include <optional> - -#include "Core/ConfigManager.h" -#include "Core/Core.h" -#include "Core/HW/SI/SI.h" -#include "Core/HW/SI/SI_Device.h" -#include "Core/IOS/IOS.h" - #include "DolphinQt/Config/CommonControllersWidget.h" -#include "DolphinQt/Config/Mapping/GCPadWiiUConfigDialog.h" -#include "DolphinQt/Config/Mapping/MappingWindow.h" +#include "DolphinQt/Config/GamecubeControllersWidget.h" #include "DolphinQt/Config/WiimoteControllersWidget.h" #include "DolphinQt/QtUtils/WrapInScrollArea.h" -#include "DolphinQt/Settings.h" - -#include "InputCommon/GCAdapter.h" - -#include "UICommon/UICommon.h" - -static const std::map<SerialInterface::SIDevices, int> s_gc_types = { - {SerialInterface::SIDEVICE_NONE, 0}, {SerialInterface::SIDEVICE_GC_CONTROLLER, 1}, - {SerialInterface::SIDEVICE_WIIU_ADAPTER, 2}, {SerialInterface::SIDEVICE_GC_STEERING, 3}, - {SerialInterface::SIDEVICE_DANCEMAT, 4}, {SerialInterface::SIDEVICE_GC_TARUKONGA, 5}, - {SerialInterface::SIDEVICE_GC_GBA, 6}, {SerialInterface::SIDEVICE_GC_KEYBOARD, 7}}; - -static std::optional<int> ToGCMenuIndex(const SerialInterface::SIDevices sidevice) -{ - auto it = s_gc_types.find(sidevice); - return it != s_gc_types.end() ? it->second : std::optional<int>(); -} - -static std::optional<SerialInterface::SIDevices> FromGCMenuIndex(const int menudevice) -{ - auto it = std::find_if(s_gc_types.begin(), s_gc_types.end(), - [=](auto pair) { return pair.second == menudevice; }); - return it != s_gc_types.end() ? it->first : std::optional<SerialInterface::SIDevices>(); -} ControllersWindow::ControllersWindow(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("Controller Settings")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - CreateGamecubeLayout(); + m_gamecube_controllers = new GamecubeControllersWidget(this); m_wiimote_controllers = new WiimoteControllersWidget(this); m_common = new CommonControllersWidget(this); CreateMainLayout(); - LoadSettings(); ConnectWidgets(); } -void ControllersWindow::CreateGamecubeLayout() -{ - m_gc_box = new QGroupBox(tr("GameCube Controllers")); - m_gc_layout = new QGridLayout(); - m_gc_layout->setVerticalSpacing(7); - m_gc_layout->setColumnStretch(1, 1); - - for (size_t i = 0; i < m_gc_groups.size(); i++) - { - auto* gc_label = new QLabel(tr("Port %1").arg(i + 1)); - auto* gc_box = m_gc_controller_boxes[i] = new QComboBox(); - auto* gc_button = m_gc_buttons[i] = new QPushButton(tr("Configure")); - - for (const auto& item : - {tr("None"), tr("Standard Controller"), tr("GameCube Adapter for Wii U"), - tr("Steering Wheel"), tr("Dance Mat"), tr("DK Bongos"), tr("GBA"), tr("Keyboard")}) - { - gc_box->addItem(item); - } - - int controller_row = m_gc_layout->rowCount(); - m_gc_layout->addWidget(gc_label, controller_row, 0); - m_gc_layout->addWidget(gc_box, controller_row, 1); - m_gc_layout->addWidget(gc_button, controller_row, 2); - } - m_gc_box->setLayout(m_gc_layout); -} - void ControllersWindow::CreateMainLayout() { auto* layout = new QVBoxLayout(); m_button_box = new QDialogButtonBox(QDialogButtonBox::Close); - layout->addWidget(m_gc_box); + layout->addWidget(m_gamecube_controllers); layout->addWidget(m_wiimote_controllers); layout->addWidget(m_common); layout->addStretch(); @@ -116,112 +41,4 @@ void ControllersWindow::CreateMainLayout() void ControllersWindow::ConnectWidgets() { connect(m_button_box, &QDialogButtonBox::rejected, this, &QDialog::reject); - - for (size_t i = 0; i < m_gc_groups.size(); i++) - { - connect(m_gc_controller_boxes[i], qOverload<int>(&QComboBox::currentIndexChanged), this, - &ControllersWindow::SaveSettings); - connect(m_gc_controller_boxes[i], qOverload<int>(&QComboBox::currentIndexChanged), this, - &ControllersWindow::OnGCTypeChanged); - connect(m_gc_buttons[i], &QPushButton::clicked, this, &ControllersWindow::OnGCPadConfigure); - } -} - -void ControllersWindow::OnGCTypeChanged(int type) -{ - const auto* box = static_cast<QComboBox*>(QObject::sender()); - - for (size_t i = 0; i < m_gc_groups.size(); i++) - { - if (m_gc_controller_boxes[i] == box) - { - const int index = box->currentIndex(); - m_gc_buttons[i]->setEnabled(index != 0 && index != 6); - return; - } - } - - SaveSettings(); -} - -void ControllersWindow::OnGCPadConfigure() -{ - size_t index; - for (index = 0; index < m_gc_groups.size(); index++) - { - if (m_gc_buttons[index] == QObject::sender()) - break; - } - - MappingWindow::Type type; - - switch (m_gc_controller_boxes[index]->currentIndex()) - { - case 0: // None - case 6: // GBA - return; - case 1: // Standard Controller - type = MappingWindow::Type::MAPPING_GCPAD; - break; - case 2: // GameCube Adapter for Wii U - GCPadWiiUConfigDialog(static_cast<int>(index), this).exec(); - return; - case 3: // Steering Wheel - type = MappingWindow::Type::MAPPING_GC_STEERINGWHEEL; - break; - case 4: // Dance Mat - type = MappingWindow::Type::MAPPING_GC_DANCEMAT; - break; - case 5: // DK Bongos - type = MappingWindow::Type::MAPPING_GC_BONGOS; - break; - case 7: // Keyboard - type = MappingWindow::Type::MAPPING_GC_KEYBOARD; - break; - default: - return; - } - - MappingWindow* window = new MappingWindow(this, type, static_cast<int>(index)); - window->setAttribute(Qt::WA_DeleteOnClose, true); - window->setWindowModality(Qt::WindowModality::WindowModal); - window->show(); -} - -void ControllersWindow::LoadSettings() -{ - for (size_t i = 0; i < m_gc_groups.size(); i++) - { - const std::optional<int> gc_index = ToGCMenuIndex(SConfig::GetInstance().m_SIDevice[i]); - if (gc_index) - { - m_gc_controller_boxes[i]->setCurrentIndex(*gc_index); - m_gc_buttons[i]->setEnabled(*gc_index != 0 && *gc_index != 6); - } - } -} - -void ControllersWindow::SaveSettings() -{ - for (size_t i = 0; i < m_gc_groups.size(); i++) - { - const int index = m_gc_controller_boxes[i]->currentIndex(); - const std::optional<SerialInterface::SIDevices> si_device = FromGCMenuIndex(index); - if (si_device) - { - SConfig::GetInstance().m_SIDevice[i] = *si_device; - - if (Core::IsRunning()) - SerialInterface::ChangeDevice(*si_device, static_cast<s32>(i)); - } - - m_gc_buttons[i]->setEnabled(index != 0 && index != 6); - } - - if (GCAdapter::UseAdapter()) - GCAdapter::StartScanThread(); - else - GCAdapter::StopScanThread(); - - SConfig::GetInstance().SaveSettings(); } |
