diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp index 0d91c178b2..01bd5961e9 100644 --- a/pcsx2/gui/AppConfig.cpp +++ b/pcsx2/gui/AppConfig.cpp @@ -710,16 +710,22 @@ int AppConfig::GeMaxPresetIndex() } bool AppConfig::isOkGetPresetTextAndColor(int n, wxString& label, wxColor& c){ - switch(n){ - case 0: label=pxE("!Panel:", L"1 - Safest"); c=wxColor(L"Forest GREEN"); break; - case 1: label=pxE("!Panel:", L"2 - Safe (faster)"); c=wxColor(L"Dark Green"); break; - case 2: label=pxE("!Panel:", L"3 - Balanced"); c=wxColor(L"Blue");break; - case 3: label=pxE("!Panel:", L"4 - Aggressive"); c=wxColor(L"Purple"); break; - case 4: label=pxE("!Panel:", L"5 - Aggressive plus"); c=wxColor(L"Orange"); break; - case 5: label=pxE("!Panel:", L"6 - Mostly Harmful"); c=wxColor(L"Red");break; - default: return false; - } - return true; + static const wxString presetNamesAndColors[][2]= + { + { pxE("!Panel:Presets:Name:1", L"Safest"), L"Forest GREEN" }, + { pxE("!Panel:Presets:Name:2", L"Safe (faster)"), L"Dark Green" }, + { pxE("!Panel:Presets:Name:3", L"Balanced"), L"Blue" }, + { pxE("!Panel:Presets:Name:4", L"Aggressive"), L"Purple" }, + { pxE("!Panel:Presets:Name:5", L"Aggressive plus"), L"Orange"}, + { pxE("!Panel:Presets:Name:6", L"Mostly Harmful"), L"Red" } + }; + if ( n<0 || n>GeMaxPresetIndex() ) + return false; + + label = wxString::Format(L"%d - ", n) + presetNamesAndColors[n][0]; + c = wxColor(presetNamesAndColors[n][1]); + + return true; } diff --git a/pcsx2/gui/Dialogs/SysConfigDialog.cpp b/pcsx2/gui/Dialogs/SysConfigDialog.cpp index 4976d06881..04bfd94fee 100644 --- a/pcsx2/gui/Dialogs/SysConfigDialog.cpp +++ b/pcsx2/gui/Dialogs/SysConfigDialog.cpp @@ -110,7 +110,7 @@ void Dialogs::SysConfigDialog::AddPresetsControl() wxDefaultPosition, wxDefaultSize, wxHORIZONTAL /*| wxSL_AUTOTICKS | wxSL_LABELS */); m_slider_presets->SetToolTip( - pxE( "!Notice:Tooltip", + pxE( "!Notice:Tooltip:Presets:Slider", L"The Presets apply speed hacks, some recompiler options and some game fixes known to boost speed.\n" L"Known important game fixes ('Patches') will be applied automatically.\n\n" L"Presets info:\n" @@ -124,7 +124,7 @@ void Dialogs::SysConfigDialog::AddPresetsControl() m_check_presets = new pxCheckBox( this, pxE("!Panel:", L"Preset:"), 0); m_check_presets->SetToolTip( - pxE( "!Notice:Tooltip", + pxE( "!Notice:Tooltip:Presets:Checkbox", L"The Presets apply speed hacks, some recompiler options and some game fixes known to boost speed.\n" L"Known important game fixes ('Patches') will be applied automatically.\n\n" //This creates nested macros = not working. Un/comment manually if needed. @@ -157,8 +157,8 @@ void Dialogs::SysConfigDialog::AddPresetsControl() *m_extraButtonSizer += 5; *m_extraButtonSizer += *m_msg_preset | pxMiddle; - Connect( m_slider_presets->GetId(), wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( Dialogs::SysConfigDialog::Preset_Scroll ) ); - Connect( m_slider_presets->GetId(), wxEVT_SCROLL_CHANGED, wxScrollEventHandler( Dialogs::SysConfigDialog::Preset_Scroll ) ); + Connect( m_slider_presets->GetId(), wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( Dialogs::SysConfigDialog::Preset_Scroll ) ); + Connect( m_slider_presets->GetId(), wxEVT_SCROLL_CHANGED, wxScrollEventHandler( Dialogs::SysConfigDialog::Preset_Scroll ) ); Connect( m_check_presets->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( Dialogs::SysConfigDialog::Presets_Toggled ) ); } diff --git a/pcsx2/gui/Panels/SpeedhacksPanel.cpp b/pcsx2/gui/Panels/SpeedhacksPanel.cpp index 7fde63d91c..580eaa408e 100644 --- a/pcsx2/gui/Panels/SpeedhacksPanel.cpp +++ b/pcsx2/gui/Panels/SpeedhacksPanel.cpp @@ -268,8 +268,8 @@ Panels::SpeedHacksPanel::SpeedHacksPanel( wxWindow* parent ) Connect( wxEVT_SCROLL_TOP, wxScrollEventHandler( SpeedHacksPanel::Slider_Click ) ); Connect( wxEVT_SCROLL_BOTTOM, wxScrollEventHandler( SpeedHacksPanel::Slider_Click ) ); - Connect( m_slider_eecycle->GetId(), wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( SpeedHacksPanel::EECycleRate_Scroll ) ); - Connect( m_slider_vustealer->GetId(), wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler( SpeedHacksPanel::VUCycleRate_Scroll ) ); + Connect( m_slider_eecycle->GetId(), wxEVT_SCROLL_CHANGED, wxScrollEventHandler( SpeedHacksPanel::EECycleRate_Scroll ) ); + Connect( m_slider_vustealer->GetId(), wxEVT_SCROLL_CHANGED, wxScrollEventHandler( SpeedHacksPanel::VUCycleRate_Scroll ) ); Connect( m_check_Enable->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( SpeedHacksPanel::OnEnable_Toggled ) ); Connect( wxID_DEFAULT, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SpeedHacksPanel::Defaults_Click ) ); }