Index: src/ch/BufferSizeDlg.cpp =================================================================== diff -u -rd5c3edd0d167db9b5d47d04248820fda49499a5e -r3921d82d9605d98b2281f3f42d9f9c8385b89a3e --- src/ch/BufferSizeDlg.cpp (.../BufferSizeDlg.cpp) (revision d5c3edd0d167db9b5d47d04248820fda49499a5e) +++ src/ch/BufferSizeDlg.cpp (.../BufferSizeDlg.cpp) (revision 3921d82d9605d98b2281f3f42d9f9c8385b89a3e) @@ -30,42 +30,38 @@ ///////////////////////////////////////////////////////////////////////////// // CBufferSizeDlg dialog -CBufferSizeDlg::CBufferSizeDlg() - : ictranslate::CLanguageDialog(CBufferSizeDlg::IDD) +CBufferSizeDlg::CBufferSizeDlg(chengine::TBufferSizes* pInitialBufferSizes, chengine::TBufferSizes::EBufferType eSelectedBuffer) : + ictranslate::CLanguageDialog(IDD_BUFFERSIZE_DIALOG), + m_eSelectedBuffer(eSelectedBuffer) { - //{{AFX_DATA_INIT(CBufferSizeDlg) - m_uiDefaultSize = 0; - m_uiLANSize = 0; - m_uiCDROMSize = 0; - m_uiOneDiskSize = 0; - m_uiTwoDisksSize = 0; - m_bOnlyDefaultCheck = FALSE; - //}}AFX_DATA_INIT - m_iActiveIndex=BI_DEFAULT; + if (pInitialBufferSizes) + m_bsSizes = *pInitialBufferSizes; } void CBufferSizeDlg::DoDataExchange(CDataExchange* pDX) { CLanguageDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(CBufferSizeDlg) + DDX_Control(pDX, IDC_TWODISKSMULTIPLIER_COMBO, m_ctlTwoDisksMulti); DDX_Control(pDX, IDC_ONEDISKMULTIPLIER_COMBO, m_ctlOneDiskMulti); DDX_Control(pDX, IDC_LANMULTIPLIER_COMBO, m_ctlLANMulti); DDX_Control(pDX, IDC_DEFAULTMULTIPLIER_COMBO, m_ctlDefaultMulti); DDX_Control(pDX, IDC_CDROMMULTIPLIER_COMBO, m_ctlCDROMMulti); + DDX_Control(pDX, IDC_BUFFERCOUNT_SPIN, m_ctlBufferCountSpin); DDX_Text(pDX, IDC_DEFAULTSIZE_EDIT, m_uiDefaultSize); DDX_Text(pDX, IDC_LANSIZE_EDIT, m_uiLANSize); DDX_Text(pDX, IDC_CDROMSIZE_EDIT, m_uiCDROMSize); DDX_Text(pDX, IDC_ONEDISKSIZE_EDIT, m_uiOneDiskSize); DDX_Text(pDX, IDC_TWODISKSSIZE_EDIT, m_uiTwoDisksSize); DDX_Check(pDX, IDC_ONLYDEFAULT_CHECK, m_bOnlyDefaultCheck); - //}}AFX_DATA_MAP + DDX_Text(pDX, IDC_BUFFERCOUNT_EDIT, m_uiBufferCount); + DDX_Text(pDX, IDC_MAXREADAHEAD_EDIT, m_uiMaxReadAhead); + DDX_Text(pDX, IDC_MAXCONCURRENTREADS_EDIT, m_uiMaxConcurrentReads); + DDX_Text(pDX, IDC_MAXCONCURRENTWRITES_EDIT, m_uiMaxConcurrentWrites); } BEGIN_MESSAGE_MAP(CBufferSizeDlg,ictranslate::CLanguageDialog) - //{{AFX_MSG_MAP(CBufferSizeDlg) ON_BN_CLICKED(IDC_ONLYDEFAULT_CHECK, OnOnlydefaultCheck) - //}}AFX_MSG_MAP END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// @@ -76,61 +72,71 @@ CLanguageDialog::OnInitDialog(); // set all the combos - m_ctlDefaultMulti.AddString(GetResManager()->LoadString(IDS_BYTE_STRING)); - m_ctlDefaultMulti.AddString(GetResManager()->LoadString(IDS_KBYTE_STRING)); - m_ctlDefaultMulti.AddString(GetResManager()->LoadString(IDS_MBYTE_STRING)); + m_ctlDefaultMulti.AddString(GetResManager().LoadString(IDS_BYTE_STRING)); + m_ctlDefaultMulti.AddString(GetResManager().LoadString(IDS_KBYTE_STRING)); + m_ctlDefaultMulti.AddString(GetResManager().LoadString(IDS_MBYTE_STRING)); - m_ctlOneDiskMulti.AddString(GetResManager()->LoadString(IDS_BYTE_STRING)); - m_ctlOneDiskMulti.AddString(GetResManager()->LoadString(IDS_KBYTE_STRING)); - m_ctlOneDiskMulti.AddString(GetResManager()->LoadString(IDS_MBYTE_STRING)); + m_ctlOneDiskMulti.AddString(GetResManager().LoadString(IDS_BYTE_STRING)); + m_ctlOneDiskMulti.AddString(GetResManager().LoadString(IDS_KBYTE_STRING)); + m_ctlOneDiskMulti.AddString(GetResManager().LoadString(IDS_MBYTE_STRING)); - m_ctlTwoDisksMulti.AddString(GetResManager()->LoadString(IDS_BYTE_STRING)); - m_ctlTwoDisksMulti.AddString(GetResManager()->LoadString(IDS_KBYTE_STRING)); - m_ctlTwoDisksMulti.AddString(GetResManager()->LoadString(IDS_MBYTE_STRING)); + m_ctlTwoDisksMulti.AddString(GetResManager().LoadString(IDS_BYTE_STRING)); + m_ctlTwoDisksMulti.AddString(GetResManager().LoadString(IDS_KBYTE_STRING)); + m_ctlTwoDisksMulti.AddString(GetResManager().LoadString(IDS_MBYTE_STRING)); - m_ctlCDROMMulti.AddString(GetResManager()->LoadString(IDS_BYTE_STRING)); - m_ctlCDROMMulti.AddString(GetResManager()->LoadString(IDS_KBYTE_STRING)); - m_ctlCDROMMulti.AddString(GetResManager()->LoadString(IDS_MBYTE_STRING)); + m_ctlCDROMMulti.AddString(GetResManager().LoadString(IDS_BYTE_STRING)); + m_ctlCDROMMulti.AddString(GetResManager().LoadString(IDS_KBYTE_STRING)); + m_ctlCDROMMulti.AddString(GetResManager().LoadString(IDS_MBYTE_STRING)); - m_ctlLANMulti.AddString(GetResManager()->LoadString(IDS_BYTE_STRING)); - m_ctlLANMulti.AddString(GetResManager()->LoadString(IDS_KBYTE_STRING)); - m_ctlLANMulti.AddString(GetResManager()->LoadString(IDS_MBYTE_STRING)); + m_ctlLANMulti.AddString(GetResManager().LoadString(IDS_BYTE_STRING)); + m_ctlLANMulti.AddString(GetResManager().LoadString(IDS_KBYTE_STRING)); + m_ctlLANMulti.AddString(GetResManager().LoadString(IDS_MBYTE_STRING)); // fill edit controls and set multipliers - SetDefaultSize(m_bsSizes.m_uiDefaultSize); - SetOneDiskSize(m_bsSizes.m_uiOneDiskSize); - SetTwoDisksSize(m_bsSizes.m_uiTwoDisksSize); - SetCDSize(m_bsSizes.m_uiCDSize); - SetLANSize(m_bsSizes.m_uiLANSize); - m_bOnlyDefaultCheck=m_bsSizes.m_bOnlyDefault; + SetDefaultSize(m_bsSizes.GetDefaultSize()); + SetOneDiskSize(m_bsSizes.GetOneDiskSize()); + SetTwoDisksSize(m_bsSizes.GetTwoDisksSize()); + SetCDSize(m_bsSizes.GetCDSize()); + SetLANSize(m_bsSizes.GetLANSize()); + m_uiBufferCount = m_bsSizes.GetBufferCount(); + m_bOnlyDefaultCheck=m_bsSizes.IsOnlyDefault(); + m_uiMaxReadAhead = m_bsSizes.GetMaxReadAheadBuffers(); + m_uiMaxConcurrentReads = m_bsSizes.GetMaxConcurrentReads(); + m_uiMaxConcurrentWrites = m_bsSizes.GetMaxConcurrentWrites(); - EnableControls(!m_bsSizes.m_bOnlyDefault); + // buffer count handling + m_ctlBufferCountSpin.SetRange(1, 1000); + EnableControls(!m_bsSizes.IsOnlyDefault()); + UpdateData(FALSE); // set focus to the requested control - switch (m_iActiveIndex) + switch (m_eSelectedBuffer) { - case BI_DEFAULT: + case chengine::TBufferSizes::eBuffer_Default: GetDlgItem(IDC_DEFAULTSIZE_EDIT)->SetFocus(); static_cast(GetDlgItem(IDC_DEFAULTSIZE_EDIT))->SetSel(0, -1); break; - case BI_ONEDISK: + case chengine::TBufferSizes::eBuffer_OneDisk: GetDlgItem(IDC_ONEDISKSIZE_EDIT)->SetFocus(); static_cast(GetDlgItem(IDC_ONEDISKSIZE_EDIT))->SetSel(0, -1); break; - case BI_TWODISKS: + case chengine::TBufferSizes::eBuffer_TwoDisks: GetDlgItem(IDC_TWODISKSSIZE_EDIT)->SetFocus(); static_cast(GetDlgItem(IDC_TWODISKSSIZE_EDIT))->SetSel(0, -1); break; - case BI_CD: + case chengine::TBufferSizes::eBuffer_CD: GetDlgItem(IDC_CDROMSIZE_EDIT)->SetFocus(); static_cast(GetDlgItem(IDC_CDROMSIZE_EDIT))->SetSel(0, -1); break; - case BI_LAN: + case chengine::TBufferSizes::eBuffer_LAN: GetDlgItem(IDC_LANSIZE_EDIT)->SetFocus(); static_cast(GetDlgItem(IDC_LANSIZE_EDIT))->SetSel(0, -1); break; + case chengine::TBufferSizes::eBuffer_Last: + default: + break; } return FALSE; @@ -143,37 +149,37 @@ // set all the combos int iSel=m_ctlDefaultMulti.GetCurSel(); m_ctlDefaultMulti.ResetContent(); - m_ctlDefaultMulti.AddString(GetResManager()->LoadString(IDS_BYTE_STRING)); - m_ctlDefaultMulti.AddString(GetResManager()->LoadString(IDS_KBYTE_STRING)); - m_ctlDefaultMulti.AddString(GetResManager()->LoadString(IDS_MBYTE_STRING)); + m_ctlDefaultMulti.AddString(GetResManager().LoadString(IDS_BYTE_STRING)); + m_ctlDefaultMulti.AddString(GetResManager().LoadString(IDS_KBYTE_STRING)); + m_ctlDefaultMulti.AddString(GetResManager().LoadString(IDS_MBYTE_STRING)); m_ctlDefaultMulti.SetCurSel(iSel); iSel=m_ctlOneDiskMulti.GetCurSel(); m_ctlOneDiskMulti.ResetContent(); - m_ctlOneDiskMulti.AddString(GetResManager()->LoadString(IDS_BYTE_STRING)); - m_ctlOneDiskMulti.AddString(GetResManager()->LoadString(IDS_KBYTE_STRING)); - m_ctlOneDiskMulti.AddString(GetResManager()->LoadString(IDS_MBYTE_STRING)); + m_ctlOneDiskMulti.AddString(GetResManager().LoadString(IDS_BYTE_STRING)); + m_ctlOneDiskMulti.AddString(GetResManager().LoadString(IDS_KBYTE_STRING)); + m_ctlOneDiskMulti.AddString(GetResManager().LoadString(IDS_MBYTE_STRING)); m_ctlOneDiskMulti.SetCurSel(iSel); iSel=m_ctlTwoDisksMulti.GetCurSel(); m_ctlTwoDisksMulti.ResetContent(); - m_ctlTwoDisksMulti.AddString(GetResManager()->LoadString(IDS_BYTE_STRING)); - m_ctlTwoDisksMulti.AddString(GetResManager()->LoadString(IDS_KBYTE_STRING)); - m_ctlTwoDisksMulti.AddString(GetResManager()->LoadString(IDS_MBYTE_STRING)); + m_ctlTwoDisksMulti.AddString(GetResManager().LoadString(IDS_BYTE_STRING)); + m_ctlTwoDisksMulti.AddString(GetResManager().LoadString(IDS_KBYTE_STRING)); + m_ctlTwoDisksMulti.AddString(GetResManager().LoadString(IDS_MBYTE_STRING)); m_ctlTwoDisksMulti.SetCurSel(iSel); iSel=m_ctlCDROMMulti.GetCurSel(); m_ctlCDROMMulti.ResetContent(); - m_ctlCDROMMulti.AddString(GetResManager()->LoadString(IDS_BYTE_STRING)); - m_ctlCDROMMulti.AddString(GetResManager()->LoadString(IDS_KBYTE_STRING)); - m_ctlCDROMMulti.AddString(GetResManager()->LoadString(IDS_MBYTE_STRING)); + m_ctlCDROMMulti.AddString(GetResManager().LoadString(IDS_BYTE_STRING)); + m_ctlCDROMMulti.AddString(GetResManager().LoadString(IDS_KBYTE_STRING)); + m_ctlCDROMMulti.AddString(GetResManager().LoadString(IDS_MBYTE_STRING)); m_ctlCDROMMulti.SetCurSel(iSel); iSel=m_ctlLANMulti.GetCurSel(); m_ctlLANMulti.ResetContent(); - m_ctlLANMulti.AddString(GetResManager()->LoadString(IDS_BYTE_STRING)); - m_ctlLANMulti.AddString(GetResManager()->LoadString(IDS_KBYTE_STRING)); - m_ctlLANMulti.AddString(GetResManager()->LoadString(IDS_MBYTE_STRING)); + m_ctlLANMulti.AddString(GetResManager().LoadString(IDS_BYTE_STRING)); + m_ctlLANMulti.AddString(GetResManager().LoadString(IDS_KBYTE_STRING)); + m_ctlLANMulti.AddString(GetResManager().LoadString(IDS_MBYTE_STRING)); m_ctlLANMulti.SetCurSel(iSel); UpdateData(FALSE); @@ -208,12 +214,16 @@ } // assign values - m_bsSizes.m_bOnlyDefault=m_bOnlyDefaultCheck != 0; - m_bsSizes.m_uiDefaultSize=m_uiDefaultSize*IndexToValue(m_ctlDefaultMulti.GetCurSel()); - m_bsSizes.m_uiOneDiskSize=m_uiOneDiskSize*IndexToValue(m_ctlOneDiskMulti.GetCurSel()); - m_bsSizes.m_uiTwoDisksSize=m_uiTwoDisksSize*IndexToValue(m_ctlTwoDisksMulti.GetCurSel()); - m_bsSizes.m_uiCDSize=m_uiCDROMSize*IndexToValue(m_ctlCDROMMulti.GetCurSel()); - m_bsSizes.m_uiLANSize=m_uiLANSize*IndexToValue(m_ctlLANMulti.GetCurSel()); + m_bsSizes.SetOnlyDefault(m_bOnlyDefaultCheck != 0); + m_bsSizes.SetDefaultSize(m_uiDefaultSize*IndexToValue(m_ctlDefaultMulti.GetCurSel())); + m_bsSizes.SetOneDiskSize(m_uiOneDiskSize*IndexToValue(m_ctlOneDiskMulti.GetCurSel())); + m_bsSizes.SetTwoDisksSize(m_uiTwoDisksSize*IndexToValue(m_ctlTwoDisksMulti.GetCurSel())); + m_bsSizes.SetCDSize(m_uiCDROMSize*IndexToValue(m_ctlCDROMMulti.GetCurSel())); + m_bsSizes.SetLANSize(m_uiLANSize*IndexToValue(m_ctlLANMulti.GetCurSel())); + m_bsSizes.SetBufferCount(m_uiBufferCount); + m_bsSizes.SetMaxReadAheadBuffers(m_uiMaxReadAhead); + m_bsSizes.SetMaxConcurrentReads(m_uiMaxConcurrentReads); + m_bsSizes.SetMaxConcurrentWrites(m_uiMaxConcurrentWrites); CLanguageDialog::OnOK(); }