Merge pull request #6151 from MayImilae/adjust-cpu-override-text

Adjust CPU Override Text
This commit is contained in:
Anthony 2017-11-06 22:55:36 -08:00 committed by GitHub
commit 98ffaf9661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions

View File

@ -37,7 +37,7 @@ void AdvancedPane::CreateLayout()
cpu_options->setLayout(cpu_options_layout); cpu_options->setLayout(cpu_options_layout);
main_layout->addWidget(cpu_options); main_layout->addWidget(cpu_options);
m_cpu_clock_override_checkbox = new QCheckBox(tr("Enable CPU Clock Override")); m_cpu_clock_override_checkbox = new QCheckBox(tr("Enable Emulated CPU Clock Override"));
cpu_options_layout->addWidget(m_cpu_clock_override_checkbox); cpu_options_layout->addWidget(m_cpu_clock_override_checkbox);
auto* cpu_clock_override_slider_layout = new QHBoxLayout(); auto* cpu_clock_override_slider_layout = new QHBoxLayout();
@ -52,10 +52,12 @@ void AdvancedPane::CreateLayout()
cpu_clock_override_slider_layout->addWidget(m_cpu_clock_override_slider_label); cpu_clock_override_slider_layout->addWidget(m_cpu_clock_override_slider_label);
auto* cpu_clock_override_description = auto* cpu_clock_override_description =
new QLabel(tr("Higher values can make variable-framerate games run at a higher framerate, at " new QLabel(tr("Adjusts the emulated CPU's clock rate.\n\n"
"the expense of CPU. Lower values can make variable-framerate games run at a " "Higher values may make variable-framerate games run at a higher framerate, "
"lower framerate, saving CPU.\n\nWARNING: Changing this from the default " "at the expense of performance. Lower values may activate a game's "
"(100%) can and will break games and cause glitches. Do so at your own risk. " "internal frameskip, potentially improving performance.\n\n"
"WARNING: Changing this from the default (100%) can and will "
"break games and cause glitches. Do so at your own risk. "
"Please do not report bugs that occur with a non-default clock.")); "Please do not report bugs that occur with a non-default clock."));
cpu_clock_override_description->setWordWrap(true); cpu_clock_override_description->setWordWrap(true);
cpu_options_layout->addWidget(cpu_clock_override_description); cpu_options_layout->addWidget(cpu_clock_override_description);

View File

@ -29,7 +29,8 @@ AdvancedConfigPane::AdvancedConfigPane(wxWindow* parent, wxWindowID id) : wxPane
void AdvancedConfigPane::InitializeGUI() void AdvancedConfigPane::InitializeGUI()
{ {
m_clock_override_checkbox = new wxCheckBox(this, wxID_ANY, _("Enable CPU Clock Override")); m_clock_override_checkbox =
new wxCheckBox(this, wxID_ANY, _("Enable Emulated CPU Clock Override"));
m_clock_override_slider = m_clock_override_slider =
new DolphinSlider(this, wxID_ANY, 100, 0, 150, wxDefaultPosition, FromDIP(wxSize(200, -1))); new DolphinSlider(this, wxID_ANY, 100, 0, 150, wxDefaultPosition, FromDIP(wxSize(200, -1)));
m_clock_override_text = new wxStaticText(this, wxID_ANY, ""); m_clock_override_text = new wxStaticText(this, wxID_ANY, "");
@ -45,10 +46,11 @@ void AdvancedConfigPane::InitializeGUI()
m_custom_rtc_time_picker = new wxTimePickerCtrl(this, wxID_ANY); m_custom_rtc_time_picker = new wxTimePickerCtrl(this, wxID_ANY);
wxStaticText* const clock_override_description = wxStaticText* const clock_override_description =
new wxStaticText(this, wxID_ANY, _("Higher values can make variable-framerate games " new wxStaticText(this, wxID_ANY, _("Adjusts the emulated CPU's clock rate.\n\n"
"run at a higher framerate, at the expense of CPU. " "Higher values may make variable-framerate games run "
"Lower values can make variable-framerate games " "at a higher framerate, at the expense of performance. "
"run at a lower framerate, saving CPU.\n\n" "Lower values may activate a game's internal "
"frameskip, potentially improving performance.\n\n"
"WARNING: Changing this from the default (100%) " "WARNING: Changing this from the default (100%) "
"can and will break games and cause glitches. " "can and will break games and cause glitches. "
"Do so at your own risk. Please do not report " "Do so at your own risk. Please do not report "