RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-04-05 22:46:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

overlays: add setting for fatal error hint (disabled by default)

Browse source
This commit is contained in:
Megamouse 2026-03-30 15:32:37 +02:00 • committed by Ani
parent b0dbac9a07
commit cb3a83cba7
9 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp
View file

@ -229,6 +229,7 @@ namespace rsx
add_checkbox(&g_cfg.misc.show_pressure_intensity_toggle_hint, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_PRESSURE_INTENSITY_TOGGLE_HINT);
add_checkbox(&g_cfg.misc.show_analog_limiter_toggle_hint, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_ANALOG_LIMITER_TOGGLE_HINT);
add_checkbox(&g_cfg.misc.show_mouse_and_keyboard_toggle_hint, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_MOUSE_AND_KB_TOGGLE_HINT);
add_checkbox(&g_cfg.misc.show_fatal_error_hints, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_FATAL_ERROR_HINTS);
add_checkbox(&g_cfg.video.record_with_overlays, localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_RECORD_WITH_OVERLAYS);
apply_layout();

1
rpcs3/Emu/localized_string_id.h
View file

@ -254,6 +254,7 @@ enum class localized_string_id
HOME_MENU_SETTINGS_OVERLAYS_SHOW_PRESSURE_INTENSITY_TOGGLE_HINT,
HOME_MENU_SETTINGS_OVERLAYS_SHOW_ANALOG_LIMITER_TOGGLE_HINT,
HOME_MENU_SETTINGS_OVERLAYS_SHOW_MOUSE_AND_KB_TOGGLE_HINT,
HOME_MENU_SETTINGS_OVERLAYS_SHOW_FATAL_ERROR_HINTS,
HOME_MENU_SETTINGS_OVERLAYS_RECORD_WITH_OVERLAYS,
HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY,
HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE,

1
rpcs3/Emu/system_config.h
View file

@ -357,6 +357,7 @@ struct cfg_root : cfg::node
cfg::_bool show_pressure_intensity_toggle_hint{ this, "Show pressure intensity toggle hint", true, true };
cfg::_bool show_analog_limiter_toggle_hint{ this, "Show analog limiter toggle hint", true, true };
cfg::_bool show_mouse_and_keyboard_toggle_hint{ this, "Show mouse and keyboard toggle hint", true, true };
cfg::_bool show_fatal_error_hints{ this, "Show fatal error hints", false, true };
cfg::_bool show_capture_hints{ this, "Show capture hints", true, true };
cfg::_bool use_native_interface{ this, "Use native user interface", true };
cfg::string gdb_server{ this, "GDB Server", "127.0.0.1:2345" };

10
rpcs3/rpcs3.cpp
View file

@ -68,6 +68,7 @@ DYNAMIC_IMPORT("ntdll.dll", NtSetTimerResolution, NTSTATUS(ULONG DesiredResoluti
#include "util/media_utils.h"
#include "rpcs3_version.h"
#include "Emu/System.h"
#include "Emu/system_config.h"
#include "Emu/system_utils.hpp"
#include "Emu/RSX/Overlays/overlay_message.h"
#include <thread>
@ -353,11 +354,14 @@ public:
#endif
if (msg == logs::level::fatal)
{
std::string overlay_msg = "Fatal error: " + _msg.substr(rpcs3_prefix.size());
fmt::trim_back(overlay_msg, " \t\n");
if (g_cfg.misc.show_fatal_error_hints)
{
std::string overlay_msg = "Fatal error: " + _msg.substr(rpcs3_prefix.size());
fmt::trim_back(overlay_msg, " \t\n");
rsx::overlays::queue_message(overlay_msg, umax);
}
// Pause emulation if fatal error encountered
rsx::overlays::queue_message(overlay_msg, umax);
Emu.Pause(true);
}
}

2
rpcs3/rpcs3qt/emu_settings_type.h
View file

@ -189,6 +189,7 @@ enum class emu_settings_type
ShowPressureIntensityToggleHint,
ShowAnalogLimiterToggleHint,
ShowMouseAndKeyboardToggleHint,
ShowFatalErrorHints,
ShowCaptureHints,
WindowTitleFormat,
PauseDuringHomeMenu,
@ -405,6 +406,7 @@ inline static const std::map<emu_settings_type, cfg_location> settings_location
{ emu_settings_type::ShowPressureIntensityToggleHint, { "Miscellaneous", "Show pressure intensity toggle hint"}},
{ emu_settings_type::ShowAnalogLimiterToggleHint, { "Miscellaneous", "Show analog limiter toggle hint"}},
{ emu_settings_type::ShowMouseAndKeyboardToggleHint, { "Miscellaneous", "Show mouse and keyboard toggle hint"}},
{ emu_settings_type::ShowFatalErrorHints, { "Miscellaneous", "Show fatal error hints"}},
{ emu_settings_type::ShowCaptureHints, { "Miscellaneous", "Show capture hints" }},
{ emu_settings_type::SilenceAllLogs, { "Miscellaneous", "Silence All Logs" }},
{ emu_settings_type::WindowTitleFormat, { "Miscellaneous", "Window Title Format" }},

1
rpcs3/rpcs3qt/localized_emu.h
View file

@ -274,6 +274,7 @@ private:
case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_PRESSURE_INTENSITY_TOGGLE_HINT: return tr("Show Pressure Intensity Toggle Hint", "Overlays");
case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_ANALOG_LIMITER_TOGGLE_HINT: return tr( "Show Analog Limiter Toggle Hint", "Overlays");
case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_MOUSE_AND_KB_TOGGLE_HINT: return tr("Show Mouse And Keyboard Toggle Hint", "Overlays");
case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_SHOW_FATAL_ERROR_HINTS: return tr("Show Fatal Error Hints", "Overlays");
case localized_string_id::HOME_MENU_SETTINGS_OVERLAYS_RECORD_WITH_OVERLAYS: return tr("Record With Overlays", "Overlays");
case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY: return tr("Performance Overlay");
case localized_string_id::HOME_MENU_SETTINGS_PERFORMANCE_OVERLAY_ENABLE: return tr("Enable Performance Overlay", "Performance Overlay");

3
rpcs3/rpcs3qt/settings_dialog.cpp
View file

@ -1847,6 +1847,9 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
m_emu_settings->EnhanceCheckBox(ui->showMouseAndKeyboardToggleHint, emu_settings_type::ShowMouseAndKeyboardToggleHint);
SubscribeTooltip(ui->showMouseAndKeyboardToggleHint, tooltips.settings.show_mouse_and_keyboard_toggle_hint);
m_emu_settings->EnhanceCheckBox(ui->showFatalErrorHints, emu_settings_type::ShowFatalErrorHints);
SubscribeTooltip(ui->showFatalErrorHints, tooltips.settings.show_fatal_error_hints);
m_emu_settings->EnhanceCheckBox(ui->showCaptureHints, emu_settings_type::ShowCaptureHints);
SubscribeTooltip(ui->showCaptureHints, tooltips.settings.show_capture_hints);

7
rpcs3/rpcs3qt/settings_dialog.ui
View file

@ -3037,6 +3037,13 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showFatalErrorHints">
<property name="text">
<string>Show fatal error hints</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showMouseAndKeyboardToggleHint">
<property name="text">

1
rpcs3/rpcs3qt/tooltips.h
View file

@ -154,6 +154,7 @@ public:
const QString show_pressure_intensity_toggle_hint = tr("Shows pressure intensity toggle hint using the native overlay.");
const QString show_analog_limiter_toggle_hint = tr("Shows analog limiter toggle hint using the native overlay.");
const QString show_mouse_and_keyboard_toggle_hint = tr("Shows mouse and keyboard toggle hint using the native overlay.");
const QString show_fatal_error_hints = tr("Shows fatal error hints using the native overlay.");
const QString show_capture_hints = tr("Shows screenshot and recording hints using the native overlay.");
const QString use_native_interface = tr("Enables use of native HUD within the game window that can interact with game controllers.\nWhen disabled, regular Qt dialogs are used instead.\nCurrently, the on-screen keyboard only supports the English key layout.");
const QString record_with_overlays = tr("Enables recording with overlays.\nThis also affects screenshots.");