Index: src/ch/FeedbackNotEnoughSpaceDlg.cpp =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r22bbc4a87fa0b249e1e02ba385f28da9d77a4aa1 --- src/ch/FeedbackNotEnoughSpaceDlg.cpp (.../FeedbackNotEnoughSpaceDlg.cpp) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/FeedbackNotEnoughSpaceDlg.cpp (.../FeedbackNotEnoughSpaceDlg.cpp) (revision 22bbc4a87fa0b249e1e02ba385f28da9d77a4aa1) @@ -18,11 +18,13 @@ ***************************************************************************/ #include "stdafx.h" #include "ch.h" +#include "FileInfo.h" #include "FeedbackNotEnoughSpaceDlg.h" #include "btnIDs.h" #include "StringHelpers.h" #include "..\Common\FileSupport.h" #include "FeedbackHandler.h" + #ifdef _DEBUG #define new DEBUG_NEW #undef THIS_FILE @@ -34,7 +36,7 @@ CFeedbackNotEnoughSpaceDlg::CFeedbackNotEnoughSpaceDlg(ull_t ullSizeRequired, const tchar_t* pszSrcPath, const tchar_t* pszDstPath) - :ictranslate::CLanguageDialog(CFeedbackNotEnoughSpaceDlg::IDD), + :ictranslate::CLanguageDialog(IDD_FEEDBACK_NOTENOUGHSPACE_DIALOG), m_bAllItems(FALSE), m_ullRequired(ullSizeRequired), m_strDisk(pszDstPath) @@ -67,7 +69,7 @@ void CFeedbackNotEnoughSpaceDlg::UpdateDialog() { // format needed text - ictranslate::CFormat fmt(GetResManager()->LoadString(IDS_NERPATH_STRING)); + ictranslate::CFormat fmt(GetResManager().LoadString(IDS_NERPATH_STRING)); fmt.SetParam(_t("%path"), m_strDisk); CWnd* pWnd=GetDlgItem(IDC_HEADER_STATIC); @@ -88,7 +90,26 @@ BOOL CFeedbackNotEnoughSpaceDlg::OnInitDialog() { CLanguageDialog::OnInitDialog(); - + + AddResizableControl(IDC_HEADER_STATIC, 0.0, 0.0, 1.0, 0.0); + AddResizableControl(IDC_001_STATIC, 0.0, 0.0, 0.0, 0.0); + + AddResizableControl(IDC_FILES_LIST, 0.0, 0.0, 1.0, 1.0); + + AddResizableControl(IDC_003_STATIC, 0.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_004_STATIC, 0.0, 1.0, 0.0, 0.0); + + AddResizableControl(IDC_REQUIRED_STATIC, 0.0, 1.0, 1.0, 0.0); + AddResizableControl(IDC_AVAILABLE_STATIC, 0.0, 1.0, 1.0, 0.0); + + AddResizableControl(IDC_RETRY_BUTTON, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDC_IGNORE_BUTTON, 1.0, 1.0, 0.0, 0.0); + AddResizableControl(IDCANCEL, 1.0, 1.0, 0.0, 0.0); + + AddResizableControl(IDC_ALL_ITEMS_CHECK, 0.0, 1.0, 1.0, 0.0); + + InitializeResizableControls(); + // set to top SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE /*| SWP_SHOWWINDOW*/); @@ -130,11 +151,13 @@ void CFeedbackNotEnoughSpaceDlg::OnRetryButton() { + UpdateData(TRUE); EndDialog(CFeedbackHandler::eResult_Retry); } void CFeedbackNotEnoughSpaceDlg::OnIgnoreButton() { + UpdateData(TRUE); EndDialog(CFeedbackHandler::eResult_Skip); } @@ -145,5 +168,6 @@ void CFeedbackNotEnoughSpaceDlg::OnBnClickedCancel() { + UpdateData(TRUE); EndDialog(CFeedbackHandler::eResult_Cancel); }