From f1a26ff6546f5393d4d057549c6fcc28bc66cccf Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Thu, 30 Oct 2014 10:35:46 -0400 Subject: [PATCH 1/3] 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. --- Source/Android/assets/Dolphin.ini | 6 ++ Source/Core/Core/ConfigManager.cpp | 40 +++++--- Source/Core/Core/ConfigManager.h | 6 ++ Source/Core/Core/CoreParameter.cpp | 10 ++ Source/Core/DiscIO/Volume.h | 16 ++-- Source/Core/DiscIO/VolumeCommon.cpp | 20 ++-- Source/Core/DolphinQt/Utils/Resources.cpp | 18 ++-- Source/Core/DolphinWX/Frame.cpp | 30 +++++- Source/Core/DolphinWX/FrameTools.cpp | 30 +++++- Source/Core/DolphinWX/GameListCtrl.cpp | 53 ++++++++--- Source/Core/DolphinWX/Globals.h | 6 ++ Source/Core/DolphinWX/ISOFile.cpp | 2 +- Source/Core/DolphinWX/ISOProperties.cpp | 16 ++++ .../DolphinWX/resources/Flag_Netherlands.xpm | 43 +++++++++ .../Core/DolphinWX/resources/Flag_Spain.xpm | 94 +++++++++++++++++++ 15 files changed, 337 insertions(+), 53 deletions(-) create mode 100644 Source/Core/DolphinWX/resources/Flag_Netherlands.xpm create mode 100644 Source/Core/DolphinWX/resources/Flag_Spain.xpm diff --git a/Source/Android/assets/Dolphin.ini b/Source/Android/assets/Dolphin.ini index 2dbfe2ba35..1d0113587f 100644 --- a/Source/Android/assets/Dolphin.ini +++ b/Source/Android/assets/Dolphin.ini @@ -169,9 +169,15 @@ ListGC = True ListJap = True ListPal = True ListUsa = True +ListAustralia = True ListFrance = True +ListGermany = True +ListInternational = True ListItaly = True ListKorea = True +ListNetherlands = True +ListRussia = True +ListSpain = True ListTaiwan = True ListUnknown = True ListSort = 3 diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index f9e8c170a0..2c74b423b4 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -274,9 +274,15 @@ void SConfig::SaveGameListSettings(IniFile& ini) gamelist->Set("ListJap", m_ListJap); gamelist->Set("ListPal", m_ListPal); gamelist->Set("ListUsa", m_ListUsa); + gamelist->Set("ListAustralia", m_ListAustralia); gamelist->Set("ListFrance", m_ListFrance); + gamelist->Set("ListGermany", m_ListGermany); + gamelist->Set("ListInternational", m_ListInternational); gamelist->Set("ListItaly", m_ListItaly); gamelist->Set("ListKorea", m_ListKorea); + gamelist->Set("ListNetherlands", m_ListNetherlands); + gamelist->Set("ListRussia", m_ListRussia); + gamelist->Set("ListSpain", m_ListSpain); gamelist->Set("ListTaiwan", m_ListTaiwan); gamelist->Set("ListUnknown", m_ListUnknown); gamelist->Set("ListSort", m_ListSort); @@ -478,21 +484,27 @@ void SConfig::LoadGameListSettings(IniFile& ini) { IniFile::Section* gamelist = ini.GetOrCreateSection("GameList"); - gamelist->Get("ListDrives", &m_ListDrives, false); - gamelist->Get("ListWad", &m_ListWad, true); - gamelist->Get("ListWii", &m_ListWii, true); - gamelist->Get("ListGC", &m_ListGC, true); - gamelist->Get("ListJap", &m_ListJap, true); - gamelist->Get("ListPal", &m_ListPal, true); - gamelist->Get("ListUsa", &m_ListUsa, true); + gamelist->Get("ListDrives", &m_ListDrives, false); + gamelist->Get("ListWad", &m_ListWad, true); + gamelist->Get("ListWii", &m_ListWii, true); + gamelist->Get("ListGC", &m_ListGC, true); + gamelist->Get("ListJap", &m_ListJap, true); + gamelist->Get("ListPal", &m_ListPal, true); + gamelist->Get("ListUsa", &m_ListUsa, true); - gamelist->Get("ListFrance", &m_ListFrance, true); - gamelist->Get("ListItaly", &m_ListItaly, true); - gamelist->Get("ListKorea", &m_ListKorea, true); - gamelist->Get("ListTaiwan", &m_ListTaiwan, true); - gamelist->Get("ListUnknown", &m_ListUnknown, true); - gamelist->Get("ListSort", &m_ListSort, 3); - gamelist->Get("ListSortSecondary",&m_ListSort2, 0); + gamelist->Get("ListAustralia", &m_ListAustralia, true); + gamelist->Get("ListFrance", &m_ListFrance, true); + gamelist->Get("ListGermany", &m_ListGermany, true); + gamelist->Get("ListInternational", &m_ListInternational, true); + gamelist->Get("ListItaly", &m_ListItaly, true); + gamelist->Get("ListKorea", &m_ListKorea, true); + gamelist->Get("ListNetherlands", &m_ListNetherlands, true); + gamelist->Get("ListRussia", &m_ListRussia, true); + gamelist->Get("ListSpain", &m_ListSpain, true); + gamelist->Get("ListTaiwan", &m_ListTaiwan, true); + gamelist->Get("ListUnknown", &m_ListUnknown, true); + gamelist->Get("ListSort", &m_ListSort, 3); + gamelist->Get("ListSortSecondary", &m_ListSort2, 0); // Determines if compressed games display in blue gamelist->Get("ColorCompressed", &m_ColorCompressed, true); diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index c5a2cfbcc3..7c14d9dfb8 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -63,9 +63,15 @@ struct SConfig : NonCopyable bool m_ListPal; bool m_ListUsa; bool m_ListJap; + bool m_ListAustralia; bool m_ListFrance; + bool m_ListGermany; + bool m_ListInternational; bool m_ListItaly; bool m_ListKorea; + bool m_ListNetherlands; + bool m_ListRussia; + bool m_ListSpain; bool m_ListTaiwan; bool m_ListUnknown; int m_ListSort; diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index bef3eb9f52..a8effe8a08 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -169,14 +169,20 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2) Region = JAP_DIR; break; + case DiscIO::IVolume::COUNTRY_AUSTRALIA: case DiscIO::IVolume::COUNTRY_EUROPE: case DiscIO::IVolume::COUNTRY_FRANCE: + case DiscIO::IVolume::COUNTRY_INTERNATIONAL: case DiscIO::IVolume::COUNTRY_ITALY: + case DiscIO::IVolume::COUNTRY_NETHERLANDS: case DiscIO::IVolume::COUNTRY_RUSSIA: + case DiscIO::IVolume::COUNTRY_SPAIN: bNTSC = false; Region = EUR_DIR; break; + case DiscIO::IVolume::COUNTRY_SDK: + case DiscIO::IVolume::COUNTRY_UNKNOWN: default: if (PanicYesNoT("Your GCM/ISO file seems to be invalid (invalid country)." "\nContinue with PAL region?")) @@ -249,14 +255,18 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2) Region = JAP_DIR; break; + case DiscIO::IVolume::COUNTRY_AUSTRALIA: case DiscIO::IVolume::COUNTRY_EUROPE: case DiscIO::IVolume::COUNTRY_FRANCE: + case DiscIO::IVolume::COUNTRY_INTERNATIONAL: case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_RUSSIA: bNTSC = false; Region = EUR_DIR; break; + case DiscIO::IVolume::COUNTRY_SDK: + case DiscIO::IVolume::COUNTRY_UNKNOWN: default: bNTSC = false; Region = EUR_DIR; diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h index 0b10bf2387..09442c89df 100644 --- a/Source/Core/DiscIO/Volume.h +++ b/Source/Core/DiscIO/Volume.h @@ -34,20 +34,24 @@ public: virtual bool CheckIntegrity() const { return false; } virtual bool IsDiscTwo() const { return false; } + // Increment CACHE_REVISION if values are changed (ISOFile.cpp) enum ECountry { COUNTRY_EUROPE = 0, - COUNTRY_FRANCE, - COUNTRY_RUSSIA, - COUNTRY_USA, COUNTRY_JAPAN, - COUNTRY_KOREA, + COUNTRY_USA, + COUNTRY_AUSTRALIA, + COUNTRY_FRANCE, + COUNTRY_GERMANY, + COUNTRY_INTERNATIONAL, COUNTRY_ITALY, + COUNTRY_KOREA, + COUNTRY_NETHERLANDS, + COUNTRY_RUSSIA, + COUNTRY_SPAIN, COUNTRY_TAIWAN, COUNTRY_SDK, COUNTRY_UNKNOWN, - COUNTRY_GERMANY, - COUNTRY_AUSTRALIA, NUMBER_OF_COUNTRIES }; diff --git a/Source/Core/DiscIO/VolumeCommon.cpp b/Source/Core/DiscIO/VolumeCommon.cpp index 7da110403a..69a9cc8981 100644 --- a/Source/Core/DiscIO/VolumeCommon.cpp +++ b/Source/Core/DiscIO/VolumeCommon.cpp @@ -15,24 +15,22 @@ IVolume::ECountry CountrySwitch(u8 CountryCode) { switch (CountryCode) { - // Region free - fall through to European defaults for now + // Region free - Uses European flag as placeholder case 'A': - + return IVolume::COUNTRY_INTERNATIONAL; // PAL - case 'D': // German + case 'D': return IVolume::COUNTRY_GERMANY; case 'X': // Used by a couple PAL games - case 'Y': // German, french - + case 'Y': // German, French case 'L': // Japanese import to PAL regions case 'M': // Japanese import to PAL regions - case 'S': // Spanish-speaking regions case 'P': return IVolume::COUNTRY_EUROPE; - case 'U': // Australia + case 'U': return IVolume::COUNTRY_AUSTRALIA; case 'F': @@ -41,9 +39,15 @@ IVolume::ECountry CountrySwitch(u8 CountryCode) case 'I': return IVolume::COUNTRY_ITALY; + case 'H': + return IVolume::COUNTRY_NETHERLANDS; + case 'R': return IVolume::COUNTRY_RUSSIA; + case 'S': + return IVolume::COUNTRY_SPAIN; + // NTSC case 'E': case 'N': // Japanese import to USA and other NTSC regions @@ -54,8 +58,8 @@ IVolume::ECountry CountrySwitch(u8 CountryCode) return IVolume::COUNTRY_JAPAN; case 'K': - case 'T': // Korea with English language case 'Q': // Korea with Japanese language + case 'T': // Korea with English language return IVolume::COUNTRY_KOREA; case 'O': diff --git a/Source/Core/DolphinQt/Utils/Resources.cpp b/Source/Core/DolphinQt/Utils/Resources.cpp index 0056f4f972..0826c04b22 100644 --- a/Source/Core/DolphinQt/Utils/Resources.cpp +++ b/Source/Core/DolphinQt/Utils/Resources.cpp @@ -21,15 +21,21 @@ void Resources::Init() QString dir = QString::fromStdString(File::GetSysDirectory() + "Resources/"); m_regions.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES); - m_regions[DiscIO::IVolume::COUNTRY_EUROPE].load(dir + SL("Flag_Europe.png")); - m_regions[DiscIO::IVolume::COUNTRY_FRANCE].load(dir + SL("Flag_France.png")); - m_regions[DiscIO::IVolume::COUNTRY_RUSSIA].load(dir + SL("Flag_Unknown.png")); // TODO - m_regions[DiscIO::IVolume::COUNTRY_USA].load(dir + SL("Flag_USA.png")); m_regions[DiscIO::IVolume::COUNTRY_JAPAN].load(dir + SL("Flag_Japan.png")); - m_regions[DiscIO::IVolume::COUNTRY_KOREA].load(dir + SL("Flag_Korea.png")); + m_regions[DiscIO::IVolume::COUNTRY_EUROPE].load(dir + SL("Flag_Europe.png")); + m_regions[DiscIO::IVolume::COUNTRY_USA].load(dir + SL("Flag_USA.png")); + + m_regions[DiscIO::IVolume::COUNTRY_AUSTRALIA].load(dir + SL("Flag_Australia.png")); + m_regions[DiscIO::IVolume::COUNTRY_FRANCE].load(dir + SL("Flag_France.png")); + m_regions[DiscIO::IVolume::COUNTRY_GERMANY].load(dir + SL("Flag_Germany.png")); + m_regions[DiscIO::IVolume::COUNTRY_INTERNATIONAL].load(dir + SL("Flag_Europe.png")); // Uses European flag as a placeholder m_regions[DiscIO::IVolume::COUNTRY_ITALY].load(dir + SL("Flag_Italy.png")); - m_regions[DiscIO::IVolume::COUNTRY_TAIWAN].load(dir + SL("Flag_Taiwan.png")); + m_regions[DiscIO::IVolume::COUNTRY_KOREA].load(dir + SL("Flag_Korea.png")); + m_regions[DiscIO::IVolume::COUNTRY_NETHERLANDS].load(dir + SL("Flag_Netherlands.png")); + m_regions[DiscIO::IVolume::COUNTRY_RUSSIA].load(dir + SL("Flag_Russia.png")); m_regions[DiscIO::IVolume::COUNTRY_SDK].load(dir + SL("Flag_SDK.png")); + m_regions[DiscIO::IVolume::COUNTRY_SPAIN].load(dir + SL("Flag_Spain.png")); + m_regions[DiscIO::IVolume::COUNTRY_TAIWAN].load(dir + SL("Flag_Taiwan.png")); m_regions[DiscIO::IVolume::COUNTRY_UNKNOWN].load(dir + SL("Flag_Unknown.png")); m_platforms.resize(3); diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 1d42b02a55..3784ae4bc9 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -836,17 +836,32 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event)) (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_ListUnknown))) { - SConfig::GetInstance().m_ListGC = SConfig::GetInstance().m_ListWii = - SConfig::GetInstance().m_ListWad = SConfig::GetInstance().m_ListJap = - SConfig::GetInstance().m_ListUsa = SConfig::GetInstance().m_ListPal = - SConfig::GetInstance().m_ListFrance = SConfig::GetInstance().m_ListItaly = - SConfig::GetInstance().m_ListKorea = SConfig::GetInstance().m_ListTaiwan = + SConfig::GetInstance().m_ListGC = + SConfig::GetInstance().m_ListWii = + SConfig::GetInstance().m_ListWad = + 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_ListUnknown = true; GetMenuBar()->FindItem(IDM_LISTGC)->Check(true); @@ -855,9 +870,14 @@ void CFrame::OnGameListCtrl_ItemActivated(wxListEvent& WXUNUSED (event)) GetMenuBar()->FindItem(IDM_LISTJAP)->Check(true); GetMenuBar()->FindItem(IDM_LISTUSA)->Check(true); GetMenuBar()->FindItem(IDM_LISTPAL)->Check(true); + GetMenuBar()->FindItem(IDM_LISTAUSTRALIA)->Check(true); GetMenuBar()->FindItem(IDM_LISTFRANCE)->Check(true); + GetMenuBar()->FindItem(IDM_LISTGERMANY)->Check(true); GetMenuBar()->FindItem(IDM_LISTITALY)->Check(true); GetMenuBar()->FindItem(IDM_LISTKOREA)->Check(true); + GetMenuBar()->FindItem(IDM_LISTNETHERLANDS)->Check(true); + GetMenuBar()->FindItem(IDM_LISTRUSSIA)->Check(true); + GetMenuBar()->FindItem(IDM_LISTSPAIN)->Check(true); GetMenuBar()->FindItem(IDM_LISTTAIWAN)->Check(true); GetMenuBar()->FindItem(IDM_LIST_UNK)->Check(true); diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 22dbdc0e6d..b9aa252275 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -328,16 +328,29 @@ wxMenuBar* CFrame::CreateMenu() regionMenu->AppendCheckItem(IDM_LISTUSA, _("Show USA")); regionMenu->Check(IDM_LISTUSA, SConfig::GetInstance().m_ListUsa); regionMenu->AppendSeparator(); + regionMenu->AppendCheckItem(IDM_LISTAUSTRALIA, _("Show Australia")); + regionMenu->Check(IDM_LISTAUSTRALIA, SConfig::GetInstance().m_ListAustralia); regionMenu->AppendCheckItem(IDM_LISTFRANCE, _("Show France")); regionMenu->Check(IDM_LISTFRANCE, SConfig::GetInstance().m_ListFrance); + regionMenu->AppendCheckItem(IDM_LISTGERMANY, _("Show Germany")); + regionMenu->Check(IDM_LISTGERMANY, SConfig::GetInstance().m_ListGermany); + regionMenu->AppendCheckItem(IDM_LISTINTERNATIONAL, _("Show International")); + regionMenu->Check(IDM_LISTINTERNATIONAL, SConfig::GetInstance().m_ListInternational); regionMenu->AppendCheckItem(IDM_LISTITALY, _("Show Italy")); regionMenu->Check(IDM_LISTITALY, SConfig::GetInstance().m_ListItaly); regionMenu->AppendCheckItem(IDM_LISTKOREA, _("Show Korea")); regionMenu->Check(IDM_LISTKOREA, SConfig::GetInstance().m_ListKorea); + regionMenu->AppendCheckItem(IDM_LISTNETHERLANDS, _("Show Netherlands")); + regionMenu->Check(IDM_LISTNETHERLANDS, SConfig::GetInstance().m_ListNetherlands); + regionMenu->AppendCheckItem(IDM_LISTRUSSIA, _("Show Russia")); + regionMenu->Check(IDM_LISTRUSSIA, SConfig::GetInstance().m_ListRussia); + regionMenu->AppendCheckItem(IDM_LISTSPAIN, _("Show Spain")); + regionMenu->Check(IDM_LISTSPAIN, SConfig::GetInstance().m_ListSpain); regionMenu->AppendCheckItem(IDM_LISTTAIWAN, _("Show Taiwan")); regionMenu->Check(IDM_LISTTAIWAN, SConfig::GetInstance().m_ListTaiwan); - regionMenu->AppendCheckItem(IDM_LIST_UNK, _("Show unknown")); + regionMenu->AppendCheckItem(IDM_LIST_UNK, _("Show Unknown")); regionMenu->Check(IDM_LIST_UNK, SConfig::GetInstance().m_ListUnknown); + viewMenu->AppendCheckItem(IDM_LISTDRIVES, _("Show Drives")); viewMenu->Check(IDM_LISTDRIVES, SConfig::GetInstance().m_ListDrives); viewMenu->Append(IDM_PURGECACHE, _("Purge Cache")); @@ -1936,15 +1949,30 @@ void CFrame::GameListChanged(wxCommandEvent& event) case IDM_LISTUSA: SConfig::GetInstance().m_ListUsa = event.IsChecked(); break; + case IDM_LISTAUSTRALIA: + SConfig::GetInstance().m_ListAustralia = event.IsChecked(); + break; case IDM_LISTFRANCE: SConfig::GetInstance().m_ListFrance = event.IsChecked(); break; + case IDM_LISTGERMANY: + SConfig::GetInstance().m_ListGermany = event.IsChecked(); + break; case IDM_LISTITALY: SConfig::GetInstance().m_ListItaly = event.IsChecked(); break; case IDM_LISTKOREA: SConfig::GetInstance().m_ListKorea = event.IsChecked(); break; + case IDM_LISTNETHERLANDS: + SConfig::GetInstance().m_ListNetherlands = event.IsChecked(); + break; + case IDM_LISTRUSSIA: + SConfig::GetInstance().m_ListRussia = event.IsChecked(); + break; + case IDM_LISTSPAIN: + SConfig::GetInstance().m_ListSpain = event.IsChecked(); + break; case IDM_LISTTAIWAN: SConfig::GetInstance().m_ListTaiwan = event.IsChecked(); break; diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index f94f59484e..d95daa8d62 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -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; diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index 6e6554462a..edbd89bf6a 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -127,9 +127,15 @@ enum IDM_LISTJAP, IDM_LISTPAL, IDM_LISTUSA, + IDM_LISTAUSTRALIA, IDM_LISTFRANCE, + IDM_LISTGERMANY, + IDM_LISTINTERNATIONAL, IDM_LISTITALY, IDM_LISTKOREA, + IDM_LISTNETHERLANDS, + IDM_LISTRUSSIA, + IDM_LISTSPAIN, IDM_LISTTAIWAN, IDM_LIST_UNK, IDM_LISTDRIVES, diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index deb6df8c8c..b4dbdf91d2 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 = 0x115; +static const u32 CACHE_REVISION = 0x116; #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 f2d0a501ae..487ab94544 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -196,18 +196,33 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW m_GameID->SetValue(StrToWxStr(OpenISO->GetUniqueID())); switch (OpenISO->GetCountry()) { + case DiscIO::IVolume::COUNTRY_AUSTRALIA: + m_Country->SetValue(_("AUSTRALIA")); + break; case DiscIO::IVolume::COUNTRY_EUROPE: m_Country->SetValue(_("EUROPE")); break; case DiscIO::IVolume::COUNTRY_FRANCE: m_Country->SetValue(_("FRANCE")); break; + case DiscIO::IVolume::COUNTRY_INTERNATIONAL: + m_Country->SetValue(_("INTERNATIONAL")); + break; case DiscIO::IVolume::COUNTRY_ITALY: m_Country->SetValue(_("ITALY")); break; + case DiscIO::IVolume::COUNTRY_GERMANY: + m_Country->SetValue(_("GERMANY")); + break; + case DiscIO::IVolume::COUNTRY_NETHERLANDS: + m_Country->SetValue(_("NETHERLANDS")); + break; case DiscIO::IVolume::COUNTRY_RUSSIA: m_Country->SetValue(_("RUSSIA")); break; + case DiscIO::IVolume::COUNTRY_SPAIN: + m_Country->SetValue(_("SPAIN")); + break; case DiscIO::IVolume::COUNTRY_USA: m_Country->SetValue(_("USA")); if (!IsWad) // For (non wad) NTSC Games, there's no multi lang @@ -241,6 +256,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW case DiscIO::IVolume::COUNTRY_SDK: m_Country->SetValue(_("No Country (SDK)")); break; + case DiscIO::IVolume::COUNTRY_UNKNOWN: default: m_Country->SetValue(_("UNKNOWN")); break; diff --git a/Source/Core/DolphinWX/resources/Flag_Netherlands.xpm b/Source/Core/DolphinWX/resources/Flag_Netherlands.xpm new file mode 100644 index 0000000000..c02e098412 --- /dev/null +++ b/Source/Core/DolphinWX/resources/Flag_Netherlands.xpm @@ -0,0 +1,43 @@ +/* XPM */ +static const char * Flag_Netherlands_xpm[] = { +"96 32 8 1", +" c None", +". c #000000", +"+ c #AE1C28", +"@ c #C3565F", +"# c #FFFFFF", +"$ c #526EA5", +"% c #1F448A", +"& c #21468B", +" ", +" ", +" ", +" ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".##############################. ", +".##############################. ", +".##############################. ", +".##############################. ", +".##############################. ", +".##############################. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%. ", +".&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&. ", +".&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&. ", +".&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&. ", +".&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&. ", +".&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&. ", +"................................ ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Spain.xpm b/Source/Core/DolphinWX/resources/Flag_Spain.xpm new file mode 100644 index 0000000000..09d1cffb4b --- /dev/null +++ b/Source/Core/DolphinWX/resources/Flag_Spain.xpm @@ -0,0 +1,94 @@ +/* XPM */ +static const char * Flag_Spain_xpm[] = { +"96 32 59 1", +" c None", +". c #000000", +"+ c #C60B1E", +"@ c #FFC400", +"# c #E8B707", +"$ c #E6B709", +"% c #FAC006", +"& c #C08113", +"* c #B9720D", +"= c #B9720E", +"- c #BF8113", +"; c #FAC005", +"> c #D99F03", +", c #D69A03", +"' c #C47F08", +") c #A37D0A", +"! c #AB7D0A", +"~ c #C58109", +"{ c #DDA102", +"] c #E3B91B", +"^ c #DCB41F", +"/ c #A73C12", +"( c #A83D11", +"_ c #B59BA2", +": c #C5A6A9", +"< c #DDB420", +"[ c #DFB61E", +"} c #CE872D", +"| c #C67C30", +"1 c #925318", +"2 c #854523", +"3 c #A17C89", +"4 c #C6A0B1", +"5 c #C77F2F", +"6 c #C8822E", +"7 c #D59433", +"8 c #CD8D39", +"9 c #A64D1B", +"0 c #7C423D", +"a c #7D4443", +"b c #B9572A", +"c c #CC8C39", +"d c #D08E35", +"e c #E3B72C", +"f c #DDB632", +"g c #A7560E", +"h c #AB580D", +"i c #B44C15", +"j c #B34C13", +"k c #DDB52E", +"l c #DEB32E", +"m c #C7AA2D", +"n c #C6AD31", +"o c #C4872C", +"p c #B58955", +"q c #B9885E", +"r c #CF8932", +"s c #C6AC2F", +"t c #C4AA2E", +" ", +" ", +" ", +" ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@#$@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@%&*=-;@@@@@@@@@@@@@@@@@. ", +".@@@@@@>,')!~{{@@@@@@@@@@@@@@@@. ", +".@@@@@@]^/(_:<[@@@@@@@@@@@@@@@@. ", +".@@@@@@}|123456@@@@@@@@@@@@@@@@. ", +".@@@@@@7890abcd@@@@@@@@@@@@@@@@. ", +".@@@@@@efghijkl@@@@@@@@@@@@@@@@. ", +".@@@@@@mnopqrst@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +"................................ ", +" ", +" ", +" ", +" ", +" ", +" "}; From 695bbac36aebe23d29f9071e24011d60c4bea219 Mon Sep 17 00:00:00 2001 From: Steven Vascellaro Date: Tue, 18 Nov 2014 18:52:19 -0500 Subject: [PATCH 2/3] Removed SDK flag SDK is not an official Nintendo country code, and is not actually used by any official software. --- Source/Core/Core/CoreParameter.cpp | 2 - Source/Core/DiscIO/Volume.h | 1 - Source/Core/DiscIO/VolumeCommon.cpp | 3 - Source/Core/DolphinQt/Utils/Resources.cpp | 1 - Source/Core/DolphinWX/GameListCtrl.cpp | 2 - Source/Core/DolphinWX/ISOFile.cpp | 2 +- Source/Core/DolphinWX/ISOProperties.cpp | 3 - Source/Core/DolphinWX/resources/Flag_SDK.xpm | 114 ------------------- 8 files changed, 1 insertion(+), 127 deletions(-) delete mode 100644 Source/Core/DolphinWX/resources/Flag_SDK.xpm diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index a8effe8a08..6907667b46 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -181,7 +181,6 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2) Region = EUR_DIR; break; - case DiscIO::IVolume::COUNTRY_SDK: case DiscIO::IVolume::COUNTRY_UNKNOWN: default: if (PanicYesNoT("Your GCM/ISO file seems to be invalid (invalid country)." @@ -265,7 +264,6 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2) Region = EUR_DIR; break; - case DiscIO::IVolume::COUNTRY_SDK: case DiscIO::IVolume::COUNTRY_UNKNOWN: default: bNTSC = false; diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h index 09442c89df..c15be880ea 100644 --- a/Source/Core/DiscIO/Volume.h +++ b/Source/Core/DiscIO/Volume.h @@ -50,7 +50,6 @@ public: COUNTRY_RUSSIA, COUNTRY_SPAIN, COUNTRY_TAIWAN, - COUNTRY_SDK, COUNTRY_UNKNOWN, NUMBER_OF_COUNTRIES }; diff --git a/Source/Core/DiscIO/VolumeCommon.cpp b/Source/Core/DiscIO/VolumeCommon.cpp index 69a9cc8981..0956f119c9 100644 --- a/Source/Core/DiscIO/VolumeCommon.cpp +++ b/Source/Core/DiscIO/VolumeCommon.cpp @@ -62,9 +62,6 @@ IVolume::ECountry CountrySwitch(u8 CountryCode) case 'T': // Korea with English language return IVolume::COUNTRY_KOREA; - case 'O': - return IVolume::COUNTRY_SDK; - case 'W': return IVolume::COUNTRY_TAIWAN; diff --git a/Source/Core/DolphinQt/Utils/Resources.cpp b/Source/Core/DolphinQt/Utils/Resources.cpp index 0826c04b22..d730a788b6 100644 --- a/Source/Core/DolphinQt/Utils/Resources.cpp +++ b/Source/Core/DolphinQt/Utils/Resources.cpp @@ -33,7 +33,6 @@ void Resources::Init() m_regions[DiscIO::IVolume::COUNTRY_KOREA].load(dir + SL("Flag_Korea.png")); m_regions[DiscIO::IVolume::COUNTRY_NETHERLANDS].load(dir + SL("Flag_Netherlands.png")); m_regions[DiscIO::IVolume::COUNTRY_RUSSIA].load(dir + SL("Flag_Russia.png")); - m_regions[DiscIO::IVolume::COUNTRY_SDK].load(dir + SL("Flag_SDK.png")); m_regions[DiscIO::IVolume::COUNTRY_SPAIN].load(dir + SL("Flag_Spain.png")); m_regions[DiscIO::IVolume::COUNTRY_TAIWAN].load(dir + SL("Flag_Taiwan.png")); m_regions[DiscIO::IVolume::COUNTRY_UNKNOWN].load(dir + SL("Flag_Unknown.png")); diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index d95daa8d62..ede17e799f 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -74,7 +74,6 @@ #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" @@ -236,7 +235,6 @@ void CGameListCtrl::InitBitmaps() 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)); diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index b4dbdf91d2..41345ccdcb 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 = 0x116; +static const u32 CACHE_REVISION = 0x117; #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 487ab94544..cccd86e539 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -253,9 +253,6 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW m_Lang->Disable(); } break; - case DiscIO::IVolume::COUNTRY_SDK: - m_Country->SetValue(_("No Country (SDK)")); - break; case DiscIO::IVolume::COUNTRY_UNKNOWN: default: m_Country->SetValue(_("UNKNOWN")); diff --git a/Source/Core/DolphinWX/resources/Flag_SDK.xpm b/Source/Core/DolphinWX/resources/Flag_SDK.xpm deleted file mode 100644 index 169caacdcc..0000000000 --- a/Source/Core/DolphinWX/resources/Flag_SDK.xpm +++ /dev/null @@ -1,114 +0,0 @@ -/* XPM */ -static const char * Flag_SDK_xpm[] = { -"96 32 79 1", -" c None", -". c #000000", -"+ c #FFFFFF", -"@ c #E9E9FE", -"# c #5959FE", -"$ c #1515FE", -"% c #0505FE", -"& c #1313FE", -"* c #3232FE", -"= c #0000FF", -"- c #0202FE", -"; c #0C0CFE", -"> c #2B2BFE", -", c #7676FE", -"' c #EEEEFE", -") c #D4D4FE", -"! c #1C1CFE", -"~ c #0303FE", -"{ c #9292FE", -"] c #5151FE", -"^ c #B1B1FE", -"/ c #F8F8FE", -"( c #CCCCFE", -"_ c #E5E5FE", -": c #9393FE", -"< c #0A0AFE", -"[ c #2424FE", -"} c #EAEAFE", -"| c #C2C2FE", -"1 c #1010FE", -"2 c #0D0DFE", -"3 c #B6B6FE", -"4 c #0F0FFE", -"5 c #8989FE", -"6 c #6767FE", -"7 c #ACACFE", -"8 c #0808FE", -"9 c #1E1EFE", -"0 c #D2D2FE", -"a c #5F5FFE", -"b c #9C9CFE", -"c c #E8E8FE", -"d c #DDDDFE", -"e c #1A1AFE", -"f c #9494FE", -"g c #3636FE", -"h c #E7E7FE", -"i c #B7B7FE", -"j c #0707FE", -"k c #A4A4FE", -"l c #F7F7FE", -"m c #B0B0FE", -"n c #FCFCFE", -"o c #C4C4FE", -"p c #8181FE", -"q c #2020FE", -"r c #1B1BFE", -"s c #0101FE", -"t c #0606FE", -"u c #AEAEFE", -"v c #E2E2FE", -"w c #8787FE", -"x c #0404FE", -"y c #A2A2FE", -"z c #3E3EFE", -"A c #A8A8FE", -"B c #F9F9FE", -"C c #5656FE", -"D c #E6E6FE", -"E c #B4B4FE", -"F c #0909FE", -"G c #9696FE", -"H c #4D4DFE", -"I c #2222FE", -"J c #1D1DFE", -"K c #6969FE", -"L c #0E0EFE", -"M c #2D2DFE", -"N c #7575FE", -" ", -" ", -" ", -" ", -"................................ ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".+@#$%&*+++==-;>,'+++==+++)!~{+. ", -".+]=^/(]+++==+_:<[}++==++|123++. ", -".+4=_++++++==+++5=6++==+7890+++. ", -".+9=&abc+++==+++d=e++==f-gh++++. ", -".+ie===jk++==+++l=%++====m+++++. ", -".++nopq=!++==+++d=r++==:stu++++. ", -".+++++v=1++==+++w=6++==+kx~y+++. ", -".+zAcB7=C++==+D:<[}++==++EFsG++. ", -".+HI;%JK'++==~LMN'+++==+++|4=w+. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -"................................ ", -" ", -" ", -" ", -" ", -" ", -" "}; From 64f6d912b6ac6ef531969ef0497e481765a22474 Mon Sep 17 00:00:00 2001 From: Steven Vascellaro Date: Tue, 18 Nov 2014 19:38:39 -0500 Subject: [PATCH 3/3] Converted country flags for DolphinQt --- Data/Sys/Resources/Flag_Australia.png | Bin 0 -> 920 bytes Data/Sys/Resources/Flag_Europe.png | Bin 0 -> 612 bytes Data/Sys/Resources/Flag_France.png | Bin 0 -> 187 bytes Data/Sys/Resources/Flag_Germany.png | Bin 0 -> 196 bytes Data/Sys/Resources/Flag_Italy.png | Bin 0 -> 187 bytes Data/Sys/Resources/Flag_Japan.png | Bin 0 -> 399 bytes Data/Sys/Resources/Flag_Korea.png | Bin 0 -> 918 bytes Data/Sys/Resources/Flag_Netherlands.png | Bin 0 -> 214 bytes Data/Sys/Resources/Flag_Russia.png | Bin 0 -> 201 bytes Data/Sys/Resources/Flag_Spain.png | Bin 0 -> 411 bytes Data/Sys/Resources/Flag_Taiwan.png | Bin 0 -> 401 bytes Data/Sys/Resources/Flag_USA.png | Bin 0 -> 638 bytes Data/Sys/Resources/Flag_Unknown.png | Bin 0 -> 462 bytes 13 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Data/Sys/Resources/Flag_Australia.png create mode 100644 Data/Sys/Resources/Flag_Europe.png create mode 100644 Data/Sys/Resources/Flag_France.png create mode 100644 Data/Sys/Resources/Flag_Germany.png create mode 100644 Data/Sys/Resources/Flag_Italy.png create mode 100644 Data/Sys/Resources/Flag_Japan.png create mode 100644 Data/Sys/Resources/Flag_Korea.png create mode 100644 Data/Sys/Resources/Flag_Netherlands.png create mode 100644 Data/Sys/Resources/Flag_Russia.png create mode 100644 Data/Sys/Resources/Flag_Spain.png create mode 100644 Data/Sys/Resources/Flag_Taiwan.png create mode 100644 Data/Sys/Resources/Flag_USA.png create mode 100644 Data/Sys/Resources/Flag_Unknown.png diff --git a/Data/Sys/Resources/Flag_Australia.png b/Data/Sys/Resources/Flag_Australia.png new file mode 100644 index 0000000000000000000000000000000000000000..aed07e509f129777897488a4830d7ad7df324ab8 GIT binary patch literal 920 zcmV;J184k+P)}E2ZJqs)cjuth5`tB2kNqqEB6nE<_Sts7wlp3i^^36O_t7_=DbwXt@RkHAnM_U;7|6S0#N+u1!1JtBre&O@MW0Plz5xKKRN%yh1?)A~5VmP0ld_+V zzI)wy1c1xRXu1zy;$+MO48{AIJyRi?AE%L1vuY{_KD{Sgf1I38eSYgpB$DBsz^Rg# z6scsCn45`xY^0{>Ao&k!5Ij8q2*9=UMQp4z622mh=TlVd-m0hZ^H-mR<+6$FOw&<# zzZ%EaUf(1EZ+XRs0md3-7&E^2B2~!vVY1*@nStWT6@q3c5VUHnEuAzqcjEQ_w$7?u zw?qraL`G0~HVIe~Z2mnWSFT?=0Zs zkv&8%ozJ7bMozDt`)4OofwG&sNMDyQWcRKLn&sijkV44HK-U`9;UX?z>9 z?)+~L1QHFl4!`k#j$uk-)PE7M*`3(zPXA*lhOmjj97<1Sb#g4_mGxXMGSc1a3e0OL zhVEV$@meKI7iqAyIs?+&uLMa8)g;8J07#5iv1CEyhzf^>1ff;S2@MJInMksS-=f)R5+cFn$W<~#G=eBb-Nc><8cXh{Ih zFU8~i)eRJ4wq&OVg^-*Zs2~x%uAD+j(a}9^F<_>5xs@%@Z`P1furRjF;@C1$3i{0& zH?yml>D~XwfcGQGgtbC>r-x59lk8l+v3FtMBNNtRmY!Z}k4ZqbQiMIa%NJKiQ33#h z;7{@nuJ2ycjy6O=G%3sd+9S4Deu6n$kxKM@l@b2@8Ltp(bv)^YLDG99tD^ud-F*;NvmDp>FO(pgi9eRVIdC_&k{78X?@rNWt^TJAq zfW`4g@n4aNEW&?nuM|`?c zznon?yUzOb486M3z(@WWRb7MmC&O%hJ%$hxJ9iH|cOM}n<(=cquVtyaMq70lN(C1O yKOm*x`Q~89DoBP=(X;aD&`OMbA`)>Ar9T0D1h^OWREL8A0000{XE)7O>#9+$9yiiM`Z*>s?gho_5Uh{y5dl!SyI=M5SfS{s4D zu~I9r>;L_eN?v!Zb+s2=;f%LGci@P@frKlJi}@r<53FEzlQnqN5XjzR1r+LGzN^8? YkjBNKEv!4)1863Lr>mdKI;Vst0I9Av(EtDd literal 0 HcmV?d00001 diff --git a/Data/Sys/Resources/Flag_Germany.png b/Data/Sys/Resources/Flag_Germany.png new file mode 100644 index 0000000000000000000000000000000000000000..7ae967139989fec470317a9b7691cfed75ca5071 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ez!3HE3M$U5qQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#9+$9yirjBok6A#WKu;IP5Rc=@DG3Qb&Koo|bS5?& zT*2%nYw&FtIF1_nk327mTjJMaa_`7$r&lQ6j%uqV4AN59#s;dZJC kZ;w?1i*-Zc0_mj;?0IaHOOk6?fQB=8y85}Sb4q9e03b9t7ytkO literal 0 HcmV?d00001 diff --git a/Data/Sys/Resources/Flag_Italy.png b/Data/Sys/Resources/Flag_Italy.png new file mode 100644 index 0000000000000000000000000000000000000000..9e87c615bfd14ad05cc13f19f7c963f239f24a5b GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ez!3HE3M$U5qQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#9+$9ys`W~xwR3<%9-c0aAs)w*QxXz>oHuA_Xl(?7 z#7WYDUH_lIQ}Mc6Da*a+ie#+q$pc3W4kTP*T+Am?dSC^!o2{XE)7O>#9+$9yiqNNSmW>Pyj53}sjv*e$lT#8Bew;UGXlQM0 zY<&3te`6uDva&L>@L`7LK=ut2Rz1AG{yxw7=WEj|%*t&KZ{OW7DFFmKLY_!0nZzu) zWD=94M5L$jB*95+o!%|>^YRJHjC%i?Bxa1W?r_*!rl@yZrofkn|q#5yz7M`Ha51l^Wu31Hgh-5`qla2>84y4 z>0e1d&0bkQc>T2+$o_h3Z(;;rLAIuFu15bhqpz|GlJDKOEEFoNyHef|;w8Y`KTpcB zbPt;pPteK6E9DHr*3!)fw`KC|X_MNaYkn!^!hNf$jh($y%~Tbu0{=Yylty`{l>XSFgCUwL=RChGCD=nLx>kL7K7d-Md7tlj1;FGKAp)4@>C_+y0=7~?hGD!jK{;oO7LZP-@pwE$qfyJ`%gf7nJRZ{N zba544ci`fF#%{M4O{nWSqoboNE-upA+KQ%WghCq(yPZTLK}Saiu~-bR*UQw@lr;tR_xI`S?4+%&4X4w|($W%Z zYim?iRs!&B;dc%mh4?GB4T3;L%V&Ia`x~mdB>;|&ju;;wN7FR&`8@0E>qMhb>gwvs zQ$Q3&0)YU#ySpTlNk&FSPRLW=|3u>EcO0$8Fpghf{QaE#Qmn}@@#WJ5 zVt-f~SDTgK#WS^p&tBlAVB=U2`Pt>>@rRc=7DNmI!e=kAbjD@fipxc#!{EXBMjo7R zEEuEJef<6uP*s(op`nxSdtY5EnedCRy(eqG-;b)Q)(gmFG6aJ`1_uYxG>zHWSpaU` z@8hn!qF}N+mn!fLehGl0C>$IdFfcGcFc>70$&^2ahlhu>x3?on5=~7_OiWBLKR-`x zZ7l%5{5ZqInN9wDE?^39#bGkk*Gk{L>i}f4Swf)@4u^y7?QK?8R#;tKrMkMh{4t!H znFAV_4RCRZ4nNK%j#=SPY=z_&7@K(WLc)Fs*3LJZfpMnpU+1&o290v21QYj zBne&DOOorljwDGaih|4KA`*$bmHgi@3n7=wnX)XK@p#;{ig-M3%Cc{XE)7O>#9#BwOk~{989Z)FQ)5S5wNAwc7)^V0?110KYD>n(iChJ}lT~YKtyqmUCoqX7M5Ouux+y3i zI4@X1(|Q7v{mh5klrFMgD!-|OU(e&!_S-<~7(8A5T-G@yGywp) CVmuW9 literal 0 HcmV?d00001 diff --git a/Data/Sys/Resources/Flag_Russia.png b/Data/Sys/Resources/Flag_Russia.png new file mode 100644 index 0000000000000000000000000000000000000000..b6e926a982f5da674891f3d84b31d0a4a34e6755 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Ez!3HE3M$U5qQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#9+$MR7}x34I0c|kn5T{XE)7O>#9#Bw4?pF1oCb4Nn)x5Rc<;rylfT3KVJEU%j_) zakF346b{a(r$V=61UsI-x9Iu{%c_>Do-)T7fiB%-$+73@8G))aWt~b4m?e*M#s^sj$qia82lUG!lezN!ck21}_!Xl^mjul397WqtK zJAb$M)!yJ~nY zM!WrhVZ0+{gzwAL9XJ6{RRv9}AVhLq2+*_&s;XpL0x3iG`y)aKOw&TwpBaxgluCji zI3i`3{T-Oiw)noJ)zYX|RVI^9mP?n#!pW}-)@u*Ta3V;IOe*=hXe@edr#?l+wS#2qvOd z5@Q8k5{M5pu~H-4dtSR^agfULB*(-pC)xaF=9~S^3ZS%je1MA=R*2(}qO|y)!CHri zAVzRjF`l6+EkWp!X9dgepEV+WX>YSmAc{gpMpDKMD1zYXwx}W^fE-`?sc>rPYBS}p zY$AXzoWIHR^aP%7Q0H(e7*P}fRh$FQ7pl^+xA&D78xI=M7m>OHGcyw;X-rvEctL=3 ziin~rD2itcW$73n59xM0JUz46>XTik|d@qD}3Kzoy8afDpZvv2mO>%y}|74BuSD`6eWIOuvQTiF^00RBuU6%kh8u0k(aL?Hv9@s zcSzHO;V>r%0?NYTd4d>2RXU>B=kPEm9f|37JG{Pftyu)s=Y75(1@gam^YF-ue*6iX zXwHfSP}O$U!7+k2%eUKIM!$AHw3fiXf#BVpyX_+Qwzlz~BiOq4s9glRt54cR(B`M~ YH%y$-$j!TeyZ`_I07*qoM6N<$f(vaL2mk;8 literal 0 HcmV?d00001 diff --git a/Data/Sys/Resources/Flag_Unknown.png b/Data/Sys/Resources/Flag_Unknown.png new file mode 100644 index 0000000000000000000000000000000000000000..9177a7416c233332d4bb61723b01411d097c869f GIT binary patch literal 462 zcmV;<0WtoGP)n~$pon!^JHa)mg)310 ze~OzKpI2opGBEydNbbp>n=dElCQ%|n@llqD2$NZ*7h0CkaZY)Xq==4dUFW~YBE)q1+~*0dOT=PCBtp#Ro<+X`eg%Mhp2+21 z0>EHEghE6jL9AA1mUjRa3%#989{V~SA`l>oMPjqLn)(d@l0>OQWV25n6-9{g_|DWX z0zj$z0IsW#k4EMSI1Zr{VcW!TXa+zssZZGLPK~qO>Rc*iZmx2f$YdT@s^2FpiwFjZ zUe5qfuj`A|YQ%o8qgvIuM#BuSTwa#je7=Ssfd31i{QfEZ0<&!Xa