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 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU=ZVAV_;xd7&*^{fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>FdgVk4suuRC|r0>|O>2W>rrY#}JR>N2g_b zTn>~tR{vW+SbOQiYpYs|U#{6Ay-O*uyK9kuY>%FcQ0xjHu1>CBlf*?{kzH_w*

<=%i> z?>;lnw|iy9Rgbk#PX{o~-rVKc5nTBDPTC^hty|_+x~)^1r5h!AnIU-Z+(YTUF=t}> z9(l-po)UZ`?_)shZJQGx1GOa0c2BO`o*ppy!N=tkJfi^Pr5Ee_Cmg&eN%1WAuzJ-F?k#I=I@~SQdt!=H%u4G+UjuXo7lo*7b*f+HU`y{8}~C#_&pSheJ)z zr0e{fcf{u{x_VK0-j%qAvl$NXPoFKlG<3(WJ0%wTdpjIfFJ^a~&=F@>FU;}7)?khN h#Rw;(Yx6I~|5ny`di;-MF9QPugQu&X%Q~loCIET~s?Y!c literal 0 HcmV?d00001 diff --git a/Data/Sys/Resources/Flag_Europe.png b/Data/Sys/Resources/Flag_Europe.png new file mode 100644 index 0000000000000000000000000000000000000000..e1b4dbba5af715d5a22e2e464a37e34ec3ca1cef GIT binary patch literal 612 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU=ZVAV_;xd7&*^{fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>FdgVk4soUl|$^)nJxwf#*dyZjv*e$k51d~ zFXAY2+Pls(mEw;N(i-)@h zGBGqg@c+cO?tQYd_MzL;d<$Rc?Rq81aw`7ZcUktvrgc?&=I(N?JJP4e+ImT{YwF}3 z`>u(+{v~x?E@t^FiHocs-hJ+Lj{mE_`F^^TCg)lv?chgGpXk)KT`pp%Z9Ck3GIEWN zW(`BMpZWco-nU|!tT)PdUhO+I?Xv7#uB6)x5CsV(Fnj z9*wOZ+f`gXAM)yGIQr53iJthPY?s(o{0?`+4Y$6(vggagwZFdKbF5L(T=840G=6D# z`HdO#9(tuQH!OCq*%h>ZPOR+wfcrnm(Aegm>W6dcY}*8ctjqbW%jFeS zp3Z%IW_{|)U2f5(5?-w0?Dh&vAN+ila9qoyE%4&zPcJWc_0%c}74k2&XRKk_A^t6- Sy_tc5fx*+&&t;ucLK6UmW)XG( literal 0 HcmV?d00001 diff --git a/Data/Sys/Resources/Flag_France.png b/Data/Sys/Resources/Flag_France.png new file mode 100644 index 0000000000000000000000000000000000000000..e04c5d2114d660fe84fdafa0fef78dea7b9cb085 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU=ZVAV_;xd7&*^{fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>FdgVk4soU#X{5IY&ru2gNLV!V~EG`8k)ju;$BxWc%YPong|3T8K1gI5iK l>^)WqR~UPk?`p6zq;YX*3+qnyU|?Wi@O1TaS?83{1OTb7Hqih8 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!ia0y~yU{GLSU=ZVAV_;xd7&*^{fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>FdgVk4soUMeet)$1Da0hCojj#}JR>$tej5 zKh7I8G;}6599+TdCTsA3FCj4@A>o6R!s+dX1_lO31_pojTRZRt$oVoa=94hF8L%h2 uAxFR2s^NC332%>80*iG+;R5NU4D5MqlS`6oSQr=>7(8A5T-G@yGywo0G&mRl 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!ia0y~yU{GLSU=ZVAV_;xd7&*^{fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>FdgVk4soU)q17U+Bpmi3?7~?jv*e$lT#8B zew;UGXlQM0Y-~)NBpulG|M@!=ue+79+>5SA#@e1daKzw1!WG8Fd=jMxRxrEC8oX)< lWbd&`xWd@Od{={&Ai( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>FdgVk4soUMd(vE%SHwUMj1~R#}JR>$tej5 zKh7I8G_*E0Ha`6Szp;>6Sy`D`_%K6rAp3?1s~+B8f1l_4^R?*}X63erx9{$kl#q~+ z*b(wXV#y?C$t9DRBqbs}jVB3CV(av7v7f&$X~&D%hd=!M!@K6w9=BOMzh*Bt*x=nM zG?$~Z?7)6`dr809?#4AcOSsot#WC};O&0c+m~rFgirL)reBxa%6tS_fwVfBwGq9Pv zan`TS4^KDcx=8;@`f2vc`oZh3)h^P%zTVoK7{OPNttp(V(Z9{;tE__Ld-p91g$nDg zlsANU2{8B1lX5KG!zRTObh7bEIfJmZbo0S&nLK;iq;}|9Lpfq{X+)78&qol`;+0Oul^ ATL1t6 literal 0 HcmV?d00001 diff --git a/Data/Sys/Resources/Flag_Korea.png b/Data/Sys/Resources/Flag_Korea.png new file mode 100644 index 0000000000000000000000000000000000000000..d1ae515358db1a334fc231908fc44776cf3beed3 GIT binary patch literal 918 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU=ZVAV_;xd7&*^{fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>FdgVk4soURei7W$IA>1%*viFjv*e$k50Sq z9i1+5++JNqD9qqmR$6=6hD%qrK63Do?ULb6}=Rl#;Xk!B&6b_C9}FIsg6P z@0Ii4SF#>>BBIDNw$vi~Fv4ZMAsuVjVrbOSf)yEz4|iQhcpD zW6m5G5mzxWu?Z@jbLY;T^n{^o_gohxM|XGjjS)QSub;khWr`{5x9{IyzIn4`?ONXD zmrq{0B$S<<9TFDC^daYAIiFnX5AAKdO%AT7(`!n8ORw6c%Fx%>Cm}EIe%a*HPn*}T zU%M<0eD&(psbB{YSEfdW-Me?IO!jnhbMre9eE+}8qi5wZYmXW9#V7pvJLgaE)FZw5 zp8r2cFf6~^dHb!}OrK5Lx4SC{IEc8uE_VnGUABC=q_lMP+B0wRm*nw^=N?>c%(dYL7uK0+#d_S6SQjkmU(k9)8*;cq!yIrSU7ax9b@TZ&HoO~UL#aC~z?Ov3y$$Glh2i`i)hD91OGBO4R1`Y-i zDw9u6v2SZ{Z{MS9`Pxsv%J%o? zKYRACFCEac4_cg-zb6O*zksb~YI{L|)?LJ$xW-bBcKC{H-}h{~w?1 eWAWDgrF~rF3P=A6<{kzH1_n=8KbLh*2~7afxvO;m literal 0 HcmV?d00001 diff --git a/Data/Sys/Resources/Flag_Netherlands.png b/Data/Sys/Resources/Flag_Netherlands.png new file mode 100644 index 0000000000000000000000000000000000000000..4f5cd1ab16ee20a9ffca9775fdc03653f5addeed GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU=ZVAV_;xd7&*^{fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>FdgVk6V~QS&}>MpdAAPL$arfV~EG`x6=%H z8yo~!((Usb`4}w}9N9Pyin6l$?NilfD3LLm_UPCFzm3(FjExhy3VJ82*3??D8f#8q z5>1Fm^Z#{IP(W~Au!5%b1Sb2L54Xw3HJ0scc2qWWQ8?QwhJG$E)qP85kHC NJYD@<);T3K0RXvTJQV-{ 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!ia0y~yU{GLSU=ZVAV_;xd7&*^{fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>FdgVk4suujO%o29LSh3PZ!4!kK@TH2?;;W z8#FYuHa0ds{QtkPkXcz-nOXQSLvtW|j}=%r@#{W!=GP4yW-VTvnQ(Dj vH1UHn5B~lBlp!Tidf-GU!(#_?FUI24yvHV-IyjAifq}u()z4*}Q$iB}cKboB literal 0 HcmV?d00001 diff --git a/Data/Sys/Resources/Flag_Spain.png b/Data/Sys/Resources/Flag_Spain.png new file mode 100644 index 0000000000000000000000000000000000000000..1a89e7a198336512367c0a2e3e3280df6837a2d7 GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU=ZVAV_;xd7&*^{fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>FdgVk6V~QMebJhp(q9hMh#CF#}JR>Z>Jvg zVhR*#+h4u6Z*j9<)D#ZRr>8=GIzHf0XT*V`E@| zkNe^ILi#dR;;GLza|qb{QvJqv@8oKW+J@zEeJXwdRw*w$V-`4`*)X4B(%ET#;tQ^< zFzy#Uyt!eI!IVC~1KJKxB{WS9JgzsrjP3Q@eyZf`!=r0IUXxc;ntrnP{EsrtzrrG? z_>L7ubQbwcVmp7g_|@LvY2`IjVwUg+WS%YTb&O%psr)WtAG0VRI9I#nA2W9xbK^2>^+Cnx{#GB7YO Nc)I$ztaD0e0su5i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>FdgVk4soUMeVZv2NnhfMmbLx#}JR>Z>Je% zA99dro8K*%DSJy~u@HwV&}RN2JNy?%lr_7#J8lUHx3vIVCg! E04JWKOaK4? literal 0 HcmV?d00001 diff --git a/Data/Sys/Resources/Flag_USA.png b/Data/Sys/Resources/Flag_USA.png new file mode 100644 index 0000000000000000000000000000000000000000..6e438c4b022b705e7261d00959dd154df7d5620c GIT binary patch literal 638 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU=ZVAV_;xd7&*^{fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>FdgVk4soURj_DgiWdU|6St>}V~EG`r_*-( zhdK(h@4xxk&PK=gM5~)#+=4A3D_@wH9lLZ&VXk46M3go+_tq(w_8;OZ9@g=A!lErd<{gY`?@(|n z2s50wP)pbG#l&>h)9>e-D%EA?Z}wB@a&mJEI>w{X^x)OD6-r7CGV#Aw7G%B5GJd)~ zN2x(?&i<2MzOc;84|ranB@rmX7&?dfy!fh18@GR-DlW}0by0lcE@oq6VUEmRZ}_Zoct`=gaT-8T02Wbvbn{I`rB0N~57^(_SCi8% zt*w90iHXT@`}?-4_rb4AwUbnq>1fy7PndgDf>|qMswxN5r#(u2%xuj)$5(Hk<+@?( z*Uq^0&Ju1Zk$r}8OE)Wg{lUAr$AH7a!eYt&`_F$qdYUG9=B)1|70t?d!fuA!R&h8V zT=`&)a;MX#JxL`cQ{wWw4A1Ag)$Y{`I6rsq!8dPIJSPQ+sMaNH2on@BY}>R!#q&hM zgw1>ZPMp48&g>7DU%AKSmWKxF989MUJ*sSya1OOvbmRF419jQXmu1#__7$y-WV!mh zcAq@!r~MV5Kb+{Q`@=aW<6IYOz}2#A2MwFdPj9~+>$bnle#^82`x_tJoxA(3(vNN1 uKF(LZvFrPaSeD(Z{cpKmc((kDxzC)7C(iC}*u%iUz~JfX=d#Wzp$PyBZ5jvw 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 zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU=ZVAV_;xd7&*^{fq{W7$=lt9;Xep2*t>i( z0|NtRfk$L90|U1(2s1Lwnj^u$z`$PO>FdgVk4soURkm7RBawlDG1}9`F~sBe+iBKa zhXO>}&R-SSB5=2%|6I@!_w?MiS|z+mie`EWkC=`G)hy^Jjj}#yx}sG(;9q^$Y{~iI zsX9gm{|Y?bot!^gU;VjSppw(az-b*EFZr8;yqF$swqvO0aL|<9KDTJ*_hULDai8XP zzusyfCmuEJLZM&fq$M4F*|E>}A6Gh3^6SoX&UM~Ll3Y}r&OD#zx}T|zwV`I-iKlT) z2NE1woLrO~*My}{D`ybn-aFSv?zfe!l7K>&YtrVOvwrb1OmbQ2lCs%fUevYY`7_HR2bwx8zq{xM@y05O& z&B4|gcb*|&{p;?lSx4&DFOIsp)9oD+ffh^zWDZD<^l_WvuYFlUKicm zb}xTx$K#84gjE7p+OYnJ?7FyO-^#MtN={E1YxcFtH~i;b@aLcAU#87D|B5zU_W;Ef NgQu&X%Q~loCIBw