Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

Fix controls config dialog

crueter9278eac8f042
diff --git a/dist/org.yuzu_emu.yuzu.desktop b/dist/org.yuzu_emu.yuzu.desktop
index 51e191a8e5..8b6b347b1a 100644
--- a/dist/org.yuzu_emu.yuzu.desktop
+++ b/dist/org.yuzu_emu.yuzu.desktop
@@ -8,8 +8,8 @@ Name=yuzu
GenericName=Switch Emulator
Comment=Nintendo Switch video game console emulator
Icon=org.yuzu_emu.yuzu
-TryExec=yuzu
-Exec=yuzu %f
+TryExec=eden
+Exec=eden %f
Categories=Game;Emulator;Qt;
MimeType=application/x-nx-nro;application/x-nx-nso;application/x-nx-nsp;application/x-nx-xci;
Keywords=Nintendo;Switch;
diff --git a/src/yuzu/configuration/configure.ui b/src/yuzu/configuration/configure.ui
index 11d21a944a..973219c9fd 100644
--- a/src/yuzu/configuration/configure.ui
+++ b/src/yuzu/configuration/configure.ui
@@ -7,13 +7,13 @@
<x>0</x>
<y>0</y>
<width>650</width>
- <height>650</height>
+ <height>700</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
- <height>650</height>
+ <height>675</height>
</size>
</property>
<property name="windowTitle">
@@ -71,7 +71,7 @@
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
</property>
</widget>
</item>
diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp
index 28c3baf086..0343595604 100644
--- a/src/yuzu/configuration/configure_input.cpp
+++ b/src/yuzu/configuration/configure_input.cpp
@@ -121,7 +121,7 @@ void ConfigureInput::Initialize(InputCommon::InputSubsystem* input_subsystem,
&ConfigureInput::UpdateAllInputDevices);
connect(player_controllers[i], &ConfigureInputPlayer::RefreshInputProfiles, this,
&ConfigureInput::UpdateAllInputProfiles, Qt::QueuedConnection);
- connect(connected_controller_checkboxes[i], &QCheckBox::stateChanged, [this, i](int state) {
+ connect(connected_controller_checkboxes[i], &QCheckBox::checkStateChanged, [this, i](int state) {
// Keep activated controllers synced with the "Connected Controllers" checkboxes
player_controllers[i]->ConnectPlayer(state == Qt::Checked);
});
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp
index 400917f9de..12fe935e41 100644
--- a/src/yuzu/configuration/configure_input_player.cpp
+++ b/src/yuzu/configuration/configure_input_player.cpp
@@ -1183,7 +1183,7 @@ void ConfigureInputPlayer::UpdateControllerAvailableButtons() {
// List of all the widgets that will be hidden by any of the following layouts that need
// "unhidden" after the controller type changes
- const std::array<QWidget*, 14> layout_show = {
+ const std::array<QWidget*, 19> layout_show = {
ui->buttonShoulderButtonsSLSRLeft,
ui->buttonShoulderButtonsSLSRRight,
ui->horizontalSpacerShoulderButtonsWidget,
@@ -1191,11 +1191,16 @@ void ConfigureInputPlayer::UpdateControllerAvailableButtons() {
ui->horizontalSpacerShoulderButtonsWidget3,
ui->horizontalSpacerShoulderButtonsWidget4,
ui->buttonShoulderButtonsLeft,
- ui->buttonMiscButtonsMinusScreenshot,
+ ui->buttonMiscButtonsMinusGroup,
ui->bottomLeft,
+ ui->LStick,
+ ui->Dpad,
ui->buttonShoulderButtonsRight,
- ui->buttonMiscButtonsPlusHome,
+ ui->buttonMiscButtonsPlusGroup,
+ ui->buttonMiscButtonsHomeGroup,
ui->bottomRight,
+ ui->faceButtons,
+ ui->RStick,
ui->buttonMiscButtonsMinusGroup,
ui->buttonMiscButtonsScreenshotGroup,
};
@@ -1213,6 +1218,7 @@ void ConfigureInputPlayer::UpdateControllerAvailableButtons() {
ui->buttonShoulderButtonsSLSRRight,
ui->horizontalSpacerShoulderButtonsWidget2,
ui->horizontalSpacerShoulderButtonsWidget4,
+ ui->buttonMiscButtonsScreenshotGroup,
};
break;
case Core::HID::NpadStyleIndex::JoyconLeft:
@@ -1221,15 +1227,23 @@ void ConfigureInputPlayer::UpdateControllerAvailableButtons() {
ui->horizontalSpacerShoulderButtonsWidget2,
ui->horizontalSpacerShoulderButtonsWidget3,
ui->buttonShoulderButtonsRight,
- ui->buttonMiscButtonsPlusHome,
- ui->bottomRight,
+ ui->buttonMiscButtonsPlusGroup,
+ ui->buttonMiscButtonsHomeGroup,
+ ui->faceButtons,
+ ui->RStick,
+ ui->buttonMiscButtonsScreenshotGroup,
};
break;
case Core::HID::NpadStyleIndex::JoyconRight:
layout_hidden = {
- ui->buttonShoulderButtonsSLSRLeft, ui->horizontalSpacerShoulderButtonsWidget,
- ui->horizontalSpacerShoulderButtonsWidget4, ui->buttonShoulderButtonsLeft,
- ui->buttonMiscButtonsMinusScreenshot, ui->bottomLeft,
+ ui->buttonShoulderButtonsSLSRLeft,
+ ui->horizontalSpacerShoulderButtonsWidget,
+ ui->horizontalSpacerShoulderButtonsWidget4,
+ ui->buttonShoulderButtonsLeft,
+ ui->buttonMiscButtonsMinusGroup,
+ ui->LStick,
+ ui->Dpad,
+ ui->buttonMiscButtonsScreenshotGroup,
};
break;
case Core::HID::NpadStyleIndex::GameCube:
@@ -1242,6 +1256,13 @@ void ConfigureInputPlayer::UpdateControllerAvailableButtons() {
ui->buttonMiscButtonsScreenshotGroup,
};
break;
+ case Core::HID::NpadStyleIndex::JoyconDual:
+ layout_hidden = {
+ ui->buttonShoulderButtonsSLSRLeft,
+ ui->buttonShoulderButtonsSLSRRight,
+ ui->buttonMiscButtonsScreenshotGroup,
+ };
+ break;
default:
break;
}
diff --git a/src/yuzu/configuration/configure_input_player.ui b/src/yuzu/configuration/configure_input_player.ui
index 5518cccd1d..012379a477 100644
--- a/src/yuzu/configuration/configure_input_player.ui
+++ b/src/yuzu/configuration/configure_input_player.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>780</width>
- <height>487</height>
+ <width>1391</width>
+ <height>680</height>
</rect>
</property>
<property name="windowTitle">
@@ -57,7 +57,7 @@
<item>
<widget class="QGroupBox" name="groupConnectedController">
<property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
+ <enum>Qt::LayoutDirection::LeftToRight</enum>
</property>
<property name="title">
<string>Connect Controller</string>
@@ -225,7 +225,7 @@
</property>
<layout class="QHBoxLayout" name="_2">
<property name="sizeConstraint">
- <enum>QLayout::SetMinimumSize</enum>
+ <enum>QLayout::SizeConstraint::SetMinimumSize</enum>
</property>
<property name="leftMargin">
<number>0</number>
@@ -241,12 +241,12 @@
</property>
<item>
<widget class="QWidget" name="bottomLeft" native="true">
- <layout class="QVBoxLayout" name="bottomLeftLayout" stretch="0,0,0,0">
+ <layout class="QVBoxLayout" name="bottomLeftLayout" stretch="0,0,0">
<property name="spacing">
<number>0</number>
</property>
<property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
+ <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
</property>
<property name="leftMargin">
<number>0</number>
@@ -272,20 +272,20 @@
<string>Left Stick</string>
</property>
<property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
+ <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
- <number>6</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
@@ -294,11 +294,8 @@
<number>0</number>
</property>
<item>
- <widget class="QWidget" name="buttonLStickUpWidget" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout_20">
- <property name="spacing">
- <number>0</number>
- </property>
+ <widget class="QWidget" name="LStickDirectionsWidget" native="true">
+ <layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property>
@@ -311,33 +308,170 @@
<property name="bottomMargin">
<number>0</number>
</property>
- <item>
- <spacer name="horizontalSpacerLStickUpLeft">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="buttonLStickDownGroup">
+ <property name="title">
+ <string>Down</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- </spacer>
+ <layout class="QVBoxLayout" name="buttonLStickDownVerticalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="buttonLStickDown">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>68</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">min-width: 68px;</string>
+ </property>
+ <property name="text">
+ <string>Down</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QGroupBox" name="buttonLStickRightGroup">
+ <property name="title">
+ <string>Right</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
+ </property>
+ <layout class="QVBoxLayout" name="buttonLStickRightVerticalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="buttonLStickRight">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>68</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">min-width: 68px;</string>
+ </property>
+ <property name="text">
+ <string>Right</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="buttonLStickLeftGroup">
+ <property name="title">
+ <string>Left</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
+ </property>
+ <layout class="QVBoxLayout" name="buttonLStickLeftVerticalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="buttonLStickLeft">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>68</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">min-width: 68px;</string>
+ </property>
+ <property name="text">
+ <string>Left</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</item>
- <item alignment="Qt::AlignHCenter">
+ <item row="0" column="1">
<widget class="QGroupBox" name="buttonLStickUpGroup">
<property name="title">
<string>Up</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
<property name="flat">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="buttonLStickUpVerticalLayout">
<property name="spacing">
- <number>3</number>
+ <number>0</number>
</property>
<property name="leftMargin">
<number>3</number>
@@ -355,7 +489,7 @@
<widget class="QPushButton" name="buttonLStickUp">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -376,56 +510,43 @@
</layout>
</widget>
</item>
- <item>
- <spacer name="horizontalSpacerLStickUpRight">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="buttonLStickLeftRightHorizontaLayout">
+ <layout class="QHBoxLayout" name="buttonLStickPressedModifierHorizontalLayout">
<property name="spacing">
<number>3</number>
</property>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonLStickLeftGroup">
+ <item alignment="Qt::AlignmentFlag::AlignHCenter">
+ <widget class="QGroupBox" name="buttonLStickPressedGroup">
<property name="title">
- <string>Left</string>
+ <string>Pressed</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <layout class="QVBoxLayout" name="buttonLStickLeftVerticalLayout">
+ <layout class="QVBoxLayout" name="buttonLStickPressedVerticalLayout" stretch="0">
<property name="spacing">
- <number>3</number>
+ <number>0</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
- <number>3</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
- <widget class="QPushButton" name="buttonLStickLeft">
+ <widget class="QPushButton" name="buttonLStick">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -439,42 +560,42 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>Left</string>
+ <string>Pressed</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonLStickRightGroup">
+ <item alignment="Qt::AlignmentFlag::AlignHCenter">
+ <widget class="QGroupBox" name="buttonLStickModGroup">
<property name="title">
- <string>Right</string>
+ <string>Modifier</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <layout class="QVBoxLayout" name="buttonLStickRightVerticalLayout">
+ <layout class="QVBoxLayout" name="buttonLStickModVerticalLayout">
<property name="spacing">
- <number>3</number>
+ <number>0</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
- <number>3</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
- <widget class="QPushButton" name="buttonLStickRight">
+ <widget class="QPushButton" name="buttonLStickMod">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -488,234 +609,33 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>Right</string>
+ <string>Modifier</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- </layout>
- </item>
- <item>
- <widget class="QWidget" name="buttonLStickDownWidget" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout_22">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <spacer name="horizontalSpacerLStickDownLeft">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item>
+ <widget class="QGroupBox" name="buttonLStickRangeGroup">
+ <property name="title">
+ <string>Range</string>
+ </property>
+ <layout class="QHBoxLayout" name="buttonLStickRangeGroupHorizontalLayout">
+ <property name="spacing">
+ <number>0</number>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <property name="leftMargin">
+ <number>3</number>
</property>
- </spacer>
- </item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonLStickDownGroup">
- <property name="title">
- <string>Down</string>
+ <property name="topMargin">
+ <number>0</number>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QVBoxLayout" name="buttonLStickDownVerticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
- </property>
- <item>
- <widget class="QPushButton" name="buttonLStickDown">
- <property name="minimumSize">
- <size>
- <width>68</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>68</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">min-width: 68px;</string>
- </property>
- <property name="text">
- <string>Down</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacerLStickDownRight">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="buttonLStickPressedModifierHorizontalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonLStickPressedGroup">
- <property name="title">
- <string>Pressed</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QVBoxLayout" name="buttonLStickPressedVerticalLayout" stretch="0">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
- </property>
- <item>
- <widget class="QPushButton" name="buttonLStick">
- <property name="minimumSize">
- <size>
- <width>68</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>68</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">min-width: 68px;</string>
- </property>
- <property name="text">
- <string>Pressed</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonLStickModGroup">
- <property name="title">
- <string>Modifier</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QVBoxLayout" name="buttonLStickModVerticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
- </property>
- <item>
- <widget class="QPushButton" name="buttonLStickMod">
- <property name="minimumSize">
- <size>
- <width>68</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>68</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">min-width: 68px;</string>
- </property>
- <property name="text">
- <string>Modifier</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="buttonLStickRangeGroup">
- <property name="title">
- <string>Range</string>
- </property>
- <layout class="QHBoxLayout" name="buttonLStickRangeGroupHorizontalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
+ <property name="rightMargin">
+ <number>3</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
<widget class="QSpinBox" name="spinboxLStickRange">
@@ -756,7 +676,7 @@
<number>3</number>
</property>
<property name="sizeConstraint">
- <enum>QLayout::SetDefaultConstraint</enum>
+ <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
</property>
<property name="leftMargin">
<number>0</number>
@@ -778,7 +698,7 @@
<string>Deadzone: 0%</string>
</property>
<property name="alignment">
- <set>Qt::AlignHCenter</set>
+ <set>Qt::AlignmentFlag::AlignHCenter</set>
</property>
</widget>
</item>
@@ -790,7 +710,7 @@
<number>100</number>
</property>
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
@@ -802,7 +722,7 @@
<string>Modifier Range: 0%</string>
</property>
<property name="alignment">
- <set>Qt::AlignHCenter</set>
+ <set>Qt::AlignmentFlag::AlignHCenter</set>
</property>
</widget>
</item>
@@ -814,7 +734,7 @@
<number>100</number>
</property>
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
@@ -823,19 +743,6 @@
</layout>
</widget>
</item>
- <item>
- <spacer name="verticalSpacerBottomLeft">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
<item>
<widget class="QGroupBox" name="Dpad">
<property name="sizePolicy">
@@ -861,20 +768,17 @@
<number>3</number>
</property>
<property name="topMargin">
- <number>6</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
- <widget class="QWidget" name="buttonDpadUpWidget" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout_23">
- <property name="spacing">
- <number>0</number>
- </property>
+ <widget class="QWidget" name="dpadDirectionsWidget" native="true">
+ <layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
@@ -887,48 +791,38 @@
<property name="bottomMargin">
<number>0</number>
</property>
- <item>
- <spacer name="horizontalSpacerDpadUpLeft">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonDpadUpGroup">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="buttonDpadDownGroup">
<property name="title">
- <string>Up</string>
+ <string>Down</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <layout class="QVBoxLayout" name="buttonDpadUpVerticalLayout">
+ <layout class="QVBoxLayout" name="buttonDpadDownVerticalLayout">
<property name="spacing">
- <number>3</number>
+ <number>0</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
- <number>3</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
- <widget class="QPushButton" name="buttonDpadUp">
+ <widget class="QPushButton" name="buttonDpadDown">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -942,194 +836,140 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>Up</string>
+ <string>Down</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- <item>
- <spacer name="horizontalSpacerDpadUpRight">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="buttonDpadLeftGroup">
+ <property name="title">
+ <string>Left</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- </spacer>
+ <layout class="QVBoxLayout" name="buttonDpadLeftVerticalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="buttonDpadLeft">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>68</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">min-width: 68px;</string>
+ </property>
+ <property name="text">
+ <string>Left</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</item>
- </layout>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="buttonDpadLeftRightHorizontalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonDpadLeftGroup">
- <property name="title">
- <string>Left</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QVBoxLayout" name="buttonDpadLeftVerticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
+ <item row="1" column="1">
+ <widget class="QGroupBox" name="buttonDpadRightGroup">
+ <property name="title">
+ <string>Right</string>
</property>
- <property name="bottomMargin">
- <number>3</number>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <item>
- <widget class="QPushButton" name="buttonDpadLeft">
- <property name="minimumSize">
- <size>
- <width>68</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>68</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">min-width: 68px;</string>
- </property>
- <property name="text">
- <string>Left</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonDpadRightGroup">
- <property name="title">
- <string>Right</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QVBoxLayout" name="buttonDpadRightVerticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
- </property>
- <item>
- <widget class="QPushButton" name="buttonDpadRight">
- <property name="minimumSize">
- <size>
- <width>68</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>68</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">min-width: 68px;</string>
- </property>
- <property name="text">
- <string>Right</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QWidget" name="buttonDpadDownWidget" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout_24">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <spacer name="horizontalSpacerDpadDownLeft">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
+ <layout class="QVBoxLayout" name="buttonDpadRightVerticalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="buttonDpadRight">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>68</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">min-width: 68px;</string>
+ </property>
+ <property name="text">
+ <string>Right</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonDpadDownGroup">
+ <item row="0" column="1">
+ <widget class="QGroupBox" name="buttonDpadUpGroup">
<property name="title">
- <string>Down</string>
+ <string>Up</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <layout class="QVBoxLayout" name="buttonDpadDownVerticalLayout">
+ <layout class="QVBoxLayout" name="buttonDpadUpVerticalLayout">
<property name="spacing">
- <number>3</number>
+ <number>0</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
- <number>3</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
- <widget class="QPushButton" name="buttonDpadDown">
+ <widget class="QPushButton" name="buttonDpadUp">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -1143,26 +983,13 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>Down</string>
+ <string>Up</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- <item>
- <spacer name="horizontalSpacerDpadDownRight">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
</item>
@@ -1172,7 +999,7 @@
<item>
<spacer name="verticalSpacerBottomLeft_2">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1187,7 +1014,7 @@
</item>
<item>
<widget class="QWidget" name="bottomMiddle" native="true">
- <layout class="QVBoxLayout" stretch="0,0,0">
+ <layout class="QVBoxLayout" name="bottomMiddleLayout" stretch="0,0,0">
<property name="spacing">
<number>6</number>
</property>
@@ -1208,162 +1035,9 @@
<property name="spacing">
<number>3</number>
</property>
- <item>
- <widget class="QWidget" name="buttonShoulderButtonsSLSRLeft" native="true">
- <layout class="QVBoxLayout" name="buttonShoulderButtonsSLSRLeftVerticalLayout">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonShoulderButtonsSLLeftGroup">
- <property name="title">
- <string>SL</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QVBoxLayout" name="buttonShoulderButtonsSLLeftVerticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
- </property>
- <item>
- <widget class="QPushButton" name="buttonSLLeft">
- <property name="minimumSize">
- <size>
- <width>68</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>68</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">min-width: 68px;</string>
- </property>
- <property name="text">
- <string>SL</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonShoulderButtonsSRLeftGroup">
- <property name="title">
- <string>SR</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QVBoxLayout" name="buttonShoulderButtonsSRLeftVerticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
- </property>
- <item>
- <widget class="QPushButton" name="buttonSRLeft">
- <property name="minimumSize">
- <size>
- <width>68</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>68</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">min-width: 68px;</string>
- </property>
- <property name="text">
- <string>SR</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QWidget" name="horizontalSpacerShoulderButtonsWidget4" native="true">
- <layout class="QHBoxLayout" name="horizontalSpacerShoulderButtonsWidget4Layout">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <spacer name="horizontalSpacerShoulderButtons5">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
<item>
- <widget class="QWidget" name="buttonShoulderButtonsLeft" native="true">
- <layout class="QVBoxLayout" name="buttonShoulderButtonsLeftVerticalLayout">
+ <widget class="QWidget" name="buttonShoulderButtonsSLSRLeft" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>0</number>
</property>
@@ -1380,14 +1054,14 @@
<number>0</number>
</property>
<item>
- <widget class="QGroupBox" name="buttonShoulderButtonsButtonLGroup">
+ <widget class="QGroupBox" name="buttonShoulderButtonsSRLeftGroup">
<property name="title">
- <string>L</string>
+ <string>SR</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <layout class="QVBoxLayout" name="buttonShoulderButtonsLVerticalLayout">
+ <layout class="QVBoxLayout" name="buttonShoulderButtonsSRLeftVerticalLayout">
<property name="spacing">
<number>3</number>
</property>
@@ -1404,10 +1078,10 @@
<number>3</number>
</property>
<item>
- <widget class="QPushButton" name="buttonL">
+ <widget class="QPushButton" name="buttonSRLeft">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -1421,7 +1095,7 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>L</string>
+ <string>SR</string>
</property>
</widget>
</item>
@@ -1429,20 +1103,14 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="buttonShoulderButtonsButtonZLGroup">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <widget class="QGroupBox" name="buttonShoulderButtonsSLLeftGroup">
<property name="title">
- <string>ZL</string>
+ <string>SL</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <layout class="QVBoxLayout" name="buttonShoulderButtonsZLVerticalLayout">
+ <layout class="QVBoxLayout" name="buttonShoulderButtonsSLLeftVerticalLayout">
<property name="spacing">
<number>3</number>
</property>
@@ -1459,10 +1127,10 @@
<number>3</number>
</property>
<item>
- <widget class="QPushButton" name="buttonZL">
+ <widget class="QPushButton" name="buttonSLLeft">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -1476,26 +1144,10 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>ZL</string>
+ <string>SL</string>
</property>
</widget>
</item>
- <item>
- <widget class="QSlider" name="sliderZLThreshold">
- <property name="maximumSize">
- <size>
- <width>70</width>
- <height>15</height>
- </size>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -1503,8 +1155,8 @@
</widget>
</item>
<item>
- <widget class="QWidget" name="horizontalSpacerShoulderButtonsWidget" native="true">
- <layout class="QHBoxLayout" name="horizontalSpacerShoulderButtonsWidgetLayout">
+ <widget class="QWidget" name="horizontalSpacerShoulderButtonsWidget4" native="true">
+ <layout class="QHBoxLayout" name="horizontalSpacerShoulderButtonsWidget4Layout">
<property name="spacing">
<number>0</number>
</property>
@@ -1521,9 +1173,9 @@
<number>0</number>
</property>
<item>
- <spacer name="horizontalSpacerShoulderButtons1">
+ <spacer name="horizontalSpacerShoulderButtons5">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1537,8 +1189,8 @@
</widget>
</item>
<item>
- <widget class="QWidget" name="buttonMiscButtonsMinusScreenshot" native="true">
- <layout class="QVBoxLayout" name="buttonMiscButtonsMinusScreenshotVerticalLayout">
+ <widget class="QWidget" name="buttonShoulderButtonsLeft" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
<property name="spacing">
<number>0</number>
</property>
@@ -1554,15 +1206,21 @@
<property name="bottomMargin">
<number>0</number>
</property>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonMiscButtonsMinusGroup">
+ <item>
+ <widget class="QGroupBox" name="buttonShoulderButtonsButtonZLGroup">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="title">
- <string>Minus</string>
+ <string>ZL</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <layout class="QVBoxLayout" name="buttonMiscMinusVerticalLayout">
+ <layout class="QVBoxLayout" name="buttonShoulderButtonsZLVerticalLayout">
<property name="spacing">
<number>3</number>
</property>
@@ -1579,10 +1237,10 @@
<number>3</number>
</property>
<item>
- <widget class="QPushButton" name="buttonMinus">
+ <widget class="QPushButton" name="buttonZL">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -1596,22 +1254,38 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>Minus</string>
+ <string>ZL</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="sliderZLThreshold">
+ <property name="maximumSize">
+ <size>
+ <width>70</width>
+ <height>15</height>
+ </size>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonMiscButtonsScreenshotGroup">
+ <item>
+ <widget class="QGroupBox" name="buttonShoulderButtonsButtonLGroup">
<property name="title">
- <string>Capture</string>
+ <string>L</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <layout class="QVBoxLayout" name="buttonMiscScrCapVerticalLayout">
+ <layout class="QVBoxLayout" name="buttonShoulderButtonsLVerticalLayout">
<property name="spacing">
<number>3</number>
</property>
@@ -1628,10 +1302,10 @@
<number>3</number>
</property>
<item>
- <widget class="QPushButton" name="buttonScreenshot">
+ <widget class="QPushButton" name="buttonL">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -1645,7 +1319,7 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>Capture</string>
+ <string>L</string>
</property>
</widget>
</item>
@@ -1656,8 +1330,8 @@
</widget>
</item>
<item>
- <widget class="QWidget" name="buttonMiscButtonsPlusHome" native="true">
- <layout class="QVBoxLayout" name="buttonMiscButtonsPlusHomeVerticalLayout">
+ <widget class="QWidget" name="horizontalSpacerShoulderButtonsWidget" native="true">
+ <layout class="QHBoxLayout" name="horizontalSpacerShoulderButtonsWidgetLayout">
<property name="spacing">
<number>0</number>
</property>
@@ -1673,35 +1347,207 @@
<property name="bottomMargin">
<number>0</number>
</property>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonMiscButtonsPlusGroup">
- <property name="title">
- <string>Plus</string>
+ <item>
+ <spacer name="horizontalSpacerShoulderButtons1">
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
</property>
- <layout class="QVBoxLayout" name="buttonMiscPlusVerticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="buttonMiscButtonsPlusGroup">
+ <property name="title">
+ <string>Plus</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
+ </property>
+ <layout class="QVBoxLayout" name="buttonMiscPlusVerticalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="buttonPlus">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>68</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">min-width: 68px;</string>
+ </property>
+ <property name="text">
+ <string>Plus</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="buttonMiscButtonsMinusGroup">
+ <property name="title">
+ <string>Minus</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
+ </property>
+ <layout class="QVBoxLayout" name="buttonMiscMinusVerticalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="buttonMinus">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>68</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">min-width: 68px;</string>
+ </property>
+ <property name="text">
+ <string>Minus</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QWidget" name="horizontalSpacerShoulderButtonsWidget3" native="true">
+ <layout class="QHBoxLayout" name="horizontalSpacerShoulderButtonsWidget3Layout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <spacer name="horizontalSpacerShoulderButtons2">
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QWidget" name="buttonShoulderButtonsRight" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="buttonShoulderButtonsZRGroup">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>ZR</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
+ </property>
+ <layout class="QVBoxLayout" name="buttonShoulderButtonsZRVerticalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
</property>
<item>
- <widget class="QPushButton" name="buttonPlus">
+ <widget class="QPushButton" name="buttonZR">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -1715,22 +1561,38 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>Plus</string>
+ <string>ZR</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="sliderZRThreshold">
+ <property name="maximumSize">
+ <size>
+ <width>70</width>
+ <height>15</height>
+ </size>
+ </property>
+ <property name="maximum">
+ <number>100</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonMiscButtonsHomeGroup">
+ <item>
+ <widget class="QGroupBox" name="buttonShoulderButtonsRGroup">
<property name="title">
- <string>Home</string>
+ <string>R</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <layout class="QVBoxLayout" name="buttonMiscHomeVerticalLayout">
+ <layout class="QVBoxLayout" name="buttonShoulderButtonsRVerticalLayout">
<property name="spacing">
<number>3</number>
</property>
@@ -1747,10 +1609,10 @@
<number>3</number>
</property>
<item>
- <widget class="QPushButton" name="buttonHome">
+ <widget class="QPushButton" name="buttonR">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -1764,7 +1626,7 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>Home</string>
+ <string>R</string>
</property>
</widget>
</item>
@@ -1775,8 +1637,8 @@
</widget>
</item>
<item>
- <widget class="QWidget" name="horizontalSpacerShoulderButtonsWidget3" native="true">
- <layout class="QHBoxLayout" name="horizontalSpacerShoulderButtonsWidget3Layout">
+ <widget class="QWidget" name="horizontalSpacerShoulderButtonsWidget2" native="true">
+ <layout class="QHBoxLayout" name="horizontalSpacerShoulderButtonsWidget2Layout">
<property name="spacing">
<number>0</number>
</property>
@@ -1793,9 +1655,9 @@
<number>0</number>
</property>
<item>
- <spacer name="horizontalSpacerShoulderButtons2">
+ <spacer name="horizontalSpacerShoulderButtons3">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1809,8 +1671,8 @@
</widget>
</item>
<item>
- <widget class="QWidget" name="buttonShoulderButtonsRight" native="true">
- <layout class="QVBoxLayout" name="buttonShoulderButtonsRightVerticalLayout">
+ <widget class="QWidget" name="buttonShoulderButtonsSLSRRight" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
<property name="spacing">
<number>0</number>
</property>
@@ -1827,14 +1689,14 @@
<number>0</number>
</property>
<item>
- <widget class="QGroupBox" name="buttonShoulderButtonsRGroup">
+ <widget class="QGroupBox" name="buttonShoulderButtonsSRRightGroup">
<property name="title">
- <string>R</string>
+ <string>SR</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <layout class="QVBoxLayout" name="buttonShoulderButtonsRVerticalLayout">
+ <layout class="QVBoxLayout" name="buttonShoulderButtonsSRRightVerticalLayout">
<property name="spacing">
<number>3</number>
</property>
@@ -1851,10 +1713,10 @@
<number>3</number>
</property>
<item>
- <widget class="QPushButton" name="buttonR">
+ <widget class="QPushButton" name="buttonSRRight">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -1868,7 +1730,7 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>R</string>
+ <string>SR</string>
</property>
</widget>
</item>
@@ -1876,20 +1738,14 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="buttonShoulderButtonsZRGroup">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <widget class="QGroupBox" name="buttonShoulderButtonsSLRightGroup">
<property name="title">
- <string>ZR</string>
+ <string>SL</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <layout class="QVBoxLayout" name="buttonShoulderButtonsZRVerticalLayout">
+ <layout class="QVBoxLayout" name="buttonShoulderButtonsSLRightVerticalLayout">
<property name="spacing">
<number>3</number>
</property>
@@ -1906,10 +1762,10 @@
<number>3</number>
</property>
<item>
- <widget class="QPushButton" name="buttonZR">
+ <widget class="QPushButton" name="buttonSLRight">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -1923,220 +1779,50 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>ZR</string>
+ <string>SL</string>
</property>
</widget>
</item>
- <item>
- <widget class="QSlider" name="sliderZRThreshold">
- <property name="maximumSize">
- <size>
- <width>70</width>
- <height>15</height>
- </size>
- </property>
- <property name="maximum">
- <number>100</number>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
- <item>
- <widget class="QWidget" name="horizontalSpacerShoulderButtonsWidget2" native="true">
- <layout class="QHBoxLayout" name="horizontalSpacerShoulderButtonsWidget2Layout">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <spacer name="horizontalSpacerShoulderButtons3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QWidget" name="buttonShoulderButtonsSLSRRight" native="true">
- <layout class="QVBoxLayout" name="buttonShoulderButtonsSLSRRightVerticalLayout">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonShoulderButtonsSLRightGroup">
- <property name="title">
- <string>SL</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QVBoxLayout" name="buttonShoulderButtonsSLRightVerticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
- </property>
- <item>
- <widget class="QPushButton" name="buttonSLRight">
- <property name="minimumSize">
- <size>
- <width>68</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>68</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">min-width: 68px;</string>
- </property>
- <property name="text">
- <string>SL</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonShoulderButtonsSRRightGroup">
- <property name="title">
- <string>SR</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QVBoxLayout" name="buttonShoulderButtonsSRRightVerticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
- </property>
- <item>
- <widget class="QPushButton" name="buttonSRRight">
- <property name="minimumSize">
- <size>
- <width>68</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>68</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">min-width: 68px;</string>
- </property>
- <property name="text">
- <string>SR</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
</layout>
</item>
- <item>
- <widget class="PlayerControlPreview" name="controllerFrame">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="styleSheet">
- <string notr="true">image: url(:/controller/pro);</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- </layout>
- </widget>
- </item>
+ <item>
+ <widget class="PlayerControlPreview" name="controllerFrame">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">image: url(:/controller/pro);</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ </layout>
+ </widget>
+ </item>
<item>
<layout class="QHBoxLayout" name="miscButtons">
<property name="spacing">
@@ -2148,7 +1834,7 @@
<item>
<spacer name="horizontalSpacerMiscButtons1">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -2164,7 +1850,7 @@
<string>Motion 1</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
<layout class="QVBoxLayout" name="buttonDpadLeftVerticalLayout_2">
<property name="spacing">
@@ -2186,7 +1872,7 @@
<widget class="QPushButton" name="buttonMotionLeft">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -2213,7 +1899,7 @@
<string>Motion 2</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
<layout class="QVBoxLayout" name="buttonDpadRightVerticalLayout_2">
<property name="spacing">
@@ -2235,7 +1921,7 @@
<widget class="QPushButton" name="buttonMotionRight">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -2257,17 +1943,102 @@
</widget>
</item>
<item>
- <spacer name="horizontalSpacerMiscButtons4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <widget class="QGroupBox" name="buttonMiscButtonsScreenshotGroup">
+ <property name="title">
+ <string>Capture</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- </spacer>
+ <layout class="QVBoxLayout" name="buttonMiscScrCapVerticalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="buttonScreenshot">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>68</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">min-width: 68px;</string>
+ </property>
+ <property name="text">
+ <string>Capture</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="buttonMiscButtonsHomeGroup">
+ <property name="title">
+ <string>Home</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
+ </property>
+ <layout class="QVBoxLayout" name="buttonMiscHomeVerticalLayout">
+ <property name="spacing">
+ <number>3</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>3</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="buttonHome">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>68</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">min-width: 68px;</string>
+ </property>
+ <property name="text">
+ <string>Home</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</item>
</layout>
</item>
@@ -2317,20 +2088,17 @@
<number>3</number>
</property>
<property name="topMargin">
- <number>6</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
- <widget class="QWidget" name="buttonFaceButtonsBWidget" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout_6">
- <property name="spacing">
- <number>0</number>
- </property>
+ <widget class="QWidget" name="faceButtonsWidget" native="true">
+ <layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
@@ -2343,48 +2111,38 @@
<property name="bottomMargin">
<number>0</number>
</property>
- <item>
- <spacer name="horizontalSpacerBLeft">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item alignment="Qt::AlignHCenter">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <item row="0" column="1">
<widget class="QGroupBox" name="buttonFaceButtonsXGroup">
<property name="title">
<string>X</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
<layout class="QVBoxLayout" name="buttonFaceButtonsXVerticalLayout">
<property name="spacing">
- <number>3</number>
+ <number>0</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
- <number>3</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
<widget class="QPushButton" name="buttonX">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -2405,187 +2163,35 @@
</layout>
</widget>
</item>
- <item>
- <spacer name="horizontalSpacerBRight">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="buttonFaceButtonsYAHorizontalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonFaceButtonsYGroup">
- <property name="title">
- <string>Y</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QVBoxLayout" name="buttonFaceButtonsYVerticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
- </property>
- <item>
- <widget class="QPushButton" name="buttonY">
- <property name="minimumSize">
- <size>
- <width>68</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>68</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">min-width: 68px;</string>
- </property>
- <property name="text">
- <string>Y</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonFaceButtonsAGroup">
- <property name="title">
- <string>A</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QVBoxLayout" name="buttonFaceButtonsAVerticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
- </property>
- <item>
- <widget class="QPushButton" name="buttonA">
- <property name="minimumSize">
- <size>
- <width>68</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>68</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">min-width: 68px;</string>
- </property>
- <property name="text">
- <string>A</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QWidget" name="buttonFaceButtonsXWidget" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout_10">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <spacer name="horizontalSpacerXLeft">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item alignment="Qt::AlignHCenter">
+ <item row="2" column="2">
<widget class="QGroupBox" name="buttonFaceButtonsBWidget_2">
<property name="title">
<string>B</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
<layout class="QVBoxLayout" name="buttonFaceButtonsBVerticalLayout">
<property name="spacing">
- <number>3</number>
+ <number>0</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
- <number>3</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
<widget class="QPushButton" name="buttonB">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -2606,18 +2212,103 @@
</layout>
</widget>
</item>
- <item>
- <spacer name="horizontalSpacerXRight">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="0" column="2">
+ <widget class="QGroupBox" name="buttonFaceButtonsAGroup">
+ <property name="title">
+ <string>A</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- </spacer>
+ <layout class="QVBoxLayout" name="buttonFaceButtonsAVerticalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="buttonA">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>68</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">min-width: 68px;</string>
+ </property>
+ <property name="text">
+ <string>A</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QGroupBox" name="buttonFaceButtonsYGroup">
+ <property name="title">
+ <string>Y</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
+ </property>
+ <layout class="QVBoxLayout" name="buttonFaceButtonsYVerticalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="buttonY">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>68</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">min-width: 68px;</string>
+ </property>
+ <property name="text">
+ <string>Y</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</item>
</layout>
</widget>
@@ -2625,19 +2316,6 @@
</layout>
</widget>
</item>
- <item>
- <spacer name="verticalSpacerBottomRight">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
<item>
<widget class="QGroupBox" name="RStick">
<property name="sizePolicy">
@@ -2650,7 +2328,7 @@
<string>Right Stick</string>
</property>
<property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
</property>
<property name="flat">
<bool>false</bool>
@@ -2666,7 +2344,7 @@
<number>3</number>
</property>
<property name="topMargin">
- <number>6</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
@@ -2675,17 +2353,8 @@
<number>0</number>
</property>
<item>
- <widget class="QWidget" name="buttonRStickUpWidget" native="true">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_9">
- <property name="spacing">
- <number>0</number>
- </property>
+ <widget class="QWidget" name="RStickDirectionsWidget" native="true">
+ <layout class="QGridLayout" name="gridLayout_4">
<property name="leftMargin">
<number>0</number>
</property>
@@ -2698,48 +2367,87 @@
<property name="bottomMargin">
<number>0</number>
</property>
- <item>
- <spacer name="horizontalSpacerRStickUpLeft">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <item row="1" column="1">
+ <widget class="QGroupBox" name="buttonRStickRightGroup">
+ <property name="title">
+ <string>Right</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- </spacer>
+ <layout class="QVBoxLayout" name="buttonRStickRightVerticalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="buttonRStickRight">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>68</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">min-width: 68px;</string>
+ </property>
+ <property name="text">
+ <string>Right</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonRStickUpGroup">
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="buttonRStickDownGroup">
<property name="title">
- <string>Up</string>
+ <string>Down</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <layout class="QVBoxLayout" name="buttonRStickUpVerticalLayout">
+ <layout class="QVBoxLayout" name="buttonRStickDownVerticalLayout">
<property name="spacing">
- <number>3</number>
+ <number>0</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
- <number>3</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
- <widget class="QPushButton" name="buttonRStickUp">
+ <widget class="QPushButton" name="buttonRStickDown">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -2753,174 +2461,71 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>Up</string>
+ <string>Down</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- <item>
- <spacer name="horizontalSpacerRStickUpRight">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="buttonRStickLeftRightHorizontalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonRStickLeftGroup">
- <property name="title">
- <string>Left</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QVBoxLayout" name="buttonRStickLeftVerticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
- </property>
- <item>
- <widget class="QPushButton" name="buttonRStickLeft">
- <property name="minimumSize">
- <size>
- <width>68</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>68</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">min-width: 68px;</string>
- </property>
- <property name="text">
- <string>Left</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item alignment="Qt::AlignHCenter">
- <widget class="QGroupBox" name="buttonRStickRightGroup">
- <property name="title">
- <string>Right</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QVBoxLayout" name="buttonRStickRightVerticalLayout">
- <property name="spacing">
- <number>3</number>
- </property>
- <property name="leftMargin">
- <number>3</number>
- </property>
- <property name="topMargin">
- <number>3</number>
- </property>
- <property name="rightMargin">
- <number>3</number>
- </property>
- <property name="bottomMargin">
- <number>3</number>
- </property>
- <item>
- <widget class="QPushButton" name="buttonRStickRight">
- <property name="minimumSize">
- <size>
- <width>68</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>68</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true">min-width: 68px;</string>
- </property>
- <property name="text">
- <string>Right</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QWidget" name="buttonRStickDownWidget" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout_11">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <spacer name="horizontalSpacerRStickDownLeft">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="buttonRStickLeftGroup">
+ <property name="title">
+ <string>Left</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <property name="alignment">
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- </spacer>
+ <layout class="QVBoxLayout" name="buttonRStickLeftVerticalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>3</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>3</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="buttonRStickLeft">
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>68</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">min-width: 68px;</string>
+ </property>
+ <property name="text">
+ <string>Left</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</item>
- <item>
- <widget class="QGroupBox" name="buttonRStickDownGroup">
+ <item row="0" column="1">
+ <widget class="QGroupBox" name="buttonRStickUpGroup">
<property name="title">
- <string>Down</string>
+ <string>Up</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
- <layout class="QVBoxLayout" name="buttonRStickDownVerticalLayout">
+ <layout class="QVBoxLayout" name="buttonRStickUpVerticalLayout">
<property name="spacing">
<number>3</number>
</property>
@@ -2937,10 +2542,10 @@
<number>3</number>
</property>
<item>
- <widget class="QPushButton" name="buttonRStickDown">
+ <widget class="QPushButton" name="buttonRStickUp">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -2954,26 +2559,34 @@
<string notr="true">min-width: 68px;</string>
</property>
<property name="text">
- <string>Down</string>
+ <string>Up</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
- <item>
- <spacer name="horizontalSpacerRStickDownRight">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QWidget" name="buttonRStickDownWidget" native="true">
+ <layout class="QHBoxLayout" name="horizontalLayout_11">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
</layout>
</widget>
</item>
@@ -2982,35 +2595,35 @@
<property name="spacing">
<number>3</number>
</property>
- <item alignment="Qt::AlignHCenter">
+ <item alignment="Qt::AlignmentFlag::AlignHCenter">
<widget class="QGroupBox" name="groupRStickPressed">
<property name="title">
<string>Pressed</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
<layout class="QVBoxLayout" name="buttonRStickPressedVerticalLayout">
<property name="spacing">
- <number>3</number>
+ <number>0</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
- <number>3</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
<widget class="QPushButton" name="buttonRStick">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -3031,35 +2644,35 @@
</layout>
</widget>
</item>
- <item alignment="Qt::AlignHCenter">
+ <item alignment="Qt::AlignmentFlag::AlignHCenter">
<widget class="QGroupBox" name="buttonRStickModGroup">
<property name="title">
<string>Modifier</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
<layout class="QVBoxLayout" name="buttonRStickModVerticalLayout">
<property name="spacing">
- <number>3</number>
+ <number>0</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
- <number>3</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
<widget class="QPushButton" name="buttonRStickMod">
<property name="minimumSize">
<size>
- <width>68</width>
+ <width>70</width>
<height>0</height>
</size>
</property>
@@ -3087,19 +2700,19 @@
</property>
<layout class="QHBoxLayout" name="buttonRStickRangeGroupHorizontalLayout">
<property name="spacing">
- <number>3</number>
+ <number>0</number>
</property>
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
- <number>3</number>
+ <number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
<widget class="QSpinBox" name="spinboxRStickRange">
@@ -3159,7 +2772,7 @@
<string>Deadzone: 0%</string>
</property>
<property name="alignment">
- <set>Qt::AlignHCenter</set>
+ <set>Qt::AlignmentFlag::AlignHCenter</set>
</property>
</widget>
</item>
@@ -3171,7 +2784,7 @@
<number>100</number>
</property>
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
@@ -3183,7 +2796,7 @@
<string>Modifier Range: 0%</string>
</property>
<property name="alignment">
- <set>Qt::AlignHCenter</set>
+ <set>Qt::AlignmentFlag::AlignHCenter</set>
</property>
</widget>
</item>
@@ -3195,7 +2808,7 @@
<number>100</number>
</property>
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
@@ -3222,7 +2835,7 @@
<item>
<spacer name="mousePanningHorizontalSpacerLeft">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -3238,23 +2851,23 @@
<string>Mouse panning</string>
</property>
<property name="alignment">
- <set>Qt::AlignCenter</set>
+ <set>Qt::AlignmentFlag::AlignCenter</set>
</property>
<layout class="QVBoxLayout" name="mousePanningVerticalLayout">
<property name="spacing">
- <number>3</number>
+ <number>0</number>
</property>
<property name="leftMargin">
- <number>3</number>
+ <number>0</number>
</property>
<property name="topMargin">
- <number>3</number>
+ <number>0</number>
</property>
<property name="rightMargin">
- <number>3</number>
+ <number>0</number>
</property>
<property name="bottomMargin">
- <number>3</number>
+ <number>0</number>
</property>
<item>
<widget class="QPushButton" name="mousePanningButton">
@@ -3269,7 +2882,7 @@
<item>
<spacer name="mousePanningHorizontalSpacerRight">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -3288,7 +2901,7 @@
<item>
<spacer name="verticalSpacerBottomRight_2">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -3308,16 +2921,14 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>PlayerControlPreview</class>
- <extends>QFrame</extends>
- <header>yuzu/configuration/configure_input_player_widget.h</header>
- <container>1</container>
- </customwidget>
- </customwidgets>
- <resources>
- <include location="../../../dist/icons/controller/controller.qrc"/>
- </resources>
+ <customwidgets>
+ <customwidget>
+ <class>PlayerControlPreview</class>
+ <extends>QFrame</extends>
+ <header>yuzu/configuration/configure_input_player_widget.h</header>
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
+ <resources/>
<connections/>
</ui>
diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui
index 754ef650af..f61af0ccbb 100644
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@@ -18,7 +18,7 @@
<normaloff>:/img/yuzu.ico</normaloff>:/img/yuzu.ico</iconset>
</property>
<property name="tabShape">
- <enum>QTabWidget::Rounded</enum>
+ <enum>QTabWidget::TabShape::Rounded</enum>
</property>
<property name="dockNestingEnabled">
<bool>true</bool>
@@ -45,7 +45,7 @@
<x>0</x>
<y>0</y>
<width>1280</width>
- <height>21</height>
+ <height>22</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
@@ -257,8 +257,11 @@
<property name="text">
<string>Con&amp;figure...</string>
</property>
+ <property name="shortcut">
+ <string>Ctrl+,</string>
+ </property>
<property name="menuRole">
- <enum>QAction::PreferencesRole</enum>
+ <enum>QAction::MenuRole::PreferencesRole</enum>
</property>
</action>
<action name="action_Display_Dock_Widget_Headers">
@@ -423,7 +426,7 @@
<string>&amp;Configure TAS...</string>
</property>
<property name="menuRole">
- <enum>QAction::NoRole</enum>
+ <enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="action_Configure_Current_Game">
@@ -434,7 +437,7 @@
<string>Configure C&amp;urrent Game...</string>
</property>
<property name="menuRole">
- <enum>QAction::NoRole</enum>
+ <enum>QAction::MenuRole::NoRole</enum>
</property>
</action>
<action name="action_TAS_Start">