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

Merge pull request #3466 from JosJuice/game-list-empty-condition 

DolphinWX: Unify the condition for the game list being empty
This commit is contained in:
Pierre Bourdon 2016-01-07 00:33:32 +01:00
parent ccd646dad0 dcde91cdd8
commit 4553f723ff
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/DolphinWX/Frame.cpp
View File

@ -870,25 +870,7 @@ void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event))
// 1. Boot the selected iso
// 2. Boot the default or last loaded iso.
// 3. Call BrowseForDirectory if the gamelist is empty
if (!m_GameListCtrl->GetISO(0) &&
!((SConfig::GetInstance().m_ListGC &&
SConfig::GetInstance().m_ListWii &&
SConfig::GetInstance().m_ListWad &&
SConfig::GetInstance().m_ListElfDol) &&
(SConfig::GetInstance().m_ListJap &&
SConfig::GetInstance().m_ListUsa &&
SConfig::GetInstance().m_ListPal &&
SConfig::GetInstance().m_ListAustralia &&
SConfig::GetInstance().m_ListFrance &&
SConfig::GetInstance().m_ListGermany &&
SConfig::GetInstance().m_ListItaly &&
SConfig::GetInstance().m_ListKorea &&
SConfig::GetInstance().m_ListNetherlands &&
SConfig::GetInstance().m_ListRussia &&
SConfig::GetInstance().m_ListSpain &&
SConfig::GetInstance().m_ListTaiwan &&
SConfig::GetInstance().m_ListWorld &&
SConfig::GetInstance().m_ListUnknown)))
if (!m_GameListCtrl->GetISO(0) && CGameListCtrl::IsHidingItems())
{
SConfig::GetInstance().m_ListGC =
SConfig::GetInstance().m_ListWii =

36
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -310,20 +310,14 @@ void CGameListCtrl::Update()
wxString errorString;
// We just check for one hide setting to be enabled, as we may only
// have GC games for example, and hide them, so we should show the
// second message instead
if ((SConfig::GetInstance().m_ListGC &&
SConfig::GetInstance().m_ListWii &&
SConfig::GetInstance().m_ListWad &&
SConfig::GetInstance().m_ListElfDol) &&
(SConfig::GetInstance().m_ListJap &&
SConfig::GetInstance().m_ListUsa &&
SConfig::GetInstance().m_ListPal))
// first message instead
if (IsHidingItems())
{
errorString = _("Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to browse for files...");
errorString = _("Dolphin is currently set to hide all games. Double-click here to show all games...");
}
else
{
errorString = _("Dolphin is currently set to hide all games. Double-click here to show all games...");
errorString = _("Dolphin could not find any GameCube/Wii ISOs or WADs. Double-click here to browse for files...");
}
InsertColumn(0, "");
long index = InsertItem(0, errorString);
@ -956,6 +950,28 @@ const GameListItem * CGameListCtrl::GetSelectedISO()
}
}
bool CGameListCtrl::IsHidingItems()
{
return !(SConfig::GetInstance().m_ListGC &&
SConfig::GetInstance().m_ListWii &&
SConfig::GetInstance().m_ListWad &&
SConfig::GetInstance().m_ListElfDol &&
SConfig::GetInstance().m_ListJap &&
SConfig::GetInstance().m_ListUsa &&
SConfig::GetInstance().m_ListPal &&
SConfig::GetInstance().m_ListAustralia &&
SConfig::GetInstance().m_ListFrance &&
SConfig::GetInstance().m_ListGermany &&
SConfig::GetInstance().m_ListItaly &&
SConfig::GetInstance().m_ListKorea &&
SConfig::GetInstance().m_ListNetherlands &&
SConfig::GetInstance().m_ListRussia &&
SConfig::GetInstance().m_ListSpain &&
SConfig::GetInstance().m_ListTaiwan &&
SConfig::GetInstance().m_ListWorld &&
SConfig::GetInstance().m_ListUnknown);
}
void CGameListCtrl::OnOpenContainingFolder(wxCommandEvent& WXUNUSED (event))
{
const GameListItem* iso = GetSelectedISO();

2
Source/Core/DolphinWX/GameListCtrl.h
View File

@ -39,6 +39,8 @@ public:
const GameListItem *GetSelectedISO();
const GameListItem *GetISO(size_t index) const;
static bool IsHidingItems();
enum
{
COLUMN_DUMMY = 0,