ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI: Remove option to disable per-game settings

This commit is contained in:
refractionpcsx2 2024-02-17 02:11:36 +00:00
parent 45421a9f96
commit 987dd805c2
7 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2-gsrunner/Main.cpp
View File

@ -118,9 +118,6 @@ bool GSRunner::InitializeConfig()
Pad::ClearPortBindings(si, 0);
si.ClearSection("Hotkeys");
// make sure any gamesettings inis in your tree don't get loaded
si.SetBoolValue("EmuCore", "EnablePerGameSettings", false);
// force logging
si.SetBoolValue("Logging", "EnableSystemConsole", !s_no_console);
si.SetBoolValue("Logging", "EnableTimestamps", true);

5
pcsx2-qt/Settings/InterfaceSettingsWidget.cpp
View File

@ -87,12 +87,9 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* dialog, QWidget
connect(m_ui.language, QOverload<int>::of(&QComboBox::currentIndexChanged), [this]() { emit languageChanged(); });
// Per-game settings is special, we don't want to bind it if we're editing per-game settings.
m_ui.perGameSettings->setEnabled(!dialog->isPerGameSettings());
if (!dialog->isPerGameSettings())
{
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.pauseOnStart, "UI", "StartPaused", false);
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.perGameSettings, "EmuCore", "EnablePerGameSettings", true);
connect(m_ui.perGameSettings, &QCheckBox::stateChanged, g_emu_thread, &EmuThread::reloadGameSettings);
}
if (!dialog->isPerGameSettings() && AutoUpdaterDialog::isSupported())
@ -154,8 +151,6 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* dialog, QWidget
dialog->registerWidgetHelp(
m_ui.hideMainWindow, tr("Hide Main Window When Running"), tr("Unchecked"),
tr("Hides the main window (with the game list) when a game is running, requires Render To Separate Window to be enabled."));
dialog->registerWidgetHelp(m_ui.perGameSettings, tr("Enable Per-Game Settings"), tr("Checked"),
tr("When enabled, custom per-game settings will be applied. Disable to always use the global configuration."));
dialog->registerWidgetHelp(
m_ui.discordPresence, tr("Enable Discord Presence"), tr("Unchecked"),
tr("Shows the game you are currently playing as part of your profile in Discord."));

7
pcsx2-qt/Settings/InterfaceSettingsWidget.ui
View File

@ -78,13 +78,6 @@
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="perGameSettings">
<property name="text">
<string>Enable Per-Game Settings</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>

1
pcsx2/Config.h
View File

@ -1132,7 +1132,6 @@ struct Pcsx2Config
EnableNoInterlacingPatches : 1,
EnableFastBoot : 1,
EnableFastBootFastForward : 1,
EnablePerGameSettings : 1,
// TODO - Vaser - where are these settings exposed in the Qt UI?
EnableRecordingTools : 1,
EnableGameFixes : 1, // enables automatic game fixes

6
pcsx2/ImGui/FullscreenUI.cpp
View File

@ -2731,12 +2731,6 @@ void FullscreenUI::DrawInterfaceSettingsPage()
FSUI_CSTR("Automatically saves the emulator state when powering down or exiting. You can then resume directly from where you left "
"off next time."),
"EmuCore", "SaveStateOnShutdown", false);
if (DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_WRENCH, "Enable Per-Game Settings"),
FSUI_CSTR("When enabled, custom per-game settings will be applied. Disable to always use the global configuration."), "EmuCore", "EnablePerGameSettings",
IsEditingGameSettings(bsi)))
{
Host::RunOnCPUThread(&VMManager::ReloadGameSettings);
}
if (DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_PAINT_BRUSH, "Use Light Theme"),
FSUI_CSTR("Uses a light coloured theme instead of the default dark theme."), "UI", "UseLightFullscreenUITheme", false))
{

2
pcsx2/Pcsx2Config.cpp
View File

@ -1692,7 +1692,6 @@ Pcsx2Config::Pcsx2Config()
McdFolderAutoManage = true;
EnablePatches = true;
EnableFastBoot = true;
EnablePerGameSettings = true;
EnableRecordingTools = true;
EnableGameFixes = true;
InhibitScreensaver = true;
@ -1727,7 +1726,6 @@ void Pcsx2Config::LoadSaveCore(SettingsWrapper& wrap)
SettingsWrapBitBool(EnableNoInterlacingPatches);
SettingsWrapBitBool(EnableFastBoot);
SettingsWrapBitBool(EnableFastBootFastForward);
SettingsWrapBitBool(EnablePerGameSettings);
SettingsWrapBitBool(EnableRecordingTools);
SettingsWrapBitBool(EnableGameFixes);
SettingsWrapBitBool(SaveStateOnShutdown);

2
pcsx2/VMManager.cpp
View File

@ -849,7 +849,7 @@ std::string VMManager::GetSerialForGameSettings()
bool VMManager::UpdateGameSettingsLayer()
{
std::unique_ptr<INISettingsInterface> new_interface;
if (s_disc_crc != 0 && EmuConfig.EnablePerGameSettings)
if (s_disc_crc != 0)
{
std::string filename(GetGameSettingsPath(GetSerialForGameSettings(), s_disc_crc));
if (!FileSystem::FileExists(filename.c_str()))