Index: src/ch/CustomCopyDlg.cpp =================================================================== diff -u -r2d7bee54f998ae8f5d4145a2cf3f4a589253016f -rb193a95402f2bf4c456fb9d65d111caaf6994823 --- src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision 2d7bee54f998ae8f5d4145a2cf3f4a589253016f) +++ src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision b193a95402f2bf4c456fb9d65d111caaf6994823) @@ -17,16 +17,17 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ #include "stdafx.h" +#include #include "resource.h" -#include "FileInfo.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 +#include "../libicpf/file.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -222,7 +223,7 @@ m_ctlPriority.AddString(GetResManager().LoadString(IDS_PRIORITY0_STRING+stIndex)); } - m_ctlPriority.SetCurSel(PriorityToIndex(GetTaskPropValue(m_tTaskDefinition.GetConfiguration()))); + m_ctlPriority.SetCurSel(PriorityToIndex(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration()))); // fill buffer sizes listbox SetBuffersizesString(); @@ -277,15 +278,12 @@ lvc.cx=static_cast(0.1*rc.Width()); m_ctlFilters.InsertColumn(6, &lvc); - CFiltersArray afFilters; - GetTaskPropValue(m_tTaskDefinition.GetConfiguration(), afFilters); + m_bFilters = !m_tTaskDefinition.GetFilters().IsEmpty(); - m_bFilters = !afFilters.IsEmpty(); - // other custom flags - m_bIgnoreFolders = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - m_bForceDirectories = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - m_bOnlyCreate = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + m_bIgnoreFolders = chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + m_bForceDirectories = chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + m_bOnlyCreate = chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); m_bAdvanced = (m_bIgnoreFolders | m_bForceDirectories | m_bOnlyCreate); UpdateData(FALSE); @@ -378,11 +376,11 @@ m_ctlFilters.InsertColumn(6, &lvc); // refresh the entries in filters' list - CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + const chcore::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters(); m_ctlFilters.DeleteAllItems(); for(size_t stIndex = 0; stIndex < afFilters.GetSize(); ++stIndex) { - const CFileFilter* pFilter = afFilters.GetAt(stIndex); + const chcore::TFileFilter* pFilter = afFilters.GetAt(stIndex); if(pFilter) AddFilter(*pFilter, boost::numeric_cast(stIndex)); } @@ -486,11 +484,11 @@ m_tTaskDefinition.SetOperationType(m_ctlOperation.GetCurSel() == 0 ? chcore::eOperation_Copy: chcore::eOperation_Move); // priority - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), m_ctlPriority.GetCurSel()); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), IndexToPriority(m_ctlPriority.GetCurSel())); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), (m_bIgnoreFolders != 0)); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), (m_bForceDirectories != 0)); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), (m_bOnlyCreate != 0)); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), (m_bIgnoreFolders != 0)); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), (m_bForceDirectories != 0)); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), (m_bOnlyCreate != 0)); CLanguageDialog::OnOK(); } @@ -510,34 +508,34 @@ TCHAR szSize[64]; ictranslate::CFormat fmt; - BUFFERSIZES bsSizes; - bsSizes.m_bOnlyDefault = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - bsSizes.m_uiDefaultSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - bsSizes.m_uiOneDiskSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - bsSizes.m_uiTwoDisksSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - bsSizes.m_uiCDSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - bsSizes.m_uiLANSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + chcore::TBufferSizes bsSizes; + bsSizes.SetOnlyDefault(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + bsSizes.SetDefaultSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + bsSizes.SetOneDiskSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + bsSizes.SetTwoDisksSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + bsSizes.SetCDSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + bsSizes.SetLANSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); fmt.SetFormat(GetResManager().LoadString(IDS_BSEDEFAULT_STRING)); - fmt.SetParam(_t("%size"), GetSizeString(bsSizes.m_uiDefaultSize, szSize, 64, true)); + fmt.SetParam(_t("%size"), GetSizeString(bsSizes.GetDefaultSize(), szSize, 64, true)); m_ctlBufferSizes.AddString(fmt); - if (!bsSizes.m_bOnlyDefault) + if (!bsSizes.IsOnlyDefault()) { fmt.SetFormat(GetResManager().LoadString(IDS_BSEONEDISK_STRING)); - fmt.SetParam(_t("%size"), GetSizeString(bsSizes.m_uiOneDiskSize, szSize, 64, true)); + fmt.SetParam(_t("%size"), GetSizeString(bsSizes.GetOneDiskSize(), szSize, 64, true)); m_ctlBufferSizes.AddString(fmt); fmt.SetFormat(GetResManager().LoadString(IDS_BSETWODISKS_STRING)); - fmt.SetParam(_t("%size"), GetSizeString(bsSizes.m_uiTwoDisksSize, szSize, 64, true)); + fmt.SetParam(_t("%size"), GetSizeString(bsSizes.GetTwoDisksSize(), szSize, 64, true)); m_ctlBufferSizes.AddString(fmt); fmt.SetFormat(GetResManager().LoadString(IDS_BSECD_STRING)); - fmt.SetParam(_t("%size"), GetSizeString(bsSizes.m_uiCDSize, szSize, 64, true)); + fmt.SetParam(_t("%size"), GetSizeString(bsSizes.GetCDSize(), szSize, 64, true)); m_ctlBufferSizes.AddString(fmt); fmt.SetFormat(GetResManager().LoadString(IDS_BSELAN_STRING)); - fmt.SetParam(_t("%size"), GetSizeString(bsSizes.m_uiLANSize, szSize, 64, true)); + fmt.SetParam(_t("%size"), GetSizeString(bsSizes.GetLANSize(), szSize, 64, true)); m_ctlBufferSizes.AddString(fmt); } } @@ -546,21 +544,21 @@ { CBufferSizeDlg dlg; - dlg.m_bsSizes.m_bOnlyDefault = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - dlg.m_bsSizes.m_uiDefaultSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - dlg.m_bsSizes.m_uiOneDiskSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - dlg.m_bsSizes.m_uiTwoDisksSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - dlg.m_bsSizes.m_uiCDSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - dlg.m_bsSizes.m_uiLANSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + dlg.m_bsSizes.SetOnlyDefault(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + dlg.m_bsSizes.SetDefaultSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + dlg.m_bsSizes.SetOneDiskSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + dlg.m_bsSizes.SetTwoDisksSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + dlg.m_bsSizes.SetCDSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + dlg.m_bsSizes.SetLANSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); if(dlg.DoModal() == IDOK) { - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.m_bOnlyDefault); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.m_uiDefaultSize); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.m_uiOneDiskSize); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.m_uiTwoDisksSize); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.m_uiCDSize); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.m_uiLANSize); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.IsOnlyDefault()); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.GetDefaultSize()); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.GetOneDiskSize()); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.GetTwoDisksSize()); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.GetCDSize()); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.GetLANSize()); SetBuffersizesString(); } @@ -590,36 +588,34 @@ void CCustomCopyDlg::OnAddfilterButton() { CFilterDlg dlg; - CString strData; - CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + chcore::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters(); for (size_t i = 0; i < afFilters.GetSize(); i++) { - const CFileFilter* pFilter = afFilters.GetAt(i); + const chcore::TFileFilter* pFilter = afFilters.GetAt(i); BOOST_ASSERT(pFilter); if(pFilter) { - if(pFilter->m_bUseMask) - dlg.m_astrAddMask.Add(pFilter->GetCombinedMask(strData)); - if(pFilter->m_bUseExcludeMask) - dlg.m_astrAddExcludeMask.Add(pFilter->GetCombinedExcludeMask(strData)); + if(pFilter->GetUseMask()) + dlg.m_astrAddMask.Add(pFilter->GetCombinedMask()); + if(pFilter->GetUseExcludeMask()) + dlg.m_astrAddExcludeMask.Add(pFilter->GetCombinedExcludeMask()); } } if(dlg.DoModal() == IDOK) { - if(dlg.m_ffFilter.m_bUseMask || dlg.m_ffFilter.m_bUseExcludeMask || dlg.m_ffFilter.m_bUseSize || dlg.m_ffFilter.m_bUseDate || dlg.m_ffFilter.m_bUseAttributes) + if(dlg.m_ffFilter.GetUseMask() || dlg.m_ffFilter.GetUseExcludeMask() || dlg.m_ffFilter.GetUseSize1() || dlg.m_ffFilter.GetUseDateTime1() || dlg.m_ffFilter.GetUseAttributes()) { afFilters.Add(dlg.m_ffFilter); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), afFilters); AddFilter(dlg.m_ffFilter); } else MsgBox(IDS_EMPTYFILTER_STRING, MB_OK | MB_ICONINFORMATION); } } -void CCustomCopyDlg::AddFilter(const CFileFilter &rFilter, int iPos) +void CCustomCopyDlg::AddFilter(const chcore::TFileFilter &rFilter, int iPos) { LVITEM lvi; TCHAR szLoaded[1024]; @@ -631,10 +627,9 @@ ///////////////////// lvi.iSubItem=0; - if (rFilter.m_bUseMask) + if (rFilter.GetUseMask()) { - CString strData; - rFilter.GetCombinedMask(strData); + chcore::TString strData = rFilter.GetCombinedMask(); _tcscpy(szLoaded, strData); } else @@ -647,10 +642,9 @@ ///////////////////// lvi.iSubItem=1; - if (rFilter.m_bUseExcludeMask) + if (rFilter.GetUseExcludeMask()) { - CString strData; - rFilter.GetCombinedExcludeMask(strData); + chcore::TString strData = rFilter.GetCombinedExcludeMask(); _tcscpy(szLoaded, strData); } else @@ -663,15 +657,15 @@ ///////////////// lvi.iSubItem=2; - if (rFilter.m_bUseSize) + if (rFilter.GetUseSize1()) { - _sntprintf(szLoaded, 1024, _T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.m_iSizeType1), GetSizeString(rFilter.m_ullSize1, szData, 64, true)); + _sntprintf(szLoaded, 1024, _T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType1()), GetSizeString(rFilter.GetSize1(), szData, 64, true)); szLoaded[1023] = _T('\0'); - if (rFilter.m_bUseSize2) + if (rFilter.GetUseSize2()) { _tcscat(szLoaded, GetResManager().LoadString(IDS_AND_STRING)); CString strLoaded2; - strLoaded2.Format(_T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.m_iSizeType2), GetSizeString(rFilter.m_ullSize2, szData, 64, true)); + strLoaded2.Format(_T("%s %s"), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetSizeType2()), GetSizeString(rFilter.GetSize2(), szData, 64, true)); _tcscat(szLoaded, strLoaded2); } } @@ -685,23 +679,20 @@ /////////////////// lvi.iSubItem=3; - if (rFilter.m_bUseDate) + if (rFilter.GetUseDateTime1()) { - _sntprintf(szLoaded, 1024, _T("%s %s"), GetResManager().LoadString(IDS_DATECREATED_STRING+rFilter.m_iDateType), GetResManager().LoadString(IDS_LT_STRING+rFilter.m_iDateType1)); + _sntprintf(szLoaded, 1024, _T("%s %s"), GetResManager().LoadString(IDS_DATECREATED_STRING+rFilter.GetDateType()), GetResManager().LoadString(IDS_LT_STRING+rFilter.GetDateCmpType1())); szLoaded[1023] = _T('\0'); - if (rFilter.m_bDate1) - _tcscat(szLoaded, rFilter.m_tDate1.Format(_T(" %x"))); - if (rFilter.m_bTime1) - _tcscat(szLoaded, rFilter.m_tTime1.Format(_T(" %X"))); + chcore::TString strFmtDateTime = rFilter.GetDateTime1().Format(rFilter.GetUseDate1(), rFilter.GetUseTime1()); + _tcscat(szLoaded, (PCTSTR)strFmtDateTime); - if (rFilter.m_bUseDate2) + if (rFilter.GetUseDateTime2()) { _tcscat(szLoaded, GetResManager().LoadString(IDS_AND_STRING)); - _tcscat(szLoaded, GetResManager().LoadString(IDS_LT_STRING+rFilter.m_iDateType2)); - if (rFilter.m_bDate2) - _tcscat(szLoaded, rFilter.m_tDate2.Format(_T(" %x"))); - if (rFilter.m_bTime2) - _tcscat(szLoaded, rFilter.m_tTime2.Format(_T(" %X"))); + _tcscat(szLoaded, GetResManager().LoadString(IDS_LT_STRING + rFilter.GetDateCmpType2())); + + strFmtDateTime = rFilter.GetDateTime2().Format(rFilter.GetUseDate2(), rFilter.GetUseTime2()); + _tcscat(szLoaded, (PCTSTR)strFmtDateTime); } } else @@ -714,21 +705,21 @@ ///////////////////// lvi.iSubItem=4; szLoaded[0]=_T('\0'); - if (rFilter.m_bUseAttributes) + if(rFilter.GetUseAttributes()) { - if (rFilter.m_iArchive == 1) + if(rFilter.GetArchive() == 1) _tcscat(szLoaded, _T("A")); - if (rFilter.m_iReadOnly == 1) + if(rFilter.GetReadOnly() == 1) _tcscat(szLoaded, _T("R")); - if (rFilter.m_iHidden == 1) + if(rFilter.GetHidden() == 1) _tcscat(szLoaded, _T("H")); - if (rFilter.m_iSystem == 1) + if(rFilter.GetSystem() == 1) _tcscat(szLoaded, _T("S")); - if (rFilter.m_iDirectory == 1) + if(rFilter.GetDirectory() == 1) _tcscat(szLoaded, _T("D")); } - if (!rFilter.m_bUseAttributes || szLoaded[0] == _T('\0')) + if (!rFilter.GetUseAttributes() || szLoaded[0] == _T('\0')) _tcscpy(szLoaded, GetResManager().LoadString(IDS_FILTERATTRIB_STRING)); lvi.pszText=szLoaded; @@ -738,21 +729,21 @@ ///////////////////// lvi.iSubItem=5; szLoaded[0]=_T('\0'); - if (rFilter.m_bUseAttributes) + if(rFilter.GetUseAttributes()) { - if (rFilter.m_iArchive == 0) + if(rFilter.GetArchive() == 0) _tcscat(szLoaded, _T("A")); - if (rFilter.m_iReadOnly == 0) + if(rFilter.GetReadOnly() == 0) _tcscat(szLoaded, _T("R")); - if (rFilter.m_iHidden == 0) + if(rFilter.GetHidden() == 0) _tcscat(szLoaded, _T("H")); - if (rFilter.m_iSystem == 0) + if(rFilter.GetSystem() == 0) _tcscat(szLoaded, _T("S")); - if (rFilter.m_iDirectory == 0) + if(rFilter.GetDirectory() == 0) _tcscat(szLoaded, _T("D")); } - if (!rFilter.m_bUseAttributes || szLoaded[0] == _T('0')) + if(!rFilter.GetUseAttributes() || szLoaded[0] == _T('0')) _tcscpy(szLoaded, GetResManager().LoadString(IDS_FILTERATTRIB_STRING)); lvi.pszText=szLoaded; @@ -762,7 +753,7 @@ void CCustomCopyDlg::OnRemovefilterButton() { - CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + chcore::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters(); POSITION pos; int iItem; @@ -776,8 +767,6 @@ iItem=m_ctlFilters.GetNextSelectedItem(pos); m_ctlFilters.DeleteItem(iItem); afFilters.RemoveAt(iItem); - - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), afFilters); } } } @@ -823,26 +812,25 @@ POSITION pos = m_ctlFilters.GetFirstSelectedItemPosition(); if(pos != NULL) { - CFiltersArray afFilters = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + chcore::TFileFiltersArray& afFilters = m_tTaskDefinition.GetFilters(); int iItem = m_ctlFilters.GetNextSelectedItem(pos); CFilterDlg dlg; - const CFileFilter* pFilter = afFilters.GetAt(iItem); + const chcore::TFileFilter* pFilter = afFilters.GetAt(iItem); BOOST_ASSERT(pFilter); if(pFilter) dlg.m_ffFilter = *pFilter; - CString strData; for(size_t stIndex = 0; stIndex < afFilters.GetSize(); ++stIndex) { pFilter = afFilters.GetAt(stIndex); BOOST_ASSERT(pFilter); if(pFilter) { - if(pFilter->m_bUseMask && boost::numeric_cast(stIndex) != iItem) - dlg.m_astrAddMask.Add(pFilter->GetCombinedMask(strData)); - if (pFilter->m_bUseExcludeMask && boost::numeric_cast(stIndex) != iItem) - dlg.m_astrAddExcludeMask.Add(pFilter->GetCombinedExcludeMask(strData)); + if(pFilter->GetUseMask() && boost::numeric_cast(stIndex) != iItem) + dlg.m_astrAddMask.Add(pFilter->GetCombinedMask()); + if (pFilter->GetUseExcludeMask() && boost::numeric_cast(stIndex) != iItem) + dlg.m_astrAddExcludeMask.Add(pFilter->GetCombinedExcludeMask()); } } @@ -853,11 +841,10 @@ //m_ccData.m_afFilters.RemoveAt(iItem); // insert new if needed - if (dlg.m_ffFilter.m_bUseMask || dlg.m_ffFilter.m_bUseExcludeMask || dlg.m_ffFilter.m_bUseSize - || dlg.m_ffFilter.m_bUseDate || dlg.m_ffFilter.m_bUseAttributes) + if (dlg.m_ffFilter.GetUseMask() || dlg.m_ffFilter.GetUseExcludeMask() || dlg.m_ffFilter.GetUseSize1() + || dlg.m_ffFilter.GetUseDateTime1() || dlg.m_ffFilter.GetUseAttributes()) { afFilters.SetAt(iItem, dlg.m_ffFilter); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), afFilters); AddFilter(dlg.m_ffFilter, iItem); } } @@ -873,22 +860,22 @@ { CBufferSizeDlg dlg; - dlg.m_bsSizes.m_bOnlyDefault = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - dlg.m_bsSizes.m_uiDefaultSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - dlg.m_bsSizes.m_uiOneDiskSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - dlg.m_bsSizes.m_uiTwoDisksSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - dlg.m_bsSizes.m_uiCDSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); - dlg.m_bsSizes.m_uiLANSize = GetTaskPropValue(m_tTaskDefinition.GetConfiguration()); + dlg.m_bsSizes.SetOnlyDefault(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + dlg.m_bsSizes.SetDefaultSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + dlg.m_bsSizes.SetOneDiskSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + dlg.m_bsSizes.SetTwoDisksSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + dlg.m_bsSizes.SetCDSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); + dlg.m_bsSizes.SetLANSize(chcore::GetTaskPropValue(m_tTaskDefinition.GetConfiguration())); dlg.m_iActiveIndex = iItem; if(dlg.DoModal() == IDOK) { - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.m_bOnlyDefault); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.m_uiDefaultSize); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.m_uiOneDiskSize); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.m_uiTwoDisksSize); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.m_uiCDSize); - SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.m_uiLANSize); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.IsOnlyDefault()); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.GetDefaultSize()); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.GetOneDiskSize()); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.GetTwoDisksSize()); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.GetCDSize()); + chcore::SetTaskPropValue(m_tTaskDefinition.GetConfiguration(), dlg.m_bsSizes.GetLANSize()); SetBuffersizesString(); }