ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix missing vibration binding for NegConRumble

This commit is contained in:
Stenzek 2025-02-14 18:51:45 +10:00
parent 5ae32d3c70
commit 5060e72b96
No known key found for this signature in database
8 changed files with 117 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/duckstation-qt/controllerbindingwidget_analog_controller.ui
View File

@ -418,7 +418,7 @@
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1021,7 +1021,7 @@
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1038,7 +1038,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1066,7 +1066,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="resources/resources.qrc">:/controllers/analog_controller.svg</pixmap>
<pixmap resource="resources/duckstation-qt.qrc">:/controllers/analog_controller.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -1076,7 +1076,7 @@
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -1090,19 +1090,6 @@
</item>
<item row="2" column="1">
<layout class="QGridLayout" name="gridLayout_32">
<item row="1" column="0" colspan="4">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="3">
<widget class="QGroupBox" name="groupBox_28">
<property name="title">
@ -1143,6 +1130,19 @@
</layout>
</widget>
</item>
<item row="1" column="0" colspan="4">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1" colspan="2">
<widget class="QGroupBox" name="groupBox_31">
<property name="title">
@ -1222,8 +1222,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="resources/resources.qrc"/>
<include location="resources/resources.qrc"/>
<include location="resources/duckstation-qt.qrc"/>
</resources>
<connections/>
</ui>

3
src/duckstation-qt/controllerbindingwidget_analog_joystick.ui
View File

@ -1137,8 +1137,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="resources/resources.qrc"/>
<include location="resources/resources.qrc"/>
<include location="resources/duckstation-qt.qrc"/>
</resources>
<connections/>
</ui>

3
src/duckstation-qt/controllerbindingwidget_digital_controller.ui
View File

@ -727,8 +727,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="resources/resources.qrc"/>
<include location="resources/resources.qrc"/>
<include location="resources/duckstation-qt.qrc"/>
</resources>
<connections/>
</ui>

1
src/duckstation-qt/controllerbindingwidget_guncon.ui
View File

@ -583,7 +583,6 @@
</customwidgets>
<resources>
<include location="resources/duckstation-qt.qrc"/>
<include location="resources/duckstation-qt.qrc"/>
</resources>
<connections/>
</ui>

1
src/duckstation-qt/controllerbindingwidget_justifier.ui
View File

@ -583,7 +583,6 @@
</customwidgets>
<resources>
<include location="resources/duckstation-qt.qrc"/>
<include location="resources/duckstation-qt.qrc"/>
</resources>
<connections/>
</ui>

1
src/duckstation-qt/controllerbindingwidget_mouse.ui
View File

@ -273,7 +273,6 @@
</customwidgets>
<resources>
<include location="resources/duckstation-qt.qrc"/>
<include location="resources/duckstation-qt.qrc"/>
</resources>
<connections/>
</ui>

18
src/duckstation-qt/controllerbindingwidget_negcon.ui
View File

@ -40,7 +40,7 @@
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -256,7 +256,7 @@
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -345,7 +345,7 @@
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -527,7 +527,7 @@
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -544,7 +544,7 @@
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -572,7 +572,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="resources/resources.qrc">:/controllers/negcon.svg</pixmap>
<pixmap resource="resources/duckstation-qt.qrc">:/controllers/negcon.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -582,7 +582,7 @@
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -688,7 +688,7 @@
<item row="1" column="1" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@ -710,7 +710,7 @@
</customwidget>
</customwidgets>
<resources>
<include location="resources/resources.qrc"/>
<include location="resources/duckstation-qt.qrc"/>
</resources>
<connections/>
</ui>

89
src/duckstation-qt/controllerbindingwidget_negconrumble.ui
View File

@ -572,7 +572,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="resources/resources.qrc">:/controllers/negcon.svg</pixmap>
<pixmap resource="resources/duckstation-qt.qrc">:/controllers/negcon.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -720,6 +720,86 @@
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_29">
<property name="title">
<string>Large Motor</string>
</property>
<layout class="QGridLayout" name="gridLayout_30">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="InputVibrationBindingWidget" name="LargeMotor">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="2">
<widget class="QGroupBox" name="groupBox_32">
<property name="title">
<string>Small Motor</string>
</property>
<layout class="QGridLayout" name="gridLayout_31">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="InputVibrationBindingWidget" name="SmallMotor">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>PushButton</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
@ -730,9 +810,14 @@
<extends>QPushButton</extends>
<header>inputbindingwidgets.h</header>
</customwidget>
<customwidget>
<class>InputVibrationBindingWidget</class>
<extends>QPushButton</extends>
<header>inputbindingwidgets.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="resources/resources.qrc"/>
<include location="resources/duckstation-qt.qrc"/>
</resources>
<connections/>
</ui>