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

Merge pull request #1201 from PCSX2-Alpha/minor_changes 

PCSX2-WX: Minor changes to core panels/dialog
This commit is contained in:
Jonathan Li 2016-02-24 19:59:40 +00:00
parent cb776d2f50 e1febf7ec1
commit 1103f9046a
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/gui/Dialogs/AboutBoxDialog.cpp
View File

@ -55,7 +55,7 @@ Dialogs::AboutBoxDialog::AboutBoxDialog(wxWindow* parent)
wxString contribsString = wxsFormat( wxString contribsString = wxsFormat(
L"%s: \n" L"%s: \n"
L"ChickenLiver(Lilypad), Gabest (Gsdx, Cdvdolio, Xpad)" L"ChickenLiver(Lilypad), Gabest (GSdx, Cdvdolio, Xpad)"
L"\n\n" L"\n\n"
L"%s: \n" L"%s: \n"
L"Ckemu, Prafull, General Plot, KrossX, Devina, ssakash, turtleli, Blyss Sarania, micove, black_wd, Belmont, BGome," L"Ckemu, Prafull, General Plot, KrossX, Devina, ssakash, turtleli, Blyss Sarania, micove, black_wd, Belmont, BGome,"

3
pcsx2/gui/Panels/ConfigurationPanels.h
View File

@ -178,7 +178,7 @@ namespace Panels
pxRadioPanel* m_panel_RecIOP; pxRadioPanel* m_panel_RecIOP;
pxCheckBox* m_check_EECacheEnable; pxCheckBox* m_check_EECacheEnable;
AdvancedOptionsFPU* m_advancedOptsFpu; AdvancedOptionsFPU* m_advancedOptsFpu;
wxButton *m_button_RestoreDefaults; wxButton* m_button_RestoreDefaults;
public: public:
CpuPanelEE( wxWindow* parent ); CpuPanelEE( wxWindow* parent );
@ -190,6 +190,7 @@ namespace Panels
protected: protected:
void OnRestoreDefaults( wxCommandEvent& evt ); void OnRestoreDefaults( wxCommandEvent& evt );
void EECache_Event( wxCommandEvent& evt );
}; };
class CpuPanelVU : public BaseApplicableConfigPanel_SpecificConfig class CpuPanelVU : public BaseApplicableConfigPanel_SpecificConfig

32
pcsx2/gui/Panels/CpuPanel.cpp
View File

@ -171,6 +171,7 @@ Panels::CpuPanelEE::CpuPanelEE( wxWindow* parent )
*this += m_button_RestoreDefaults | StdButton(); *this += m_button_RestoreDefaults | StdButton();
Connect( wxID_DEFAULT, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CpuPanelEE::OnRestoreDefaults ) ); Connect( wxID_DEFAULT, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CpuPanelEE::OnRestoreDefaults ) );
Bind(wxEVT_COMMAND_RADIOBUTTON_SELECTED, &CpuPanelEE::EECache_Event, this);
} }
Panels::CpuPanelVU::CpuPanelVU( wxWindow* parent ) Panels::CpuPanelVU::CpuPanelVU( wxWindow* parent )
@ -233,7 +234,7 @@ void Panels::CpuPanelEE::Apply()
Pcsx2Config::RecompilerOptions& recOps( g_Conf->EmuOptions.Cpu.Recompiler ); Pcsx2Config::RecompilerOptions& recOps( g_Conf->EmuOptions.Cpu.Recompiler );
recOps.EnableEE = !!m_panel_RecEE->GetSelection(); recOps.EnableEE = !!m_panel_RecEE->GetSelection();
recOps.EnableIOP = !!m_panel_RecIOP->GetSelection(); recOps.EnableIOP = !!m_panel_RecIOP->GetSelection();
recOps.EnableEECache = m_check_EECacheEnable ->GetValue(); recOps.EnableEECache = m_check_EECacheEnable->GetValue();
} }
void Panels::CpuPanelEE::AppStatusEvent_OnSettingsApplied() void Panels::CpuPanelEE::AppStatusEvent_OnSettingsApplied()
@ -241,9 +242,8 @@ void Panels::CpuPanelEE::AppStatusEvent_OnSettingsApplied()
ApplyConfigToGui( *g_Conf ); ApplyConfigToGui( *g_Conf );
} }
void Panels::CpuPanelEE::ApplyConfigToGui( AppConfig& configToApply, int flags ){ void Panels::CpuPanelEE::ApplyConfigToGui( AppConfig& configToApply, int flags )
m_panel_RecEE->Enable(true); {
const Pcsx2Config::RecompilerOptions& recOps( configToApply.EmuOptions.Cpu.Recompiler ); const Pcsx2Config::RecompilerOptions& recOps( configToApply.EmuOptions.Cpu.Recompiler );
m_panel_RecEE->SetSelection( (int)recOps.EnableEE ); m_panel_RecEE->SetSelection( (int)recOps.EnableEE );
m_panel_RecIOP->SetSelection( (int)recOps.EnableIOP ); m_panel_RecIOP->SetSelection( (int)recOps.EnableIOP );
@ -251,8 +251,9 @@ void Panels::CpuPanelEE::ApplyConfigToGui( AppConfig& configToApply, int flags )
m_panel_RecEE->Enable(!configToApply.EnablePresets); m_panel_RecEE->Enable(!configToApply.EnablePresets);
m_panel_RecIOP->Enable(!configToApply.EnablePresets); m_panel_RecIOP->Enable(!configToApply.EnablePresets);
m_check_EECacheEnable ->SetValue(recOps.EnableEECache); //EECache option is exclusive to the EE Interpreter.
m_check_EECacheEnable->Enable(!configToApply.EnablePresets); m_check_EECacheEnable->SetValue(recOps.EnableEECache);
m_check_EECacheEnable->Enable(!configToApply.EnablePresets && m_panel_RecEE->GetSelection() == 0);
m_button_RestoreDefaults->Enable(!configToApply.EnablePresets); m_button_RestoreDefaults->Enable(!configToApply.EnablePresets);
if( flags & AppConfig::APPLY_FLAG_MANUALLY_PROPAGATE ) if( flags & AppConfig::APPLY_FLAG_MANUALLY_PROPAGATE )
@ -293,17 +294,10 @@ void Panels::CpuPanelVU::AppStatusEvent_OnSettingsApplied()
void Panels::CpuPanelVU::ApplyConfigToGui( AppConfig& configToApply, int flags ) void Panels::CpuPanelVU::ApplyConfigToGui( AppConfig& configToApply, int flags )
{ {
m_panel_VU0->Enable(true);
m_panel_VU1->Enable(true);
m_panel_VU0->EnableItem( 1, true); #ifdef DISABLE_SVU
#ifndef DISABLE_SVU m_panel_VU0->EnableItem( 2, false);
m_panel_VU0->EnableItem( 2, true); m_panel_VU1->EnableItem( 2, false);
#endif
m_panel_VU1->EnableItem( 1, true);
#ifndef DISABLE_SVU
m_panel_VU1->EnableItem( 2, true);
#endif #endif
Pcsx2Config::RecompilerOptions& recOps( configToApply.EmuOptions.Cpu.Recompiler ); Pcsx2Config::RecompilerOptions& recOps( configToApply.EmuOptions.Cpu.Recompiler );
@ -428,3 +422,9 @@ void Panels::AdvancedOptionsVU::ApplyConfigToGui( AppConfig& configToApply, int
this->Enable(!configToApply.EnablePresets); this->Enable(!configToApply.EnablePresets);
} }
void Panels::CpuPanelEE::EECache_Event(wxCommandEvent& event)
{
m_check_EECacheEnable->Enable(m_panel_RecEE->GetSelection() == 0);
event.Skip();
}