Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DolphinWX: Unify the condition for the game list being empty #3466

Merged
merged 1 commit into from
Jan 6, 2016
Merged

DolphinWX: Unify the condition for the game list being empty #3466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 1 addition & 19 deletions Source/Core/DolphinWX/Frame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
36 changes: 26 additions & 10 deletions Source/Core/DolphinWX/GameListCtrl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 2 additions & 0 deletions Source/Core/DolphinWX/GameListCtrl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ class CGameListCtrl : public wxListCtrl
const GameListItem *GetSelectedISO();
const GameListItem *GetISO(size_t index) const;

static bool IsHidingItems();

enum
{
COLUMN_DUMMY = 0,
Expand Down