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

use windows-1252 for gamename/description, fixes copyright/tm symbol in the gamelist & isoproperties

This commit is contained in:
LPFaint99 2011-12-20 02:10:40 -08:00
parent 9ddb67d4a9
commit e4c4602d9e
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -434,6 +434,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
// company: 0x007030 // company: 0x007030
int ImageIndex = -1; int ImageIndex = -1;
wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252));
#ifdef _WIN32 #ifdef _WIN32
wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent); wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent);
static bool validCP932 = ::IsValidCodePage(932) != 0; static bool validCP932 = ::IsValidCodePage(932) != 0;
@ -494,25 +495,25 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
case DiscIO::IVolume::COUNTRY_USA: case DiscIO::IVolume::COUNTRY_USA:
rISOFile.GetName(wname); rISOFile.GetName(wname);
SetItem(_Index, COLUMN_TITLE, SetItem(_Index, COLUMN_TITLE,
wxString::From8BitData(rISOFile.GetName(0).c_str()), -1); wxString(rISOFile.GetName(0).c_str(), WindowsCP1252), -1);
m_gameList.append(StringFromFormat("%s (U)\n", rISOFile.GetName(0).c_str())); m_gameList.append(StringFromFormat("%s (U)\n", rISOFile.GetName(0).c_str()));
SetItem(_Index, COLUMN_NOTES, SetItem(_Index, COLUMN_NOTES,
wxString::From8BitData(company.size() ? wxString(company.size() ?
company.c_str() : rISOFile.GetDescription(0).c_str()), -1); company.c_str() : rISOFile.GetDescription(0).c_str(), WindowsCP1252), -1);
break; break;
default: default:
rISOFile.GetName(wname, SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage); rISOFile.GetName(wname, SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage);
SetItem(_Index, COLUMN_TITLE, SetItem(_Index, COLUMN_TITLE,
wxString::From8BitData( wxString(
rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str(), WindowsCP1252),
-1); -1);
m_gameList.append(StringFromFormat("%s (E)\n", m_gameList.append(StringFromFormat("%s (E)\n",
rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str())); rISOFile.GetName(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()));
SetItem(_Index, COLUMN_NOTES, SetItem(_Index, COLUMN_NOTES,
wxString::From8BitData(company.size() ? wxString(company.size() ?
company.c_str() : company.c_str() :
rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str()), rISOFile.GetDescription(SConfig::GetInstance().m_LocalCoreStartupParameter.SelectedLanguage).c_str(), WindowsCP1252),
-1); -1);
break; break;
} }

15
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -1265,7 +1265,8 @@ void CISOProperties::ChangeBannerDetails(int lang)
wxString shortName, wxString shortName,
comment, comment,
maker; maker;
wxCSConv WindowsCP1252(wxFontMapper::GetEncodingName(wxFONTENCODING_CP1252));
#ifdef _WIN32 #ifdef _WIN32
wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent); wxCSConv SJISConv(*(wxCSConv*)wxConvCurrent);
static bool validCP932 = ::IsValidCodePage(932) != 0; static bool validCP932 = ::IsValidCodePage(932) != 0;
@ -1300,19 +1301,19 @@ void CISOProperties::ChangeBannerDetails(int lang)
if (OpenGameListItem->GetName(wname)) if (OpenGameListItem->GetName(wname))
shortName = wname; shortName = wname;
else else
shortName = wxString::From8BitData(OpenGameListItem->GetName(0).c_str()); shortName = wxString(OpenGameListItem->GetName(0).c_str(), WindowsCP1252);
if ((comment = OpenGameListItem->GetDescription()).size() == 0) if ((comment = OpenGameListItem->GetDescription()).size() == 0)
comment = wxString(OpenGameListItem->GetDescription(0).c_str(), SJISConv); comment = wxString(OpenGameListItem->GetDescription(0).c_str(), WindowsCP1252);
maker = wxString::From8BitData(OpenGameListItem->GetCompany().c_str()); maker = wxString(OpenGameListItem->GetCompany().c_str(), WindowsCP1252);
break; break;
default: default:
if (OpenGameListItem->GetName(wname, lang)) if (OpenGameListItem->GetName(wname, lang))
shortName = wname; shortName = wname;
else else
shortName = wxString::From8BitData(OpenGameListItem->GetName(lang).c_str()); shortName = wxString(OpenGameListItem->GetName(lang).c_str(), WindowsCP1252);
if ((comment = OpenGameListItem->GetDescription()).size() == 0) if ((comment = OpenGameListItem->GetDescription()).size() == 0)
comment = wxString(OpenGameListItem->GetDescription(lang).c_str(), SJISConv); comment = wxString(OpenGameListItem->GetDescription(lang).c_str(), WindowsCP1252);
maker = wxString::From8BitData(OpenGameListItem->GetCompany().c_str()); maker = wxString(OpenGameListItem->GetCompany().c_str(), WindowsCP1252);
break; break;
break; break;