mirror of https://github.com/PCSX2/pcsx2.git
OSD: Add PCSX2 Version toggle
This commit is contained in:
parent
24a87c3fee
commit
cd4de28b9e
|
@ -124,6 +124,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
|
||||||
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowSettings, "EmuCore/GS", "OsdShowSettings", false);
|
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowSettings, "EmuCore/GS", "OsdShowSettings", false);
|
||||||
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowInputs, "EmuCore/GS", "OsdShowInputs", false);
|
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowInputs, "EmuCore/GS", "OsdShowInputs", false);
|
||||||
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowFrameTimes, "EmuCore/GS", "OsdShowFrameTimes", false);
|
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowFrameTimes, "EmuCore/GS", "OsdShowFrameTimes", false);
|
||||||
|
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.osdShowVersion, "EmuCore/GS", "OsdShowVersion", false);
|
||||||
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.warnAboutUnsafeSettings, "EmuCore", "WarnAboutUnsafeSettings", true);
|
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.warnAboutUnsafeSettings, "EmuCore", "WarnAboutUnsafeSettings", true);
|
||||||
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.fxaa, "EmuCore/GS", "fxaa", false);
|
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.fxaa, "EmuCore/GS", "fxaa", false);
|
||||||
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.shadeBoost, "EmuCore/GS", "ShadeBoost", false);
|
SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.shadeBoost, "EmuCore/GS", "ShadeBoost", false);
|
||||||
|
@ -718,8 +719,11 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* dialog, QWidget*
|
||||||
dialog->registerWidgetHelp(m_ui.osdShowInputs, tr("Show Inputs"), tr("Unchecked"),
|
dialog->registerWidgetHelp(m_ui.osdShowInputs, tr("Show Inputs"), tr("Unchecked"),
|
||||||
tr("Shows the current controller state of the system in the bottom-left corner of the display."));
|
tr("Shows the current controller state of the system in the bottom-left corner of the display."));
|
||||||
|
|
||||||
dialog->registerWidgetHelp(
|
dialog->registerWidgetHelp(m_ui.osdShowFrameTimes, tr("Show Frame Times"), tr("Unchecked"),
|
||||||
m_ui.osdShowFrameTimes, tr("Show Frame Times"), tr("Unchecked"), tr("Displays a graph showing the average frametimes."));
|
tr("Displays a graph showing the average frametimes."));
|
||||||
|
|
||||||
|
dialog->registerWidgetHelp(m_ui.osdShowVersion, tr("Show PCSX2 Version"), tr("Unchecked"),
|
||||||
|
tr("Shows the current PCSX2 version on the top-right corner of the display"));
|
||||||
|
|
||||||
dialog->registerWidgetHelp(m_ui.warnAboutUnsafeSettings, tr("Warn About Unsafe Settings"), tr("Checked"),
|
dialog->registerWidgetHelp(m_ui.warnAboutUnsafeSettings, tr("Warn About Unsafe Settings"), tr("Checked"),
|
||||||
tr("Displays warnings when settings are enabled which may break games."));
|
tr("Displays warnings when settings are enabled which may break games."));
|
||||||
|
|
|
@ -1610,59 +1610,17 @@
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0" colspan="2">
|
<item row="1" column="0" colspan="2">
|
||||||
<layout class="QGridLayout" name="gridLayout_6">
|
<layout class="QGridLayout" name="gridLayout_6">
|
||||||
<item row="3" column="1">
|
|
||||||
<widget class="QCheckBox" name="osdShowIndicators">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show Indicators</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
<item row="1" column="1">
|
||||||
<widget class="QCheckBox" name="osdShowResolution">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show Resolution</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1">
|
|
||||||
<widget class="QCheckBox" name="osdShowInputs">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show Inputs</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QCheckBox" name="osdShowGPU">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show GPU Usage</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="0">
|
|
||||||
<widget class="QCheckBox" name="osdShowSettings">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show Settings</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QCheckBox" name="osdShowFPS">
|
<widget class="QCheckBox" name="osdShowFPS">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Show FPS</string>
|
<string>Show FPS</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QCheckBox" name="osdShowMessages">
|
<widget class="QCheckBox" name="osdShowVersion">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Show OSD Messages</string>
|
<string>Show PCSX2 Version</string>
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="0">
|
|
||||||
<widget class="QCheckBox" name="osdShowGSStats">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show Statistics</string>
|
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
@ -1673,27 +1631,76 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1">
|
<item row="3" column="1">
|
||||||
<widget class="QCheckBox" name="osdShowSpeed">
|
<widget class="QCheckBox" name="osdShowIndicators">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Show Speed Percentages</string>
|
<string>Show Indicators</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="1">
|
<item row="0" column="0">
|
||||||
|
<widget class="QCheckBox" name="osdShowMessages">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show OSD Messages</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="7" column="0">
|
||||||
<widget class="QCheckBox" name="warnAboutUnsafeSettings">
|
<widget class="QCheckBox" name="warnAboutUnsafeSettings">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Warn About Unsafe Settings</string>
|
<string>Warn About Unsafe Settings</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="0">
|
<item row="2" column="1">
|
||||||
|
<widget class="QCheckBox" name="osdShowGPU">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show GPU Usage</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QCheckBox" name="osdShowResolution">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show Resolution</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="6" column="1">
|
||||||
<widget class="QCheckBox" name="osdShowFrameTimes">
|
<widget class="QCheckBox" name="osdShowFrameTimes">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Show Frame Times</string>
|
<string>Show Frame Times</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="4" column="1">
|
||||||
|
<widget class="QCheckBox" name="osdShowGSStats">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show Statistics</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0">
|
||||||
|
<widget class="QCheckBox" name="osdShowSpeed">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show Speed Percentages</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="6" column="0">
|
||||||
|
<widget class="QCheckBox" name="osdShowInputs">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show Inputs</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="0">
|
||||||
|
<widget class="QCheckBox" name="osdShowSettings">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show Settings</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
|
|
@ -621,6 +621,7 @@ struct Pcsx2Config
|
||||||
OsdShowSettings : 1,
|
OsdShowSettings : 1,
|
||||||
OsdShowInputs : 1,
|
OsdShowInputs : 1,
|
||||||
OsdShowFrameTimes : 1,
|
OsdShowFrameTimes : 1,
|
||||||
|
OsdShowVersion : 1,
|
||||||
HWSpinGPUForReadbacks : 1,
|
HWSpinGPUForReadbacks : 1,
|
||||||
HWSpinCPUForReadbacks : 1,
|
HWSpinCPUForReadbacks : 1,
|
||||||
GPUPaletteConversion : 1,
|
GPUPaletteConversion : 1,
|
||||||
|
|
|
@ -1054,6 +1054,7 @@ static void HotkeyToggleOSD()
|
||||||
GSConfig.OsdShowSettings ^= EmuConfig.GS.OsdShowSettings;
|
GSConfig.OsdShowSettings ^= EmuConfig.GS.OsdShowSettings;
|
||||||
GSConfig.OsdShowInputs ^= EmuConfig.GS.OsdShowInputs;
|
GSConfig.OsdShowInputs ^= EmuConfig.GS.OsdShowInputs;
|
||||||
GSConfig.OsdShowFrameTimes ^= EmuConfig.GS.OsdShowFrameTimes;
|
GSConfig.OsdShowFrameTimes ^= EmuConfig.GS.OsdShowFrameTimes;
|
||||||
|
GSConfig.OsdShowVersion ^= EmuConfig.GS.OsdShowVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
BEGIN_HOTKEY_LIST(g_gs_hotkeys){"Screenshot", TRANSLATE_NOOP("Hotkeys", "Graphics"),
|
BEGIN_HOTKEY_LIST(g_gs_hotkeys){"Screenshot", TRANSLATE_NOOP("Hotkeys", "Graphics"),
|
||||||
|
|
|
@ -3123,6 +3123,9 @@ void FullscreenUI::DrawInterfaceSettingsPage()
|
||||||
FSUI_CSTR(
|
FSUI_CSTR(
|
||||||
"Shows on-screen-display messages when events occur such as save states being created/loaded, screenshots being taken, etc."),
|
"Shows on-screen-display messages when events occur such as save states being created/loaded, screenshots being taken, etc."),
|
||||||
"EmuCore/GS", "OsdShowMessages", true);
|
"EmuCore/GS", "OsdShowMessages", true);
|
||||||
|
DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_INFO, "Show PCSX2 Version"),
|
||||||
|
FSUI_CSTR("Shows the current PCSX2 version on the top-right corner of the display."), "EmuCore/GS",
|
||||||
|
"OsdShowVersion", false);
|
||||||
DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_TACHOMETER_ALT, "Show Speed"),
|
DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_TACHOMETER_ALT, "Show Speed"),
|
||||||
FSUI_CSTR("Shows the current emulation speed of the system in the top-right corner of the display as a percentage."), "EmuCore/GS",
|
FSUI_CSTR("Shows the current emulation speed of the system in the top-right corner of the display as a percentage."), "EmuCore/GS",
|
||||||
"OsdShowSpeed", false);
|
"OsdShowSpeed", false);
|
||||||
|
@ -3287,11 +3290,11 @@ void FullscreenUI::DrawEmulationSettingsPage()
|
||||||
|
|
||||||
MenuHeading(FSUI_CSTR("Speed Control"));
|
MenuHeading(FSUI_CSTR("Speed Control"));
|
||||||
|
|
||||||
DrawFloatListSetting(bsi, FSUI_ICONSTR(ICON_FA_PLAY,"Normal Speed"), FSUI_CSTR("Sets the speed when running without fast forwarding."), "Framerate",
|
DrawFloatListSetting(bsi, FSUI_ICONSTR(ICON_FA_PLAY, "Normal Speed"), FSUI_CSTR("Sets the speed when running without fast forwarding."), "Framerate",
|
||||||
"NominalScalar", 1.00f, speed_entries, speed_values, std::size(speed_entries), true);
|
"NominalScalar", 1.00f, speed_entries, speed_values, std::size(speed_entries), true);
|
||||||
DrawFloatListSetting(bsi, FSUI_ICONSTR(ICON_FA_FAST_FORWARD,"Fast Forward Speed"), FSUI_CSTR("Sets the speed when using the fast forward hotkey."), "Framerate",
|
DrawFloatListSetting(bsi, FSUI_ICONSTR(ICON_FA_FAST_FORWARD, "Fast Forward Speed"), FSUI_CSTR("Sets the speed when using the fast forward hotkey."), "Framerate",
|
||||||
"TurboScalar", 2.00f, speed_entries, speed_values, std::size(speed_entries), true);
|
"TurboScalar", 2.00f, speed_entries, speed_values, std::size(speed_entries), true);
|
||||||
DrawFloatListSetting(bsi, FSUI_ICONSTR(ICON_PF_SLOW_MOTION,"Slow Motion Speed"), FSUI_CSTR("Sets the speed when using the slow motion hotkey."), "Framerate",
|
DrawFloatListSetting(bsi, FSUI_ICONSTR(ICON_PF_SLOW_MOTION, "Slow Motion Speed"), FSUI_CSTR("Sets the speed when using the slow motion hotkey."), "Framerate",
|
||||||
"SlomoScalar", 0.50f, speed_entries, speed_values, std::size(speed_entries), true);
|
"SlomoScalar", 0.50f, speed_entries, speed_values, std::size(speed_entries), true);
|
||||||
|
|
||||||
MenuHeading(FSUI_CSTR("System Settings"));
|
MenuHeading(FSUI_CSTR("System Settings"));
|
||||||
|
@ -3597,7 +3600,7 @@ void FullscreenUI::DrawGraphicsSettingsPage(SettingsInterface* bsi, bool show_ad
|
||||||
BeginMenuButtons();
|
BeginMenuButtons();
|
||||||
|
|
||||||
MenuHeading(FSUI_CSTR("Renderer"));
|
MenuHeading(FSUI_CSTR("Renderer"));
|
||||||
DrawStringListSetting(bsi, FSUI_ICONSTR(ICON_FA_PAINT_BRUSH,"Renderer"), FSUI_CSTR("Selects the API used to render the emulated GS."), "EmuCore/GS",
|
DrawStringListSetting(bsi, FSUI_ICONSTR(ICON_FA_PAINT_BRUSH, "Renderer"), FSUI_CSTR("Selects the API used to render the emulated GS."), "EmuCore/GS",
|
||||||
"Renderer", "-1", s_renderer_names, s_renderer_values, std::size(s_renderer_names), true);
|
"Renderer", "-1", s_renderer_names, s_renderer_values, std::size(s_renderer_names), true);
|
||||||
|
|
||||||
MenuHeading(FSUI_CSTR("Display"));
|
MenuHeading(FSUI_CSTR("Display"));
|
||||||
|
@ -3950,7 +3953,7 @@ void FullscreenUI::DrawAudioSettingsPage()
|
||||||
DrawIntRangeSetting(bsi, FSUI_ICONSTR(ICON_FA_VOLUME_UP, "Output Volume"),
|
DrawIntRangeSetting(bsi, FSUI_ICONSTR(ICON_FA_VOLUME_UP, "Output Volume"),
|
||||||
FSUI_CSTR("Controls the volume of the audio played on the host."), "SPU2/Output", "OutputVolume", 100,
|
FSUI_CSTR("Controls the volume of the audio played on the host."), "SPU2/Output", "OutputVolume", 100,
|
||||||
0, 100, "%d%%");
|
0, 100, "%d%%");
|
||||||
DrawIntRangeSetting(bsi, FSUI_ICONSTR(ICON_FA_FAST_FORWARD,"Fast Forward Volume"),
|
DrawIntRangeSetting(bsi, FSUI_ICONSTR(ICON_FA_FAST_FORWARD, "Fast Forward Volume"),
|
||||||
FSUI_CSTR("Controls the volume of the audio played on the host when fast forwarding."), "SPU2/Output",
|
FSUI_CSTR("Controls the volume of the audio played on the host when fast forwarding."), "SPU2/Output",
|
||||||
"FastForwardVolume", 100, 0, 100, "%d%%");
|
"FastForwardVolume", 100, 0, 100, "%d%%");
|
||||||
DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_VOLUME_MUTE, "Mute All Sound"),
|
DrawToggleSetting(bsi, FSUI_ICONSTR(ICON_FA_VOLUME_MUTE, "Mute All Sound"),
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include "SIO/Pad/PadBase.h"
|
#include "SIO/Pad/PadBase.h"
|
||||||
#include "USB/USB.h"
|
#include "USB/USB.h"
|
||||||
#include "VMManager.h"
|
#include "VMManager.h"
|
||||||
|
#include "svnrev.h"
|
||||||
|
|
||||||
#include "common/BitUtils.h"
|
#include "common/BitUtils.h"
|
||||||
#include "common/FileSystem.h"
|
#include "common/FileSystem.h"
|
||||||
|
@ -121,6 +122,7 @@ __ri void ImGuiManager::DrawPerformanceOverlay(float& position_y, float scale, f
|
||||||
{
|
{
|
||||||
bool first = true;
|
bool first = true;
|
||||||
const float speed = PerformanceMetrics::GetSpeed();
|
const float speed = PerformanceMetrics::GetSpeed();
|
||||||
|
|
||||||
if (GSConfig.OsdShowFPS)
|
if (GSConfig.OsdShowFPS)
|
||||||
{
|
{
|
||||||
switch (PerformanceMetrics::GetInternalFPSMethod())
|
switch (PerformanceMetrics::GetInternalFPSMethod())
|
||||||
|
@ -152,6 +154,16 @@ __ri void ImGuiManager::DrawPerformanceOverlay(float& position_y, float scale, f
|
||||||
else
|
else
|
||||||
text.append_format(" ({:.0f}%)", target_speed * 100.0f);
|
text.append_format(" ({:.0f}%)", target_speed * 100.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (GSConfig.OsdShowVersion)
|
||||||
|
{
|
||||||
|
if (GSConfig.OsdShowFPS || GSConfig.OsdShowSpeed)
|
||||||
|
{
|
||||||
|
text.append_format(" | ");
|
||||||
|
}
|
||||||
|
text.append_format("PCSX2 {}", GIT_REV);
|
||||||
|
}
|
||||||
|
|
||||||
if (!text.empty())
|
if (!text.empty())
|
||||||
{
|
{
|
||||||
ImU32 color;
|
ImU32 color;
|
||||||
|
|
|
@ -629,6 +629,7 @@ Pcsx2Config::GSOptions::GSOptions()
|
||||||
OsdShowSettings = false;
|
OsdShowSettings = false;
|
||||||
OsdShowInputs = false;
|
OsdShowInputs = false;
|
||||||
OsdShowFrameTimes = false;
|
OsdShowFrameTimes = false;
|
||||||
|
OsdShowVersion = false;
|
||||||
|
|
||||||
HWDownloadMode = GSHardwareDownloadMode::Enabled;
|
HWDownloadMode = GSHardwareDownloadMode::Enabled;
|
||||||
HWSpinGPUForReadbacks = false;
|
HWSpinGPUForReadbacks = false;
|
||||||
|
@ -833,6 +834,7 @@ void Pcsx2Config::GSOptions::LoadSave(SettingsWrapper& wrap)
|
||||||
SettingsWrapBitBool(OsdShowSettings);
|
SettingsWrapBitBool(OsdShowSettings);
|
||||||
SettingsWrapBitBool(OsdShowInputs);
|
SettingsWrapBitBool(OsdShowInputs);
|
||||||
SettingsWrapBitBool(OsdShowFrameTimes);
|
SettingsWrapBitBool(OsdShowFrameTimes);
|
||||||
|
SettingsWrapBitBool(OsdShowVersion);
|
||||||
|
|
||||||
SettingsWrapBitBool(HWSpinGPUForReadbacks);
|
SettingsWrapBitBool(HWSpinGPUForReadbacks);
|
||||||
SettingsWrapBitBool(HWSpinCPUForReadbacks);
|
SettingsWrapBitBool(HWSpinCPUForReadbacks);
|
||||||
|
|
Loading…
Reference in New Issue