Rename GCPadWiiU -> GCPadWiiUConfigDialog
This name better reflects its new standalone functionality.
This commit is contained in:
parent
a8b5eab4c4
commit
cb47857e8a
|
@ -50,7 +50,7 @@ set(SRCS
|
||||||
Config/LogWidget.cpp
|
Config/LogWidget.cpp
|
||||||
Config/Mapping/GCKeyboardEmu.cpp
|
Config/Mapping/GCKeyboardEmu.cpp
|
||||||
Config/Mapping/GCPadEmu.cpp
|
Config/Mapping/GCPadEmu.cpp
|
||||||
Config/Mapping/GCPadWiiU.cpp
|
Config/Mapping/GCPadWiiUConfigDialog.cpp
|
||||||
Config/Mapping/Hotkey3D.cpp
|
Config/Mapping/Hotkey3D.cpp
|
||||||
Config/Mapping/HotkeyGeneral.cpp
|
Config/Mapping/HotkeyGeneral.cpp
|
||||||
Config/Mapping/HotkeyGraphics.cpp
|
Config/Mapping/HotkeyGraphics.cpp
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#include "Core/IOS/IOS.h"
|
#include "Core/IOS/IOS.h"
|
||||||
#include "Core/IOS/USB/Bluetooth/BTReal.h"
|
#include "Core/IOS/USB/Bluetooth/BTReal.h"
|
||||||
#include "Core/NetPlayProto.h"
|
#include "Core/NetPlayProto.h"
|
||||||
#include "DolphinQt2/Config/Mapping/GCPadWiiU.h"
|
#include "DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.h"
|
||||||
#include "DolphinQt2/Config/Mapping/MappingWindow.h"
|
#include "DolphinQt2/Config/Mapping/MappingWindow.h"
|
||||||
#include "DolphinQt2/Settings.h"
|
#include "DolphinQt2/Settings.h"
|
||||||
#include "UICommon/UICommon.h"
|
#include "UICommon/UICommon.h"
|
||||||
|
@ -418,7 +418,7 @@ void ControllersWindow::OnGCPadConfigure()
|
||||||
type = MappingWindow::Type::MAPPING_GCPAD;
|
type = MappingWindow::Type::MAPPING_GCPAD;
|
||||||
break;
|
break;
|
||||||
case 2: // GameCube Adapter for Wii U
|
case 2: // GameCube Adapter for Wii U
|
||||||
GCPadWiiU(index, this).exec();
|
GCPadWiiUConfigDialog(static_cast<int>(index), this).exec();
|
||||||
return;
|
return;
|
||||||
case 3: // Steering Wheel
|
case 3: // Steering Wheel
|
||||||
type = MappingWindow::Type::MAPPING_GC_STEERINGWHEEL;
|
type = MappingWindow::Type::MAPPING_GC_STEERINGWHEEL;
|
||||||
|
|
|
@ -7,12 +7,13 @@
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
#include "DolphinQt2/Config/Mapping/GCPadWiiU.h"
|
#include "DolphinQt2/Config/Mapping/GCPadWiiUConfigDialog.h"
|
||||||
|
|
||||||
#include "Core/ConfigManager.h"
|
#include "Core/ConfigManager.h"
|
||||||
#include "InputCommon/GCAdapter.h"
|
#include "InputCommon/GCAdapter.h"
|
||||||
|
|
||||||
GCPadWiiU::GCPadWiiU(int port, QWidget* parent) : QDialog(parent), m_port{port}
|
GCPadWiiUConfigDialog::GCPadWiiUConfigDialog(int port, QWidget* parent)
|
||||||
|
: QDialog(parent), m_port{port}
|
||||||
{
|
{
|
||||||
CreateLayout();
|
CreateLayout();
|
||||||
ConnectWidgets();
|
ConnectWidgets();
|
||||||
|
@ -20,7 +21,7 @@ GCPadWiiU::GCPadWiiU(int port, QWidget* parent) : QDialog(parent), m_port{port}
|
||||||
LoadSettings();
|
LoadSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
void GCPadWiiU::CreateLayout()
|
void GCPadWiiUConfigDialog::CreateLayout()
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("GameCube Adapter for Wii U at Port %1").arg(m_port + 1));
|
setWindowTitle(tr("GameCube Adapter for Wii U at Port %1").arg(m_port + 1));
|
||||||
|
|
||||||
|
@ -45,20 +46,20 @@ void GCPadWiiU::CreateLayout()
|
||||||
setLayout(m_layout);
|
setLayout(m_layout);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GCPadWiiU::ConnectWidgets()
|
void GCPadWiiUConfigDialog::ConnectWidgets()
|
||||||
{
|
{
|
||||||
connect(m_rumble, &QCheckBox::toggled, this, &GCPadWiiU::SaveSettings);
|
connect(m_rumble, &QCheckBox::toggled, this, &GCPadWiiUConfigDialog::SaveSettings);
|
||||||
connect(m_simulate_bongos, &QCheckBox::toggled, this, &GCPadWiiU::SaveSettings);
|
connect(m_simulate_bongos, &QCheckBox::toggled, this, &GCPadWiiUConfigDialog::SaveSettings);
|
||||||
connect(m_button_box, &QDialogButtonBox::accepted, this, &GCPadWiiU::accept);
|
connect(m_button_box, &QDialogButtonBox::accepted, this, &GCPadWiiUConfigDialog::accept);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GCPadWiiU::LoadSettings()
|
void GCPadWiiUConfigDialog::LoadSettings()
|
||||||
{
|
{
|
||||||
m_rumble->setChecked(SConfig::GetInstance().m_AdapterRumble[m_port]);
|
m_rumble->setChecked(SConfig::GetInstance().m_AdapterRumble[m_port]);
|
||||||
m_simulate_bongos->setChecked(SConfig::GetInstance().m_AdapterKonga[m_port]);
|
m_simulate_bongos->setChecked(SConfig::GetInstance().m_AdapterKonga[m_port]);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GCPadWiiU::SaveSettings()
|
void GCPadWiiUConfigDialog::SaveSettings()
|
||||||
{
|
{
|
||||||
SConfig::GetInstance().m_AdapterRumble[m_port] = m_rumble->isChecked();
|
SConfig::GetInstance().m_AdapterRumble[m_port] = m_rumble->isChecked();
|
||||||
SConfig::GetInstance().m_AdapterKonga[m_port] = m_simulate_bongos->isChecked();
|
SConfig::GetInstance().m_AdapterKonga[m_port] = m_simulate_bongos->isChecked();
|
|
@ -11,10 +11,10 @@ class QLabel;
|
||||||
class QDialogButtonBox;
|
class QDialogButtonBox;
|
||||||
class QVBoxLayout;
|
class QVBoxLayout;
|
||||||
|
|
||||||
class GCPadWiiU final : public QDialog
|
class GCPadWiiUConfigDialog final : public QDialog
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit GCPadWiiU(int port, QWidget* parent = nullptr);
|
explicit GCPadWiiUConfigDialog(int port, QWidget* parent = nullptr);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void LoadSettings();
|
void LoadSettings();
|
|
@ -177,7 +177,7 @@
|
||||||
<ClCompile Include="Config\InfoWidget.cpp" />
|
<ClCompile Include="Config\InfoWidget.cpp" />
|
||||||
<ClCompile Include="Config\Mapping\GCKeyboardEmu.cpp" />
|
<ClCompile Include="Config\Mapping\GCKeyboardEmu.cpp" />
|
||||||
<ClCompile Include="Config\Mapping\GCPadEmu.cpp" />
|
<ClCompile Include="Config\Mapping\GCPadEmu.cpp" />
|
||||||
<ClCompile Include="Config\Mapping\GCPadWiiU.cpp" />
|
<ClCompile Include="Config\Mapping\GCPadWiiUConfigDialog.cpp" />
|
||||||
<ClCompile Include="Config\Mapping\Hotkey3D.cpp" />
|
<ClCompile Include="Config\Mapping\Hotkey3D.cpp" />
|
||||||
<ClCompile Include="Config\Mapping\HotkeyGeneral.cpp" />
|
<ClCompile Include="Config\Mapping\HotkeyGeneral.cpp" />
|
||||||
<ClCompile Include="Config\Mapping\HotkeyGraphics.cpp" />
|
<ClCompile Include="Config\Mapping\HotkeyGraphics.cpp" />
|
||||||
|
|
Loading…
Reference in New Issue