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

Merge pull request #4048 from EmptyChaos/wx-cheat-notice

Browse Source 
WX: ISOProperties: Add notice when cheats are disabled (Issue 9690)
This commit is contained in:
shuffle2
2016-10-02 22:06:26 -07:00
committed by GitHub
parent 0789499bf0 cf0b4c9387
commit 8107a19ddc
21 changed files with 879 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -598,6 +598,20 @@ void CFrame::InitBitmaps()
RecreateToolbar();
}
void CFrame::OpenGeneralConfiguration(int tab)
{
CConfigMain config_main(this);
if (tab > -1)
config_main.SetSelectedTab(tab);
HotkeyManagerEmu::Enable(false);
if (config_main.ShowModal() == wxID_OK)
m_GameListCtrl->Update();
HotkeyManagerEmu::Enable(true);
UpdateGUI();
}
// Menu items
// Start the game or change the disc.
@ -1312,12 +1326,7 @@ void CFrame::OnReset(wxCommandEvent& WXUNUSED(event))
void CFrame::OnConfigMain(wxCommandEvent& WXUNUSED(event))
{
CConfigMain ConfigMain(this);
HotkeyManagerEmu::Enable(false);
if (ConfigMain.ShowModal() == wxID_OK)
m_GameListCtrl->Update();
HotkeyManagerEmu::Enable(true);
UpdateGUI();
OpenGeneralConfiguration();
}
void CFrame::OnConfigGFX(wxCommandEvent& WXUNUSED(event))
@ -1330,12 +1339,7 @@ void CFrame::OnConfigGFX(wxCommandEvent& WXUNUSED(event))
void CFrame::OnConfigAudio(wxCommandEvent& WXUNUSED(event))
{
CConfigMain ConfigMain(this);
ConfigMain.SetSelectedTab(CConfigMain::ID_AUDIOPAGE);
HotkeyManagerEmu::Enable(false);
if (ConfigMain.ShowModal() == wxID_OK)
m_GameListCtrl->Update();
HotkeyManagerEmu::Enable(true);
OpenGeneralConfiguration(CConfigMain::ID_AUDIOPAGE);
}
void CFrame::OnConfigControllers(wxCommandEvent& WXUNUSED(event))