diff --git a/src/duckstation-qt/controllerglobalsettingswidget.cpp b/src/duckstation-qt/controllerglobalsettingswidget.cpp
index 462b39794..a2ed607b8 100644
--- a/src/duckstation-qt/controllerglobalsettingswidget.cpp
+++ b/src/duckstation-qt/controllerglobalsettingswidget.cpp
@@ -77,12 +77,12 @@ ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent,
ControllerSettingWidgetBinder::BindWidgetToInputProfileBool(sif, m_ui.enableRawInput, "InputSources", "RawInput",
false);
#else
- m_ui.mainLayout->removeWidget(m_ui.xinputGroup);
+ m_ui.groupsLayout->removeWidget(m_ui.xinputGroup);
QtUtils::SafeDeleteWidget(m_ui.xinputGroup);
m_ui.xinputLayout = nullptr;
m_ui.enableXInputSource = nullptr;
m_ui.xinputDescription = nullptr;
- m_ui.mainLayout->removeWidget(m_ui.dinputGroup);
+ m_ui.groupsLayout->removeWidget(m_ui.dinputGroup);
QtUtils::SafeDeleteWidget(m_ui.dinputGroup);
m_ui.dinputLayout = nullptr;
m_ui.enableDInputSource = nullptr;
@@ -109,7 +109,7 @@ ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent,
}
else
{
- m_ui.mainLayout->removeWidget(m_ui.sdlGroup);
+ m_ui.groupsLayout->removeWidget(m_ui.sdlGroup);
QtUtils::SafeDeleteWidget(m_ui.sdlGroup);
m_ui.sdlGridLayout = nullptr;
m_ui.sdlLEDLayout = nullptr;
@@ -119,17 +119,17 @@ ControllerGlobalSettingsWidget::ControllerGlobalSettingsWidget(QWidget* parent,
m_ui.enableSDLEnhancedMode = nullptr;
m_ui.sdlHelpText = nullptr;
m_ui.enableTouchPadAsPointer = nullptr;
- m_ui.mainLayout->removeWidget(m_ui.xinputGroup);
+ m_ui.groupsLayout->removeWidget(m_ui.xinputGroup);
QtUtils::SafeDeleteWidget(m_ui.xinputGroup);
m_ui.xinputLayout = nullptr;
m_ui.enableXInputSource = nullptr;
m_ui.xinputDescription = nullptr;
- m_ui.mainLayout->removeWidget(m_ui.dinputGroup);
+ m_ui.groupsLayout->removeWidget(m_ui.dinputGroup);
QtUtils::SafeDeleteWidget(m_ui.dinputGroup);
m_ui.dinputLayout = nullptr;
m_ui.enableDInputSource = nullptr;
m_ui.dinputDescription = nullptr;
- m_ui.mainLayout->removeWidget(m_ui.pointerGroup);
+ m_ui.groupsLayout->removeWidget(m_ui.pointerGroup);
QtUtils::SafeDeleteWidget(m_ui.pointerGroup);
m_ui.pointerLayout = nullptr;
m_ui.pointerDescription = nullptr;
diff --git a/src/duckstation-qt/controllerglobalsettingswidget.ui b/src/duckstation-qt/controllerglobalsettingswidget.ui
index 941fd6883..3349f676f 100644
--- a/src/duckstation-qt/controllerglobalsettingswidget.ui
+++ b/src/duckstation-qt/controllerglobalsettingswidget.ui
@@ -10,7 +10,7 @@
658
-
+
0
@@ -23,366 +23,376 @@
0
- -
-
-
- SDL Input Source
-
-
-
-
-
-
-
-
-
-
- 0
- 0
-
+
-
+
+
-
+
+
+ SDL Input Source
+
+
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Enables the player LED on DualSense controllers.
+
+
+ Enable DualSense Player LED
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Adjusts LED settings for controllers with configurable LEDs.
+
+
+
+
+
+
+
+
+ -
+
+
+ <html><head/><body><p>Enables the SDL input source and detection of controllers.</p></body></html>
+
+ Enable SDL Input Source
+
+
+
+ -
+
- Enables the player LED on DualSense controllers.
+ <html><head/><body><p>Allows rumble and LED effects for DualShock 4 / DualSense controllers in Bluetooth mode. This option is not required for wired connections.</p><p><span style=" font-weight:700;">Enabling enhanced reports may result in your controller being unusable in other applications until it is turned off and on again.</span></p></body></html>
- Enable DualSense Player LED
+ DualShock 4 / DualSense Enhanced Mode (Bluetooth Only)
- -
-
-
-
- 0
- 0
-
+
-
+
+
+ <html><head/><body><p>The SDL input source supports most controllers, and is the preferred option. Enhanced mode may be required for the Vibration/LED functionality of DualShock 4 / DualSense pads in Bluetooth mode. You can also edit <a href="ADVANCED_SDL_OPTIONS"><span style=" text-decoration: underline; color:#99ebff;">advanced options</span></a> which control device-specific behavior.</p></body></html>
+
+ true
+
+
+
+ -
+
- Adjusts LED settings for controllers with configurable LEDs.
+ Allows use of the touchpad for DualShock 4 / DualSense controllers.
-
-
+
+ Enable Touchpad
-
- -
-
-
- <html><head/><body><p>Enables the SDL input source and detection of controllers.</p></body></html>
-
-
- Enable SDL Input Source
-
-
-
- -
-
-
- <html><head/><body><p>Allows rumble and LED effects for DualShock 4 / DualSense controllers in Bluetooth mode. This option is not required for wired connections.</p><p><span style=" font-weight:700;">Enabling enhanced reports may result in your controller being unusable in other applications until it is turned off and on again.</span></p></body></html>
-
-
- DualShock 4 / DualSense Enhanced Mode (Bluetooth Only)
-
-
-
- -
-
-
- <html><head/><body><p>The SDL input source supports most controllers, and is the preferred option. Enhanced mode may be required for the Vibration/LED functionality of DualShock 4 / DualSense pads in Bluetooth mode. You can also edit <a href="ADVANCED_SDL_OPTIONS"><span style=" text-decoration: underline; color:#99ebff;">advanced options</span></a> which control device-specific behavior.</p></body></html>
-
-
- true
-
-
-
- -
-
-
- Allows use of the touchpad for DualShock 4 / DualSense controllers.
-
-
- Enable Touchpad
-
-
-
-
-
-
- -
-
-
- XInput Source
-
-
-
-
-
-
- <html><head/><body><p>The XInput source provides support for controllers that use the XInput protocol. This source should <span style=" font-weight:700;">only</span> be used if you are using a XInput wrapper library.</p></body></html>
-
-
- true
-
-
-
- -
-
-
- Enable XInput Source
-
-
-
-
-
-
- -
-
-
- DirectInput Source
-
-
-
-
-
-
- The DirectInput source provides support for legacy controllers which do not support XInput. Accessing these controllers via SDL is recommended instead.
-
-
- true
-
-
-
- -
-
-
- Enable DirectInput Source
-
-
-
-
-
-
- -
-
-
- Mouse/Pointer Source
-
-
-
-
-
-
- Using raw input improves precision when you bind controller sticks to the mouse pointer. Also enables multiple mice to be used.
-
-
- true
-
-
-
- -
-
-
- Horizontal Sensitivity:
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 150
- 0
-
-
-
- 1
+
+
+ -
+
+
+ XInput Source
+
+
+
-
+
+
+ <html><head/><body><p>The XInput source provides support for controllers that use the XInput protocol. This source should <span style=" font-weight:700;">only</span> be used if you are using a XInput wrapper library.</p></body></html>
-
- 30
+
+ true
-
- Qt::Orientation::Horizontal
+
+
+ -
+
+
+ Enable XInput Source
- -
-
-
-
- 0
- 0
-
+
+
+
+ -
+
+
+ DirectInput Source
+
+
+
-
+
+
+ The DirectInput source provides support for legacy controllers which do not support XInput. Accessing these controllers via SDL is recommended instead.
-
-
- 20
- 0
-
+
+ true
+
+
+ -
+
- 10
+ Enable DirectInput Source
-
- -
-
-
- Vertical Sensitivity:
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 150
- 0
-
+
+
+ -
+
+
+ Mouse/Pointer Source
+
+
+
-
+
+
+ Using raw input improves precision when you bind controller sticks to the mouse pointer. Also enables multiple mice to be used.
-
- 1
+
+ true
-
- 30
+
+
+ -
+
+
+ Horizontal Sensitivity:
-
- Qt::Orientation::Horizontal
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 150
+ 0
+
+
+
+ 1
+
+
+ 30
+
+
+ Qt::Orientation::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 20
+ 0
+
+
+
+ 10
+
+
+
+
+
+ -
+
+
+ Vertical Sensitivity:
- -
-
-
-
- 0
- 0
-
+
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 150
+ 0
+
+
+
+ 1
+
+
+ 30
+
+
+ Qt::Orientation::Horizontal
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 20
+ 0
+
+
+
+ 10
+
+
+
+
+
+ -
+
+
-
+
+
+ Allows the mouse to be mapped to emulated controls. By default movement of the mouse will be ignored.
+
+
+ Enable Mouse Mapping
+
+
+
+ -
+
+
+ Uses raw input for mice input. Enable if you wish to use multiple mice/lightguns.
+
+
+ Use Raw Input
+
+
+
+
+
+
+
+
+ -
+
+
+ Controller Multitap
+
+
+
-
+
+
+ The multitap enables up to 8 controllers to be connected to the console. Each multitap provides 4 ports. Multitap is not supported by all games.
-
-
- 20
- 0
-
+
+ true
+
+
+ -
+
- 10
+ Multitap Mode:
+ -
+
+
-
- -
-
-
-
-
-
- Allows the mouse to be mapped to emulated controls. By default movement of the mouse will be ignored.
-
+
+
+ -
+
+
+ Profile Settings
+
+
+
-
+
- Enable Mouse Mapping
+ When these options are enabled, input sources and hotkeys can be set in this input profile, and will be used instead of the global source/hotkey configuration. By default, sources and hotkeys are always shared between all profiles.
+
+
+ true
- -
-
-
- Uses raw input for mice input. Enable if you wish to use multiple mice/lightguns.
+
-
+
+
+ Use Profile Input Sources
+
+
+ -
+
- Use Raw Input
+ Use Profile Hotkeys
-
-
-
-
- -
-
-
- Controller Multitap
-
-
-
-
-
-
- The multitap enables up to 8 controllers to be connected to the console. Each multitap provides 4 ports. Multitap is not supported by all games.
-
-
- true
-
-
-
- -
-
-
- Multitap Mode:
-
-
-
- -
-
-
-
-
-
- -
-
-
- Profile Settings
-
-
-
-
-
-
- When these options are enabled, input sources and hotkeys can be set in this input profile, and will be used instead of the global source/hotkey configuration. By default, sources and hotkeys are always shared between all profiles.
-
-
- true
-
-
-
- -
-
-
- Use Profile Input Sources
-
-
-
- -
-
-
- Use Profile Hotkeys
-
-
-
-
-
-
- -
-
-
- Qt::Orientation::Vertical
-
-
+
+
+ -
+
+
+ Qt::Orientation::Vertical
+
+
+
+ 0
+ 0
+
+
+
+
+
- -
+
-
Detected Devices