From 6ce33de287ff976c37f747697afe62cbcca281e5 Mon Sep 17 00:00:00 2001 From: TheTechnician27 Date: Fri, 17 Feb 2023 19:58:32 -0600 Subject: [PATCH] UI: Update and Add mouseover dialog (#8119) --- pcsx2-qt/Settings/AdvancedSettingsWidget.cpp | 4 +-- pcsx2-qt/Settings/EmulationSettingsWidget.cpp | 4 +-- pcsx2-qt/Settings/GraphicsSettingsWidget.cpp | 31 +++++++++++++------ pcsx2-qt/Settings/MemoryCardConvertDialog.cpp | 2 +- pcsx2-qt/Settings/SettingsDialog.cpp | 2 +- pcsx2/Docs/GameIndex.md | 4 +-- pcsx2/USB/usb-lightgun/guncon2.cpp | 4 +-- pcsx2/ps2/BiosTools.cpp | 2 +- 8 files changed, 32 insertions(+), 21 deletions(-) diff --git a/pcsx2-qt/Settings/AdvancedSettingsWidget.cpp b/pcsx2-qt/Settings/AdvancedSettingsWidget.cpp index c1b54f6519..106f9bc364 100644 --- a/pcsx2-qt/Settings/AdvancedSettingsWidget.cpp +++ b/pcsx2-qt/Settings/AdvancedSettingsWidget.cpp @@ -72,7 +72,7 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsDialog* dialog, QWidget* dialog->registerWidgetHelp(m_ui.eeClampMode, tr("Clamping Mode"), tr("Normal (Default)"), tr("")); dialog->registerWidgetHelp(m_ui.eeRecompiler, tr("Enable Recompiler"), tr("Checked"), - tr("Performs just - in - time binary translation of 64 - bit MIPS - IV machine code to x86.")); + tr("Performs just-in-time binary translation of 64-bit MIPS-IV machine code to x86.")); dialog->registerWidgetHelp(m_ui.eeWaitLoopDetection, tr("Wait Loop Detection"), tr("Checked"), tr("Moderate speedup for some games, with no known side effects.")); @@ -86,7 +86,7 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(SettingsDialog* dialog, QWidget* tr("Uses backpatching to avoid register flushing on every memory access.")); dialog->registerWidgetHelp(m_ui.pauseOnTLBMiss, tr("Pause On TLB Miss"), tr("Unchecked"), - tr("Pauses the virtual machine when a TLB miss occurs, instead of ignoring it and continuing. Note the the VM will pause after the " + tr("Pauses the virtual machine when a TLB miss occurs, instead of ignoring it and continuing. Note that the VM will pause after the " "end of the block, not on the instruction which caused the exception. Refer to the console to see the address where the invalid " "access occurred.")); diff --git a/pcsx2-qt/Settings/EmulationSettingsWidget.cpp b/pcsx2-qt/Settings/EmulationSettingsWidget.cpp index 4e00749b93..6536926a2b 100644 --- a/pcsx2-qt/Settings/EmulationSettingsWidget.cpp +++ b/pcsx2-qt/Settings/EmulationSettingsWidget.cpp @@ -120,8 +120,8 @@ EmulationSettingsWidget::EmulationSettingsWidget(SettingsDialog* dialog, QWidget tr("Allows games and homebrew to access files / folders directly on the host computer.")); dialog->registerWidgetHelp(m_ui.optimalFramePacing, tr("Optimal Frame Pacing"), tr("Unchecked"), - tr("Sets the vsync queue size to 0, making every frame be completed and presented by the GS before input is polled, and the next frame begins. " - "Using this setting can reduce input lag, at the cost of measurably higher CPU and GPU requirements.")); + tr("Sets the VSync queue size to 0, making every frame be completed and presented by the GS before input is polled and the next frame begins. " + "Using this setting can reduce input lag at the cost of measurably higher CPU and GPU requirements.")); dialog->registerWidgetHelp(m_ui.maxFrameLatency, tr("Maximum Frame Latency"), tr("2 Frames"), tr("Sets the maximum number of frames that can be queued up to the GS, before the CPU thread will wait for one of them to complete before continuing. " "Higher values can assist with smoothing out irregular frame times, but add additional input lag.")); diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp index 6adca6cded..dacf3a408f 100644 --- a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp +++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp @@ -372,7 +372,8 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget* dialog->registerWidgetHelp(m_ui.PCRTCOverscan, tr("Show Overscan"), tr("Unchecked"), tr("Enables the option to show the overscan area on games which draw more than the safe area of the screen.")); - dialog->registerWidgetHelp(m_ui.fmvAspectRatio, tr("FMV Aspect Ratio"), tr("Off (Default)"), tr("Overrides the FMV aspect ratio.")); + dialog->registerWidgetHelp(m_ui.fmvAspectRatio, tr("FMV Aspect Ratio"), tr("Off (Default)"), + tr("Overrides the full-motion video (FMV) aspect ratio.")); dialog->registerWidgetHelp(m_ui.PCRTCAntiBlur, tr("Anti-Blur"), tr("Checked"), tr("Enables internal Anti-Blur hacks. Less accurate to PS2 rendering but will make a lot of games look less blurry.")); @@ -402,24 +403,32 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget* tr("Selects the quality at which screenshots will be compressed. Higher values preserve more detail for JPEG, and reduce file " "size for PNG.")); - dialog->registerWidgetHelp(m_ui.stretchY, tr("Stretch Height"), tr("100%"), tr("")); + dialog->registerWidgetHelp(m_ui.stretchY, tr("Stretch Height"), tr("100%"), + tr("Stretches (> 100%) or squashes (< 100%) the vertical component of the display")); dialog->registerWidgetHelp(m_ui.fullscreenModes, tr("Fullscreen Mode"), tr("Borderless Fullscreen"), tr("Chooses the fullscreen resolution and frequency.")); - dialog->registerWidgetHelp(m_ui.cropLeft, tr("Left"), tr("0px"), tr("")); + dialog->registerWidgetHelp(m_ui.cropLeft, tr("Left"), tr("0px"), + tr("Changes number of pixels cropped from the left side of the display")); - dialog->registerWidgetHelp(m_ui.cropTop, tr("Top"), tr("0px"), tr("")); + dialog->registerWidgetHelp(m_ui.cropTop, tr("Top"), tr("0px"), + tr("Changes number of pixels cropped from the top of the display")); - dialog->registerWidgetHelp(m_ui.cropRight, tr("Right"), tr("0px"), tr("")); + dialog->registerWidgetHelp(m_ui.cropRight, tr("Right"), tr("0px"), + tr("Changes number of pixels cropped from the right side of the display")); - dialog->registerWidgetHelp(m_ui.cropBottom, tr("Bottom"), tr("0px"), tr("")); + dialog->registerWidgetHelp(m_ui.cropBottom, tr("Bottom"), tr("0px"), + tr("Changes number of pixels cropped from the bottom of the display")); } // Rendering tab { // Hardware - dialog->registerWidgetHelp(m_ui.upscaleMultiplier, tr("Internal Resolution"), tr("Native (PS2) (Default)"), tr("")); + dialog->registerWidgetHelp(m_ui.upscaleMultiplier, tr("Internal Resolution"), tr("Native (PS2) (Default)"), + tr("Control the resolution at which games are rendered. High resolutions can impact performance on" + "older or lower-end GPUs.
Non-native resolution may cause minor graphical issues in some games.
" + "FMV resolution will remain unchanged, as the video files are pre-rendered.")); dialog->registerWidgetHelp( m_ui.mipmapping, tr("Mipmapping"), tr("Automatic (Default)"), tr("Control the accuracy level of the mipmapping emulation.")); @@ -491,7 +500,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget* dialog->registerWidgetHelp(m_ui.cpuSpriteRenderBW, tr("CPU Sprite Renderer Size"), tr("0 (Disabled)"), tr("")); - dialog->registerWidgetHelp(m_ui.cpuCLUTRender, tr("Software Clut Render"), tr("0 (Disabled)"), tr("")); + dialog->registerWidgetHelp(m_ui.cpuCLUTRender, tr("Software CLUT Render"), tr("0 (Disabled)"), tr("")); dialog->registerWidgetHelp(m_ui.skipDrawStart, tr("Skipdraw Range Start"), tr("0"), tr("Completely skips drawing surfaces from the surface in the left box up to the surface specified in the box on the right.")); @@ -592,7 +601,8 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget* dialog->registerWidgetHelp(m_ui.shadeBoostSaturation, tr("Saturation"), tr("50"), tr("")); - dialog->registerWidgetHelp(m_ui.tvShader, tr("TV Shader"), tr("None (Default)"), tr("")); + dialog->registerWidgetHelp(m_ui.tvShader, tr("TV Shader"), tr("None (Default)"), + tr("Applies a shader which replicates the visual effects of different styles of television set.")); } // OSD tab @@ -654,7 +664,8 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget* tr("Allows the GPU instead of just the CPU to transform lines into sprites. " "This reduces CPU load and bandwidth requirement, but it is heavier on the GPU.")); - dialog->registerWidgetHelp(m_ui.gsDumpCompression, tr("GS Dump Compression"), tr("Zstandard (zst)"), tr("")); + dialog->registerWidgetHelp(m_ui.gsDumpCompression, tr("GS Dump Compression"), tr("Zstandard (zst)"), + tr("Change the compression algorithm used when creating a GS dump.")); dialog->registerWidgetHelp(m_ui.useBlitSwapChain, tr("Use Blit Swap Chain"), tr("Unchecked"), tr("Uses a blit presentation model instead of flipping when using the Direct3D 11 " diff --git a/pcsx2-qt/Settings/MemoryCardConvertDialog.cpp b/pcsx2-qt/Settings/MemoryCardConvertDialog.cpp index 67abbf4f85..b6b99b8706 100644 --- a/pcsx2-qt/Settings/MemoryCardConvertDialog.cpp +++ b/pcsx2-qt/Settings/MemoryCardConvertDialog.cpp @@ -58,7 +58,7 @@ MemoryCardConvertDialog::MemoryCardConvertDialog(QWidget* parent, QString select SetType(MemoryCardType::File, MemoryCardFileType::PS2_8MB, "A standard, 8 MB memory card. Most compatible, but smallest capacity."); break; case 16: - SetType(MemoryCardType::File, MemoryCardFileType::PS2_16MB, "2x larger as a standard memory card. May have some compatibility issues."); + SetType(MemoryCardType::File, MemoryCardFileType::PS2_16MB, "2x larger than a standard memory card. May have some compatibility issues."); break; case 32: SetType(MemoryCardType::File, MemoryCardFileType::PS2_32MB, "4x larger than a standard memory card. Likely to have compatibility issues."); diff --git a/pcsx2-qt/Settings/SettingsDialog.cpp b/pcsx2-qt/Settings/SettingsDialog.cpp index 44f827f962..fd653d0074 100644 --- a/pcsx2-qt/Settings/SettingsDialog.cpp +++ b/pcsx2-qt/Settings/SettingsDialog.cpp @@ -115,7 +115,7 @@ void SettingsDialog::setupUi(const GameList::Entry* game) { addWidget(m_game_fix_settings_widget = new GameFixSettingsWidget(this, m_ui.settingsContainer), tr("Game Fix"), QStringLiteral("close-line"), - tr("Game Fix Settings
Gamefixes can work around incorrect emulation in some titles
however they can " + tr("Game Fix Settings
Gamefixes can work around incorrect emulation in some titles.
However, they can " "also cause problems in games if used incorrectly.
It is best to leave them all disabled unless advised otherwise.")); } diff --git a/pcsx2/Docs/GameIndex.md b/pcsx2/Docs/GameIndex.md index ed607cd38c..1946eaa7c2 100644 --- a/pcsx2/Docs/GameIndex.md +++ b/pcsx2/Docs/GameIndex.md @@ -169,8 +169,8 @@ The clamp modes are also numerically based. * alignSprite [`0` or `1`] {Off or On} Default: Off (`0`) * mergeSprite [`0` or `1`] {Off or On} Default: Off (`0`) * wildArmsHack [`0` or `1`] {Off or On} Default: Off (`0`) -* skipDrawStart [Value between `0` to `100000`] {0-100000} Default: Off (`0`) -* skipDrawEnd [Value between `0` to `100000`] {0-100000} Default: Off (`0`) +* skipDrawStart [Value between `0` to `10000`] {0-10000} Default: Off (`0`) +* skipDrawEnd [Value between `0` to `10000`] {0-10000} Default: Off (`0`) * halfPixelOffset [`0` or `1` or `2` or `3`] {Off, Normal Vertex, Special Texture or Special Texture Aggressive} Default: Off (`0`) * roundSprite [`0` or `1` or `2`] {Off, Half or Full} Default: Off (`0`) diff --git a/pcsx2/USB/usb-lightgun/guncon2.cpp b/pcsx2/USB/usb-lightgun/guncon2.cpp index 12785d0732..335e1dd616 100644 --- a/pcsx2/USB/usb-lightgun/guncon2.cpp +++ b/pcsx2/USB/usb-lightgun/guncon2.cpp @@ -513,9 +513,9 @@ namespace usb_lightgun {SettingInfo::Type::Float, "scale_y", "Y Scale (Sensitivity)", "Scales the position to simulate CRT curvature.", "100", "0", "200", "0.1", "%.2f%%", nullptr, nullptr, 1.0f}, - {SettingInfo::Type::Float, "center_x", "Center X", "Sets the center position of the simulated screen.", + {SettingInfo::Type::Float, "center_x", "Center X", "Sets the horizontal center position of the simulated screen.", "320", "0", "1024", "1", "%.0fpx", nullptr, nullptr, 1.0f}, - {SettingInfo::Type::Float, "center_y", "Center Y", "Sets the center position of the simulated screen.", + {SettingInfo::Type::Float, "center_y", "Center Y", "Sets the vertical center position of the simulated screen.", "120", "0", "1024", "1", "%.0fpx", nullptr, nullptr, 1.0f}, {SettingInfo::Type::Integer, "screen_width", "Screen Width", "Sets the width of the simulated screen.", "640", "1", "1024", "1", "%dpx", nullptr, nullptr, 1.0f}, diff --git a/pcsx2/ps2/BiosTools.cpp b/pcsx2/ps2/BiosTools.cpp index 8af51db6f8..c998d4b460 100644 --- a/pcsx2/ps2/BiosTools.cpp +++ b/pcsx2/ps2/BiosTools.cpp @@ -137,7 +137,7 @@ static bool LoadBiosVersion(std::FILE* fp, u32& version, std::string& descriptio version |= strtol(vermin, (char**)NULL, 0); foundRomVer = true; - Console.WriteLn("Bios Found: %s", description.c_str()); + Console.WriteLn("BIOS Found: %s", description.c_str()); } if ((rd.fileSize % 0x10) == 0)