Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qt: Native DualShock 3 support in Windows using official Sony driver #9138

Closed
wants to merge 1 commit into from
Closed

Qt: Native DualShock 3 support in Windows using official Sony driver #9138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pcsx2-gsrunner/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ bool GSRunner::InitializeConfig()
// ensure all input sources are disabled, we're not using them
si.SetBoolValue("InputSources", "SDL", false);
si.SetBoolValue("InputSources", "XInput", false);
si.SetBoolValue("InputSources", "DS3Input", false);

// we don't need any sound output
si.SetStringValue("SPU2/Output", "OutputModule", "nullout");
Expand Down
4 changes: 4 additions & 0 deletions pcsx2-qt/Settings/ControllerGlobalSettingsWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,17 @@ ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent,
#ifdef _WIN32
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enableXInputSource, "InputSources", "XInput", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enableDInputSource, "InputSources", "DInput", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.enableDS3Source, "InputSources", "DS3Input", false);
#else
m_ui.mainLayout->removeWidget(m_ui.xinputGroup);
m_ui.xinputGroup->deleteLater();
m_ui.xinputGroup = nullptr;
m_ui.mainLayout->removeWidget(m_ui.dinputGroup);
m_ui.dinputGroup->deleteLater();
m_ui.dinputGroup = nullptr;
m_ui.mainLayout->removeWidget(m_ui.ds3inputGroup);
m_ui.ds3inputGroup->deleteLater();
m_ui.ds3inputGroup = nullptr;
#endif

if (dialog->isEditingProfile())
Expand Down
30 changes: 28 additions & 2 deletions pcsx2-qt/Settings/ControllerGlobalSettingsWidget.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item row="5" column="0">
<item row="6" column="0">
<widget class="QGroupBox" name="profileSettings">
<property name="title">
<string>Profile Settings</string>
Expand Down Expand Up @@ -146,7 +146,7 @@
</layout>
</widget>
</item>
<item row="4" column="0">
<item row="5" column="0">
<widget class="QGroupBox" name="multitapGroup">
<property name="title">
<string>Controller Multitap</string>
Expand Down Expand Up @@ -231,6 +231,32 @@
</widget>
</item>
<item row="3" column="0">
<widget class="QGroupBox" name="ds3inputGroup">
<property name="title">
<string>DualShock 3 Input Source</string>
</property>
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>The DualShock 3 input source provides native support for DualShock 3 controllers. (Requires Official Sony DualShock 3 Driver)</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="enableDS3Source">
<property name="text">
<string>Enable DualShock 3 Input Source</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<widget class="QGroupBox" name="mouseGroup">
<property name="title">
<string>Mouse/Pointer Source</string>
Expand Down
2 changes: 2 additions & 0 deletions pcsx2/ImGui/FullscreenUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3814,6 +3814,8 @@ void FullscreenUI::DrawControllerSettingsPage()
#ifdef _WIN32
DrawToggleSetting(bsi, ICON_FA_COG " Enable XInput Input Source",
"The XInput source provides support for XBox 360/XBox One/XBox Series controllers.", "InputSources", "XInput", false, true, false);
DrawToggleSetting(bsi, ICON_FA_COG " Enable DualShock 3 Input Source",
"The DualShock 3 input source provides native support for DualShock 3 controllers. (Requires Official Sony DualShock 3 Driver)", "InputSources", "DS3Input", false, true, false);
#endif

MenuHeading("Multitap");
Expand Down
Loading