xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-07 03:15:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

9.21

Browse Source
This commit is contained in:
Igor Pavlov
2011-04-11 00:00:00 +00:00
committed by Kornel Lesiński
parent de4f8c22fe
commit 35596517f2
322 changed files with 9989 additions and 7759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CPP/7zip/UI/FileManager/ProgressDialog2.cpp
View File

@@ -146,6 +146,7 @@ bool CProgressDialog::OnInit()
m_ProgressBar.Attach(GetItem(IDC_PROGRESS1));
_messageList.Attach(GetItem(IDC_PROGRESS_LIST));
_messageList.SetUnicodeFormat();
_wasCreated = true;
_dialogCreatedEvent.Set();
@@ -154,7 +155,6 @@ bool CProgressDialog::OnInit()
LangSetDlgItemsText(HWND(*this), kIDLangPairs, sizeof(kIDLangPairs) / sizeof(kIDLangPairs[0]));
#endif
CWindow window(GetItem(IDC_BUTTON_PROGRESS_PRIORITY));
window.GetText(backgroundString);
backgroundedString = backgroundString;
@@ -171,11 +171,6 @@ bool CProgressDialog::OnInit()
SetPauseText();
SetPriorityText();
#ifndef UNDER_CE
_messageList.SetUnicodeFormat(true);
#endif
_messageList.InsertColumn(0, L"", 30);
const UString s = LangStringSpec(IDS_MESSAGES_DIALOG_MESSAGE_COLUMN, 0x02000A80);
@@ -957,10 +952,8 @@ UString HResultToMessage(HRESULT errorCode)
UString message;
if (errorCode == E_OUTOFMEMORY)
message = LangStringSpec(IDS_MEM_ERROR, 0x0200060B);
else if (!NError::MyFormatMessage(errorCode, message))
message.Empty();
if (message.IsEmpty())
message = L"Error";
else
message = NError::MyFormatMessageW(errorCode);
return message;
}
@@ -989,8 +982,8 @@ void CProgressThreadVirt::Process()
m = HResultToMessage(Result);
}
AddMessageToString(m, ErrorMessage);
AddMessageToString(m, ErrorPath1);
AddMessageToString(m, ErrorPath2);
AddMessageToString(m, fs2us(ErrorPath1));
AddMessageToString(m, fs2us(ErrorPath2));
if (m.IsEmpty())
{