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

Fixed Issue 1952 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4792 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
ayuanx 2010-01-08 13:16:37 +00:00
parent 9ed2d1957a
commit 11091893b2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,7 +235,7 @@ void CGameListCtrl::Update()
// Instead of showing the notes + the company, which is unknown with wii titles
// We show in the same column : company for GC games and description for wii/wad games
InsertColumn(COLUMN_NOTES, _(" "));
InsertColumn(COLUMN_NOTES, _("Notes"));
InsertColumn(COLUMN_COUNTRY, _(""));
InsertColumn(COLUMN_SIZE, _("Size"));
InsertColumn(COLUMN_EMULATION_STATE, _("State"));
@ -244,8 +244,8 @@ void CGameListCtrl::Update()
// set initial sizes for columns
SetColumnWidth(COLUMN_PLATFORM, 35);
SetColumnWidth(COLUMN_BANNER, 96);
SetColumnWidth(COLUMN_TITLE, 150);
SetColumnWidth(COLUMN_NOTES, 130);
SetColumnWidth(COLUMN_TITLE, 200);
SetColumnWidth(COLUMN_NOTES, 200);
SetColumnWidth(COLUMN_COUNTRY, 32);
SetColumnWidth(COLUMN_EMULATION_STATE, 50);
@ -360,7 +360,7 @@ void CGameListCtrl::InsertItemInReportView(long _Index)
case DiscIO::IVolume::COUNTRY_JAPAN:
{
wxString name = wxString(rISOFile.GetName(0).c_str(), SJISConv);
m_gameList.append(StringFromFormat("%s (J)\n", (const char*)name.mb_str()));
m_gameList.append(StringFromFormat("%s (J)\n", (const char*)name.c_str()));
SetItem(_Index, COLUMN_TITLE, name, -1);
SetItem(_Index, COLUMN_NOTES, wxString(company.size() ? company.c_str() : rISOFile.GetDescription(0).c_str(), SJISConv), -1);
}
@ -1154,10 +1154,10 @@ void CGameListCtrl::AutomaticColumnWidth()
+ 5); // some pad to keep the horizontal scrollbar away :)
// We hide the Company column if the window is too small
if (0.66*resizable > 200)
if (0.5*resizable > 200)
{
SetColumnWidth(COLUMN_TITLE, 0.66*resizable);
SetColumnWidth(COLUMN_NOTES, 0.34*resizable);
SetColumnWidth(COLUMN_TITLE, 0.5*resizable);
SetColumnWidth(COLUMN_NOTES, 0.5*resizable);
}
else
{

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

@ -1175,14 +1175,14 @@ void CISOProperties::ChangeBannerDetails(int lang)
// Updates the informations shown in the window
m_ShortName->SetValue(name);
m_Comment->SetValue(wxString(OpenGameListItem->GetDescription(0).c_str(), SJISConv));
m_Maker->SetValue(wxString::FromAscii(OpenGameListItem->GetCompany().c_str()));//dev too
m_Maker->SetValue(wxString(OpenGameListItem->GetCompany().c_str(), SJISConv));//dev too
std::string filename, extension;
SplitPath(OpenGameListItem->GetFileName(), 0, &filename, &extension);
// Also sets the window's title
SetTitle(wxString::Format(wxT("%s%s"),
wxString::FromAscii(StringFromFormat("%s%s: %s - ", filename.c_str(), extension.c_str(), OpenGameListItem->GetUniqueID().c_str()).c_str()).c_str(),
wxString(StringFromFormat("%s%s: %s - ", filename.c_str(), extension.c_str(), OpenGameListItem->GetUniqueID().c_str()).c_str(), *wxConvCurrent).c_str(),
name.c_str()));
}
else // Do the same for PAL/US Games using Ascii