From 7c1ab2911a184fa634afcec3c616a092ca15010c Mon Sep 17 00:00:00 2001 From: Stevoisiak Date: Wed, 8 Apr 2015 18:55:16 -0400 Subject: [PATCH] Move down Country_World The countries are sorted alphabetically. This should have been changed when the variable was renamed from Country_International to Country_World --- Source/Core/Core/ConfigManager.cpp | 4 ++-- Source/Core/Core/ConfigManager.h | 2 +- Source/Core/Core/CoreParameter.cpp | 2 +- Source/Core/DiscIO/Volume.h | 2 +- Source/Core/DolphinQt/GameList/GameFile.cpp | 2 +- Source/Core/DolphinQt/GameList/GameTracker.cpp | 8 ++++---- Source/Core/DolphinQt/Utils/Resources.cpp | 2 +- Source/Core/DolphinWX/Frame.cpp | 6 +++--- Source/Core/DolphinWX/FrameTools.cpp | 10 +++++----- Source/Core/DolphinWX/GameListCtrl.cpp | 10 +++++----- Source/Core/DolphinWX/Globals.h | 2 +- Source/Core/DolphinWX/ISOFile.cpp | 2 +- Source/Core/DolphinWX/ISOProperties.cpp | 6 +++--- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Source/Core/Core/ConfigManager.cpp b/Source/Core/Core/ConfigManager.cpp index 79e4a43bb1..89d561cfca 100644 --- a/Source/Core/Core/ConfigManager.cpp +++ b/Source/Core/Core/ConfigManager.cpp @@ -289,13 +289,13 @@ void SConfig::SaveGameListSettings(IniFile& ini) gamelist->Set("ListAustralia", m_ListAustralia); gamelist->Set("ListFrance", m_ListFrance); gamelist->Set("ListGermany", m_ListGermany); - gamelist->Set("ListWorld", m_ListWorld); 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("ListWorld", m_ListWorld); gamelist->Set("ListUnknown", m_ListUnknown); gamelist->Set("ListSort", m_ListSort); gamelist->Set("ListSortSecondary", m_ListSort2); @@ -539,13 +539,13 @@ void SConfig::LoadGameListSettings(IniFile& ini) gamelist->Get("ListAustralia", &m_ListAustralia, true); gamelist->Get("ListFrance", &m_ListFrance, true); gamelist->Get("ListGermany", &m_ListGermany, true); - gamelist->Get("ListWorld", &m_ListWorld, 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("ListWorld", &m_ListWorld, true); gamelist->Get("ListUnknown", &m_ListUnknown, true); gamelist->Get("ListSort", &m_ListSort, 3); gamelist->Get("ListSortSecondary", &m_ListSort2, 0); diff --git a/Source/Core/Core/ConfigManager.h b/Source/Core/Core/ConfigManager.h index cac39cbb31..23fce73852 100644 --- a/Source/Core/Core/ConfigManager.h +++ b/Source/Core/Core/ConfigManager.h @@ -70,13 +70,13 @@ struct SConfig : NonCopyable bool m_ListAustralia; bool m_ListFrance; bool m_ListGermany; - bool m_ListWorld; bool m_ListItaly; bool m_ListKorea; bool m_ListNetherlands; bool m_ListRussia; bool m_ListSpain; bool m_ListTaiwan; + bool m_ListWorld; bool m_ListUnknown; int m_ListSort; int m_ListSort2; diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index 5b4937657f..0694b4c07d 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -123,11 +123,11 @@ static const char* GetRegionOfCountry(DiscIO::IVolume::ECountry country) case DiscIO::IVolume::COUNTRY_EUROPE: case DiscIO::IVolume::COUNTRY_FRANCE: case DiscIO::IVolume::COUNTRY_GERMANY: - case DiscIO::IVolume::COUNTRY_WORLD: case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_NETHERLANDS: case DiscIO::IVolume::COUNTRY_RUSSIA: case DiscIO::IVolume::COUNTRY_SPAIN: + case DiscIO::IVolume::COUNTRY_WORLD: return EUR_DIR; case DiscIO::IVolume::COUNTRY_UNKNOWN: diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h index 01a45b294a..a98a0eb082 100644 --- a/Source/Core/DiscIO/Volume.h +++ b/Source/Core/DiscIO/Volume.h @@ -52,13 +52,13 @@ public: COUNTRY_AUSTRALIA, COUNTRY_FRANCE, COUNTRY_GERMANY, - COUNTRY_WORLD, COUNTRY_ITALY, COUNTRY_KOREA, COUNTRY_NETHERLANDS, COUNTRY_RUSSIA, COUNTRY_SPAIN, COUNTRY_TAIWAN, + COUNTRY_WORLD, COUNTRY_UNKNOWN, NUMBER_OF_COUNTRIES }; diff --git a/Source/Core/DolphinQt/GameList/GameFile.cpp b/Source/Core/DolphinQt/GameList/GameFile.cpp index 143c25dcf0..67b7d7855f 100644 --- a/Source/Core/DolphinQt/GameList/GameFile.cpp +++ b/Source/Core/DolphinQt/GameList/GameFile.cpp @@ -26,7 +26,7 @@ #include "DolphinQt/Utils/Resources.h" #include "DolphinQt/Utils/Utils.h" -static const u32 CACHE_REVISION = 0x005; +static const u32 CACHE_REVISION = 0x006; static const u32 DATASTREAM_REVISION = 15; // Introduced in Qt 5.2 static QStringList VectorToStringList(std::vector vec, bool trim = false) diff --git a/Source/Core/DolphinQt/GameList/GameTracker.cpp b/Source/Core/DolphinQt/GameList/GameTracker.cpp index b584470cb4..4320350e40 100644 --- a/Source/Core/DolphinQt/GameList/GameTracker.cpp +++ b/Source/Core/DolphinQt/GameList/GameTracker.cpp @@ -163,10 +163,6 @@ void DGameTracker::ScanForGames() if (!SConfig::GetInstance().m_ListGermany) list = false; break; - case DiscIO::IVolume::COUNTRY_WORLD: - if (!SConfig::GetInstance().m_ListWorld) - list = false; - break; case DiscIO::IVolume::COUNTRY_ITALY: if (!SConfig::GetInstance().m_ListItaly) list = false; @@ -199,6 +195,10 @@ void DGameTracker::ScanForGames() if (!SConfig::GetInstance().m_ListUsa) list = false; break; + case DiscIO::IVolume::COUNTRY_WORLD: + if (!SConfig::GetInstance().m_ListWorld) + list = false; + break; case DiscIO::IVolume::COUNTRY_UNKNOWN: default: if (!SConfig::GetInstance().m_ListUnknown) diff --git a/Source/Core/DolphinQt/Utils/Resources.cpp b/Source/Core/DolphinQt/Utils/Resources.cpp index cb26274eed..02656e9788 100644 --- a/Source/Core/DolphinQt/Utils/Resources.cpp +++ b/Source/Core/DolphinQt/Utils/Resources.cpp @@ -31,13 +31,13 @@ void Resources::Init() m_regions[DiscIO::IVolume::COUNTRY_AUSTRALIA].load(GIFN("Flag_Australia")); m_regions[DiscIO::IVolume::COUNTRY_FRANCE].load(GIFN("Flag_France")); m_regions[DiscIO::IVolume::COUNTRY_GERMANY].load(GIFN("Flag_Germany")); - m_regions[DiscIO::IVolume::COUNTRY_WORLD].load(GIFN("Flag_Europe")); // Uses European flag as a placeholder m_regions[DiscIO::IVolume::COUNTRY_ITALY].load(GIFN("Flag_Italy")); m_regions[DiscIO::IVolume::COUNTRY_KOREA].load(GIFN("Flag_Korea")); m_regions[DiscIO::IVolume::COUNTRY_NETHERLANDS].load(GIFN("Flag_Netherlands")); m_regions[DiscIO::IVolume::COUNTRY_RUSSIA].load(GIFN("Flag_Russia")); m_regions[DiscIO::IVolume::COUNTRY_SPAIN].load(GIFN("Flag_Spain")); m_regions[DiscIO::IVolume::COUNTRY_TAIWAN].load(GIFN("Flag_Taiwan")); + m_regions[DiscIO::IVolume::COUNTRY_WORLD].load(GIFN("Flag_Europe")); // Uses European flag as a placeholder m_regions[DiscIO::IVolume::COUNTRY_UNKNOWN].load(GIFN("Flag_Unknown")); m_platforms.resize(3); diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 66d5409bc1..8b19fdf5c0 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -883,13 +883,13 @@ void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event)) SConfig::GetInstance().m_ListAustralia && SConfig::GetInstance().m_ListFrance && SConfig::GetInstance().m_ListGermany && - SConfig::GetInstance().m_ListWorld && SConfig::GetInstance().m_ListItaly && SConfig::GetInstance().m_ListKorea && SConfig::GetInstance().m_ListNetherlands && SConfig::GetInstance().m_ListRussia && SConfig::GetInstance().m_ListSpain && SConfig::GetInstance().m_ListTaiwan && + SConfig::GetInstance().m_ListWorld && SConfig::GetInstance().m_ListUnknown))) { SConfig::GetInstance().m_ListGC = @@ -901,13 +901,13 @@ void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event)) SConfig::GetInstance().m_ListAustralia = SConfig::GetInstance().m_ListFrance = SConfig::GetInstance().m_ListGermany = - SConfig::GetInstance().m_ListWorld = SConfig::GetInstance().m_ListItaly = SConfig::GetInstance().m_ListKorea = SConfig::GetInstance().m_ListNetherlands = SConfig::GetInstance().m_ListRussia = SConfig::GetInstance().m_ListSpain = SConfig::GetInstance().m_ListTaiwan = + SConfig::GetInstance().m_ListWorld = SConfig::GetInstance().m_ListUnknown = true; GetMenuBar()->FindItem(IDM_LIST_GC)->Check(true); @@ -919,13 +919,13 @@ void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event)) GetMenuBar()->FindItem(IDM_LIST_AUSTRALIA)->Check(true); GetMenuBar()->FindItem(IDM_LIST_FRANCE)->Check(true); GetMenuBar()->FindItem(IDM_LIST_GERMANY)->Check(true); - GetMenuBar()->FindItem(IDM_LIST_WORLD)->Check(true); GetMenuBar()->FindItem(IDM_LIST_ITALY)->Check(true); GetMenuBar()->FindItem(IDM_LIST_KOREA)->Check(true); GetMenuBar()->FindItem(IDM_LIST_NETHERLANDS)->Check(true); GetMenuBar()->FindItem(IDM_LIST_RUSSIA)->Check(true); GetMenuBar()->FindItem(IDM_LIST_SPAIN)->Check(true); GetMenuBar()->FindItem(IDM_LIST_TAIWAN)->Check(true); + GetMenuBar()->FindItem(IDM_LIST_WORLD)->Check(true); GetMenuBar()->FindItem(IDM_LIST_UNKNOWN)->Check(true); m_GameListCtrl->Update(); diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index f8f2c99aa8..de41814259 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -336,8 +336,6 @@ wxMenuBar* CFrame::CreateMenu() regionMenu->Check(IDM_LIST_FRANCE, SConfig::GetInstance().m_ListFrance); regionMenu->AppendCheckItem(IDM_LIST_GERMANY, _("Show Germany")); regionMenu->Check(IDM_LIST_GERMANY, SConfig::GetInstance().m_ListGermany); - regionMenu->AppendCheckItem(IDM_LIST_WORLD, _("Show World")); - regionMenu->Check(IDM_LIST_WORLD, SConfig::GetInstance().m_ListWorld); regionMenu->AppendCheckItem(IDM_LIST_ITALY, _("Show Italy")); regionMenu->Check(IDM_LIST_ITALY, SConfig::GetInstance().m_ListItaly); regionMenu->AppendCheckItem(IDM_LIST_KOREA, _("Show Korea")); @@ -350,6 +348,8 @@ wxMenuBar* CFrame::CreateMenu() regionMenu->Check(IDM_LIST_SPAIN, SConfig::GetInstance().m_ListSpain); regionMenu->AppendCheckItem(IDM_LIST_TAIWAN, _("Show Taiwan")); regionMenu->Check(IDM_LIST_TAIWAN, SConfig::GetInstance().m_ListTaiwan); + regionMenu->AppendCheckItem(IDM_LIST_WORLD, _("Show World")); + regionMenu->Check(IDM_LIST_WORLD, SConfig::GetInstance().m_ListWorld); regionMenu->AppendCheckItem(IDM_LIST_UNKNOWN, _("Show Unknown")); regionMenu->Check(IDM_LIST_UNKNOWN, SConfig::GetInstance().m_ListUnknown); @@ -1944,9 +1944,6 @@ void CFrame::GameListChanged(wxCommandEvent& event) case IDM_LIST_GERMANY: SConfig::GetInstance().m_ListGermany = event.IsChecked(); break; - case IDM_LIST_WORLD: - SConfig::GetInstance().m_ListWorld = event.IsChecked(); - break; case IDM_LIST_ITALY: SConfig::GetInstance().m_ListItaly = event.IsChecked(); break; @@ -1965,6 +1962,9 @@ void CFrame::GameListChanged(wxCommandEvent& event) case IDM_LIST_TAIWAN: SConfig::GetInstance().m_ListTaiwan = event.IsChecked(); break; + case IDM_LIST_WORLD: + SConfig::GetInstance().m_ListWorld = event.IsChecked(); + break; case IDM_LIST_UNKNOWN: SConfig::GetInstance().m_ListUnknown = event.IsChecked(); break; diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index a66b3e7a66..66677d0f90 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -232,13 +232,13 @@ void CGameListCtrl::InitBitmaps() 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_WORLD] = 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_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_WORLD] = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm)); // Uses European flag as a placeholder m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm)); m_PlatformImageIndex.resize(3); @@ -632,10 +632,6 @@ void CGameListCtrl::ScanForISOs() if (!SConfig::GetInstance().m_ListGermany) list = false; break; - case DiscIO::IVolume::COUNTRY_WORLD: - if (!SConfig::GetInstance().m_ListWorld) - list = false; - break; case DiscIO::IVolume::COUNTRY_ITALY: if (!SConfig::GetInstance().m_ListItaly) list = false; @@ -668,6 +664,10 @@ void CGameListCtrl::ScanForISOs() if (!SConfig::GetInstance().m_ListUsa) list = false; break; + case DiscIO::IVolume::COUNTRY_WORLD: + if (!SConfig::GetInstance().m_ListWorld) + list = false; + break; case DiscIO::IVolume::COUNTRY_UNKNOWN: default: if (!SConfig::GetInstance().m_ListUnknown) diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h index 7d3a5e6686..4cbc5bba9d 100644 --- a/Source/Core/DolphinWX/Globals.h +++ b/Source/Core/DolphinWX/Globals.h @@ -130,13 +130,13 @@ enum IDM_LIST_AUSTRALIA, IDM_LIST_FRANCE, IDM_LIST_GERMANY, - IDM_LIST_WORLD, IDM_LIST_ITALY, IDM_LIST_KOREA, IDM_LIST_NETHERLANDS, IDM_LIST_RUSSIA, IDM_LIST_SPAIN, IDM_LIST_TAIWAN, + IDM_LIST_WORLD, IDM_LIST_UNKNOWN, IDM_LIST_DRIVES, IDM_PURGE_CACHE, diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index 7359f342f8..db1c141de6 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 = 0x121; +static const u32 CACHE_REVISION = 0x122; #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 7413c0d313..06197d044a 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -189,9 +189,6 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW case DiscIO::IVolume::COUNTRY_FRANCE: m_Country->SetValue(_("France")); break; - case DiscIO::IVolume::COUNTRY_WORLD: - m_Country->SetValue(_("World")); - break; case DiscIO::IVolume::COUNTRY_ITALY: m_Country->SetValue(_("Italy")); break; @@ -237,6 +234,9 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW m_Lang->Disable(); } break; + case DiscIO::IVolume::COUNTRY_WORLD: + m_Country->SetValue(_("World")); + break; case DiscIO::IVolume::COUNTRY_UNKNOWN: default: m_Country->SetValue(_("Unknown"));