Fix controls config dialog

Signed-off-by: swurl <swurl@swurl.xyz>

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
+TryExec=eden
-Exec=yuzu %f
+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;

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>

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);
         });

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->buttonMiscButtonsPlusGroup,
-            ui->bottomRight,
+            ui->buttonMiscButtonsHomeGroup,
+            ui->faceButtons,
+            ui->RStick,
+            ui->buttonMiscButtonsScreenshotGroup,
         };
         break;
     case Core::HID::NpadStyleIndex::JoyconRight:
         layout_hidden = {
-            ui->buttonShoulderButtonsSLSRLeft,          ui->horizontalSpacerShoulderButtonsWidget,
+            ui->buttonShoulderButtonsSLSRLeft,
-            ui->horizontalSpacerShoulderButtonsWidget4, ui->buttonShoulderButtonsLeft,
+            ui->horizontalSpacerShoulderButtonsWidget,
-            ui->buttonMiscButtonsMinusScreenshot,       ui->bottomLeft,
+            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;
     }

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">