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

A few more language tweaks

This commit is contained in:
zilmar 2015-03-05 22:33:57 +11:00
parent f55130f308
commit 0bd4b9deb9
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Project64/User Interface/Main Menu Class.cpp
View File

@ -598,9 +598,12 @@ std::wstring CMainMenu::GetSaveSlotString (int Slot)
stdstr _GoodName = g_Settings->LoadString(Game_GoodName); stdstr _GoodName = g_Settings->LoadString(Game_GoodName);
stdstr _InstantSaveDirectory = g_Settings->LoadString(Directory_InstantSave); stdstr _InstantSaveDirectory = g_Settings->LoadString(Directory_InstantSave);
stdstr CurrentSaveName; stdstr CurrentSaveName;
if (Slot != 0) { if (Slot != 0)
{
CurrentSaveName.Format("%s.pj%d",_GoodName.c_str(), Slot); CurrentSaveName.Format("%s.pj%d",_GoodName.c_str(), Slot);
} else { }
else
{
CurrentSaveName.Format("%s.pj",_GoodName.c_str()); CurrentSaveName.Format("%s.pj",_GoodName.c_str());
} }
stdstr_f FileName("%s%s",_InstantSaveDirectory.c_str(),CurrentSaveName.c_str()); stdstr_f FileName("%s%s",_InstantSaveDirectory.c_str(),CurrentSaveName.c_str());
@ -613,16 +616,18 @@ std::wstring CMainMenu::GetSaveSlotString (int Slot)
if (LastSaveTime.empty()) if (LastSaveTime.empty())
{ {
LastSaveTime = GetFileLastMod(FileName); LastSaveTime = GetFileLastMod(FileName);
} }
// Check old file name // Check old file name
if (LastSaveTime.empty()) if (LastSaveTime.empty())
{ {
stdstr _RomName = g_Settings->LoadString(Game_GameName); stdstr _RomName = g_Settings->LoadString(Game_GameName);
if (Slot > 0) { if (Slot > 0)
{
FileName.Format("%s%s.pj%d", _InstantSaveDirectory.c_str(), _RomName.c_str(),Slot); FileName.Format("%s%s.pj%d", _InstantSaveDirectory.c_str(), _RomName.c_str(),Slot);
} else { }
else
{
FileName.Format("%s%s.pj",_InstantSaveDirectory.c_str(),_RomName.c_str()); FileName.Format("%s%s.pj",_InstantSaveDirectory.c_str(),_RomName.c_str());
} }
@ -636,8 +641,8 @@ std::wstring CMainMenu::GetSaveSlotString (int Slot)
LastSaveTime = GetFileLastMod(FileName); LastSaveTime = GetFileLastMod(FileName);
} }
} }
SlotName += LastSaveTime.ToUTF16();
return stdstr_f("%s%s",SlotName.c_str(),LastSaveTime.c_str()).ToUTF16(); return SlotName;
} }
void CMainMenu::FillOutMenu ( HMENU hMenu ) void CMainMenu::FillOutMenu ( HMENU hMenu )

10
Source/Project64/User Interface/Rom Browser Class.cpp
View File

@ -1050,8 +1050,8 @@ void CRomBrowser::RefreshRomBrowserStatic (CRomBrowser * _this)
void CRomBrowser::ResetRomBrowserColomuns (void) void CRomBrowser::ResetRomBrowserColomuns (void)
{ {
size_t Coloumn, index; size_t Coloumn, index;
LV_COLUMN lvColumn; LV_COLUMNW lvColumn;
char szString[300]; wchar_t szString[300];
GetFieldInfo(m_Fields); GetFieldInfo(m_Fields);
@ -1079,13 +1079,11 @@ void CRomBrowser::ResetRomBrowserColomuns (void)
m_FieldType[Coloumn] = -1; m_FieldType[Coloumn] = -1;
break; break;
} }
stdstr title;
title.FromUTF16(GS(m_Fields[index].LangID()));
m_FieldType[Coloumn] = m_Fields[index].ID(); m_FieldType[Coloumn] = m_Fields[index].ID();
lvColumn.cx = m_Fields[index].ColWidth(); lvColumn.cx = m_Fields[index].ColWidth();
strncpy(szString, title.c_str(), sizeof(szString)); wcsncpy(szString, GS(m_Fields[index].LangID()), sizeof(szString) / sizeof(szString[0]));
ListView_InsertColumn(m_hRomList, Coloumn, &lvColumn); SendMessage(m_hRomList, LVM_INSERTCOLUMNW, (WPARAM)(int)(Coloumn), (LPARAM)(const LV_COLUMNW *)(&lvColumn));
} }
} }

10
Source/Project64/User Interface/Settings Config.cpp
View File

@ -27,7 +27,15 @@ void CSettingConfig::Display(void * ParentWindow)
g_BaseSystem->ExternalEvent(SysEvent_PauseCPU_Settings); g_BaseSystem->ExternalEvent(SysEvent_PauseCPU_Settings);
} }
DoModal((HWND)ParentWindow); BOOL result = m_thunk.Init(NULL, NULL);
if (result)
{
_AtlWinModule.AddCreateWndData(&m_thunk.cd, this);
#ifdef _DEBUG
m_bModal = true;
#endif //_DEBUG
::DialogBoxParamW(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCEW(IDD), (HWND)ParentWindow, StartDialogProc, NULL);
}
if (g_BaseSystem) if (g_BaseSystem)
{ {