diff --git a/pcsx2-qt/Settings/InterfaceSettingsWidget.cpp b/pcsx2-qt/Settings/InterfaceSettingsWidget.cpp index 116a1e08eb..11ff0c6cf8 100644 --- a/pcsx2-qt/Settings/InterfaceSettingsWidget.cpp +++ b/pcsx2-qt/Settings/InterfaceSettingsWidget.cpp @@ -78,7 +78,7 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsDialog* dialog, QWidget m_ui.inhibitScreensaver, tr("Inhibit Screensaver"), tr("Checked"), tr("Prevents the screen saver from activating and the host from sleeping while emulation is running.")); - if (AutoUpdaterDialog::isSupported()) + if (!dialog->isPerGameSettings() && AutoUpdaterDialog::isSupported()) { SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.autoUpdateEnabled, "AutoUpdater", "CheckAtStartup", true); dialog->registerWidgetHelp(m_ui.autoUpdateEnabled, tr("Enable Automatic Update Check"), tr("Checked"), @@ -104,6 +104,16 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsDialog* dialog, QWidget m_ui.discordPresence->setEnabled(false); #endif + if (dialog->isPerGameSettings()) + { + // language/theme doesn't make sense to have in per-game settings + m_ui.verticalLayout->removeWidget(m_ui.preferencesGroup); + m_ui.preferencesGroup->hide(); + + // start paused doesn't make sense, because settings are applied after ELF load. + m_ui.pauseOnStart->setEnabled(false); + } + dialog->registerWidgetHelp( m_ui.confirmShutdown, tr("Confirm Shutdown"), tr("Checked"), tr("Determines whether a prompt will be displayed to confirm shutting down the virtual machine " diff --git a/pcsx2-qt/Settings/InterfaceSettingsWidget.ui b/pcsx2-qt/Settings/InterfaceSettingsWidget.ui index b91fc0794a..5a69dfba2f 100644 --- a/pcsx2-qt/Settings/InterfaceSettingsWidget.ui +++ b/pcsx2-qt/Settings/InterfaceSettingsWidget.ui @@ -140,7 +140,7 @@ - + Preferences diff --git a/pcsx2-qt/Settings/SettingsDialog.cpp b/pcsx2-qt/Settings/SettingsDialog.cpp index 825f6938ca..a34c0944fd 100644 --- a/pcsx2-qt/Settings/SettingsDialog.cpp +++ b/pcsx2-qt/Settings/SettingsDialog.cpp @@ -77,21 +77,7 @@ void SettingsDialog::setupUi(const GameList::Entry* game) m_ui.setupUi(this); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - // We don't include interface/game list/bios settings from per-game settings. - if (!isPerGameSettings()) - { - addWidget(m_interface_settings = new InterfaceSettingsWidget(this, m_ui.settingsContainer), tr("Interface"), - QStringLiteral("settings-3-line"), - tr("Interface Settings
These options control how the software looks and behaves.

Mouse over an option for " - "additional information.")); - addWidget(m_game_list_settings = new GameListSettingsWidget(this, m_ui.settingsContainer), tr("Game List"), - QStringLiteral("folder-settings-line"), - tr("Game List Settings
The list above shows the directories which will be searched by PCSX2 to populate the game " - "list. Search directories can be added, removed, and switched to recursive/non-recursive.")); - addWidget(m_bios_settings = new BIOSSettingsWidget(this, m_ui.settingsContainer), tr("BIOS"), QStringLiteral("hard-drive-2-line"), - tr("BIOS Settings
Configure your BIOS here.

Mouse over an option for additional information.")); - } - else + if (isPerGameSettings()) { if (game) { @@ -102,6 +88,22 @@ void SettingsDialog::setupUi(const GameList::Entry* game) m_ui.restoreDefaultsButton->setVisible(false); } + addWidget(m_interface_settings = new InterfaceSettingsWidget(this, m_ui.settingsContainer), tr("Interface"), + QStringLiteral("settings-3-line"), + tr("Interface Settings
These options control how the software looks and behaves.

Mouse over an option for " + "additional information.")); + + // We don't include game list/bios settings in per-game settings. + if (!isPerGameSettings()) + { + addWidget(m_game_list_settings = new GameListSettingsWidget(this, m_ui.settingsContainer), tr("Game List"), + QStringLiteral("folder-settings-line"), + tr("Game List Settings
The list above shows the directories which will be searched by PCSX2 to populate the game " + "list. Search directories can be added, removed, and switched to recursive/non-recursive.")); + addWidget(m_bios_settings = new BIOSSettingsWidget(this, m_ui.settingsContainer), tr("BIOS"), QStringLiteral("hard-drive-2-line"), + tr("BIOS Settings
Configure your BIOS here.

Mouse over an option for additional information.")); + } + // Common to both per-game and global settings. addWidget(m_emulation_settings = new EmulationSettingsWidget(this, m_ui.settingsContainer), tr("Emulation"), QStringLiteral("dashboard-line"), tr("Emulation Settings
These options determine the configuration of frame pacing and game settings.

Mouse over an option for additional information."));