archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 07:21:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: Add perf overlay position to settings dialog

Browse source
This commit is contained in:
VelocityRa 2018-06-10 20:25:28 +03:00 • committed by kd-11
parent dd0684b58a
commit 392a4bdc0b
4 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rpcs3/Json/tooltips.json
View file

@ -67,6 +67,7 @@
}, },
"overlay": { "overlay": {
"perfOverlayEnabled": "Enables or disables the performance overlay.", "perfOverlayEnabled": "Enables or disables the performance overlay.",
"perfOverlayPosition": "Sets the on-screen position (quadrant) of the perfomance overlay.",
"perfOverlayDetailLevel": "Controls the amount of information displayed on the performance overlay.", "perfOverlayDetailLevel": "Controls the amount of information displayed on the performance overlay.",
"perfOverlayUpdateInterval": "Sets the time interval in which the performance overlay is being updated (measured in milliseconds).", "perfOverlayUpdateInterval": "Sets the time interval in which the performance overlay is being updated (measured in milliseconds).",
"perfOverlayFontSize": "Sets the font size of the performance overlay (measured in pixels)." "perfOverlayFontSize": "Sets the font size of the performance overlay (measured in pixels)."

2
rpcs3/rpcs3qt/emu_settings.h
View file

@ -72,6 +72,7 @@ public:
// Performance Overlay // Performance Overlay
PerfOverlayEnabled, PerfOverlayEnabled,
PerfOverlayDetailLevel, PerfOverlayDetailLevel,
PerfOverlayPosition,
PerfOverlayUpdateInterval, PerfOverlayUpdateInterval,
PerfOverlayFontSize, PerfOverlayFontSize,
@ -241,6 +242,7 @@ private:
// Performance Overlay // Performance Overlay
{ PerfOverlayEnabled, { "Video", "Performance Overlay", "Enabled" } }, { PerfOverlayEnabled, { "Video", "Performance Overlay", "Enabled" } },
{ PerfOverlayDetailLevel, { "Video", "Performance Overlay", "Detail level" } }, { PerfOverlayDetailLevel, { "Video", "Performance Overlay", "Detail level" } },
{ PerfOverlayPosition, { "Video", "Performance Overlay", "Position" } },
{ PerfOverlayUpdateInterval,{ "Video", "Performance Overlay", "Metrics update interval (ms)" } }, { PerfOverlayUpdateInterval,{ "Video", "Performance Overlay", "Metrics update interval (ms)" } },
{ PerfOverlayFontSize, { "Video", "Performance Overlay", "Font size (px)" } }, { PerfOverlayFontSize, { "Video", "Performance Overlay", "Font size (px)" } },

4
rpcs3/rpcs3qt/settings_dialog.cpp
View file

@ -742,6 +742,9 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
xemu_settings->EnhanceComboBox(ui->perfOverlayDetailLevel, emu_settings::PerfOverlayDetailLevel); xemu_settings->EnhanceComboBox(ui->perfOverlayDetailLevel, emu_settings::PerfOverlayDetailLevel);
SubscribeTooltip(ui->perfOverlayDetailLevel, json_emu_overlay["perfOverlayDetailLevel"].toString()); SubscribeTooltip(ui->perfOverlayDetailLevel, json_emu_overlay["perfOverlayDetailLevel"].toString());
xemu_settings->EnhanceComboBox(ui->perfOverlayPosition, emu_settings::PerfOverlayPosition);
SubscribeTooltip(ui->perfOverlayPosition, json_emu_overlay["perfOverlayPosition"].toString());
// Checkboxes // Checkboxes
SubscribeTooltip(ui->gs_resizeOnBoot, json_emu_misc["gs_resizeOnBoot"].toString()); SubscribeTooltip(ui->gs_resizeOnBoot, json_emu_misc["gs_resizeOnBoot"].toString());
@ -777,6 +780,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
ui->label_update_interval->setEnabled(enabled); ui->label_update_interval->setEnabled(enabled);
ui->label_font_size->setEnabled(enabled); ui->label_font_size->setEnabled(enabled);
ui->perfOverlayDetailLevel->setEnabled(enabled); ui->perfOverlayDetailLevel->setEnabled(enabled);
ui->perfOverlayPosition->setEnabled(enabled);
ui->perfOverlayUpdateInterval->setEnabled(enabled); ui->perfOverlayUpdateInterval->setEnabled(enabled);
ui->perfOverlayFontSize->setEnabled(enabled); ui->perfOverlayFontSize->setEnabled(enabled);
}; };

10
rpcs3/rpcs3qt/settings_dialog.ui
View file

@ -1447,6 +1447,16 @@
<item> <item>
<widget class="QComboBox" name="perfOverlayDetailLevel"/> <widget class="QComboBox" name="perfOverlayDetailLevel"/>
</item> </item>
<item>
<widget class="QLabel" name="label_position">
<property name="text">
<string>Position:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="perfOverlayPosition"/>
</item>
<item> <item>
<widget class="QLabel" name="label_update_interval"> <widget class="QLabel" name="label_update_interval">
<property name="text"> <property name="text">