mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-11-07 04:29:27 -10:00
Qt: Add DualShock 1 binding and configuration widgets (no different graphic for the moment).
This commit is contained in:
1 parent
b04b049069
commit
d65c5ccd16
6 files changed
+1312
-1
No files matched your search
@@ -70,6 +70,7 @@ target_sources(pcsx2-qt PRIVATE
|
||||
Settings/BIOSSettingsWidget.cpp
|
||||
Settings/BIOSSettingsWidget.h
|
||||
Settings/BIOSSettingsWidget.ui
|
||||
Settings/ControllerBindingWidget_DualShock1.ui
|
||||
Settings/ControllerBindingWidget_DualShock2.ui
|
||||
Settings/ControllerBindingWidget_Guitar.ui
|
||||
Settings/ControllerBindingWidget_Popn.ui
|
||||
|
||||
@@ -120,7 +120,11 @@ void ControllerBindingWidget::onTypeChanged()
|
||||
m_ui.settings->setEnabled(has_settings);
|
||||
m_ui.macros->setEnabled(has_macros);
|
||||
|
||||
if (cinfo->type == Pad::ControllerType::DualShock2)
|
||||
if (cinfo->type == Pad::ControllerType::DualShock1)
|
||||
{
|
||||
m_bindings_widget = ControllerBindingWidget_DualShock1::createInstance(this);
|
||||
}
|
||||
else if (cinfo->type == Pad::ControllerType::DualShock2)
|
||||
{
|
||||
m_bindings_widget = ControllerBindingWidget_DualShock2::createInstance(this);
|
||||
}
|
||||
@@ -906,6 +910,28 @@ void ControllerBindingWidget_Base::initBindingWidgets()
|
||||
}
|
||||
}
|
||||
|
||||
ControllerBindingWidget_DualShock1::ControllerBindingWidget_DualShock1(ControllerBindingWidget* parent)
|
||||
: ControllerBindingWidget_Base(parent)
|
||||
{
|
||||
m_ui.setupUi(this);
|
||||
initBindingWidgets();
|
||||
}
|
||||
|
||||
ControllerBindingWidget_DualShock1::~ControllerBindingWidget_DualShock1()
|
||||
{
|
||||
}
|
||||
|
||||
QIcon ControllerBindingWidget_DualShock1::getIcon() const
|
||||
{
|
||||
return QIcon::fromTheme("controller-line");
|
||||
}
|
||||
|
||||
ControllerBindingWidget_Base* ControllerBindingWidget_DualShock1::createInstance(ControllerBindingWidget* parent)
|
||||
{
|
||||
return new ControllerBindingWidget_DualShock1(parent);
|
||||
}
|
||||
|
||||
|
||||
ControllerBindingWidget_DualShock2::ControllerBindingWidget_DualShock2(ControllerBindingWidget* parent)
|
||||
: ControllerBindingWidget_Base(parent)
|
||||
{
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <span>
|
||||
|
||||
#include "ui_ControllerBindingWidget.h"
|
||||
#include "ui_ControllerBindingWidget_DualShock1.h"
|
||||
#include "ui_ControllerBindingWidget_DualShock2.h"
|
||||
#include "ui_ControllerBindingWidget_Guitar.h"
|
||||
#include "ui_ControllerBindingWidget_Jogcon.h"
|
||||
@@ -170,6 +171,22 @@ protected:
|
||||
void initBindingWidgets();
|
||||
};
|
||||
|
||||
class ControllerBindingWidget_DualShock1 final : public ControllerBindingWidget_Base
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
ControllerBindingWidget_DualShock1(ControllerBindingWidget* parent);
|
||||
~ControllerBindingWidget_DualShock1();
|
||||
|
||||
QIcon getIcon() const override;
|
||||
|
||||
static ControllerBindingWidget_Base* createInstance(ControllerBindingWidget* parent);
|
||||
|
||||
private:
|
||||
Ui::ControllerBindingWidget_DualShock1 m_ui;
|
||||
};
|
||||
|
||||
class ControllerBindingWidget_DualShock2 final : public ControllerBindingWidget_Base
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -325,6 +325,7 @@
|
||||
<QtUi Include="Settings\AudioStretchSettingsDialog.ui" />
|
||||
<QtUi Include="Settings\BIOSSettingsWidget.ui" />
|
||||
<QtUi Include="Settings\ControllerBindingWidget.ui" />
|
||||
<QtUi Include="Settings\ControllerBindingWidget_DualShock1.ui" />
|
||||
<QtUi Include="Settings\ControllerBindingWidget_DualShock2.ui" />
|
||||
<QtUi Include="Settings\ControllerBindingWidget_Guitar.ui" />
|
||||
<QtUi Include="Settings\ControllerBindingWidget_Jogcon.ui" />
|
||||
|
||||
@@ -604,6 +604,9 @@
|
||||
<QtUi Include="Settings\ControllerBindingWidget.ui">
|
||||
<Filter>Settings</Filter>
|
||||
</QtUi>
|
||||
<QtUi Include="Settings\ControllerBindingWidget_DualShock1.ui">
|
||||
<Filter>Settings</Filter>
|
||||
</QtUi>
|
||||
<QtUi Include="Settings\ControllerBindingWidget_DualShock2.ui">
|
||||
<Filter>Settings</Filter>
|
||||
</QtUi>
|
||||
|
||||
Reference in new issue
Block a user