From e871add5f53a0a4077558bf8d7be6b8dac451ede Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Tue, 6 Jan 2015 00:30:48 -0500 Subject: [PATCH 1/2] Country filter fixes/consistency --- .../Core/DolphinQt/GameList/GameTracker.cpp | 63 ++++++++++--------- Source/Core/DolphinWX/ConfigMain.cpp | 2 +- Source/Core/DolphinWX/Frame.cpp | 3 + Source/Core/DolphinWX/FrameTools.cpp | 3 + Source/Core/DolphinWX/GameListCtrl.cpp | 63 ++++++++++--------- 5 files changed, 75 insertions(+), 59 deletions(-) diff --git a/Source/Core/DolphinQt/GameList/GameTracker.cpp b/Source/Core/DolphinQt/GameList/GameTracker.cpp index a3994548c6..23ebc8a14f 100644 --- a/Source/Core/DolphinQt/GameList/GameTracker.cpp +++ b/Source/Core/DolphinQt/GameList/GameTracker.cpp @@ -151,52 +151,57 @@ void DGameTracker::ScanForGames() if (!SConfig::GetInstance().m_ListAustralia) list = false; break; - case DiscIO::IVolume::COUNTRY_GERMANY: - if (!SConfig::GetInstance().m_ListGermany) - list = false; - break; - case DiscIO::IVolume::COUNTRY_RUSSIA: - if (!SConfig::GetInstance().m_ListRussia) - list = false; - break; - case DiscIO::IVolume::COUNTRY_UNKNOWN: - if (!SConfig::GetInstance().m_ListUnknown) - list = false; - break; - case DiscIO::IVolume::COUNTRY_TAIWAN: - if (!SConfig::GetInstance().m_ListTaiwan) - list = false; - break; - case DiscIO::IVolume::COUNTRY_KOREA: - if (!SConfig::GetInstance().m_ListKorea) - list = false; - break; - case DiscIO::IVolume::COUNTRY_JAPAN: - if (!SConfig::GetInstance().m_ListJap) - list = false; - break; - case DiscIO::IVolume::COUNTRY_USA: - if (!SConfig::GetInstance().m_ListUsa) + case DiscIO::IVolume::COUNTRY_EUROPE: + if (!SConfig::GetInstance().m_ListPal) list = false; break; case DiscIO::IVolume::COUNTRY_FRANCE: if (!SConfig::GetInstance().m_ListFrance) list = false; break; + case DiscIO::IVolume::COUNTRY_GERMANY: + if (!SConfig::GetInstance().m_ListGermany) + list = false; + break; + case DiscIO::IVolume::COUNTRY_INTERNATIONAL: + if (!SConfig::GetInstance().m_ListInternational) + list = false; + break; case DiscIO::IVolume::COUNTRY_ITALY: if (!SConfig::GetInstance().m_ListItaly) list = false; break; - case DiscIO::IVolume::COUNTRY_SPAIN: - if (!SConfig::GetInstance().m_ListSpain) + case DiscIO::IVolume::COUNTRY_JAPAN: + if (!SConfig::GetInstance().m_ListJap) + list = false; + break; + case DiscIO::IVolume::COUNTRY_KOREA: + if (!SConfig::GetInstance().m_ListKorea) list = false; break; case DiscIO::IVolume::COUNTRY_NETHERLANDS: if (!SConfig::GetInstance().m_ListNetherlands) list = false; break; + case DiscIO::IVolume::COUNTRY_RUSSIA: + if (!SConfig::GetInstance().m_ListRussia) + list = false; + break; + case DiscIO::IVolume::COUNTRY_SPAIN: + if (!SConfig::GetInstance().m_ListSpain) + list = false; + break; + case DiscIO::IVolume::COUNTRY_TAIWAN: + if (!SConfig::GetInstance().m_ListTaiwan) + list = false; + break; + case DiscIO::IVolume::COUNTRY_USA: + if (!SConfig::GetInstance().m_ListUsa) + list = false; + break; + case DiscIO::IVolume::COUNTRY_UNKNOWN: default: - if (!SConfig::GetInstance().m_ListPal) + if (!SConfig::GetInstance().m_ListUnknown) list = false; break; } diff --git a/Source/Core/DolphinWX/ConfigMain.cpp b/Source/Core/DolphinWX/ConfigMain.cpp index ca45ce9838..2a36b1da0e 100644 --- a/Source/Core/DolphinWX/ConfigMain.cpp +++ b/Source/Core/DolphinWX/ConfigMain.cpp @@ -1211,7 +1211,7 @@ inline u8 CConfigMain::GetSADRCountryCode(int language) countrycode = 1; //Japan break; case 1: //English - countrycode = 49; // United States + countrycode = 49; //United States break; case 2: //German countrycode = 78; //Germany diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 214da46b02..d8542dece8 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -841,6 +841,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event)) SConfig::GetInstance().m_ListAustralia && SConfig::GetInstance().m_ListFrance && SConfig::GetInstance().m_ListGermany && + SConfig::GetInstance().m_ListInternational && SConfig::GetInstance().m_ListItaly && SConfig::GetInstance().m_ListKorea && SConfig::GetInstance().m_ListNetherlands && @@ -858,6 +859,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event)) SConfig::GetInstance().m_ListAustralia = SConfig::GetInstance().m_ListFrance = SConfig::GetInstance().m_ListGermany = + SConfig::GetInstance().m_ListInternational = SConfig::GetInstance().m_ListItaly = SConfig::GetInstance().m_ListKorea = SConfig::GetInstance().m_ListNetherlands = @@ -875,6 +877,7 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event)) GetMenuBar()->FindItem(IDM_LIST_AUSTRALIA)->Check(true); GetMenuBar()->FindItem(IDM_LIST_FRANCE)->Check(true); GetMenuBar()->FindItem(IDM_LIST_GERMANY)->Check(true); + GetMenuBar()->FindItem(IDM_LIST_INTERNATIONAL)->Check(true); GetMenuBar()->FindItem(IDM_LIST_ITALY)->Check(true); GetMenuBar()->FindItem(IDM_LIST_KOREA)->Check(true); GetMenuBar()->FindItem(IDM_LIST_NETHERLANDS)->Check(true); diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index b13c08ab57..08ddcb2e39 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -1906,6 +1906,9 @@ void CFrame::GameListChanged(wxCommandEvent& event) case IDM_LIST_GERMANY: SConfig::GetInstance().m_ListGermany = event.IsChecked(); break; + case IDM_LIST_INTERNATIONAL: + SConfig::GetInstance().m_ListInternational = event.IsChecked(); + break; case IDM_LIST_ITALY: SConfig::GetInstance().m_ListItaly = event.IsChecked(); break; diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index be4ff0ff97..a055aa270d 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -632,52 +632,57 @@ void CGameListCtrl::ScanForISOs() if (!SConfig::GetInstance().m_ListAustralia) list = false; break; - case DiscIO::IVolume::COUNTRY_GERMANY: - if (!SConfig::GetInstance().m_ListGermany) - list = false; - break; - case DiscIO::IVolume::COUNTRY_RUSSIA: - if (!SConfig::GetInstance().m_ListRussia) - list = false; - break; - case DiscIO::IVolume::COUNTRY_UNKNOWN: - if (!SConfig::GetInstance().m_ListUnknown) - list = false; - break; - case DiscIO::IVolume::COUNTRY_TAIWAN: - if (!SConfig::GetInstance().m_ListTaiwan) - list = false; - break; - case DiscIO::IVolume::COUNTRY_KOREA: - if (!SConfig::GetInstance().m_ListKorea) - list = false; - break; - case DiscIO::IVolume::COUNTRY_JAPAN: - if (!SConfig::GetInstance().m_ListJap) - list = false; - break; - case DiscIO::IVolume::COUNTRY_USA: - if (!SConfig::GetInstance().m_ListUsa) + case DiscIO::IVolume::COUNTRY_EUROPE: + if (!SConfig::GetInstance().m_ListPal) list = false; break; case DiscIO::IVolume::COUNTRY_FRANCE: if (!SConfig::GetInstance().m_ListFrance) list = false; break; + case DiscIO::IVolume::COUNTRY_GERMANY: + if (!SConfig::GetInstance().m_ListGermany) + list = false; + break; + case DiscIO::IVolume::COUNTRY_INTERNATIONAL: + if (!SConfig::GetInstance().m_ListInternational) + list = false; + break; case DiscIO::IVolume::COUNTRY_ITALY: if (!SConfig::GetInstance().m_ListItaly) list = false; break; - case DiscIO::IVolume::COUNTRY_SPAIN: - if (!SConfig::GetInstance().m_ListSpain) + case DiscIO::IVolume::COUNTRY_JAPAN: + if (!SConfig::GetInstance().m_ListJap) + list = false; + break; + case DiscIO::IVolume::COUNTRY_KOREA: + if (!SConfig::GetInstance().m_ListKorea) list = false; break; case DiscIO::IVolume::COUNTRY_NETHERLANDS: if (!SConfig::GetInstance().m_ListNetherlands) list = false; break; + case DiscIO::IVolume::COUNTRY_RUSSIA: + if (!SConfig::GetInstance().m_ListRussia) + list = false; + break; + case DiscIO::IVolume::COUNTRY_SPAIN: + if (!SConfig::GetInstance().m_ListSpain) + list = false; + break; + case DiscIO::IVolume::COUNTRY_TAIWAN: + if (!SConfig::GetInstance().m_ListTaiwan) + list = false; + break; + case DiscIO::IVolume::COUNTRY_USA: + if (!SConfig::GetInstance().m_ListUsa) + list = false; + break; + case DiscIO::IVolume::COUNTRY_UNKNOWN: default: - if (!SConfig::GetInstance().m_ListPal) + if (!SConfig::GetInstance().m_ListUnknown) list = false; break; } From d83e7dde86c572907bc31a0cd61e87dc2a1f00bf Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Wed, 14 Jan 2015 23:44:03 -0500 Subject: [PATCH 2/2] De-capitalized countries --- Source/Core/DolphinWX/ISOFile.cpp | 2 +- Source/Core/DolphinWX/ISOProperties.cpp | 30 ++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index 8d61d9f4d4..0da27d0bc4 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -37,7 +37,7 @@ #include "DolphinWX/ISOFile.h" #include "DolphinWX/WxUtils.h" -static const u32 CACHE_REVISION = 0x118; +static const u32 CACHE_REVISION = 0x119; #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index a5f1110edf..351b08d1b0 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -200,34 +200,34 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW switch (OpenISO->GetCountry()) { case DiscIO::IVolume::COUNTRY_AUSTRALIA: - m_Country->SetValue(_("AUSTRALIA")); + m_Country->SetValue(_("Australia")); break; case DiscIO::IVolume::COUNTRY_EUROPE: - m_Country->SetValue(_("EUROPE")); + m_Country->SetValue(_("Europe")); break; case DiscIO::IVolume::COUNTRY_FRANCE: - m_Country->SetValue(_("FRANCE")); + m_Country->SetValue(_("France")); break; case DiscIO::IVolume::COUNTRY_INTERNATIONAL: - m_Country->SetValue(_("INTERNATIONAL")); + m_Country->SetValue(_("International")); break; case DiscIO::IVolume::COUNTRY_ITALY: - m_Country->SetValue(_("ITALY")); + m_Country->SetValue(_("Italy")); break; case DiscIO::IVolume::COUNTRY_GERMANY: - m_Country->SetValue(_("GERMANY")); + m_Country->SetValue(_("Germany")); break; case DiscIO::IVolume::COUNTRY_NETHERLANDS: - m_Country->SetValue(_("NETHERLANDS")); + m_Country->SetValue(_("Netherlands")); break; case DiscIO::IVolume::COUNTRY_RUSSIA: - m_Country->SetValue(_("RUSSIA")); + m_Country->SetValue(_("Russia")); break; case DiscIO::IVolume::COUNTRY_SPAIN: - m_Country->SetValue(_("SPAIN")); + m_Country->SetValue(_("Spain")); break; case DiscIO::IVolume::COUNTRY_USA: - m_Country->SetValue(_("USA")); + m_Country->SetValue(_("United States")); if (!IsWad) // For (non wad) NTSC Games, there's no multi lang { m_Lang->SetSelection(0); @@ -236,7 +236,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW break; case DiscIO::IVolume::COUNTRY_JAPAN: - m_Country->SetValue(_("JAPAN")); + m_Country->SetValue(_("Japan")); if (!IsWad) // For (non wad) NTSC Games, there's no multi lang { m_Lang->Insert(_("Japanese"), 0); @@ -245,20 +245,20 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW } break; case DiscIO::IVolume::COUNTRY_KOREA: - m_Country->SetValue(_("KOREA")); + m_Country->SetValue(_("Korea")); break; case DiscIO::IVolume::COUNTRY_TAIWAN: - m_Country->SetValue(_("TAIWAN")); + m_Country->SetValue(_("Taiwan")); if (!IsWad) // For (non wad) NTSC Games, there's no multi lang { - m_Lang->Insert(_("TAIWAN"), 0); + m_Lang->Insert(_("Taiwan"), 0); m_Lang->SetSelection(0); m_Lang->Disable(); } break; case DiscIO::IVolume::COUNTRY_UNKNOWN: default: - m_Country->SetValue(_("UNKNOWN")); + m_Country->SetValue(_("Unknown")); break; }