Merge
This commit is contained in:
@@ -31,7 +31,7 @@ BEGIN_MESSAGE_MAP(CFileUtilitiesDlg, CDialogEx)
|
||||
ON_BN_CLICKED(IDOK, &CFileUtilitiesDlg::OnBnClickedOk)
|
||||
ON_BN_CLICKED(IDC_BUTTON_BROWSE, &CFileUtilitiesDlg::OnBnClickedButtonBrowse)
|
||||
ON_BN_CLICKED(IDCANCEL, &CFileUtilitiesDlg::OnBnClickedCancel)
|
||||
ON_BN_CLICKED(IDC_RADIO_EXTRACT, &CFileUtilitiesDlg::OnBnClickedRadioExtract)
|
||||
ON_BN_CLICKED(IDC_RADIO_OUT_EXTRACT, &CFileUtilitiesDlg::OnBnClickedRadioExtract)
|
||||
ON_BN_CLICKED(IDC_RADIO_DUMP_BINARY, &CFileUtilitiesDlg::OnBnClickedRadioDumpBinary)
|
||||
ON_BN_CLICKED(IDC_RADIO_HEX_ASCII2BIN, &CFileUtilitiesDlg::OnBnClickedRadioHexAscii2bin)
|
||||
ON_BN_CLICKED(IDC_RADIO_DEDUPE, &CFileUtilitiesDlg::OnBnClickedRadioDedupe)
|
||||
@@ -44,43 +44,48 @@ void CFileUtilitiesDlg::OnBnClickedOk()
|
||||
char _criteria[256];
|
||||
CString _extractString;
|
||||
CMv_File_Utilities *m_FileUtilities = new CMv_File_Utilities();
|
||||
if (((CButton *)GetDlgItem(IDC_RADIO_HEX_BIN2ASCII))->GetCheck())
|
||||
|
||||
if (((CButton *)GetDlgItem(IDC_RADIO_2BIN))->GetCheck())
|
||||
{
|
||||
m_FileUtilities->BinToHexAscii(&m_csInputFile);
|
||||
}
|
||||
else
|
||||
if (((CButton *)GetDlgItem(IDC_RADIO_DEDUPE))->GetCheck())
|
||||
{
|
||||
m_FileUtilities->DedupeFunction(&m_csInputFile);
|
||||
}
|
||||
else
|
||||
if (((CButton *)GetDlgItem(IDC_RADIO_HEX_ASCII2BIN))->GetCheck())
|
||||
{
|
||||
}
|
||||
else
|
||||
if (((CButton *)GetDlgItem(IDC_RADIO_DUMP_BINARY))->GetCheck())
|
||||
{
|
||||
m_FileUtilities->DumpBin(&m_csInputFile);
|
||||
}
|
||||
else
|
||||
if (((CButton *)GetDlgItem(IDC_RADIO_EXTRACT))->GetCheck())
|
||||
if (((CButton *)GetDlgItem(IDC_RADIO_DUMP_PRS))->GetCheck())
|
||||
{
|
||||
m_FileUtilities->DumpPrs(&m_csInputFile);
|
||||
}
|
||||
else
|
||||
if (((CButton *)GetDlgItem(IDC_RADIO_OUT_EXTRACT))->GetCheck())
|
||||
{
|
||||
GetDlgItem(IDC_EDIT_CRITERIA)->GetWindowText(_extractString);
|
||||
if (_extractString.GetLength() == 0)
|
||||
{
|
||||
strcpy(_criteria, "Poll");
|
||||
// MessageBox(_T("Null Crtieria, operation exit."), _T("Warning Message"), MB_OK);
|
||||
// MessageBox(_T("Null Criteria, operation exit."), _T("Warning Message"), MB_OK);
|
||||
}
|
||||
else
|
||||
{
|
||||
size_t sConverted;
|
||||
wcstombs_s(&sConverted, _criteria, _extractString.GetLength()+1, _extractString, _TRUNCATE);
|
||||
};
|
||||
m_FileUtilities->ExtractCommand(&m_csInputFile, (char *)_criteria, ((CButton *)GetDlgItem(IDC_CHECK_NEGATE))->GetCheck());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_FileUtilities->ExtractCommand(&m_csInputFile, (char *)_criteria, ((CButton *)GetDlgItem(IDC_CHECK_NEGATE))->GetCheck());
|
||||
};
|
||||
|
||||
MessageBox(_T("Done."), _T("Message"), MB_OK);
|
||||
delete m_FileUtilities;
|
||||
m_FileUtilities=nullptr;
|
||||
// CDialogEx::OnOK();
|
||||
m_FileUtilities = NULL;
|
||||
}
|
||||
|
||||
//==============================================================================
|
||||
@@ -104,10 +109,11 @@ void CFileUtilitiesDlg::OnBnClickedButtonBrowse()
|
||||
//===========================================================================
|
||||
BOOL CFileUtilitiesDlg::OnInitDialog()
|
||||
{
|
||||
((CButton *)GetDlgItem(IDC_RADIO_DEDUPE))->SetCheck(1);
|
||||
((CButton *)GetDlgItem(IDC_RADIO_DEDUPE))->SetCheck(0);
|
||||
((CButton *)GetDlgItem(IDC_RADIO_HEX_ASCII2BIN))->SetCheck(0);
|
||||
((CButton *)GetDlgItem(IDC_RADIO_DUMP_BINARY))->SetCheck(0);
|
||||
((CButton *)GetDlgItem(IDC_RADIO_EXTRACT))->SetCheck(0);
|
||||
((CButton *)GetDlgItem(IDC_RADIO_OUT_EXTRACT))->SetCheck(0);
|
||||
((CButton *)GetDlgItem(IDC_RADIO_DUMP_PRS))->SetCheck(1);
|
||||
((CButton *)GetDlgItem(IDC_EDIT_CRITERIA))->EnableWindow(false);
|
||||
((CButton *)GetDlgItem(IDC_CHECK_NEGATE))->EnableWindow(false);
|
||||
return TRUE;
|
||||
|
||||
Reference in New Issue
Block a user