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 @@ 0 0 650 - 650 + 700 0 - 650 + 675 @@ -71,7 +71,7 @@ - QDialogButtonBox::Cancel|QDialogButtonBox::Ok + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok 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 layout_show = { + const std::array 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 @@ 0 0 - 780 - 487 + 1391 + 680 @@ -57,7 +57,7 @@ - Qt::LeftToRight + Qt::LayoutDirection::LeftToRight Connect Controller @@ -225,7 +225,7 @@ - QLayout::SetMinimumSize + QLayout::SizeConstraint::SetMinimumSize 0 @@ -241,12 +241,12 @@ - + 0 - QLayout::SetDefaultConstraint + QLayout::SizeConstraint::SetDefaultConstraint 0 @@ -272,20 +272,20 @@ Left Stick - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop 0 - QLayout::SetDefaultConstraint + QLayout::SizeConstraint::SetDefaultConstraint 3 - 6 + 0 3 @@ -294,11 +294,8 @@ 0 - - - - 0 - + + 0 @@ -311,234 +308,20 @@ 0 - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - Up - - - Qt::AlignCenter - - - false - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Up - - - - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - - - - 3 - - - - - Left - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Left - - - - - - - - - - Right - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Right - - - - - - - - - - - 0 - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - + Down - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - 3 + 0 3 @@ -556,7 +339,7 @@ - 68 + 70 0 @@ -577,18 +360,155 @@ - - - - Qt::Horizontal + + + + Right - - - 20 - 20 - + + Qt::AlignmentFlag::AlignCenter - + + + 0 + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + Right + + + + + + + + + + Left + + + Qt::AlignmentFlag::AlignCenter + + + + 0 + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + Left + + + + + + + + + + Up + + + Qt::AlignmentFlag::AlignCenter + + + false + + + + 0 + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + Up + + + + + @@ -598,35 +518,35 @@ 3 - + Pressed - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - 3 + 0 3 - 3 + 0 3 - 3 + 0 - 68 + 70 0 @@ -647,35 +567,35 @@ - + Modifier - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - 3 + 0 3 - 3 + 0 3 - 3 + 0 - 68 + 70 0 @@ -703,19 +623,19 @@ - 3 + 0 3 - 3 + 0 3 - 3 + 0 @@ -756,7 +676,7 @@ 3 - QLayout::SetDefaultConstraint + QLayout::SizeConstraint::SetDefaultConstraint 0 @@ -778,7 +698,7 @@ Deadzone: 0% - Qt::AlignHCenter + Qt::AlignmentFlag::AlignHCenter @@ -790,7 +710,7 @@ 100 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -802,7 +722,7 @@ Modifier Range: 0% - Qt::AlignHCenter + Qt::AlignmentFlag::AlignHCenter @@ -814,7 +734,7 @@ 100 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -823,19 +743,6 @@ - - - - Qt::Vertical - - - - 20 - 0 - - - - @@ -861,20 +768,17 @@ 3 - 6 + 0 3 - 3 + 0 - - - - 0 - + + 0 @@ -887,249 +791,38 @@ 0 - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - Up - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Up - - - - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - - - - 3 - - - - - Left - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Left - - - - - - - - - - Right - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Right - - - - - - - - - - - 0 - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - + Down - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - 3 + 0 3 - 3 + 0 3 - 3 + 0 - 68 + 70 0 @@ -1150,18 +843,152 @@ - - - - Qt::Horizontal + + + + Left - - - 20 - 20 - + + Qt::AlignmentFlag::AlignCenter - + + + 0 + + + 3 + + + 0 + + + 3 + + + 0 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + Left + + + + + + + + + + Right + + + Qt::AlignmentFlag::AlignCenter + + + + 0 + + + 3 + + + 0 + + + 3 + + + 0 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + Right + + + + + + + + + + Up + + + Qt::AlignmentFlag::AlignCenter + + + + 0 + + + 3 + + + 0 + + + 3 + + + 0 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + Up + + + + + @@ -1172,7 +999,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -1187,7 +1014,7 @@ - + 6 @@ -1208,162 +1035,9 @@ 3 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - SL - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - SL - - - - - - - - - - SR - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - SR - - - - - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 0 - 20 - - - - - - - - - + + 0 @@ -1380,14 +1054,14 @@ 0 - + - L + SR - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - + 3 @@ -1404,10 +1078,10 @@ 3 - + - 68 + 70 0 @@ -1421,7 +1095,7 @@ min-width: 68px; - L + SR @@ -1429,18 +1103,122 @@ - - - - 0 - 0 - + + + SL + + + Qt::AlignmentFlag::AlignCenter + + + + 3 + + 3 + + + 3 + + + 3 + + + 3 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + SL + + + + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Qt::Orientation::Horizontal + + + + 0 + 20 + + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + ZL - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1462,7 +1240,7 @@ - 68 + 70 0 @@ -1480,22 +1258,71 @@ - - - - - 70 - 15 - - - - 100 - - - Qt::Horizontal - - - + + + + + 70 + 15 + + + + 100 + + + Qt::Orientation::Horizontal + + + + + + + + + + L + + + Qt::AlignmentFlag::AlignCenter + + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + L + + + @@ -1523,7 +1350,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -1537,238 +1364,98 @@ - - + + + Plus + + + Qt::AlignmentFlag::AlignCenter + + - 0 + 3 - 0 + 3 - 0 + 3 - 0 + 3 - 0 + 3 - - - - Minus + + + + + 70 + 0 + - - Qt::AlignCenter + + + 68 + 16777215 + - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Minus - - - - - - - - - - Capture + + min-width: 68px; - - Qt::AlignCenter + + Plus - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Capture - - - - - - + + + Minus + + + Qt::AlignmentFlag::AlignCenter + + - 0 + 3 - 0 + 3 - 0 + 3 - 0 + 3 - 0 + 3 - - - - Plus + + + + + 70 + 0 + - - Qt::AlignCenter + + + 68 + 16777215 + - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Plus - - - - - - - - - - Home + + min-width: 68px; - - Qt::AlignCenter + + Minus - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Home - - - - @@ -1795,7 +1482,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -1810,7 +1497,7 @@ - + 0 @@ -1826,68 +1513,19 @@ 0 - - - - R - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - R - - - - - - - - - 0 - 0 - - + + + 0 + 0 + + ZR - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -1909,7 +1547,7 @@ - 68 + 70 0 @@ -1927,22 +1565,71 @@ - - - - - 70 - 15 - - - - 100 - - - Qt::Horizontal - - - + + + + + 70 + 15 + + + + 100 + + + Qt::Orientation::Horizontal + + + + + + + + + + R + + + Qt::AlignmentFlag::AlignCenter + + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + R + + + @@ -1970,7 +1657,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -1983,160 +1670,159 @@ - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - SL - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - SL - - - - - - - - - - SR - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - SR - - - - - - + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + SR + + + Qt::AlignmentFlag::AlignCenter + + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + SR + + + - - + + + + + + SL + + + Qt::AlignmentFlag::AlignCenter + + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + SL + + + + + + + + + - - - - - 0 - 0 - - - - - 75 - true - - - - image: url(:/controller/pro); - - - - 0 - - - 0 - - - 0 - - - 0 - - - - + + + + + 0 + 0 + + + + + true + + + + image: url(:/controller/pro); + + + + 0 + + + 0 + + + 0 + + + 0 + + + + @@ -2148,7 +1834,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -2164,7 +1850,7 @@ Motion 1 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -2186,7 +1872,7 @@ - 68 + 70 0 @@ -2213,7 +1899,7 @@ Motion 2 - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -2235,7 +1921,7 @@ - 68 + 70 0 @@ -2257,17 +1943,102 @@ - - - Qt::Horizontal + + + Capture - - - 20 - 20 - + + Qt::AlignmentFlag::AlignCenter - + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + Capture + + + + + + + + + + Home + + + Qt::AlignmentFlag::AlignCenter + + + + 3 + + + 3 + + + 3 + + + 3 + + + 3 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + Home + + + + + @@ -2317,20 +2088,17 @@ 3 - 6 + 0 3 - 3 + 0 - - - - 0 - + + 0 @@ -2343,48 +2111,38 @@ 0 - - - - Qt::Horizontal - - - - 20 - 20 - - - - - + + 0 + + X - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - 3 + 0 3 - 3 + 0 3 - 3 + 0 - 68 + 70 0 @@ -2405,187 +2163,35 @@ - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - - - - 3 - - - - - Y - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Y - - - - - - - - - - A - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - A - - - - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - + B - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - 3 + 0 3 - 3 + 0 3 - 3 + 0 - 68 + 70 0 @@ -2606,18 +2212,103 @@ - - - - Qt::Horizontal + + + + A - - - 20 - 20 - + + Qt::AlignmentFlag::AlignCenter - + + + 0 + + + 3 + + + 0 + + + 3 + + + 0 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + A + + + + + + + + + + Y + + + Qt::AlignmentFlag::AlignCenter + + + + 0 + + + 3 + + + 0 + + + 3 + + + 0 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + Y + + + + + @@ -2625,19 +2316,6 @@ - - - - Qt::Vertical - - - - 20 - 0 - - - - @@ -2650,7 +2328,7 @@ Right Stick - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter false @@ -2666,7 +2344,7 @@ 3 - 6 + 0 3 @@ -2675,17 +2353,8 @@ 0 - - - - 0 - 0 - - - - - 0 - + + 0 @@ -2698,26 +2367,163 @@ 0 - - - - Qt::Horizontal + + 0 + + + + + Right - - - 20 - 20 - + + Qt::AlignmentFlag::AlignCenter - + + + 0 + + + 3 + + + 0 + + + 3 + + + 0 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + Right + + + + + - + + + + Down + + + Qt::AlignmentFlag::AlignCenter + + + + 0 + + + 3 + + + 0 + + + 3 + + + 0 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + Down + + + + + + + + + + Left + + + Qt::AlignmentFlag::AlignCenter + + + + 0 + + + 3 + + + 0 + + + 3 + + + 0 + + + + + + 70 + 0 + + + + + 68 + 16777215 + + + + min-width: 68px; + + + Left + + + + + + + Up - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter @@ -2739,7 +2545,7 @@ - 68 + 70 0 @@ -2760,127 +2566,9 @@ - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - 3 - - - - - Left - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Left - - - - - - - - - - Right - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Right - - - - - - - - @@ -2899,81 +2587,6 @@ 0 - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - Down - - - Qt::AlignCenter - - - - 3 - - - 3 - - - 3 - - - 3 - - - 3 - - - - - - 68 - 0 - - - - - 68 - 16777215 - - - - min-width: 68px; - - - Down - - - - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - @@ -2982,35 +2595,35 @@ 3 - + Pressed - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - 3 + 0 3 - 3 + 0 3 - 3 + 0 - 68 + 70 0 @@ -3031,35 +2644,35 @@ - + Modifier - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - 3 + 0 3 - 3 + 0 3 - 3 + 0 - 68 + 70 0 @@ -3087,19 +2700,19 @@ - 3 + 0 3 - 3 + 0 3 - 3 + 0 @@ -3159,7 +2772,7 @@ Deadzone: 0% - Qt::AlignHCenter + Qt::AlignmentFlag::AlignHCenter @@ -3171,7 +2784,7 @@ 100 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -3183,7 +2796,7 @@ Modifier Range: 0% - Qt::AlignHCenter + Qt::AlignmentFlag::AlignHCenter @@ -3195,7 +2808,7 @@ 100 - Qt::Horizontal + Qt::Orientation::Horizontal @@ -3222,7 +2835,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -3238,23 +2851,23 @@ Mouse panning - Qt::AlignCenter + Qt::AlignmentFlag::AlignCenter - 3 + 0 - 3 + 0 - 3 + 0 - 3 + 0 - 3 + 0 @@ -3269,7 +2882,7 @@ - Qt::Horizontal + Qt::Orientation::Horizontal @@ -3288,7 +2901,7 @@ - Qt::Vertical + Qt::Orientation::Vertical @@ -3308,16 +2921,14 @@ - - - PlayerControlPreview - QFrame -
yuzu/configuration/configure_input_player_widget.h
- 1 - - - - - + + + PlayerControlPreview + QFrame +
yuzu/configuration/configure_input_player_widget.h
+ 1 + + + 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 @@ :/img/yuzu.ico:/img/yuzu.ico - QTabWidget::Rounded + QTabWidget::TabShape::Rounded true @@ -45,7 +45,7 @@ 0 0 1280 - 21 + 22 @@ -257,8 +257,11 @@ Con&figure... + + Ctrl+, + - QAction::PreferencesRole + QAction::MenuRole::PreferencesRole @@ -423,7 +426,7 @@ &Configure TAS... - QAction::NoRole + QAction::MenuRole::NoRole @@ -434,7 +437,7 @@ Configure C&urrent Game... - QAction::NoRole + QAction::MenuRole::NoRole