ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2337 from illuminatedgeek/config-tabs 

Config tabs
This commit is contained in:
Lioncash 2015-04-28 04:24:52 -04:00
parent c58e94cf95 8f56138ec4
commit 79dff19aa0
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/DolphinWX/Config/AdvancedConfigPane.cpp
View File

@ -29,14 +29,15 @@ void AdvancedConfigPane::InitializeGUI()
m_clock_override_slider->Bind(wxEVT_SLIDER, &AdvancedConfigPane::OnClockOverrideSliderChanged, this); m_clock_override_slider->Bind(wxEVT_SLIDER, &AdvancedConfigPane::OnClockOverrideSliderChanged, this);
wxStaticText* const clock_override_description = new wxStaticText(this, wxID_ANY, wxStaticText* const clock_override_description = new wxStaticText(this, wxID_ANY,
_("Higher values can make variable-framerate games\n" _("Higher values can make variable-framerate games "
"run at a higher framerate, at the expense of CPU.\n" "run at a higher framerate, at the expense of CPU. "
"Lower values can make variable-framerate games\n" "Lower values can make variable-framerate games "
"run at a lower framerate, saving CPU.\n\n" "run at a lower framerate, saving CPU.\n\n"
"WARNING: Changing this from the default (100%)\n" "WARNING: Changing this from the default (100%) "
"can and will break games and cause glitches.\n" "can and will break games and cause glitches. "
"Do so at your own risk. Please do not report\n" "Do so at your own risk. Please do not report "
"bugs that occur with a non-default clock.\n")); "bugs that occur with a non-default clock. "));
clock_override_description->Wrap(400);
wxBoxSizer* const clock_override_checkbox_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* const clock_override_checkbox_sizer = new wxBoxSizer(wxHORIZONTAL);
clock_override_checkbox_sizer->Add(m_clock_override_checkbox); clock_override_checkbox_sizer->Add(m_clock_override_checkbox);

2
Source/Core/DolphinWX/Config/ConfigMain.cpp
View File

@ -81,6 +81,8 @@ void CConfigMain::CreateGUIControls()
main_sizer->Add(Notebook, 1, wxEXPAND | wxALL, 5); main_sizer->Add(Notebook, 1, wxEXPAND | wxALL, 5);
main_sizer->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5); main_sizer->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
main_sizer->SetMinSize(400, 0);
SetSizerAndFit(main_sizer); SetSizerAndFit(main_sizer);
Center(); Center();
SetFocus(); SetFocus();