Index: src/ch/CustomCopyDlg.cpp =================================================================== diff -u -r4797e4b6b266900bfdcdf4ca6eda47c216ad9db1 -r3d5880c6661c3ed500e0c1c739a923ae9ede0364 --- src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision 4797e4b6b266900bfdcdf4ca6eda47c216ad9db1) +++ src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision 3d5880c6661c3ed500e0c1c739a923ae9ede0364) @@ -19,16 +19,16 @@ #include "stdafx.h" #include #include "resource.h" -#include "../libchcore/TFileInfo.h" #include "CustomCopyDlg.h" #include "structs.h" #include "dialogs.h" #include "BufferSizeDlg.h" #include "FilterDlg.h" #include "StringHelpers.h" #include "ch.h" -#include "../libchcore/TTaskConfigBufferSizes.h" #include "CfgProperties.h" +#include "../libchengine/TTaskDefinition.h" +#include "../libchengine/TTaskConfigBufferSizes.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -46,7 +46,7 @@ GetConfig().ExtractSubConfig(BRANCH_TASK_SETTINGS, m_tTaskDefinition.GetConfiguration()); } -CCustomCopyDlg::CCustomCopyDlg(const chcore::TTaskDefinition& rTaskDefinition) : +CCustomCopyDlg::CCustomCopyDlg(const chengine::TTaskDefinition& rTaskDefinition) : ictranslate::CLanguageDialog(IDD_CUSTOM_COPY_DIALOG), m_tTaskDefinition(rTaskDefinition) { @@ -211,15 +211,15 @@ m_ctlOperation.AddString(GetResManager().LoadString(IDS_CCDMOVE_STRING)); // copying/moving - m_ctlOperation.SetCurSel(m_tTaskDefinition.GetOperationType() == chcore::eOperation_Move ? 1 : 0); + m_ctlOperation.SetCurSel(m_tTaskDefinition.GetOperationType() == chengine::eOperation_Move ? 1 : 0); // fill priority combo for (int stIndex=0;stIndex<7;stIndex++) { m_ctlPriority.AddString(GetResManager().LoadString(IDS_PRIORITY0_STRING+stIndex)); } - m_ctlPriority.SetCurSel(PriorityToIndex(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration()))); + m_ctlPriority.SetCurSel(PriorityToIndex(chengine::GetTaskPropValue(m_tTaskDefinition.GetConfiguration()))); // fill buffer sizes listbox SetBuffersizesString(); @@ -277,9 +277,9 @@ m_bFilters = !m_tTaskDefinition.GetFilters().IsEmpty(); // other custom flags - m_bIgnoreFolders = chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - m_bForceDirectories = chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - m_bOnlyCreate = chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + m_bIgnoreFolders = chengine::GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + m_bForceDirectories = chengine::GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + m_bOnlyCreate = chengine::GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); m_bAdvanced = (m_bIgnoreFolders | m_bForceDirectories | m_bOnlyCreate); UpdateData(FALSE); @@ -369,13 +369,12 @@ m_ctlFilters.InsertColumn(6, &lvc); // refresh the entries in filters' list - const chcore::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters(); + const chengine::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters(); m_ctlFilters.DeleteAllItems(); - for(size_t stIndex = 0; stIndex < afFilters.GetSize(); ++stIndex) + for(size_t stIndex = 0; stIndex < afFilters.GetCount(); ++stIndex) { - const chcore::TFileFilter* pFilter = afFilters.GetAt(stIndex); - if(pFilter) - AddFilter(*pFilter, boost::numeric_cast(stIndex)); + const chengine::TFileFilter& rFilter = afFilters.GetAt(stIndex); + AddFilter(rFilter, boost::numeric_cast(stIndex)); } } @@ -424,18 +423,14 @@ void CCustomCopyDlg::OnRemoveButton() { - POSITION pos; - int iItem; while (true) { - pos = m_ctlFiles.GetFirstSelectedItemPosition(); + POSITION pos = m_ctlFiles.GetFirstSelectedItemPosition(); if (pos == nullptr) break; - else - { - iItem=m_ctlFiles.GetNextSelectedItem(pos); - m_ctlFiles.DeleteItem(iItem); - } + + int iItem = m_ctlFiles.GetNextSelectedItem(pos); + m_ctlFiles.DeleteItem(iItem); } } @@ -477,35 +472,35 @@ // fill the list ictranslate::CFormat fmt; - chcore::TBufferSizes bsSizes = chcore::GetTaskPropBufferSizes(m_tTaskDefinition.GetConfiguration()); + chengine::TBufferSizes bsSizes = GetTaskPropBufferSizes(m_tTaskDefinition.GetConfiguration()); fmt.SetFormat(GetResManager().LoadString(IDS_BSEDEFAULT_STRING)); fmt.SetParam(_T("%size"), GetSizeString(bsSizes.GetDefaultSize(), true)); - m_ctlBufferSizes.AddString(fmt); + m_ctlBufferSizes.AddString(fmt.ToString()); if (!bsSizes.IsOnlyDefault()) { fmt.SetFormat(GetResManager().LoadString(IDS_BSEONEDISK_STRING)); fmt.SetParam(_T("%size"), GetSizeString(bsSizes.GetOneDiskSize(), true)); - m_ctlBufferSizes.AddString(fmt); + m_ctlBufferSizes.AddString(fmt.ToString()); fmt.SetFormat(GetResManager().LoadString(IDS_BSETWODISKS_STRING)); fmt.SetParam(_T("%size"), GetSizeString(bsSizes.GetTwoDisksSize(), true)); - m_ctlBufferSizes.AddString(fmt); + m_ctlBufferSizes.AddString(fmt.ToString()); fmt.SetFormat(GetResManager().LoadString(IDS_BSECD_STRING)); fmt.SetParam(_T("%size"), GetSizeString(bsSizes.GetCDSize(), true)); - m_ctlBufferSizes.AddString(fmt); + m_ctlBufferSizes.AddString(fmt.ToString()); fmt.SetFormat(GetResManager().LoadString(IDS_BSELAN_STRING)); fmt.SetParam(_T("%size"), GetSizeString(bsSizes.GetLANSize(), true)); - m_ctlBufferSizes.AddString(fmt); + m_ctlBufferSizes.AddString(fmt.ToString()); } } void CCustomCopyDlg::OnChangebufferButton() { - chcore::TBufferSizes tBufferSizes = GetTaskPropBufferSizes(m_tTaskDefinition.GetConfiguration()); + chengine::TBufferSizes tBufferSizes = GetTaskPropBufferSizes(m_tTaskDefinition.GetConfiguration()); CBufferSizeDlg dlg(&tBufferSizes); if(dlg.DoModal() == IDOK) @@ -540,18 +535,14 @@ { CFilterDlg dlg; - chcore::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters(); - for (size_t i = 0; i < afFilters.GetSize(); i++) + chengine::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters(); + for (size_t i = 0; i < afFilters.GetCount(); i++) { - const chcore::TFileFilter* pFilter = afFilters.GetAt(i); - BOOST_ASSERT(pFilter); - if(pFilter) - { - if(pFilter->GetUseMask()) - dlg.m_astrAddMask.Add(pFilter->GetCombinedMask().c_str()); - if(pFilter->GetUseExcludeMask()) - dlg.m_astrAddExcludeMask.Add(pFilter->GetCombinedExcludeMask().c_str()); - } + const chengine::TFileFilter& rFilter = afFilters.GetAt(i); + if(rFilter.GetUseMask()) + dlg.m_astrAddMask.Add(rFilter.GetCombinedMask().c_str()); + if(rFilter.GetUseExcludeMask()) + dlg.m_astrAddExcludeMask.Add(rFilter.GetCombinedExcludeMask().c_str()); } if(dlg.DoModal() == IDOK) @@ -566,7 +557,7 @@ } } -void CCustomCopyDlg::AddFilter(const chcore::TFileFilter &rFilter, int iPos) +void CCustomCopyDlg::AddFilter(const chengine::TFileFilter &rFilter, int iPos) { LVITEM lvi; CString strLoaded; @@ -579,7 +570,7 @@ if (rFilter.GetUseMask()) { - chcore::TString strData = rFilter.GetCombinedMask(); + string::TString strData = rFilter.GetCombinedMask(); strLoaded = strData.c_str(); } else @@ -594,7 +585,7 @@ if(rFilter.GetUseExcludeMask()) { - chcore::TString strData = rFilter.GetCombinedExcludeMask(); + string::TString strData = rFilter.GetCombinedExcludeMask(); strLoaded = strData.c_str(); } else @@ -630,7 +621,7 @@ { strLoaded.Format(_T("%s %s"), GetResManager().LoadString(IDS_DATECREATED_STRING+rFilter.GetDateType()), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetDateCmpType1())); - chcore::TString strFmtDateTime = rFilter.GetDateTime1().Format(rFilter.GetUseDate1(), rFilter.GetUseTime1()); + string::TString strFmtDateTime = rFilter.GetDateTime1().Format(rFilter.GetUseDate1(), rFilter.GetUseTime1()); strLoaded += strFmtDateTime.c_str(); if (rFilter.GetUseDateTime2()) @@ -700,21 +691,17 @@ void CCustomCopyDlg::OnRemovefilterButton() { - chcore::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters(); + chengine::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters(); - POSITION pos; - int iItem; while(true) { - pos=m_ctlFilters.GetFirstSelectedItemPosition(); + POSITION pos = m_ctlFilters.GetFirstSelectedItemPosition(); if (pos == nullptr) break; - else - { - iItem=m_ctlFilters.GetNextSelectedItem(pos); - m_ctlFilters.DeleteItem(iItem); - afFilters.RemoveAt(iItem); - } + + int iItem = m_ctlFilters.GetNextSelectedItem(pos); + m_ctlFilters.DeleteItem(iItem); + afFilters.RemoveAt(iItem); } } @@ -759,26 +746,20 @@ POSITION pos = m_ctlFilters.GetFirstSelectedItemPosition(); if(pos != nullptr) { - chcore::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters(); + chengine::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters(); int iItem = m_ctlFilters.GetNextSelectedItem(pos); CFilterDlg dlg; - const chcore::TFileFilter* pFilter = afFilters.GetAt(iItem); - BOOST_ASSERT(pFilter); - if(pFilter) - dlg.m_ffFilter = *pFilter; + const chengine::TFileFilter& rFilter = afFilters.GetAt(iItem); + dlg.m_ffFilter = rFilter; - for(size_t stIndex = 0; stIndex < afFilters.GetSize(); ++stIndex) + for(size_t stIndex = 0; stIndex < afFilters.GetCount(); ++stIndex) { - pFilter = afFilters.GetAt(stIndex); - BOOST_ASSERT(pFilter); - if(pFilter) - { - if(pFilter->GetUseMask() && boost::numeric_cast(stIndex) != iItem) - dlg.m_astrAddMask.Add(pFilter->GetCombinedMask().c_str()); - if (pFilter->GetUseExcludeMask() && boost::numeric_cast(stIndex) != iItem) - dlg.m_astrAddExcludeMask.Add(pFilter->GetCombinedExcludeMask().c_str()); - } + const chengine::TFileFilter& rLoopFilter = afFilters.GetAt(stIndex); + if(rLoopFilter.GetUseMask() && boost::numeric_cast(stIndex) != iItem) + dlg.m_astrAddMask.Add(rLoopFilter.GetCombinedMask().c_str()); + if (rLoopFilter.GetUseExcludeMask() && boost::numeric_cast(stIndex) != iItem) + dlg.m_astrAddExcludeMask.Add(rLoopFilter.GetCombinedExcludeMask().c_str()); } if (dlg.DoModal() == IDOK) @@ -805,8 +786,8 @@ int iItem = m_ctlBufferSizes.GetCurSel(); if(iItem != LB_ERR) { - chcore::TBufferSizes tBufferSizes = GetTaskPropBufferSizes(m_tTaskDefinition.GetConfiguration()); - CBufferSizeDlg dlg(&tBufferSizes, (chcore::TBufferSizes::EBufferType)iItem); + chengine::TBufferSizes tBufferSizes = GetTaskPropBufferSizes(m_tTaskDefinition.GetConfiguration()); + CBufferSizeDlg dlg(&tBufferSizes, (chengine::TBufferSizes::EBufferType)iItem); if(dlg.DoModal() == IDOK) { @@ -949,7 +930,7 @@ // report ictranslate::CFormat fmt(GetResManager().LoadString(IDS_IMPORTREPORT_STRING)); fmt.SetParam(_T("%count"), uiCount); - AfxMessageBox(fmt); + AfxMessageBox(fmt.ToString()); } } @@ -998,7 +979,7 @@ fmt.SetFormat(GetResManager().LoadString(IDS_EXPORTING_TASK_FAILED)); fmt.SetParam(_T("%reason"), strError); - AfxMessageBox(fmt, MB_OK | MB_ICONERROR); + AfxMessageBox(fmt.ToString(), MB_OK | MB_ICONERROR); } } } @@ -1020,14 +1001,14 @@ } // operation type - m_tTaskDefinition.SetOperationType(m_ctlOperation.GetCurSel() == 0 ? chcore::eOperation_Copy : chcore::eOperation_Move); + m_tTaskDefinition.SetOperationType(m_ctlOperation.GetCurSel() == 0 ? chengine::eOperation_Copy : chengine::eOperation_Move); // priority - chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), IndexToPriority(m_ctlPriority.GetCurSel())); + chengine::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), IndexToPriority(m_ctlPriority.GetCurSel())); - chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), (m_bIgnoreFolders != 0)); - chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), (m_bForceDirectories != 0)); - chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), (m_bOnlyCreate != 0)); + chengine::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), (m_bIgnoreFolders != 0)); + chengine::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), (m_bForceDirectories != 0)); + chengine::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), (m_bOnlyCreate != 0)); } bool CCustomCopyDlg::HasBasicTaskData()