1、合并master与2021.1

2021-12-03 11:25:35 +08:00
parent dc07b8879b
commit 4bd7d1b80b
981 changed files with 384342 additions and 6470 deletions
@@ -48,6 +48,11 @@ void CFileUtilitiesDlg::OnBnClickedOk()
  if (((CButton *)GetDlgItem(IDC_RADIO_2BIN))->GetCheck())
  {
  }
+  else
+    if (((CButton *)GetDlgItem(IDC_RADIO_BIN2HEX))->GetCheck())
+    {
+      m_FileUtilities->Bin2Hex(&m_csInputFile);
+    }  
  else
  if (((CButton *)GetDlgItem(IDC_RADIO_DEDUPE))->GetCheck())
  {