ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2281 from Stevoisiak/MoveCountryWorld 

Re-sort Country_World
This commit is contained in:
Lioncash 2015-04-09 12:15:18 -04:00
parent 2c2409fee4 7c1ab2911a
commit 1a18cad178
13 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/ConfigManager.cpp
View File

@ -289,13 +289,13 @@ void SConfig::SaveGameListSettings(IniFile& ini)
gamelist->Set("ListAustralia", m_ListAustralia); gamelist->Set("ListAustralia", m_ListAustralia);
gamelist->Set("ListFrance", m_ListFrance); gamelist->Set("ListFrance", m_ListFrance);
gamelist->Set("ListGermany", m_ListGermany); gamelist->Set("ListGermany", m_ListGermany);
gamelist->Set("ListWorld", m_ListWorld);
gamelist->Set("ListItaly", m_ListItaly); gamelist->Set("ListItaly", m_ListItaly);
gamelist->Set("ListKorea", m_ListKorea); gamelist->Set("ListKorea", m_ListKorea);
gamelist->Set("ListNetherlands", m_ListNetherlands); gamelist->Set("ListNetherlands", m_ListNetherlands);
gamelist->Set("ListRussia", m_ListRussia); gamelist->Set("ListRussia", m_ListRussia);
gamelist->Set("ListSpain", m_ListSpain); gamelist->Set("ListSpain", m_ListSpain);
gamelist->Set("ListTaiwan", m_ListTaiwan); gamelist->Set("ListTaiwan", m_ListTaiwan);
gamelist->Set("ListWorld", m_ListWorld);
gamelist->Set("ListUnknown", m_ListUnknown); gamelist->Set("ListUnknown", m_ListUnknown);
gamelist->Set("ListSort", m_ListSort); gamelist->Set("ListSort", m_ListSort);
gamelist->Set("ListSortSecondary", m_ListSort2); gamelist->Set("ListSortSecondary", m_ListSort2);
@ -539,13 +539,13 @@ void SConfig::LoadGameListSettings(IniFile& ini)
gamelist->Get("ListAustralia", &m_ListAustralia, true); gamelist->Get("ListAustralia", &m_ListAustralia, true);
gamelist->Get("ListFrance", &m_ListFrance, true); gamelist->Get("ListFrance", &m_ListFrance, true);
gamelist->Get("ListGermany", &m_ListGermany, true); gamelist->Get("ListGermany", &m_ListGermany, true);
gamelist->Get("ListWorld", &m_ListWorld, true);
gamelist->Get("ListItaly", &m_ListItaly, true); gamelist->Get("ListItaly", &m_ListItaly, true);
gamelist->Get("ListKorea", &m_ListKorea, true); gamelist->Get("ListKorea", &m_ListKorea, true);
gamelist->Get("ListNetherlands", &m_ListNetherlands, true); gamelist->Get("ListNetherlands", &m_ListNetherlands, true);
gamelist->Get("ListRussia", &m_ListRussia, true); gamelist->Get("ListRussia", &m_ListRussia, true);
gamelist->Get("ListSpain", &m_ListSpain, true); gamelist->Get("ListSpain", &m_ListSpain, true);
gamelist->Get("ListTaiwan", &m_ListTaiwan, true); gamelist->Get("ListTaiwan", &m_ListTaiwan, true);
gamelist->Get("ListWorld", &m_ListWorld, true);
gamelist->Get("ListUnknown", &m_ListUnknown, true); gamelist->Get("ListUnknown", &m_ListUnknown, true);
gamelist->Get("ListSort", &m_ListSort, 3); gamelist->Get("ListSort", &m_ListSort, 3);
gamelist->Get("ListSortSecondary", &m_ListSort2, 0); gamelist->Get("ListSortSecondary", &m_ListSort2, 0);

2
Source/Core/Core/ConfigManager.h
View File

@ -70,13 +70,13 @@ struct SConfig : NonCopyable
bool m_ListAustralia; bool m_ListAustralia;
bool m_ListFrance; bool m_ListFrance;
bool m_ListGermany; bool m_ListGermany;
bool m_ListWorld;
bool m_ListItaly; bool m_ListItaly;
bool m_ListKorea; bool m_ListKorea;
bool m_ListNetherlands; bool m_ListNetherlands;
bool m_ListRussia; bool m_ListRussia;
bool m_ListSpain; bool m_ListSpain;
bool m_ListTaiwan; bool m_ListTaiwan;
bool m_ListWorld;
bool m_ListUnknown; bool m_ListUnknown;
int m_ListSort; int m_ListSort;
int m_ListSort2; int m_ListSort2;

2
Source/Core/Core/CoreParameter.cpp
View File

@ -123,11 +123,11 @@ static const char* GetRegionOfCountry(DiscIO::IVolume::ECountry country)
case DiscIO::IVolume::COUNTRY_EUROPE: case DiscIO::IVolume::COUNTRY_EUROPE:
case DiscIO::IVolume::COUNTRY_FRANCE: case DiscIO::IVolume::COUNTRY_FRANCE:
case DiscIO::IVolume::COUNTRY_GERMANY: case DiscIO::IVolume::COUNTRY_GERMANY:
case DiscIO::IVolume::COUNTRY_WORLD:
case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_ITALY:
case DiscIO::IVolume::COUNTRY_NETHERLANDS: case DiscIO::IVolume::COUNTRY_NETHERLANDS:
case DiscIO::IVolume::COUNTRY_RUSSIA: case DiscIO::IVolume::COUNTRY_RUSSIA:
case DiscIO::IVolume::COUNTRY_SPAIN: case DiscIO::IVolume::COUNTRY_SPAIN:
case DiscIO::IVolume::COUNTRY_WORLD:
return EUR_DIR; return EUR_DIR;
case DiscIO::IVolume::COUNTRY_UNKNOWN: case DiscIO::IVolume::COUNTRY_UNKNOWN:

2
Source/Core/DiscIO/Volume.h
View File

@ -52,13 +52,13 @@ public:
COUNTRY_AUSTRALIA, COUNTRY_AUSTRALIA,
COUNTRY_FRANCE, COUNTRY_FRANCE,
COUNTRY_GERMANY, COUNTRY_GERMANY,
COUNTRY_WORLD,
COUNTRY_ITALY, COUNTRY_ITALY,
COUNTRY_KOREA, COUNTRY_KOREA,
COUNTRY_NETHERLANDS, COUNTRY_NETHERLANDS,
COUNTRY_RUSSIA, COUNTRY_RUSSIA,
COUNTRY_SPAIN, COUNTRY_SPAIN,
COUNTRY_TAIWAN, COUNTRY_TAIWAN,
COUNTRY_WORLD,
COUNTRY_UNKNOWN, COUNTRY_UNKNOWN,
NUMBER_OF_COUNTRIES NUMBER_OF_COUNTRIES
}; };

2
Source/Core/DolphinQt/GameList/GameFile.cpp
View File

@ -26,7 +26,7 @@
#include "DolphinQt/Utils/Resources.h" #include "DolphinQt/Utils/Resources.h"
#include "DolphinQt/Utils/Utils.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 const u32 DATASTREAM_REVISION = 15; // Introduced in Qt 5.2
static QStringList VectorToStringList(std::vector<std::string> vec, bool trim = false) static QStringList VectorToStringList(std::vector<std::string> vec, bool trim = false)

8
Source/Core/DolphinQt/GameList/GameTracker.cpp
View File

@ -163,10 +163,6 @@ void DGameTracker::ScanForGames()
if (!SConfig::GetInstance().m_ListGermany) if (!SConfig::GetInstance().m_ListGermany)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_WORLD:
if (!SConfig::GetInstance().m_ListWorld)
list = false;
break;
case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_ITALY:
if (!SConfig::GetInstance().m_ListItaly) if (!SConfig::GetInstance().m_ListItaly)
list = false; list = false;
@ -199,6 +195,10 @@ void DGameTracker::ScanForGames()
if (!SConfig::GetInstance().m_ListUsa) if (!SConfig::GetInstance().m_ListUsa)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_WORLD:
if (!SConfig::GetInstance().m_ListWorld)
list = false;
break;
case DiscIO::IVolume::COUNTRY_UNKNOWN: case DiscIO::IVolume::COUNTRY_UNKNOWN:
default: default:
if (!SConfig::GetInstance().m_ListUnknown) if (!SConfig::GetInstance().m_ListUnknown)

2
Source/Core/DolphinQt/Utils/Resources.cpp
View File

@ -31,13 +31,13 @@ void Resources::Init()
m_regions[DiscIO::IVolume::COUNTRY_AUSTRALIA].load(GIFN("Flag_Australia")); 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_FRANCE].load(GIFN("Flag_France"));
m_regions[DiscIO::IVolume::COUNTRY_GERMANY].load(GIFN("Flag_Germany")); 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_ITALY].load(GIFN("Flag_Italy"));
m_regions[DiscIO::IVolume::COUNTRY_KOREA].load(GIFN("Flag_Korea")); 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_NETHERLANDS].load(GIFN("Flag_Netherlands"));
m_regions[DiscIO::IVolume::COUNTRY_RUSSIA].load(GIFN("Flag_Russia")); 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_SPAIN].load(GIFN("Flag_Spain"));
m_regions[DiscIO::IVolume::COUNTRY_TAIWAN].load(GIFN("Flag_Taiwan")); 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_regions[DiscIO::IVolume::COUNTRY_UNKNOWN].load(GIFN("Flag_Unknown"));
m_platforms.resize(3); m_platforms.resize(3);

6
Source/Core/DolphinWX/Frame.cpp
View File

@ -883,13 +883,13 @@ void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event))
SConfig::GetInstance().m_ListAustralia && SConfig::GetInstance().m_ListAustralia &&
SConfig::GetInstance().m_ListFrance && SConfig::GetInstance().m_ListFrance &&
SConfig::GetInstance().m_ListGermany && SConfig::GetInstance().m_ListGermany &&
SConfig::GetInstance().m_ListWorld &&
SConfig::GetInstance().m_ListItaly && SConfig::GetInstance().m_ListItaly &&
SConfig::GetInstance().m_ListKorea && SConfig::GetInstance().m_ListKorea &&
SConfig::GetInstance().m_ListNetherlands && SConfig::GetInstance().m_ListNetherlands &&
SConfig::GetInstance().m_ListRussia && SConfig::GetInstance().m_ListRussia &&
SConfig::GetInstance().m_ListSpain && SConfig::GetInstance().m_ListSpain &&
SConfig::GetInstance().m_ListTaiwan && SConfig::GetInstance().m_ListTaiwan &&
SConfig::GetInstance().m_ListWorld &&
SConfig::GetInstance().m_ListUnknown))) SConfig::GetInstance().m_ListUnknown)))
{ {
SConfig::GetInstance().m_ListGC = SConfig::GetInstance().m_ListGC =
@ -901,13 +901,13 @@ void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event))
SConfig::GetInstance().m_ListAustralia = SConfig::GetInstance().m_ListAustralia =
SConfig::GetInstance().m_ListFrance = SConfig::GetInstance().m_ListFrance =
SConfig::GetInstance().m_ListGermany = SConfig::GetInstance().m_ListGermany =
SConfig::GetInstance().m_ListWorld =
SConfig::GetInstance().m_ListItaly = SConfig::GetInstance().m_ListItaly =
SConfig::GetInstance().m_ListKorea = SConfig::GetInstance().m_ListKorea =
SConfig::GetInstance().m_ListNetherlands = SConfig::GetInstance().m_ListNetherlands =
SConfig::GetInstance().m_ListRussia = SConfig::GetInstance().m_ListRussia =
SConfig::GetInstance().m_ListSpain = SConfig::GetInstance().m_ListSpain =
SConfig::GetInstance().m_ListTaiwan = SConfig::GetInstance().m_ListTaiwan =
SConfig::GetInstance().m_ListWorld =
SConfig::GetInstance().m_ListUnknown = true; SConfig::GetInstance().m_ListUnknown = true;
GetMenuBar()->FindItem(IDM_LIST_GC)->Check(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_AUSTRALIA)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_FRANCE)->Check(true); GetMenuBar()->FindItem(IDM_LIST_FRANCE)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_GERMANY)->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_ITALY)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_KOREA)->Check(true); GetMenuBar()->FindItem(IDM_LIST_KOREA)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_NETHERLANDS)->Check(true); GetMenuBar()->FindItem(IDM_LIST_NETHERLANDS)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_RUSSIA)->Check(true); GetMenuBar()->FindItem(IDM_LIST_RUSSIA)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_SPAIN)->Check(true); GetMenuBar()->FindItem(IDM_LIST_SPAIN)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_TAIWAN)->Check(true); GetMenuBar()->FindItem(IDM_LIST_TAIWAN)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_WORLD)->Check(true);
GetMenuBar()->FindItem(IDM_LIST_UNKNOWN)->Check(true); GetMenuBar()->FindItem(IDM_LIST_UNKNOWN)->Check(true);
m_GameListCtrl->Update(); m_GameListCtrl->Update();

10
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -336,8 +336,6 @@ wxMenuBar* CFrame::CreateMenu()
regionMenu->Check(IDM_LIST_FRANCE, SConfig::GetInstance().m_ListFrance); regionMenu->Check(IDM_LIST_FRANCE, SConfig::GetInstance().m_ListFrance);
regionMenu->AppendCheckItem(IDM_LIST_GERMANY, _("Show Germany")); regionMenu->AppendCheckItem(IDM_LIST_GERMANY, _("Show Germany"));
regionMenu->Check(IDM_LIST_GERMANY, SConfig::GetInstance().m_ListGermany); 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->AppendCheckItem(IDM_LIST_ITALY, _("Show Italy"));
regionMenu->Check(IDM_LIST_ITALY, SConfig::GetInstance().m_ListItaly); regionMenu->Check(IDM_LIST_ITALY, SConfig::GetInstance().m_ListItaly);
regionMenu->AppendCheckItem(IDM_LIST_KOREA, _("Show Korea")); regionMenu->AppendCheckItem(IDM_LIST_KOREA, _("Show Korea"));
@ -350,6 +348,8 @@ wxMenuBar* CFrame::CreateMenu()
regionMenu->Check(IDM_LIST_SPAIN, SConfig::GetInstance().m_ListSpain); regionMenu->Check(IDM_LIST_SPAIN, SConfig::GetInstance().m_ListSpain);
regionMenu->AppendCheckItem(IDM_LIST_TAIWAN, _("Show Taiwan")); regionMenu->AppendCheckItem(IDM_LIST_TAIWAN, _("Show Taiwan"));
regionMenu->Check(IDM_LIST_TAIWAN, SConfig::GetInstance().m_ListTaiwan); 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->AppendCheckItem(IDM_LIST_UNKNOWN, _("Show Unknown"));
regionMenu->Check(IDM_LIST_UNKNOWN, SConfig::GetInstance().m_ListUnknown); regionMenu->Check(IDM_LIST_UNKNOWN, SConfig::GetInstance().m_ListUnknown);
@ -1944,9 +1944,6 @@ void CFrame::GameListChanged(wxCommandEvent& event)
case IDM_LIST_GERMANY: case IDM_LIST_GERMANY:
SConfig::GetInstance().m_ListGermany = event.IsChecked(); SConfig::GetInstance().m_ListGermany = event.IsChecked();
break; break;
case IDM_LIST_WORLD:
SConfig::GetInstance().m_ListWorld = event.IsChecked();
break;
case IDM_LIST_ITALY: case IDM_LIST_ITALY:
SConfig::GetInstance().m_ListItaly = event.IsChecked(); SConfig::GetInstance().m_ListItaly = event.IsChecked();
break; break;
@ -1965,6 +1962,9 @@ void CFrame::GameListChanged(wxCommandEvent& event)
case IDM_LIST_TAIWAN: case IDM_LIST_TAIWAN:
SConfig::GetInstance().m_ListTaiwan = event.IsChecked(); SConfig::GetInstance().m_ListTaiwan = event.IsChecked();
break; break;
case IDM_LIST_WORLD:
SConfig::GetInstance().m_ListWorld = event.IsChecked();
break;
case IDM_LIST_UNKNOWN: case IDM_LIST_UNKNOWN:
SConfig::GetInstance().m_ListUnknown = event.IsChecked(); SConfig::GetInstance().m_ListUnknown = event.IsChecked();
break; break;

10
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -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_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_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_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_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_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_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_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_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_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_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm));
m_PlatformImageIndex.resize(3); m_PlatformImageIndex.resize(3);
@ -632,10 +632,6 @@ void CGameListCtrl::ScanForISOs()
if (!SConfig::GetInstance().m_ListGermany) if (!SConfig::GetInstance().m_ListGermany)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_WORLD:
if (!SConfig::GetInstance().m_ListWorld)
list = false;
break;
case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_ITALY:
if (!SConfig::GetInstance().m_ListItaly) if (!SConfig::GetInstance().m_ListItaly)
list = false; list = false;
@ -668,6 +664,10 @@ void CGameListCtrl::ScanForISOs()
if (!SConfig::GetInstance().m_ListUsa) if (!SConfig::GetInstance().m_ListUsa)
list = false; list = false;
break; break;
case DiscIO::IVolume::COUNTRY_WORLD:
if (!SConfig::GetInstance().m_ListWorld)
list = false;
break;
case DiscIO::IVolume::COUNTRY_UNKNOWN: case DiscIO::IVolume::COUNTRY_UNKNOWN:
default: default:
if (!SConfig::GetInstance().m_ListUnknown) if (!SConfig::GetInstance().m_ListUnknown)

2
Source/Core/DolphinWX/Globals.h
View File

@ -130,13 +130,13 @@ enum
IDM_LIST_AUSTRALIA, IDM_LIST_AUSTRALIA,
IDM_LIST_FRANCE, IDM_LIST_FRANCE,
IDM_LIST_GERMANY, IDM_LIST_GERMANY,
IDM_LIST_WORLD,
IDM_LIST_ITALY, IDM_LIST_ITALY,
IDM_LIST_KOREA, IDM_LIST_KOREA,
IDM_LIST_NETHERLANDS, IDM_LIST_NETHERLANDS,
IDM_LIST_RUSSIA, IDM_LIST_RUSSIA,
IDM_LIST_SPAIN, IDM_LIST_SPAIN,
IDM_LIST_TAIWAN, IDM_LIST_TAIWAN,
IDM_LIST_WORLD,
IDM_LIST_UNKNOWN, IDM_LIST_UNKNOWN,
IDM_LIST_DRIVES, IDM_LIST_DRIVES,
IDM_PURGE_CACHE, IDM_PURGE_CACHE,

2
Source/Core/DolphinWX/ISOFile.cpp
View File

@ -37,7 +37,7 @@
#include "DolphinWX/ISOFile.h" #include "DolphinWX/ISOFile.h"
#include "DolphinWX/WxUtils.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_WIDTH 96
#define DVD_BANNER_HEIGHT 32 #define DVD_BANNER_HEIGHT 32

6
Source/Core/DolphinWX/ISOProperties.cpp
View File

@ -189,9 +189,6 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
case DiscIO::IVolume::COUNTRY_FRANCE: case DiscIO::IVolume::COUNTRY_FRANCE:
m_Country->SetValue(_("France")); m_Country->SetValue(_("France"));
break; break;
case DiscIO::IVolume::COUNTRY_WORLD:
m_Country->SetValue(_("World"));
break;
case DiscIO::IVolume::COUNTRY_ITALY: case DiscIO::IVolume::COUNTRY_ITALY:
m_Country->SetValue(_("Italy")); m_Country->SetValue(_("Italy"));
break; break;
@ -237,6 +234,9 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
m_Lang->Disable(); m_Lang->Disable();
} }
break; break;
case DiscIO::IVolume::COUNTRY_WORLD:
m_Country->SetValue(_("World"));
break;
case DiscIO::IVolume::COUNTRY_UNKNOWN: case DiscIO::IVolume::COUNTRY_UNKNOWN:
default: default:
m_Country->SetValue(_("Unknown")); m_Country->SetValue(_("Unknown"));