Merge pull request #13953 from TryTwo/add_osd_tab

Qt Settings: Transfer OSD settings to a new OSD pane.

Author: JMC47

Source/Core/Core/Config/MainSettings.cpp

@@ -512,6 +512,7 @@ const Info<bool> MAIN_MOVIE_DUMP_FRAMES_SILENT{{System::Main, "Movie", "DumpFram
 const Info<bool> MAIN_MOVIE_SHOW_INPUT_DISPLAY{{System::Main, "Movie", "ShowInputDisplay"}, false};
 const Info<bool> MAIN_MOVIE_SHOW_RTC{{System::Main, "Movie", "ShowRTC"}, false};
 const Info<bool> MAIN_MOVIE_SHOW_RERECORD{{System::Main, "Movie", "ShowRerecord"}, false};
+const Info<bool> MAIN_MOVIE_SHOW_OSD{{System::Main, "Movie", "ShowMovieWindow"}, false};
 
 // Main.Input
 

Source/Core/Core/Config/MainSettings.h

@@ -327,6 +327,7 @@ extern const Info<bool> MAIN_MOVIE_DUMP_FRAMES_SILENT;
 extern const Info<bool> MAIN_MOVIE_SHOW_INPUT_DISPLAY;
 extern const Info<bool> MAIN_MOVIE_SHOW_RTC;
 extern const Info<bool> MAIN_MOVIE_SHOW_RERECORD;
+extern const Info<bool> MAIN_MOVIE_SHOW_OSD;
 
 // Main.Input
 

Source/Core/DolphinQt/CMakeLists.txt

@@ -369,6 +369,8 @@ add_executable(dolphin-emu
   Settings/GeneralPane.h
   Settings/InterfacePane.cpp
   Settings/InterfacePane.h
+	Settings/OnScreenDisplayPane.cpp
+	Settings/OnScreenDisplayPane.h
   Settings/PathPane.cpp
   Settings/PathPane.h
   Settings/USBDevicePicker.cpp

Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp

@@ -46,57 +46,25 @@ void AdvancedWidget::CreateWidgets()
 
   auto* main_layout = new QVBoxLayout;
 
-  // Performance
-  auto* performance_box = new QGroupBox(tr("Performance Statistics"));
-  auto* performance_layout = new QGridLayout();
-  performance_box->setLayout(performance_layout);
-
-  m_show_fps = new ConfigBool(tr("Show FPS"), Config::GFX_SHOW_FPS, m_game_layer);
-  m_show_ftimes = new ConfigBool(tr("Show Frame Times"), Config::GFX_SHOW_FTIMES, m_game_layer);
-  m_show_vps = new ConfigBool(tr("Show VPS"), Config::GFX_SHOW_VPS, m_game_layer);
-  m_show_vtimes = new ConfigBool(tr("Show VBlank Times"), Config::GFX_SHOW_VTIMES, m_game_layer);
-  m_show_graphs =
-      new ConfigBool(tr("Show Performance Graphs"), Config::GFX_SHOW_GRAPHS, m_game_layer);
-  m_show_speed = new ConfigBool(tr("Show % Speed"), Config::GFX_SHOW_SPEED, m_game_layer);
-  m_show_speed_colors =
-      new ConfigBool(tr("Show Speed Colors"), Config::GFX_SHOW_SPEED_COLORS, m_game_layer);
-  m_perf_samp_window = new ConfigInteger(0, 10000, Config::GFX_PERF_SAMP_WINDOW, m_game_layer, 100);
-  m_perf_samp_window->SetTitle(tr("Performance Sample Window (ms)"));
-  m_log_render_time = new ConfigBool(tr("Log Render Time to File"),
-                                     Config::GFX_LOG_RENDER_TIME_TO_FILE, m_game_layer);
-
-  performance_layout->addWidget(m_show_fps, 0, 0);
-  performance_layout->addWidget(m_show_ftimes, 0, 1);
-  performance_layout->addWidget(m_show_vps, 1, 0);
-  performance_layout->addWidget(m_show_vtimes, 1, 1);
-  performance_layout->addWidget(m_show_speed, 2, 0);
-  performance_layout->addWidget(m_show_graphs, 2, 1);
-  performance_layout->addWidget(new QLabel(tr("Performance Sample Window (ms):")), 3, 0);
-  performance_layout->addWidget(m_perf_samp_window, 3, 1);
-  performance_layout->addWidget(m_log_render_time, 4, 0);
-  performance_layout->addWidget(m_show_speed_colors, 4, 1);
-
   // Debugging
   auto* debugging_box = new QGroupBox(tr("Debugging"));
   auto* debugging_layout = new QGridLayout();
   debugging_box->setLayout(debugging_layout);
 
+  m_log_render_time = new ConfigBool(tr("Log Render Time to File"),
+                                     Config::GFX_LOG_RENDER_TIME_TO_FILE, m_game_layer);
+
   m_enable_wireframe =
       new ConfigBool(tr("Enable Wireframe"), Config::GFX_ENABLE_WIREFRAME, m_game_layer);
-  m_show_statistics =
-      new ConfigBool(tr("Show Statistics"), Config::GFX_OVERLAY_STATS, m_game_layer);
-  m_show_proj_statistics = new ConfigBool(tr("Show Projection Statistics"),
-                                          Config::GFX_OVERLAY_PROJ_STATS, m_game_layer);
   m_enable_format_overlay =
       new ConfigBool(tr("Texture Format Overlay"), Config::GFX_TEXFMT_OVERLAY_ENABLE, m_game_layer);
   m_enable_api_validation = new ConfigBool(tr("Enable API Validation Layers"),
                                            Config::GFX_ENABLE_VALIDATION_LAYER, m_game_layer);
 
   debugging_layout->addWidget(m_enable_wireframe, 0, 0);
-  debugging_layout->addWidget(m_show_statistics, 0, 1);
-  debugging_layout->addWidget(m_enable_format_overlay, 1, 0);
-  debugging_layout->addWidget(m_show_proj_statistics, 1, 1);
-  debugging_layout->addWidget(m_enable_api_validation, 2, 0);
+  debugging_layout->addWidget(m_enable_format_overlay, 0, 1);
+  debugging_layout->addWidget(m_enable_api_validation, 1, 0);
+  debugging_layout->addWidget(m_log_render_time, 1, 1);
 
   // Utility
   auto* utility_box = new QGroupBox(tr("Utility"));
@@ -226,7 +194,6 @@ void AdvancedWidget::CreateWidgets()
   experimental_layout->addWidget(m_defer_efb_access_invalidation, 0, 0);
   experimental_layout->addWidget(m_manual_texture_sampling, 0, 1);
 
-  main_layout->addWidget(performance_box);
   main_layout->addWidget(debugging_box);
   main_layout->addWidget(utility_box);
   main_layout->addWidget(texture_dump_box);
@@ -269,53 +236,9 @@ void AdvancedWidget::OnEmulationStateChanged(bool running)
 
 void AdvancedWidget::AddDescriptions()
 {
-  static const char TR_SHOW_FPS_DESCRIPTION[] =
-      QT_TR_NOOP("Shows the number of distinct frames rendered per second as a measure of "
-                 "visual smoothness.<br><br><dolphin_emphasis>If unsure, leave this "
-                 "unchecked.</dolphin_emphasis>");
-  static const char TR_SHOW_FTIMES_DESCRIPTION[] =
-      QT_TR_NOOP("Shows the average time in ms between each distinct rendered frame alongside "
-                 "the standard deviation.<br><br><dolphin_emphasis>If unsure, leave this "
-                 "unchecked.</dolphin_emphasis>");
-  static const char TR_SHOW_VPS_DESCRIPTION[] =
-      QT_TR_NOOP("Shows the number of frames rendered per second as a measure of "
-                 "emulation speed.<br><br><dolphin_emphasis>If unsure, leave this "
-                 "unchecked.</dolphin_emphasis>");
-  static const char TR_SHOW_VTIMES_DESCRIPTION[] =
-      QT_TR_NOOP("Shows the average time in ms between each rendered frame alongside "
-                 "the standard deviation.<br><br><dolphin_emphasis>If unsure, leave this "
-                 "unchecked.</dolphin_emphasis>");
-  static const char TR_SHOW_GRAPHS_DESCRIPTION[] =
-      QT_TR_NOOP("Shows frametime graph along with statistics as a representation of "
-                 "emulation performance.<br><br><dolphin_emphasis>If unsure, leave this "
-                 "unchecked.</dolphin_emphasis>");
-  static const char TR_SHOW_SPEED_DESCRIPTION[] =
-      QT_TR_NOOP("Shows the % speed of emulation compared to full speed."
-                 "<br><br><dolphin_emphasis>If unsure, leave this "
-                 "unchecked.</dolphin_emphasis>");
-  static const char TR_SHOW_SPEED_COLORS_DESCRIPTION[] =
-      QT_TR_NOOP("Changes the color of the FPS counter depending on emulation speed."
-                 "<br><br><dolphin_emphasis>If unsure, leave this "
-                 "checked.</dolphin_emphasis>");
-  static const char TR_PERF_SAMP_WINDOW_DESCRIPTION[] =
-      QT_TR_NOOP("The amount of time the FPS and VPS counters will sample over."
-                 "<br><br>The higher the value, the more stable the FPS/VPS counter will be, "
-                 "but the slower it will be to update."
-                 "<br><br><dolphin_emphasis>If unsure, leave this "
-                 "at 1000ms.</dolphin_emphasis>");
-  static const char TR_LOG_RENDERTIME_DESCRIPTION[] = QT_TR_NOOP(
-      "Logs the render time of every frame to User/Logs/render_time.txt.<br><br>Use this "
-      "feature to measure Dolphin's performance.<br><br><dolphin_emphasis>If "
-      "unsure, leave this unchecked.</dolphin_emphasis>");
   static const char TR_WIREFRAME_DESCRIPTION[] =
       QT_TR_NOOP("Renders the scene as a wireframe.<br><br><dolphin_emphasis>If unsure, leave "
                  "this unchecked.</dolphin_emphasis>");
-  static const char TR_SHOW_STATS_DESCRIPTION[] =
-      QT_TR_NOOP("Shows various rendering statistics.<br><br><dolphin_emphasis>If unsure, "
-                 "leave this unchecked.</dolphin_emphasis>");
-  static const char TR_SHOW_PROJ_STATS_DESCRIPTION[] =
-      QT_TR_NOOP("Shows various projection statistics.<br><br><dolphin_emphasis>If unsure, "
-                 "leave this unchecked.</dolphin_emphasis>");
   static const char TR_TEXTURE_FORMAT_DESCRIPTION[] =
       QT_TR_NOOP("Modifies textures to show the format they're encoded in.<br><br>May require "
                  "an emulation reset to apply.<br><br><dolphin_emphasis>If unsure, leave this "
@@ -325,6 +248,10 @@ void AdvancedWidget::AddDescriptions()
                  "debugging graphical issues. On the Vulkan and D3D backends, this also enables "
                  "debug symbols for the compiled shaders.<br><br><dolphin_emphasis>If unsure, "
                  "leave this unchecked.</dolphin_emphasis>");
+  static const char TR_LOG_RENDERTIME_DESCRIPTION[] = QT_TR_NOOP(
+      "Logs the render time of every frame to User/Logs/render_time.txt.<br><br>Use this "
+      "feature to measure Dolphin's performance.<br><br><dolphin_emphasis>If "
+      "unsure, leave this unchecked.</dolphin_emphasis>");
   static const char TR_DUMP_TEXTURE_DESCRIPTION[] =
       QT_TR_NOOP("Dumps decoded game textures based on the other flags to "
                  "User/Dump/Textures/&lt;game_id&gt;/.<br><br><dolphin_emphasis>If unsure, leave "
@@ -443,21 +370,10 @@ void AdvancedWidget::AddDescriptions()
   static const char IF_UNSURE_UNCHECKED[] =
       QT_TR_NOOP("<dolphin_emphasis>If unsure, leave this unchecked.</dolphin_emphasis>");
 
-  m_show_fps->SetDescription(tr(TR_SHOW_FPS_DESCRIPTION));
-  m_show_ftimes->SetDescription(tr(TR_SHOW_FTIMES_DESCRIPTION));
-  m_show_vps->SetDescription(tr(TR_SHOW_VPS_DESCRIPTION));
-  m_show_vtimes->SetDescription(tr(TR_SHOW_VTIMES_DESCRIPTION));
-  m_show_graphs->SetDescription(tr(TR_SHOW_GRAPHS_DESCRIPTION));
-  m_show_speed->SetDescription(tr(TR_SHOW_SPEED_DESCRIPTION));
-  m_log_render_time->SetDescription(tr(TR_LOG_RENDERTIME_DESCRIPTION));
-  m_show_speed_colors->SetDescription(tr(TR_SHOW_SPEED_COLORS_DESCRIPTION));
-
   m_enable_wireframe->SetDescription(tr(TR_WIREFRAME_DESCRIPTION));
-  m_show_statistics->SetDescription(tr(TR_SHOW_STATS_DESCRIPTION));
-  m_show_proj_statistics->SetDescription(tr(TR_SHOW_PROJ_STATS_DESCRIPTION));
   m_enable_format_overlay->SetDescription(tr(TR_TEXTURE_FORMAT_DESCRIPTION));
   m_enable_api_validation->SetDescription(tr(TR_VALIDATION_LAYER_DESCRIPTION));
-  m_perf_samp_window->SetDescription(tr(TR_PERF_SAMP_WINDOW_DESCRIPTION));
+  m_log_render_time->SetDescription(tr(TR_LOG_RENDERTIME_DESCRIPTION));
   m_dump_textures->SetDescription(tr(TR_DUMP_TEXTURE_DESCRIPTION));
   m_dump_mip_textures->SetDescription(tr(TR_DUMP_MIP_TEXTURE_DESCRIPTION));
   m_dump_base_textures->SetDescription(tr(TR_DUMP_BASE_TEXTURE_DESCRIPTION));

Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.h

@@ -30,18 +30,8 @@ class AdvancedWidget final : public QWidget
 
   // Debugging
   ConfigBool* m_enable_wireframe;
-  ConfigBool* m_show_statistics;
-  ConfigBool* m_show_proj_statistics;
   ConfigBool* m_enable_format_overlay;
   ConfigBool* m_enable_api_validation;
-  ConfigBool* m_show_fps;
-  ConfigBool* m_show_ftimes;
-  ConfigBool* m_show_vps;
-  ConfigBool* m_show_vtimes;
-  ConfigBool* m_show_graphs;
-  ConfigBool* m_show_speed;
-  ConfigBool* m_show_speed_colors;
-  ConfigInteger* m_perf_samp_window;
   ConfigBool* m_log_render_time;
 
   // Utility

Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp

@@ -108,22 +108,15 @@ void GeneralWidget::CreateWidgets()
   auto* m_options_box = new QGroupBox(tr("Other"));
   auto* m_options_layout = new QGridLayout();
 
-  m_show_ping =
-      new ConfigBool(tr("Show NetPlay Ping"), Config::GFX_SHOW_NETPLAY_PING, m_game_layer);
   m_autoadjust_window_size = new ConfigBool(tr("Auto-Adjust Window Size"),
                                             Config::MAIN_RENDER_WINDOW_AUTOSIZE, m_game_layer);
-  m_show_messages =
-      new ConfigBool(tr("Show NetPlay Messages"), Config::GFX_SHOW_NETPLAY_MESSAGES, m_game_layer);
   m_render_main_window =
       new ConfigBool(tr("Render to Main Window"), Config::MAIN_RENDER_TO_MAIN, m_game_layer);
 
   m_options_box->setLayout(m_options_layout);
 
   m_options_layout->addWidget(m_render_main_window, 0, 0);
-  m_options_layout->addWidget(m_autoadjust_window_size, 1, 0);
-
-  m_options_layout->addWidget(m_show_messages, 0, 1);
-  m_options_layout->addWidget(m_show_ping, 1, 1);
+  m_options_layout->addWidget(m_autoadjust_window_size, 0, 1);
 
   // Other
   auto* shader_compilation_box = new QGroupBox(tr("Shader Compilation"));
@@ -268,13 +261,6 @@ void GeneralWidget::AddDescriptions()
       "if emulation speed is below 100%.<br><br><dolphin_emphasis>If unsure, leave "
       "this "
       "unchecked.</dolphin_emphasis>");
-  static const char TR_SHOW_NETPLAY_PING_DESCRIPTION[] = QT_TR_NOOP(
-      "Shows the player's maximum ping while playing on "
-      "NetPlay.<br><br><dolphin_emphasis>If unsure, leave this unchecked.</dolphin_emphasis>");
-  static const char TR_SHOW_NETPLAY_MESSAGES_DESCRIPTION[] =
-      QT_TR_NOOP("Shows chat messages, buffer changes, and desync alerts "
-                 "while playing NetPlay.<br><br><dolphin_emphasis>If unsure, leave "
-                 "this unchecked.</dolphin_emphasis>");
   static const char TR_SHADER_COMPILE_SPECIALIZED_DESCRIPTION[] =
       QT_TR_NOOP("Ubershaders are never used. Stuttering will occur during shader "
                  "compilation, but GPU demands are low.<br><br>Recommended for low-end hardware. "
@@ -320,12 +306,8 @@ void GeneralWidget::AddDescriptions()
 
   m_enable_fullscreen->SetDescription(tr(TR_FULLSCREEN_DESCRIPTION));
 
-  m_show_ping->SetDescription(tr(TR_SHOW_NETPLAY_PING_DESCRIPTION));
-
   m_autoadjust_window_size->SetDescription(tr(TR_AUTOSIZE_DESCRIPTION));
 
-  m_show_messages->SetDescription(tr(TR_SHOW_NETPLAY_MESSAGES_DESCRIPTION));
-
   m_render_main_window->SetDescription(tr(TR_RENDER_TO_MAINWINDOW_DESCRIPTION));
 
   m_shader_compilation_mode[0]->SetDescription(tr(TR_SHADER_COMPILE_SPECIALIZED_DESCRIPTION));

Source/Core/DolphinQt/Config/Graphics/GeneralWidget.h

@@ -52,10 +52,9 @@ class GeneralWidget final : public QWidget
   ConfigBool* m_enable_fullscreen;
 
   // Options
-  ConfigBool* m_show_ping;
   ConfigBool* m_autoadjust_window_size;
-  ConfigBool* m_show_messages;
   ConfigBool* m_render_main_window;
+
   std::array<ConfigRadioInt*, 4> m_shader_compilation_mode{};
   ConfigBool* m_wait_for_shaders;
   int m_previous_backend = 0;

Source/Core/DolphinQt/Config/SettingsWindow.cpp

@@ -22,6 +22,7 @@
 #include "DolphinQt/Settings/GameCubePane.h"
 #include "DolphinQt/Settings/GeneralPane.h"
 #include "DolphinQt/Settings/InterfacePane.h"
+#include "DolphinQt/Settings/OnScreenDisplayPane.h"
 #include "DolphinQt/Settings/PathPane.h"
 #include "DolphinQt/Settings/WiiPane.h"
 
@@ -129,6 +130,7 @@ SettingsWindow::SettingsWindow(MainWindow* parent) : StackedSettingsWindow{paren
   AddPane(new GraphicsPane{parent, nullptr}, tr("Graphics"));
   AddWrappedPane(new ControllersPane, tr("Controllers"));
   AddWrappedPane(new InterfacePane, tr("Interface"));
+  AddWrappedPane(new OnScreenDisplayPane, tr("On-Screen Display"));
   AddWrappedPane(new AudioPane, tr("Audio"));
   AddWrappedPane(new PathPane, tr("Paths"));
   AddWrappedPane(new GameCubePane, tr("GameCube"));

Source/Core/DolphinQt/Config/SettingsWindow.h

@@ -38,6 +38,7 @@ enum class SettingsWindowPaneIndex : int
   Graphics,
   Controllers,
   Interface,
+  OnScreenDisplay,
   Audio,
   Paths,
   GameCube,

Source/Core/DolphinQt/DolphinQt.vcxproj

@@ -218,6 +218,7 @@
     <ClCompile Include="Settings\GameCubePane.cpp" />
     <ClCompile Include="Settings\GeneralPane.cpp" />
     <ClCompile Include="Settings\InterfacePane.cpp" />
+    <ClCompile Include="Settings\OnScreenDisplayPane.cpp" />
     <ClCompile Include="Settings\PathPane.cpp" />
     <ClCompile Include="Settings\USBDevicePicker.cpp" />
     <ClCompile Include="Settings\WiiPane.cpp" />
@@ -268,6 +269,7 @@
     <ClInclude Include="QtUtils\WrapInScrollArea.h" />
     <ClInclude Include="ResourcePackManager.h" />
     <ClInclude Include="Resources.h" />
+    <ClInclude Include="Settings\OnScreenDisplayPane.h" />
     <ClInclude Include="SkylanderPortal\SkylanderModifyDialog.h" />
     <ClInclude Include="TAS\TASControlState.h" />
     <ClInclude Include="TAS\TASSlider.h" />