mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Various country flag improvements
* Added country flags for games from Netherlands and Spain * Added separate category for Region Free games (Uses European flag as placeholder) * Added missing country filter options in "show regions" menu * Rearranged country filters for readability * Incremented CACHE_REVISION Also fixed various country filters not showing up as options in the "Show regions" menu.
This commit is contained in:

committed by
Steven Vascellaro

parent
f7d1943615
commit
f1a26ff654
@ -72,8 +72,10 @@
|
||||
#include "DolphinWX/resources/Flag_Italy.xpm"
|
||||
#include "DolphinWX/resources/Flag_Japan.xpm"
|
||||
#include "DolphinWX/resources/Flag_Korea.xpm"
|
||||
#include "DolphinWX/resources/Flag_Netherlands.xpm"
|
||||
#include "DolphinWX/resources/Flag_Russia.xpm"
|
||||
#include "DolphinWX/resources/Flag_SDK.xpm"
|
||||
#include "DolphinWX/resources/Flag_Spain.xpm"
|
||||
#include "DolphinWX/resources/Flag_Taiwan.xpm"
|
||||
#include "DolphinWX/resources/Flag_Unknown.xpm"
|
||||
#include "DolphinWX/resources/Flag_USA.xpm"
|
||||
@ -223,18 +225,21 @@ void CGameListCtrl::InitBitmaps()
|
||||
SetImageList(m_imageListSmall, wxIMAGE_LIST_SMALL);
|
||||
|
||||
m_FlagImageIndex.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES);
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY] = m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(wxBitmap(Flag_France_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] = m_imageListSmall->Add(wxBitmap(Flag_USA_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_JAPAN] = m_imageListSmall->Add(wxBitmap(Flag_Japan_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA] = m_imageListSmall->Add(wxBitmap(Flag_Korea_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = m_imageListSmall->Add(wxBitmap(Flag_Italy_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] = m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_RUSSIA] = m_imageListSmall->Add(wxBitmap(Flag_Russia_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_AUSTRALIA] = m_imageListSmall->Add(wxBitmap(Flag_Australia_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] = m_imageListSmall->Add(wxBitmap(Flag_SDK_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_JAPAN] = m_imageListSmall->Add(wxBitmap(Flag_Japan_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] = m_imageListSmall->Add(wxBitmap(Flag_USA_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_AUSTRALIA] = m_imageListSmall->Add(wxBitmap(Flag_Australia_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(wxBitmap(Flag_France_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY] = m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_INTERNATIONAL] = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm)); // Uses European flag as a placeholder
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = m_imageListSmall->Add(wxBitmap(Flag_Italy_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA] = m_imageListSmall->Add(wxBitmap(Flag_Korea_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_NETHERLANDS] = m_imageListSmall->Add(wxBitmap(Flag_Netherlands_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_RUSSIA] = m_imageListSmall->Add(wxBitmap(Flag_Russia_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] = m_imageListSmall->Add(wxBitmap(Flag_SDK_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SPAIN] = m_imageListSmall->Add(wxBitmap(Flag_Spain_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] = m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm));
|
||||
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm));
|
||||
|
||||
m_PlatformImageIndex.resize(3);
|
||||
m_PlatformImageIndex[0] = m_imageListSmall->Add(wxBitmap(Platform_Gamecube_xpm));
|
||||
@ -625,6 +630,22 @@ void CGameListCtrl::ScanForISOs()
|
||||
|
||||
switch(iso_file->GetCountry())
|
||||
{
|
||||
case DiscIO::IVolume::COUNTRY_AUSTRALIA:
|
||||
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;
|
||||
@ -649,6 +670,14 @@ void CGameListCtrl::ScanForISOs()
|
||||
if (!SConfig::GetInstance().m_ListItaly)
|
||||
list = false;
|
||||
break;
|
||||
case DiscIO::IVolume::COUNTRY_SPAIN:
|
||||
if (!SConfig::GetInstance().m_ListSpain)
|
||||
list = false;
|
||||
break;
|
||||
case DiscIO::IVolume::COUNTRY_NETHERLANDS:
|
||||
if (!SConfig::GetInstance().m_ListNetherlands)
|
||||
list = false;
|
||||
break;
|
||||
default:
|
||||
if (!SConfig::GetInstance().m_ListPal)
|
||||
list = false;
|
||||
|
Reference in New Issue
Block a user