Index: src/ch/FeedbackReplaceDlg.cpp
===================================================================
diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -rc435ab507c8b8280264188b49e9ada56d46c0261
--- src/ch/FeedbackReplaceDlg.cpp	(.../FeedbackReplaceDlg.cpp)	(revision d5c3edd0d167db9b5d47d04248820fda49499a5e)
+++ src/ch/FeedbackReplaceDlg.cpp	(.../FeedbackReplaceDlg.cpp)	(revision c435ab507c8b8280264188b49e9ada56d46c0261)
@@ -3,6 +3,7 @@
 
 #include "stdafx.h"
 #include "ch.h"
+#include "FileInfo.h"
 #include "FeedbackReplaceDlg.h"
 #include "../libictranslate/ResourceManager.h"
 #include "FileInfo.h"
@@ -12,13 +13,12 @@
 
 IMPLEMENT_DYNAMIC(CFeedbackReplaceDlg, ictranslate::CLanguageDialog)
 
-CFeedbackReplaceDlg::CFeedbackReplaceDlg(const CFileInfo* pfiSrcFile, const CFileInfo* pfiDstFile, CWnd* pParent /*=NULL*/)
-	: ictranslate::CLanguageDialog(CFeedbackReplaceDlg::IDD, pParent),
-	m_pfiSrcFile(pfiSrcFile),
-	m_pfiDstFile(pfiDstFile)
-	, m_bAllItems(FALSE)
+CFeedbackReplaceDlg::CFeedbackReplaceDlg(const CFileInfoPtr& spSrcFile, const CFileInfoPtr& spDstFile, CWnd* pParent /*=NULL*/)
+	: ictranslate::CLanguageDialog(IDD_FEEDBACK_REPLACE_DIALOG, pParent),
+	m_spSrcFile(spSrcFile),
+	m_spDstFile(spDstFile),
+	m_bAllItems(FALSE)
 {
-
 }
 
 CFeedbackReplaceDlg::~CFeedbackReplaceDlg()
@@ -51,6 +51,26 @@
 {
 	CLanguageDialog::OnInitDialog();
 
+	AddResizableControl(IDC_INFO_STATIC, 0.0, 0.0, 1.0, 0.0);
+
+	AddResizableControl(IDC_00_STATIC, 0.0, 0.0, 1.0, 0.0);
+	AddResizableControl(IDC_SRC_ICON_STATIC, 0.0, 0.0, 0.0, 0.0);
+	AddResizableControl(IDC_SRC_INFO_STATIC, 0.0, 0.0, 1.0, 0.5);
+
+	AddResizableControl(IDC_01_STATIC, 0.0, 0.5, 1.0, 0.0);
+	AddResizableControl(IDC_DST_ICON_STATIC, 0.0, 0.5, 0.0, 0.0);
+	AddResizableControl(IDC_DST_INFO_STATIC, 0.0, 0.5, 1.0, 0.5);
+
+	AddResizableControl(IDC_COPY_REST_BUTTON, 0.0, 1.0, 0.0, 0.0);
+	AddResizableControl(IDC_SKIP_BUTTON, 0.0, 1.0, 0.0, 0.0);
+	AddResizableControl(IDC_PAUSE_BUTTON, 0.0, 1.0, 0.0, 0.0);
+	AddResizableControl(IDC_CANCEL_BUTTON, 0.0, 1.0, 0.0, 0.0);
+	AddResizableControl(IDC_REPLACE_BUTTON, 0.0, 1.0, 0.0, 0.0);
+
+	AddResizableControl(IDC_ALL_ITEMS_CHECK, 0.0, 1.0, 1.0, 0.0);
+
+	InitializeResizableControls();
+
 	// load the informations about files
 	RefreshFilesInfo();
 	RefreshImages();
@@ -61,75 +81,80 @@
 
 void CFeedbackReplaceDlg::RefreshFilesInfo()
 {
-	BOOST_ASSERT(m_pfiSrcFile && m_pfiDstFile);
-	if(!m_pfiSrcFile || !m_pfiDstFile)
+	BOOST_ASSERT(m_spSrcFile && m_spDstFile);
+	if(!m_spSrcFile || !m_spDstFile)
 		return;
 
 	// load template
-	ictranslate::CResourceManager* pManager = GetResManager();
-	BOOST_ASSERT(pManager);
-	if(!pManager)
-		return;
+	ictranslate::CResourceManager& rManager = GetResManager();
 
 	CString strTemplate;
-	strTemplate += pManager->LoadString(IDS_INFO_FILE_STRING);
+	strTemplate += rManager.LoadString(IDS_INFO_FILE_STRING);
 	strTemplate += _T("\r\n");
-	strTemplate += pManager->LoadString(IDS_INFO_SIZE_STRING);
+	strTemplate += rManager.LoadString(IDS_INFO_SIZE_STRING);
 	strTemplate += _T("\r\n");
-	strTemplate += pManager->LoadString(IDS_INFO_MODIFIED_STRING);
+	strTemplate += rManager.LoadString(IDS_INFO_MODIFIED_STRING);
 
 	ictranslate::CFormat fmt(strTemplate);
-	fmt.SetParam(_T("%filename"), m_pfiSrcFile->GetFullFilePath());
-	fmt.SetParam(_T("%size"), m_pfiSrcFile->GetLength64());
-	fmt.SetParam(_T("%datemod"), m_pfiSrcFile->GetLastWriteTime().Format(LOCALE_NOUSEROVERRIDE, LANG_USER_DEFAULT));
+	fmt.SetParam(_T("%filename"), m_spSrcFile->GetFullFilePath());
+	fmt.SetParam(_T("%size"), m_spSrcFile->GetLength64());
 
+	COleDateTime dtTemp = m_spSrcFile->GetLastWriteTime();
+	fmt.SetParam(_T("%datemod"), dtTemp.Format(LOCALE_NOUSEROVERRIDE, LANG_USER_DEFAULT));
+
 	m_ctlSrcInfo.SetWindowText(fmt);
 
 	fmt.SetFormat(strTemplate);
-	fmt.SetParam(_T("%filename"), m_pfiDstFile->GetFullFilePath());
-	fmt.SetParam(_T("%size"), m_pfiDstFile->GetLength64());
-	fmt.SetParam(_T("%datemod"), m_pfiDstFile->GetLastWriteTime().Format(LOCALE_NOUSEROVERRIDE, LANG_USER_DEFAULT));
+	fmt.SetParam(_T("%filename"), m_spDstFile->GetFullFilePath());
+	fmt.SetParam(_T("%size"), m_spDstFile->GetLength64());
+	dtTemp = m_spDstFile->GetLastWriteTime();
+	fmt.SetParam(_T("%datemod"), dtTemp.Format(LOCALE_NOUSEROVERRIDE, LANG_USER_DEFAULT));
 
 	m_ctlDstInfo.SetWindowText(fmt);
 }
 
 void CFeedbackReplaceDlg::RefreshImages()
 {
-	BOOST_ASSERT(m_pfiSrcFile && m_pfiDstFile);
-	if(!m_pfiSrcFile || !m_pfiDstFile)
+	BOOST_ASSERT(m_spSrcFile && m_spDstFile);
+	if(!m_spSrcFile || !m_spDstFile)
 		return;
 
 	SHFILEINFO shfi;
-	DWORD_PTR dwRes = SHGetFileInfo(m_pfiSrcFile->GetFullFilePath(), 0, &shfi, sizeof(shfi), SHGFI_ICON);
+	DWORD_PTR dwRes = SHGetFileInfo(m_spSrcFile->GetFullFilePath(), 0, &shfi, sizeof(shfi), SHGFI_ICON);
 	if(dwRes)
 		m_ctlSrcIcon.SetIcon(shfi.hIcon);
 
-	dwRes = SHGetFileInfo(m_pfiDstFile->GetFullFilePath(), 0, &shfi, sizeof(shfi), SHGFI_ICON);
+	dwRes = SHGetFileInfo(m_spDstFile->GetFullFilePath(), 0, &shfi, sizeof(shfi), SHGFI_ICON);
 	if(dwRes)
 		m_ctlDstIcon.SetIcon(shfi.hIcon);
 }
 
 void CFeedbackReplaceDlg::OnBnClickedReplaceButton()
 {
+	UpdateData(TRUE);
 	EndDialog(CFeedbackHandler::eResult_Overwrite);
 }
 
 void CFeedbackReplaceDlg::OnBnClickedCopyRestButton()
 {
+	UpdateData(TRUE);
 	EndDialog(CFeedbackHandler::eResult_CopyRest);
 }
 
 void CFeedbackReplaceDlg::OnBnClickedSkipButton()
 {
+	UpdateData(TRUE);
 	EndDialog(CFeedbackHandler::eResult_Skip);
 }
 
 void CFeedbackReplaceDlg::OnBnClickedPauseButton()
 {
+	UpdateData(TRUE);
 	EndDialog(CFeedbackHandler::eResult_Pause);
 }
 
 void CFeedbackReplaceDlg::OnBnClickedCancelButton()
 {
+	UpdateData(TRUE);
 	EndDialog(CFeedbackHandler::eResult_Cancel);
 }