summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2022-11-23 00:24:45 +0100
committerGitHub <noreply@github.com>2022-11-23 00:24:45 +0100
commit31458259b67fe67d4feb0b2d425f629e3792fdf7 (patch)
treebc30c5e0272fb545ecc01e97ac3921b2958a389c /Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
parent5e442f6ffa7664dbc696e18693c1a4dd872fae8d (diff)
parentedb2c90b38f6b32cf6f687ed0d00b272fc5a5793 (diff)
Merge pull request #11212 from Sam-Belliveau/realtime-fps-and-vps-counter
VideoCommon: Improve FPS/VPS Counting with Euler + Moving Averages and Colors
Diffstat (limited to 'Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp')
-rw-r--r--Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp26
1 files changed, 4 insertions, 22 deletions
diff --git a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
index 733da068c9..27a2c16e56 100644
--- a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
@@ -87,10 +87,7 @@ void GeneralWidget::CreateWidgets()
auto* m_options_box = new QGroupBox(tr("Other"));
auto* m_options_layout = new QGridLayout();
- m_show_fps = new GraphicsBool(tr("Show FPS"), Config::GFX_SHOW_FPS);
m_show_ping = new GraphicsBool(tr("Show NetPlay Ping"), Config::GFX_SHOW_NETPLAY_PING);
- m_log_render_time =
- new GraphicsBool(tr("Log Render Time to File"), Config::GFX_LOG_RENDER_TIME_TO_FILE);
m_autoadjust_window_size =
new GraphicsBool(tr("Auto-Adjust Window Size"), Config::MAIN_RENDER_WINDOW_AUTOSIZE);
m_show_messages =
@@ -99,14 +96,11 @@ void GeneralWidget::CreateWidgets()
m_options_box->setLayout(m_options_layout);
- m_options_layout->addWidget(m_show_fps, 0, 0);
- m_options_layout->addWidget(m_log_render_time, 0, 1);
+ 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_render_main_window, 1, 0);
- m_options_layout->addWidget(m_autoadjust_window_size, 1, 1);
-
- m_options_layout->addWidget(m_show_messages, 2, 0);
- m_options_layout->addWidget(m_show_ping, 2, 1);
+ m_options_layout->addWidget(m_show_messages, 0, 1);
+ m_options_layout->addWidget(m_show_ping, 1, 1);
// Other
auto* shader_compilation_box = new QGroupBox(tr("Shader Compilation"));
@@ -226,17 +220,9 @@ 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_FPS_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_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_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_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 "
@@ -281,12 +267,8 @@ void GeneralWidget::AddDescriptions()
m_enable_fullscreen->SetDescription(tr(TR_FULLSCREEN_DESCRIPTION));
- m_show_fps->SetDescription(tr(TR_SHOW_FPS_DESCRIPTION));
-
m_show_ping->SetDescription(tr(TR_SHOW_NETPLAY_PING_DESCRIPTION));
- m_log_render_time->SetDescription(tr(TR_LOG_RENDERTIME_DESCRIPTION));
-
m_autoadjust_window_size->SetDescription(tr(TR_AUTOSIZE_DESCRIPTION));
m_show_messages->SetDescription(tr(TR_SHOW_NETPLAY_MESSAGES_DESCRIPTION));