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

PCSX2: Set pad plugin and bios defaults automatically. (#3020) 

Default to Onepad on Linux, Lilypad on Windows, and default to using the bios if there is one listed.
This commit is contained in:
arcum42 2019-08-02 20:06:50 -07:00 committed by GitHub
parent 0814690534
commit 11187cff9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pcsx2/gui/Panels/BiosSelectorPanel.cpp
View File

@ -155,24 +155,35 @@ bool Panels::BiosSelectorPanel::ValidateEnumerationStatus()
m_BiosList.swap(bioslist);
int sel = m_ComboBox->GetSelection();
if ((sel == wxNOT_FOUND) && !(m_ComboBox->IsEmpty()))
m_ComboBox->SetSelection(0);
return validated;
}
void Panels::BiosSelectorPanel::DoRefresh()
{
if( !m_BiosList ) return;
if (!m_BiosList) return;
m_ComboBox->Clear();
const wxFileName right( g_Conf->FullpathToBios() );
const wxFileName right(g_Conf->FullpathToBios());
bool biosSet = false;
for( size_t i=0; i<m_BiosList->GetCount(); ++i )
for(size_t i=0; i<m_BiosList->GetCount(); ++i)
{
wxString description;
if( !IsBIOS((*m_BiosList)[i], description) ) continue;
if (!IsBIOS((*m_BiosList)[i], description)) continue;
int sel = m_ComboBox->Append( description, (void*)i );
if( wxFileName((*m_BiosList)[i] ) == right )
m_ComboBox->SetSelection( sel );
if (wxFileName((*m_BiosList)[i] ) == right)
{
m_ComboBox->SetSelection(sel);
biosSet = true;
}
}
if ((!biosSet) && !(m_ComboBox->IsEmpty()))
m_ComboBox->SetSelection(0);
}

50
pcsx2/gui/Panels/PluginSelectorPanel.cpp
View File

@ -579,7 +579,7 @@ bool Panels::PluginSelectorPanel::ValidateEnumerationStatus()
m_FileList.swap(pluginlist);
// set the gague length a little shorter than the plugin count. 2 reasons:
// set the gauge length a little shorter than the plugin count. 2 reasons:
// * some of the plugins might be duds.
// * on high end machines and Win7, the statusbar lags a lot and never gets to 100% before being hidden.
@ -669,7 +669,9 @@ void Panels::PluginSelectorPanel::OnEnumComplete( wxCommandEvent& evt )
// (for now we just force it to selection zero if nothing's selected)
int emptyBoxes = 0;
const PluginInfo* pi = tbl_PluginInfo; do
const PluginInfo* pi = tbl_PluginInfo;
do
{
const PluginsEnum_t pid = pi->id;
if( m_ComponentBoxes->Get(pid).GetCount() <= 0 )
@ -677,7 +679,7 @@ void Panels::PluginSelectorPanel::OnEnumComplete( wxCommandEvent& evt )
else if( m_ComponentBoxes->Get(pid).GetSelection() == wxNOT_FOUND )
{
if( pid == PluginId_GS )
if (pid == PluginId_GS)
{
int count = (int)m_ComponentBoxes->Get(pid).GetCount();
@ -699,6 +701,48 @@ void Panels::PluginSelectorPanel::OnEnumComplete( wxCommandEvent& evt )
else if( index_sse2 >= 0 ) m_ComponentBoxes->Get(pid).SetSelection( index_sse2 );
else m_ComponentBoxes->Get(pid).SetSelection( 0 );
}
else if (pid == PluginId_PAD)
{
int count = (int)m_ComponentBoxes->Get(pid).GetCount();
int index_lilypad = -1;
int index_onepad = -1;
int index_onepad_legacy = -1;
for( int i = 0; i < count; i++ )
{
auto str = m_ComponentBoxes->Get(pid).GetString(i).Lower();
if (str.Contains("lilypad")) index_lilypad = i;
if (str.Contains("onepad"))
{
if (str.Contains("legacy"))
index_onepad_legacy = i;
else
index_onepad = i;
}
}
#ifdef _WIN32
if (index_lilypad >= 0)
m_ComponentBoxes->Get(pid).SetSelection(index_lilypad);
/* else if (index_onepad >= 0)
m_ComponentBoxes->Get(pid).SetSelection(index_onepad);
else if (index_onepad_legacy >= 0)
m_ComponentBoxes->Get(pid).SetSelection(index_onepad_legacy); */
else
m_ComponentBoxes->Get(pid).SetSelection(0);
#else
if (index_onepad >= 0)
m_ComponentBoxes->Get(pid).SetSelection(index_onepad);
else if (index_onepad_legacy >= 0)
m_ComponentBoxes->Get(pid).SetSelection(index_onepad_legacy);
else if (index_lilypad >= 0)
m_ComponentBoxes->Get(pid).SetSelection(index_lilypad);
else
m_ComponentBoxes->Get(pid).SetSelection(0);
#endif
}
else
m_ComponentBoxes->Get(pid).SetSelection( 0 );