piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #2256 from RachelBryk/Dolphin-Pro"

Browse Source 
This reverts commit ae0a090701, reversing
changes made to 6b6b5ed37f.
This commit is contained in:
JosJuice
2015-04-01 22:26:45 +02:00
parent d50d8cbddd
commit 0deb9f5e39
6 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinWX/InputConfigDiag.cpp
View File

@ -946,14 +946,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin
setting->wxcontrol->Bind(wxEVT_SPINCTRL, &GamepadPage::AdjustSetting, eventsink);
options.push_back(setting);
wxBoxSizer* const szr = new wxBoxSizer(wxHORIZONTAL);
wxStaticText* nameBox = new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(groupSetting->name)));
if (groupSetting->name == "Battery" && !SConfig::GetInstance().m_DolphinPro)
{
setting->wxcontrol->Disable();
nameBox->SetToolTip(wxGetTranslation("Upgrade to Dolphin Pro to recharge batteries."));
}
szr->Add(nameBox, 0, wxCENTER | wxRIGHT, 3);
szr->Add(new wxStaticText(parent, wxID_ANY, wxGetTranslation(StrToWxStr(groupSetting->name))), 0, wxCENTER | wxRIGHT, 3);
szr->Add(setting->wxcontrol, 0, wxRIGHT, 3);
Add(szr, 0, wxALL | wxCENTER, 3);
}