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

View File

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

View File

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

View File

@ -27,8 +27,16 @@ void CSettingConfig::Display(void * ParentWindow)
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)
{
g_BaseSystem->ExternalEvent(SysEvent_ResumeCPU_Settings);