PCSX2/pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-10-12 02:08:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: Move sstate selector back to interface settings

Browse Source
This commit is contained in:
KamFretoZ
2026-03-19 20:56:34 +01:00
committed by lightningterror
parent d665efdc3a
commit deba43640e
4 changed files with 62 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcsx2-qt/Settings/AdvancedSettingsWidget.cpp
-4
View File
@@ -51,9 +51,6 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsWindow* settings_dialog,
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.gameFixes, "EmuCore", "EnableGameFixes", true);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.patches, "EmuCore", "EnablePatches", true);
dialog()->registerWidgetHelp(m_ui.savestateSelector, tr("Use Save State Selector"), tr("Checked"),
tr("Show a save state selector UI when switching slots instead of showing a notification bubble."));
SettingWidgetBinder::BindWidgetToIntSetting(
sif, m_ui.savestateCompressionMethod, "EmuCore", "SavestateCompressionType", static_cast<int>(SavestateCompressionMethod::Zstandard));
@@ -65,7 +62,6 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsWindow* settings_dialog,
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.backupSaveStates, "EmuCore", "BackupSavestate", true);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.saveStateOnShutdown, "EmuCore", "SaveStateOnShutdown", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.savestateSelector, "EmuCore", "UseSavestateSelector", true);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.pineEnable, "EmuCore", "EnablePINE", false);
SettingWidgetBinder::BindWidgetToIntSetting(sif, m_ui.pineSlot, "EmuCore", "PINESlot", 28011);
pcsx2-qt/Settings/AdvancedSettingsWidget.ui
+30 -38
View File
@@ -407,10 +407,20 @@
<string>Savestate Settings</string>
</property>
<layout class="QGridLayout" name="savestateSettingsLayout">
<item row="3" column="1">
<widget class="QCheckBox" name="saveStateOnShutdown">
<item row="3" column="0">
<widget class="QCheckBox" name="backupSaveStates">
<property name="text">
<string>Save State On Shutdown</string>
<string>Create Save State Backups</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="savestateCompressionLabel">
<property name="text">
<string>Compression Method:</string>
</property>
<property name="buddy">
<cstring>savestateCompressionMethod</cstring>
</property>
</widget>
</item>
@@ -438,6 +448,23 @@
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="savestateCompressionMethodLabel">
<property name="text">
<string>Compression Level:</string>
</property>
<property name="buddy">
<cstring>savestateCompressionLevel</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="saveStateOnShutdown">
<property name="text">
<string>Save State On Shutdown</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="savestateCompressionMethod">
<item>
@@ -462,40 +489,6 @@
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="savestateCompressionMethodLabel">
<property name="text">
<string>Compression Level:</string>
</property>
<property name="buddy">
<cstring>savestateCompressionLevel</cstring>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="backupSaveStates">
<property name="text">
<string>Create Save State Backups</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="savestateCompressionLabel">
<property name="text">
<string>Compression Method:</string>
</property>
<property name="buddy">
<cstring>savestateCompressionMethod</cstring>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="savestateSelector">
<property name="text">
<string>Use Save State Selector</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@@ -582,7 +575,6 @@
<tabstop>savestateCompressionLevel</tabstop>
<tabstop>backupSaveStates</tabstop>
<tabstop>saveStateOnShutdown</tabstop>
<tabstop>savestateSelector</tabstop>
<tabstop>pineEnable</tabstop>
<tabstop>pineSlot</tabstop>
</tabstops>
pcsx2-qt/Settings/InterfaceSettingsWidget.cpp
+4 -2
View File
@@ -98,6 +98,7 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* settings_dialog
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.pauseOnFocusLoss, "UI", "PauseOnFocusLoss", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.pauseOnControllerDisconnection, "UI", "PauseOnControllerDisconnection", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.promptOnStateLoadSaveFailure, "UI", "PromptOnStateLoadSaveFailure", true);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.savestateSelector, "EmuCore", "UseSavestateSelector", true);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.discordPresence, "EmuCore", "EnableDiscordPresence", false);
#ifdef __linux__ // Mouse locking is only supported on X11
@@ -122,8 +123,7 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* settings_dialog
}
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.startFullscreen, "UI", "StartFullscreen", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.doubleClickTogglesFullscreen, "UI", "DoubleClickTogglesFullscreen",
true);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.doubleClickTogglesFullscreen, "UI", "DoubleClickTogglesFullscreen", true);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.hideMouseCursor, "UI", "HideMouseCursor", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.renderToSeparateWindow, "UI", "RenderToSeparateWindow", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.hideMainWindow, "UI", "HideMainWindowWhenRunning", false);
@@ -203,6 +203,8 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* settings_dialog
tr("Automatically switches to fullscreen mode when a game is started."));
dialog()->registerWidgetHelp(m_ui.hideMouseCursor, tr("Hide Cursor In Fullscreen"), tr("Unchecked"),
tr("Hides the mouse pointer/cursor when the emulator is in fullscreen mode."));
dialog()->registerWidgetHelp(m_ui.savestateSelector, tr("Use Save State Selector"), tr("Checked"),
tr("Show a save state selector UI when switching slots instead of showing a notification bubble."));
dialog()->registerWidgetHelp(
m_ui.renderToSeparateWindow, tr("Render To Separate Window"), tr("Unchecked"),
tr("Renders the game to a separate window, instead of the main window. If unchecked, the game will display over the game list."));
pcsx2-qt/Settings/InterfaceSettingsWidget.ui
+28 -20
View File
@@ -29,17 +29,10 @@
<string>Behaviour</string>
</property>
<layout class="QGridLayout" name="formLayout_4">
<item row="1" column="0">
<widget class="QCheckBox" name="inhibitScreensaver">
<item row="0" column="1">
<widget class="QCheckBox" name="pauseOnFocusLoss">
<property name="text">
<string>Inhibit Screensaver</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="confirmShutdown">
<property name="text">
<string>Confirm Shutdown</string>
<string>Pause On Focus Loss</string>
</property>
</widget>
</item>
@@ -50,10 +43,17 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="mouseLock">
<item row="0" column="0">
<widget class="QCheckBox" name="confirmShutdown">
<property name="text">
<string>Enable Mouse Lock</string>
<string>Confirm Shutdown</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="promptOnStateLoadSaveFailure">
<property name="text">
<string>Prompt On State Load/Save Failure</string>
</property>
</widget>
</item>
@@ -71,17 +71,24 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="pauseOnFocusLoss">
<item row="1" column="0">
<widget class="QCheckBox" name="inhibitScreensaver">
<property name="text">
<string>Pause On Focus Loss</string>
<string>Inhibit Screensaver</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="promptOnStateLoadSaveFailure">
<item row="3" column="0">
<widget class="QCheckBox" name="savestateSelector">
<property name="text">
<string>Prompt On State Load/Save Failure</string>
<string>Use Save State Selector</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="mouseLock">
<property name="text">
<string>Enable Mouse Lock</string>
</property>
</widget>
</item>
@@ -386,8 +393,9 @@
<tabstop>pauseOnStart</tabstop>
<tabstop>discordPresence</tabstop>
<tabstop>pauseOnControllerDisconnection</tabstop>
<tabstop>mouseLock</tabstop>
<tabstop>savestateSelector</tabstop>
<tabstop>promptOnStateLoadSaveFailure</tabstop>
<tabstop>mouseLock</tabstop>
<tabstop>startFullscreen</tabstop>
<tabstop>doubleClickTogglesFullscreen</tabstop>
<tabstop>renderToSeparateWindow</tabstop>