Index: src/ch/CustomCopyDlg.cpp
===================================================================
diff -u -rad5d0d4f8d4cf517fd3ebfc13e876d08c8cb9f62 -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1
--- src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision ad5d0d4f8d4cf517fd3ebfc13e876d08c8cb9f62)
+++ src/ch/CustomCopyDlg.cpp	(.../CustomCopyDlg.cpp)	(revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1)
@@ -28,6 +28,7 @@
 #include "StringHelpers.h"
 #include "ch.h"
 #include "../libchcore/TTaskConfigBufferSizes.h"
+#include "CfgProperties.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -40,13 +41,13 @@
 
 
 CCustomCopyDlg::CCustomCopyDlg() :
-	ictranslate::CLanguageDialog(CCustomCopyDlg::IDD)
+	ictranslate::CLanguageDialog(IDD_CUSTOM_COPY_DIALOG)
 {
 	GetConfig().ExtractSubConfig(BRANCH_TASK_SETTINGS, m_tTaskDefinition.GetConfiguration());
 }
 
 CCustomCopyDlg::CCustomCopyDlg(const chcore::TTaskDefinition& rTaskDefinition) :
-	ictranslate::CLanguageDialog(CCustomCopyDlg::IDD),
+	ictranslate::CLanguageDialog(IDD_CUSTOM_COPY_DIALOG),
 	m_tTaskDefinition(rTaskDefinition)
 {
 }
@@ -99,6 +100,10 @@
 {
 	CLanguageDialog::OnInitDialog();
 
+	// set dialog icon
+	HICON hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	SetIcon(hIcon, FALSE);
+
 	AddResizableControl(IDC_001_STATIC, 0.0, 0.0, 1.0, 0.0);
 	AddResizableControl(IDC_FILES_LIST, 0.0, 0.0, 1.0, 0.5);
 	AddResizableControl(IDC_ADDFILE_BUTTON, 1.0, 0.0, 0.0, 0.0);
@@ -383,7 +388,7 @@
 
 void CCustomCopyDlg::OnAddFilesButton() 
 {
-	CFileDialog dlg(TRUE, NULL, NULL, OFN_ALLOWMULTISELECT | OFN_ENABLESIZING | OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_NODEREFERENCELINKS | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, GetResManager().LoadString(IDS_FILEDLGALLFILTER_STRING), this);
+	CFileDialog dlg(TRUE, nullptr, nullptr, OFN_ALLOWMULTISELECT | OFN_ENABLESIZING | OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_NODEREFERENCELINKS | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, GetResManager().LoadString(IDS_FILEDLGALLFILTER_STRING), this);
 	
 	TCHAR *pszBuffer = new TCHAR[65535];
 	memset(pszBuffer, 0, 65535*sizeof(TCHAR));
@@ -424,7 +429,7 @@
 	while (true)
 	{
 		pos = m_ctlFiles.GetFirstSelectedItemPosition();
-		if (pos == NULL)
+		if (pos == nullptr)
 			break;
 		else
 		{
@@ -604,11 +609,11 @@
 	
 	if (rFilter.GetUseSize1())
 	{
-		strLoaded.Format(_T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType1()), GetSizeString(rFilter.GetSize1(), true));
+		strLoaded.Format(_T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType1()), (PCTSTR)GetSizeString(rFilter.GetSize1(), true));
 		if (rFilter.GetUseSize2())
 		{
 			strLoaded += GetResManager().LoadString(IDS_AND_STRING);
-			strLoaded.AppendFormat(_T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType2()), GetSizeString(rFilter.GetSize2(), true));
+			strLoaded.AppendFormat(_T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType2()), (PCTSTR)GetSizeString(rFilter.GetSize2(), true));
 		}
 	}
 	else
@@ -702,7 +707,7 @@
 	while(true)
 	{
 		pos=m_ctlFilters.GetFirstSelectedItemPosition();
-		if (pos == NULL)
+		if (pos == nullptr)
 			break;
 		else
 		{
@@ -715,7 +720,7 @@
 
 void CCustomCopyDlg::OnDestroy() 
 {
-	m_ctlFiles.SetImageList(NULL, LVSIL_SMALL);
+	m_ctlFiles.SetImageList(nullptr, LVSIL_SMALL);
 	m_ilImages.Detach();
 
 	CLanguageDialog::OnDestroy();
@@ -752,7 +757,7 @@
 void CCustomCopyDlg::OnDblclkFiltersList(NMHDR* /*pNMHDR*/, LRESULT* pResult) 
 {
 	POSITION pos = m_ctlFilters.GetFirstSelectedItemPosition();
-	if(pos != NULL)
+	if(pos != nullptr)
 	{
 		chcore::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters();
 
@@ -863,7 +868,7 @@
 {
 	boost::shared_array<BYTE> spBuffer;
 
-	CFileDialog dlg(TRUE, NULL, NULL, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, GetResManager().LoadString(IDS_FLTALLFILTER_STRING));
+	CFileDialog dlg(TRUE, nullptr, nullptr, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, GetResManager().LoadString(IDS_FLTALLFILTER_STRING));
 	if(dlg.DoModal() == IDOK)
 	{
 		unsigned long ulSize = 0;