Index: ch.vc90.sln =================================================================== diff -u -rcb588a864d28da44cc192760595d3c5ad6f2fac9 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- ch.vc90.sln (.../ch.vc90.sln) (revision cb588a864d28da44cc192760595d3c5ad6f2fac9) +++ ch.vc90.sln (.../ch.vc90.sln) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -15,6 +15,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libicpf", "src\libicpf\libicpf.vc90.vcproj", "{5510B933-046F-4F75-8B46-5E8279C8CCDE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libictranslate", "src\libictranslate\libictranslate.vc90.vcproj", "{DD1F3242-7EE4-4F41-8B8D-D833300C445F}" + ProjectSection(ProjectDependencies) = postProject + {5510B933-046F-4F75-8B46-5E8279C8CCDE} = {5510B933-046F-4F75-8B46-5E8279C8CCDE} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Index: src/ch/AboutDlg.cpp =================================================================== diff -u -rbec38400c92cba324332df97d699ebbf843651bd -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/AboutDlg.cpp (.../AboutDlg.cpp) (revision bec38400c92cba324332df97d699ebbf843651bd) +++ src/ch/AboutDlg.cpp (.../AboutDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -31,7 +31,7 @@ bool CAboutDlg::m_bLock=false; -CAboutDlg::CAboutDlg() : CHLanguageDialog(CAboutDlg::IDD, NULL, &m_bLock) +CAboutDlg::CAboutDlg() :ictranslate::CLanguageDialog(CAboutDlg::IDD, NULL, &m_bLock) { //{{AFX_DATA_INIT(CAboutDlg) //}}AFX_DATA_INIT @@ -42,7 +42,7 @@ { } -BEGIN_MESSAGE_MAP(CAboutDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CAboutDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CAboutDlg) //}}AFX_MSG_MAP END_MESSAGE_MAP() @@ -67,7 +67,7 @@ BOOL CAboutDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); UpdateProgramVersion(); Index: src/ch/AboutDlg.h =================================================================== diff -u -r4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/AboutDlg.h (.../AboutDlg.h) (revision 4ee5b2305c2ed7776e64e7fbd52952ccfd2a8dd8) +++ src/ch/AboutDlg.h (.../AboutDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -21,7 +21,7 @@ #ifndef __ABOUTDLG_H__ #define __ABOUTDLG_H__ -class CAboutDlg : public CHLanguageDialog +class CAboutDlg : public ictranslate::CLanguageDialog { public: CAboutDlg(); Index: src/ch/BufferSizeDlg.cpp =================================================================== diff -u -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/BufferSizeDlg.cpp (.../BufferSizeDlg.cpp) (revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0) +++ src/ch/BufferSizeDlg.cpp (.../BufferSizeDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -33,7 +33,7 @@ // CBufferSizeDlg dialog CBufferSizeDlg::CBufferSizeDlg() - : CHLanguageDialog(CBufferSizeDlg::IDD) + : ictranslate::CLanguageDialog(CBufferSizeDlg::IDD) { //{{AFX_DATA_INIT(CBufferSizeDlg) m_uiDefaultSize = 0; @@ -48,7 +48,7 @@ void CBufferSizeDlg::DoDataExchange(CDataExchange* pDX) { - CHLanguageDialog::DoDataExchange(pDX); + CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CBufferSizeDlg) DDX_Control(pDX, IDC_TWODISKSMULTIPLIER_COMBO, m_ctlTwoDisksMulti); DDX_Control(pDX, IDC_ONEDISKMULTIPLIER_COMBO, m_ctlOneDiskMulti); @@ -64,7 +64,7 @@ //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(CBufferSizeDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CBufferSizeDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CBufferSizeDlg) ON_BN_CLICKED(IDC_ONLYDEFAULT_CHECK, OnOnlydefaultCheck) //}}AFX_MSG_MAP @@ -75,7 +75,7 @@ BOOL CBufferSizeDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // set all the combos m_ctlDefaultMulti.AddString(GetResManager()->LoadString(IDS_BYTE_STRING)); @@ -217,7 +217,7 @@ m_bsSizes.m_uiCDSize=m_uiCDROMSize*IndexToValue(m_ctlCDROMMulti.GetCurSel()); m_bsSizes.m_uiLANSize=m_uiLANSize*IndexToValue(m_ctlLANMulti.GetCurSel()); - CHLanguageDialog::OnOK(); + CLanguageDialog::OnOK(); } void CBufferSizeDlg::SetDefaultSize(UINT uiSize) Index: src/ch/BufferSizeDlg.h =================================================================== diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/BufferSizeDlg.h (.../BufferSizeDlg.h) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/ch/BufferSizeDlg.h (.../BufferSizeDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -25,7 +25,7 @@ ///////////////////////////////////////////////////////////////////////////// // CBufferSizeDlg dialog -class CBufferSizeDlg : public CHLanguageDialog +class CBufferSizeDlg : public ictranslate::CLanguageDialog { // Construction public: Index: src/ch/CrashDlg.cpp =================================================================== diff -u -r7c612814a43eb389fa1ac27ccd8f621fd4ff37e8 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/CrashDlg.cpp (.../CrashDlg.cpp) (revision 7c612814a43eb389fa1ac27ccd8f621fd4ff37e8) +++ src/ch/CrashDlg.cpp (.../CrashDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -15,7 +15,7 @@ // CCrashDlg dialog -IMPLEMENT_DYNAMIC(CCrashDlg, CHLanguageDialog) +IMPLEMENT_DYNAMIC(CCrashDlg,ictranslate::CLanguageDialog) CCrashDlg::CCrashDlg(bool bResult, PCTSTR pszFilename, CWnd* pParent /*=NULL*/) : CDialog(CCrashDlg::IDD, pParent), Index: src/ch/CustomCopyDlg.cpp =================================================================== diff -u -rebabad67cdda34ed4e36ab794e10d0ade8124bf3 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision ebabad67cdda34ed4e36ab794e10d0ade8124bf3) +++ src/ch/CustomCopyDlg.cpp (.../CustomCopyDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -38,7 +38,7 @@ // CCustomCopyDlg dialog -CCustomCopyDlg::CCustomCopyDlg() : CHLanguageDialog(CCustomCopyDlg::IDD) +CCustomCopyDlg::CCustomCopyDlg() :ictranslate::CLanguageDialog(CCustomCopyDlg::IDD) { //{{AFX_DATA_INIT(CCustomCopyDlg) m_ucCount = 1; @@ -68,7 +68,7 @@ void CCustomCopyDlg::DoDataExchange(CDataExchange* pDX) { - CHLanguageDialog::DoDataExchange(pDX); + CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CCustomCopyDlg) DDX_Control(pDX, IDC_DESTPATH_COMBOBOXEX, m_ctlDstPath); DDX_Control(pDX, IDC_COUNT_SPIN, m_ctlCountSpin); @@ -88,7 +88,7 @@ } -BEGIN_MESSAGE_MAP(CCustomCopyDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CCustomCopyDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CCustomCopyDlg) ON_BN_CLICKED(IDC_ADDDIR_BUTTON, OnAddDirectoryButton) ON_BN_CLICKED(IDC_ADDFILE_BUTTON, OnAddFilesButton) @@ -114,7 +114,7 @@ // CCustomCopyDlg message handlers BOOL CCustomCopyDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // make this dialog on top SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE /*| SWP_SHOWWINDOW*/); @@ -450,7 +450,7 @@ if (m_ccData.m_strDestPath.IsEmpty() || m_ccData.m_astrPaths.GetSize() == 0) MsgBox(IDS_MISSINGDATA_STRING); else - CHLanguageDialog::OnOK(); + CLanguageDialog::OnOK(); } void CCustomCopyDlg::SetBuffersizesString() @@ -707,7 +707,7 @@ m_ctlFiles.SetImageList(NULL, LVSIL_SMALL); m_ilImages.Detach(); - CHLanguageDialog::OnDestroy(); + CLanguageDialog::OnDestroy(); } void CCustomCopyDlg::EnableControls() Index: src/ch/CustomCopyDlg.h =================================================================== diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/CustomCopyDlg.h (.../CustomCopyDlg.h) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/ch/CustomCopyDlg.h (.../CustomCopyDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -27,7 +27,7 @@ ///////////////////////////////////////////////////////////////////////////// // CCustomCopyDlg dialog -class CCustomCopyDlg : public CHLanguageDialog +class CCustomCopyDlg : public ictranslate::CLanguageDialog { // Construction public: Index: src/ch/DstFileErrorDlg.cpp =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/DstFileErrorDlg.cpp (.../DstFileErrorDlg.cpp) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/DstFileErrorDlg.cpp (.../DstFileErrorDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -33,7 +33,7 @@ // CDstFileErrorDlg dialog CDstFileErrorDlg::CDstFileErrorDlg() - : CHLanguageDialog(CDstFileErrorDlg::IDD) + :ictranslate::CLanguageDialog(CDstFileErrorDlg::IDD) { //{{AFX_DATA_INIT(CDstFileErrorDlg) m_strMessage = _T(""); @@ -47,15 +47,15 @@ void CDstFileErrorDlg::DoDataExchange(CDataExchange* pDX) { - CHLanguageDialog::DoDataExchange(pDX); + CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CDstFileErrorDlg) DDX_Text(pDX, IDC_MESSAGE_EDIT, m_strMessage); DDX_Text(pDX, IDC_FILENAME_EDIT, m_strFilename); //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(CDstFileErrorDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CDstFileErrorDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CDstFileErrorDlg) ON_BN_CLICKED(IDC_RETRY_BUTTON, OnRetryButton) ON_BN_CLICKED(IDC_IGNORE_BUTTON, OnIgnoreButton) @@ -95,12 +95,12 @@ SetWindowText(m_strTitle+_T(" [")+CString(_itot(m_iTime/1000, xx, 10))+_T("]")); } - CHLanguageDialog::OnTimer(nIDEvent); + CLanguageDialog::OnTimer(nIDEvent); } BOOL CDstFileErrorDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // make this dialog on top SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE /*| SWP_SHOWWINDOW*/); Index: src/ch/DstFileErrorDlg.h =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/DstFileErrorDlg.h (.../DstFileErrorDlg.h) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/DstFileErrorDlg.h (.../DstFileErrorDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -23,7 +23,7 @@ ///////////////////////////////////////////////////////////////////////////// // CDstFileErrorDlg dialog -class CDstFileErrorDlg : public CHLanguageDialog +class CDstFileErrorDlg : public ictranslate::CLanguageDialog { // Construction public: Index: src/ch/FilterDlg.cpp =================================================================== diff -u -r66e9ad9a512cec46d691cb1ba012424dc7ac8897 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/FilterDlg.cpp (.../FilterDlg.cpp) (revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897) +++ src/ch/FilterDlg.cpp (.../FilterDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -32,7 +32,7 @@ // CFilterDlg dialog CFilterDlg::CFilterDlg() - : CHLanguageDialog(CFilterDlg::IDD) + :ictranslate::CLanguageDialog(CFilterDlg::IDD) { //{{AFX_DATA_INIT(CFilterDlg) m_iArchive = FALSE; @@ -55,7 +55,7 @@ void CFilterDlg::DoDataExchange(CDataExchange* pDX) { - CHLanguageDialog::DoDataExchange(pDX); + CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CFilterDlg) DDX_Control(pDX, IDC_FILTEREXCLUDE_COMBO, m_ctlExcludeMask); DDX_Control(pDX, IDC_SIZE2_SPIN, m_ctlSpin2); @@ -90,7 +90,7 @@ } -BEGIN_MESSAGE_MAP(CFilterDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CFilterDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CFilterDlg) ON_BN_CLICKED(IDC_ATTRIBUTES_CHECK, OnAttributesCheck) ON_BN_CLICKED(IDC_DATE_CHECK, OnDateCheck) @@ -109,7 +109,7 @@ BOOL CFilterDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // fill the combos with data const TCHAR *pszData; @@ -374,7 +374,7 @@ m_ffFilter.m_iSystem=m_iSystem; m_ffFilter.m_iDirectory=m_iDirectory; - CHLanguageDialog::OnOK(); + CLanguageDialog::OnOK(); } int CFilterDlg::GetMultiplier(int iIndex) Index: src/ch/FilterDlg.h =================================================================== diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/FilterDlg.h (.../FilterDlg.h) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/ch/FilterDlg.h (.../FilterDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -26,7 +26,7 @@ ///////////////////////////////////////////////////////////////////////////// // CFilterDlg dialog -class CFilterDlg : public CHLanguageDialog +class CFilterDlg : public ictranslate::CLanguageDialog { // Construction public: Index: src/ch/FolderDialog.cpp =================================================================== diff -u -rebabad67cdda34ed4e36ab794e10d0ade8124bf3 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/FolderDialog.cpp (.../FolderDialog.cpp) (revision ebabad67cdda34ed4e36ab794e10d0ade8124bf3) +++ src/ch/FolderDialog.cpp (.../FolderDialog.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -149,7 +149,7 @@ // CFolderDialog dialog CFolderDialog::CFolderDialog(CWnd* /*pParent*/ /*=NULL*/) - : CHLanguageDialog() + :ictranslate::CLanguageDialog() { //{{AFX_DATA_INIT(CFolderDialog) //}}AFX_DATA_INIT @@ -163,7 +163,7 @@ { } -BEGIN_MESSAGE_MAP(CFolderDialog, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CFolderDialog,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CFolderDialog) ON_NOTIFY(LVN_ENDLABELEDIT, IDC_SHORTCUT_LIST, OnEndLabelEditShortcutList) ON_BN_CLICKED(IDC_ADDSHORTCUT_BUTTON, OnAddShortcut) @@ -382,7 +382,7 @@ // initialization of most important params - reading text, bitmaps BOOL CFolderDialog::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // image list InitImageList(); @@ -528,7 +528,7 @@ m_bdData.cx=rcDlg.Width(); m_bdData.cy=rcDlg.Height(); - CHLanguageDialog::OnCancel(); + CLanguageDialog::OnCancel(); } /////////////////////////////////////////////////////////////////////////// @@ -568,7 +568,7 @@ m_bdData.cx=rcDlg.Width(); m_bdData.cy=rcDlg.Height(); - CHLanguageDialog::OnOK(); + CLanguageDialog::OnOK(); } /////////////////////////////////////////////////////////////////////////// @@ -578,7 +578,7 @@ if (!InitModalIndirect((LPCDLGTEMPLATE)__g_DlgTemplate)) return -1; else - return CHLanguageDialog::DoModal(); + return ictranslate::CLanguageDialog::DoModal(); } /////////////////////////////////////////////////////////////////////////// @@ -611,7 +611,7 @@ break; } - return CHLanguageDialog::WindowProc(message, wParam, lParam); + return ictranslate::CLanguageDialog::WindowProc(message, wParam, lParam); } ////////////////////////////////////////////////////////////////////////////// @@ -1011,7 +1011,7 @@ // resize handling void CFolderDialog::OnSize(UINT nType, int cx, int cy) { - CHLanguageDialog::OnSize(nType, cx, cy); + CLanguageDialog::OnSize(nType, cx, cy); ResizeControls(cx, cy); InvalidateRect(&m_rcGripper); @@ -1248,7 +1248,7 @@ // hit testing in a gripper cause LRESULT CFolderDialog::OnNcHitTest(CPoint point) { - UINT uiRes=CHLanguageDialog::OnNcHitTest(point); + UINT uiRes=CLanguageDialog::OnNcHitTest(point); if (uiRes == HTCLIENT) { CRect rc; Index: src/ch/FolderDialog.h =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/FolderDialog.h (.../FolderDialog.h) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/FolderDialog.h (.../FolderDialog.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -43,7 +43,7 @@ ///////////////////////////////////////////////////////////////////////////// // CFolderDialog dialog -class CFolderDialog : public CHLanguageDialog +class CFolderDialog : public ictranslate::CLanguageDialog { // Construction public: Index: src/ch/MainWnd.cpp =================================================================== diff -u -r7c612814a43eb389fa1ac27ccd8f621fd4ff37e8 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 7c612814a43eb389fa1ac27ccd8f621fd4ff37e8) +++ src/ch/MainWnd.cpp (.../MainWnd.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -49,6 +49,7 @@ #include "StringHelpers.h" #include "..\common\ipcstructs.h" #include +#include "af_defs.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -2162,11 +2163,13 @@ void CMainWnd::OnPopupHelp() { - if (!GetApp()->HtmlHelp(HH_DISPLAY_TOPIC, NULL)) + GetApp()->HtmlHelp(HH_DISPLAY_TOPIC, NULL); +/* { TCHAR szStr[512+2*_MAX_PATH]; _sntprintf(szStr, 512+2*_MAX_PATH, GetResManager()->LoadString(IDS_HELPERR_STRING), GetApp()->GetHelpPath()); AfxMessageBox(szStr, MB_OK | MB_ICONERROR); } +*/ } \ No newline at end of file Index: src/ch/MiniViewDlg.cpp =================================================================== diff -u -r830569dd9bafbdaa1b60c4a907b517b9199785b8 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision 830569dd9bafbdaa1b60c4a907b517b9199785b8) +++ src/ch/MiniViewDlg.cpp (.../MiniViewDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -43,7 +43,7 @@ // CMiniViewDlg dialog CMiniViewDlg::CMiniViewDlg(CTaskArray* pArray, bool *pbHide, CWnd* pParent /*=NULL*/) - : CHLanguageDialog(CMiniViewDlg::IDD, pParent, &m_bLock) + :ictranslate::CLanguageDialog(CMiniViewDlg::IDD, pParent, &m_bLock) { //{{AFX_DATA_INIT(CMiniViewDlg) // NOTE: the ClassWizard will add member initialization here @@ -61,13 +61,13 @@ void CMiniViewDlg::DoDataExchange(CDataExchange* pDX) { - CHLanguageDialog::DoDataExchange(pDX); + CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CMiniViewDlg) DDX_Control(pDX, IDC_PROGRESS_LIST, m_ctlStatus); //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(CMiniViewDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CMiniViewDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CMiniViewDlg) ON_WM_CTLCOLOR() ON_WM_TIMER() @@ -94,7 +94,7 @@ BOOL CMiniViewDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // fill the buttons' structure m_bdButtons[0].pfnCallbackFunc=&OnPause; @@ -135,7 +135,7 @@ SetTimer(9843, GetConfig()->get_signed_num(PP_MVREFRESHINTERVAL), NULL); } - CHLanguageDialog::OnTimer(nIDEvent); + CLanguageDialog::OnTimer(nIDEvent); } void CMiniViewDlg::RecalcSize(int nHeight, bool bInitial) @@ -274,7 +274,7 @@ return static_cast(0); } - return CHLanguageDialog::WindowProc(message, wParam, lParam); + return ictranslate::CLanguageDialog::WindowProc(message, wParam, lParam); } void CMiniViewDlg::OnNcPaint() @@ -654,7 +654,7 @@ } if (!bEnabled) - CHLanguageDialog::OnNcLButtonDown(nHitTest, point); + CLanguageDialog::OnNcLButtonDown(nHitTest, point); } void CMiniViewDlg::OnLButtonUp(UINT nFlags, CPoint point) @@ -676,7 +676,7 @@ m_iIndex=-1; - CHLanguageDialog::OnLButtonUp(nFlags, point); + CLanguageDialog::OnLButtonUp(nFlags, point); } BOOL CMiniViewDlg::OnNcActivate(BOOL bActive) @@ -727,12 +727,12 @@ } } - CHLanguageDialog::OnMouseMove(nFlags, point); + CLanguageDialog::OnMouseMove(nFlags, point); } void CMiniViewDlg::OnSettingChange(UINT uFlags, LPCTSTR lpszSection) { - CHLanguageDialog::OnSettingChange(uFlags, lpszSection); + CLanguageDialog::OnSettingChange(uFlags, lpszSection); if (uFlags == SPI_SETNONCLIENTMETRICS) ResizeDialog(); @@ -784,13 +784,13 @@ void CMiniViewDlg::HideWindow() { - static_cast(this)->ShowWindow(SW_HIDE); + static_cast(this)->ShowWindow(SW_HIDE); m_bShown=false; } void CMiniViewDlg::ShowWindow() { - static_cast(this)->ShowWindow(SW_SHOW); + static_cast(this)->ShowWindow(SW_SHOW); m_bShown=true; } Index: src/ch/MiniViewDlg.h =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/MiniViewDlg.h (.../MiniViewDlg.h) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/MiniViewDlg.h (.../MiniViewDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -33,7 +33,7 @@ #define WM_MINIVIEWDBLCLK WM_USER+14 -class CMiniViewDlg : public CHLanguageDialog +class CMiniViewDlg : public ictranslate::CLanguageDialog { // internal struct public: Index: src/ch/NotEnoughRoomDlg.cpp =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/NotEnoughRoomDlg.cpp (.../NotEnoughRoomDlg.cpp) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/NotEnoughRoomDlg.cpp (.../NotEnoughRoomDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -36,7 +36,7 @@ CNotEnoughRoomDlg::CNotEnoughRoomDlg() - : CHLanguageDialog(CNotEnoughRoomDlg::IDD) + :ictranslate::CLanguageDialog(CNotEnoughRoomDlg::IDD) { //{{AFX_DATA_INIT(CNotEnoughRoomDlg) //}}AFX_DATA_INIT @@ -48,14 +48,14 @@ void CNotEnoughRoomDlg::DoDataExchange(CDataExchange* pDX) { - CHLanguageDialog::DoDataExchange(pDX); + CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CNotEnoughRoomDlg) DDX_Control(pDX, IDC_FILES_LIST, m_ctlFiles); //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(CNotEnoughRoomDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CNotEnoughRoomDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CNotEnoughRoomDlg) ON_WM_TIMER() ON_BN_CLICKED(IDC_RETRY_BUTTON, OnRetryButton) @@ -87,7 +87,7 @@ BOOL CNotEnoughRoomDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // set to top SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE /*| SWP_SHOWWINDOW*/); @@ -132,13 +132,13 @@ // end dialog if this is enough if (m_llRequired <= llFree) { - CHLanguageDialog::OnTimer(nIDEvent); + CLanguageDialog::OnTimer(nIDEvent); EndDialog(ID_RETRY); } } } - CHLanguageDialog::OnTimer(nIDEvent); + CLanguageDialog::OnTimer(nIDEvent); } void CNotEnoughRoomDlg::OnRetryButton() Index: src/ch/NotEnoughRoomDlg.h =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/NotEnoughRoomDlg.h (.../NotEnoughRoomDlg.h) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/NotEnoughRoomDlg.h (.../NotEnoughRoomDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -23,7 +23,7 @@ ///////////////////////////////////////////////////////////////////////////// // CNotEnoughRoomDlg dialog -class CNotEnoughRoomDlg : public CHLanguageDialog +class CNotEnoughRoomDlg : public ictranslate::CLanguageDialog { // Construction public: Index: src/ch/OptionsDlg.cpp =================================================================== diff -u -r025757ce5252abbb6dfd81f8f254e419f9520a09 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/OptionsDlg.cpp (.../OptionsDlg.cpp) (revision 025757ce5252abbb6dfd81f8f254e419f9520a09) +++ src/ch/OptionsDlg.cpp (.../OptionsDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -39,7 +39,7 @@ // COptionsDlg dialog COptionsDlg::COptionsDlg(CWnd* pParent /*=NULL*/) - : CHLanguageDialog(COptionsDlg::IDD, pParent, &m_bLock) + :ictranslate::CLanguageDialog(COptionsDlg::IDD, pParent, &m_bLock) { //{{AFX_DATA_INIT(COptionsDlg) // NOTE: the ClassWizard will add member initialization here @@ -48,13 +48,13 @@ void COptionsDlg::DoDataExchange(CDataExchange* pDX) { - CHLanguageDialog::DoDataExchange(pDX); + CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(COptionsDlg) DDX_Control(pDX, IDC_PROPERTIES_LIST, m_ctlProperties); //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(COptionsDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(COptionsDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(COptionsDlg) ON_BN_CLICKED(IDC_APPLY_BUTTON, OnApplyButton) //}}AFX_MSG_MAP @@ -90,7 +90,7 @@ BOOL COptionsDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); m_ctlProperties.Init(); @@ -220,7 +220,7 @@ ApplyProperties(); SendClosingNotify(); - CHLanguageDialog::OnOK(); + CLanguageDialog::OnOK(); } void COptionsDlg::FillPropertyList() @@ -254,7 +254,7 @@ // lang CString strLangs; UINT uiIndex=0; - for (vector::iterator it=m_vld.begin();it != m_vld.end();it++) + for (vector::iterator it=m_vld.begin();it != m_vld.end();it++) { strLangs+=(*it).m_pszLngName; strLangs+=_T("!"); @@ -489,7 +489,7 @@ void COptionsDlg::OnCancel() { SendClosingNotify(); - CHLanguageDialog::OnCancel(); + CLanguageDialog::OnCancel(); } void COptionsDlg::SendClosingNotify() Index: src/ch/OptionsDlg.h =================================================================== diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/OptionsDlg.h (.../OptionsDlg.h) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/ch/OptionsDlg.h (.../OptionsDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -30,7 +30,7 @@ ///////////////////////////////////////////////////////////////////////////// // COptionsDlg dialog -class COptionsDlg : public CHLanguageDialog +class COptionsDlg : public ictranslate::CLanguageDialog { // Construction public: @@ -45,7 +45,7 @@ char_vector m_cvShortcuts; // for languages - vector m_vld; + vector m_vld; TCHAR m_szLangPath[_MAX_PATH]; // the full path to a folder with langs (@read) friend void CustomPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex); Index: src/ch/RecentDlg.cpp =================================================================== diff -u -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/RecentDlg.cpp (.../RecentDlg.cpp) (revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0) +++ src/ch/RecentDlg.cpp (.../RecentDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -34,7 +34,7 @@ CRecentDlg::CRecentDlg(CWnd* pParent /*=NULL*/) - : CHLanguageDialog(CRecentDlg::IDD, pParent) + :ictranslate::CLanguageDialog(CRecentDlg::IDD, pParent) { //{{AFX_DATA_INIT(CRecentDlg) m_strPath = _T(""); @@ -52,7 +52,7 @@ } -BEGIN_MESSAGE_MAP(CRecentDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CRecentDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CRecentDlg) ON_NOTIFY(LVN_ITEMCHANGED, IDC_RECENT_LIST, OnItemchangedRecentList) ON_BN_CLICKED(IDC_BROWSE_BUTTON, OnBrowseButton) @@ -67,7 +67,7 @@ BOOL CRecentDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // system image list SHFILEINFO sfi; Index: src/ch/RecentDlg.h =================================================================== diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/RecentDlg.h (.../RecentDlg.h) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/ch/RecentDlg.h (.../RecentDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -26,7 +26,7 @@ ///////////////////////////////////////////////////////////////////////////// // CRecentDlg dialog -class CRecentDlg : public CHLanguageDialog +class CRecentDlg : public ictranslate::CLanguageDialog { // Construction public: Index: src/ch/ReplaceFilesDlg.cpp =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/ReplaceFilesDlg.cpp (.../ReplaceFilesDlg.cpp) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/ReplaceFilesDlg.cpp (.../ReplaceFilesDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -34,7 +34,7 @@ CReplaceFilesDlg::CReplaceFilesDlg() - : CHLanguageDialog(CReplaceFilesDlg::IDD) + :ictranslate::CLanguageDialog(CReplaceFilesDlg::IDD) { //{{AFX_DATA_INIT(CReplaceFilesDlg) // NOTE: the ClassWizard will add member initialization here @@ -50,14 +50,14 @@ void CReplaceFilesDlg::DoDataExchange(CDataExchange* pDX) { - CHLanguageDialog::DoDataExchange(pDX); + CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CReplaceFilesDlg) // NOTE: the ClassWizard will add DDX and DDV calls here //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(CReplaceFilesDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CReplaceFilesDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CReplaceFilesDlg) ON_BN_CLICKED(IDC_COPY_REST_BUTTON, OnCopyRestButton) ON_BN_CLICKED(IDC_COPY_REST_ALL_BUTTON, OnCopyRestAllButton) @@ -74,7 +74,7 @@ BOOL CReplaceFilesDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // make on top SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE /*| SWP_SHOWWINDOW*/); @@ -144,5 +144,5 @@ SetWindowText(m_strTitle+_T(" [")+CString(_itot(m_iTime/1000, xx, 10))+_T("]")); } - CHLanguageDialog::OnTimer(nIDEvent); + CLanguageDialog::OnTimer(nIDEvent); } Index: src/ch/ReplaceFilesDlg.h =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/ReplaceFilesDlg.h (.../ReplaceFilesDlg.h) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/ReplaceFilesDlg.h (.../ReplaceFilesDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -25,7 +25,7 @@ ///////////////////////////////////////////////////////////////////////////// // CReplaceFilesDlg dialog -class CReplaceFilesDlg : public CHLanguageDialog +class CReplaceFilesDlg : public ictranslate::CLanguageDialog { // Construction public: Index: src/ch/ReplaceOnlyDlg.cpp =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/ReplaceOnlyDlg.cpp (.../ReplaceOnlyDlg.cpp) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/ReplaceOnlyDlg.cpp (.../ReplaceOnlyDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -34,7 +34,7 @@ CReplaceOnlyDlg::CReplaceOnlyDlg() - : CHLanguageDialog(CReplaceOnlyDlg::IDD) + :ictranslate::CLanguageDialog(CReplaceOnlyDlg::IDD) { //{{AFX_DATA_INIT(CReplaceOnlyDlg) m_strMessage = _T(""); @@ -49,14 +49,14 @@ void CReplaceOnlyDlg::DoDataExchange(CDataExchange* pDX) { - CHLanguageDialog::DoDataExchange(pDX); + CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CReplaceOnlyDlg) DDX_Text(pDX, IDC_MESSAGE_EDIT, m_strMessage); //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(CReplaceOnlyDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CReplaceOnlyDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CReplaceOnlyDlg) ON_BN_CLICKED(IDC_IGNORE_BUTTON, OnIgnoreButton) ON_BN_CLICKED(IDC_IGNORE_ALL_BUTTON, OnIgnoreAllButton) @@ -71,7 +71,7 @@ BOOL CReplaceOnlyDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // make on top SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE /*| SWP_SHOWWINDOW*/); @@ -132,5 +132,5 @@ SetWindowText(m_strTitle+_T(" [")+CString(_itot(m_iTime/1000, xx, 10))+_T("]")); } - CHLanguageDialog::OnTimer(nIDEvent); + CLanguageDialog::OnTimer(nIDEvent); } Index: src/ch/ReplaceOnlyDlg.h =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/ReplaceOnlyDlg.h (.../ReplaceOnlyDlg.h) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/ReplaceOnlyDlg.h (.../ReplaceOnlyDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -25,7 +25,7 @@ ///////////////////////////////////////////////////////////////////////////// // CReplaceOnlyDlg dialog -class CReplaceOnlyDlg : public CHLanguageDialog +class CReplaceOnlyDlg : public ictranslate::CLanguageDialog { // Construction public: Index: src/ch/ReplacePathsDlg.cpp =================================================================== diff -u -re701ed2460c2558eeefab55a1f3ed1d2c89a56c0 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/ReplacePathsDlg.cpp (.../ReplacePathsDlg.cpp) (revision e701ed2460c2558eeefab55a1f3ed1d2c89a56c0) +++ src/ch/ReplacePathsDlg.cpp (.../ReplacePathsDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -35,7 +35,7 @@ CReplacePathsDlg::CReplacePathsDlg() - : CHLanguageDialog(CReplacePathsDlg::IDD) + : ictranslate::CLanguageDialog(CReplacePathsDlg::IDD) { //{{AFX_DATA_INIT(CReplacePathsDlg) m_strDest = _T(""); @@ -46,7 +46,7 @@ void CReplacePathsDlg::DoDataExchange(CDataExchange* pDX) { - CHLanguageDialog::DoDataExchange(pDX); + CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CReplacePathsDlg) DDX_Control(pDX, IDC_PATHS_LIST, m_ctlPathsList); DDX_Text(pDX, IDC_DESTINATION_EDIT, m_strDest); @@ -55,7 +55,7 @@ } -BEGIN_MESSAGE_MAP(CReplacePathsDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CReplacePathsDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CReplacePathsDlg) ON_LBN_SELCHANGE(IDC_PATHS_LIST, OnSelchangePathsList) ON_BN_CLICKED(IDC_BROWSE_BUTTON, OnBrowseButton) @@ -67,7 +67,7 @@ BOOL CReplacePathsDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); for (int i=0;iGetClipboardDataSize();i++) m_ctlPathsList.AddString(m_pTask->GetClipboardData(i)->GetPath()); @@ -91,7 +91,7 @@ if (m_strSource.IsEmpty()) MsgBox(IDS_SOURCESTRINGMISSING_STRING); else - CHLanguageDialog::OnOK(); + CLanguageDialog::OnOK(); } void CReplacePathsDlg::OnBrowseButton() Index: src/ch/ReplacePathsDlg.h =================================================================== diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/ReplacePathsDlg.h (.../ReplacePathsDlg.h) (revision 3493e9fc470285b0a0b417d50be281467a071eb7) +++ src/ch/ReplacePathsDlg.h (.../ReplacePathsDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -25,7 +25,7 @@ ///////////////////////////////////////////////////////////////////////////// // CReplacePathsDlg dialog -class CReplacePathsDlg : public CHLanguageDialog +class CReplacePathsDlg : public ictranslate::CLanguageDialog { // Construction public: Index: src/ch/ShortcutsDlg.cpp =================================================================== diff -u -rebabad67cdda34ed4e36ab794e10d0ade8124bf3 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/ShortcutsDlg.cpp (.../ShortcutsDlg.cpp) (revision ebabad67cdda34ed4e36ab794e10d0ade8124bf3) +++ src/ch/ShortcutsDlg.cpp (.../ShortcutsDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -34,7 +34,7 @@ CShortcutsDlg::CShortcutsDlg(CWnd* pParent /*=NULL*/) - : CHLanguageDialog(CShortcutsDlg::IDD, pParent) + :ictranslate::CLanguageDialog(CShortcutsDlg::IDD, pParent) { //{{AFX_DATA_INIT(CShortcutsDlg) m_strName = _T(""); @@ -54,7 +54,7 @@ } -BEGIN_MESSAGE_MAP(CShortcutsDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CShortcutsDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CShortcutsDlg) ON_NOTIFY(LVN_ITEMCHANGED, IDC_SHORTCUT_LIST, OnItemchangedShortcutList) ON_CBN_EDITCHANGE(IDC_PATH_COMBOBOXEX, OnEditchangePathComboboxex) @@ -72,7 +72,7 @@ BOOL CShortcutsDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // system image list SHFILEINFO sfi; Index: src/ch/ShutdownDlg.cpp =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/ShutdownDlg.cpp (.../ShutdownDlg.cpp) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/ShutdownDlg.cpp (.../ShutdownDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -33,7 +33,7 @@ CShutdownDlg::CShutdownDlg() - : CHLanguageDialog(CShutdownDlg::IDD) + :ictranslate::CLanguageDialog(CShutdownDlg::IDD) { //{{AFX_DATA_INIT(CShutdownDlg) m_strTime = _T(""); @@ -43,15 +43,15 @@ void CShutdownDlg::DoDataExchange(CDataExchange* pDX) { - CHLanguageDialog::DoDataExchange(pDX); + CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CShutdownDlg) DDX_Control(pDX, IDC_TIME_PROGRESS, m_ctlProgress); DDX_Text(pDX, IDC_TIME_STATIC, m_strTime); //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(CShutdownDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CShutdownDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CShutdownDlg) ON_WM_TIMER() //}}AFX_MSG_MAP @@ -62,7 +62,7 @@ BOOL CShutdownDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // make on top SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE /*| SWP_SHOWWINDOW*/); @@ -93,7 +93,7 @@ EndDialog(IDOK); } - CHLanguageDialog::OnTimer(nIDEvent); + CLanguageDialog::OnTimer(nIDEvent); } void CShutdownDlg::FormatTimeString(int iTime, CString *pstrData) Index: src/ch/ShutdownDlg.h =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/ShutdownDlg.h (.../ShutdownDlg.h) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/ShutdownDlg.h (.../ShutdownDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -23,7 +23,7 @@ ///////////////////////////////////////////////////////////////////////////// // CShutdownDlg dialog -class CShutdownDlg : public CHLanguageDialog +class CShutdownDlg : public ictranslate::CLanguageDialog { // Construction public: Index: src/ch/SmallReplaceFilesDlg.cpp =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/SmallReplaceFilesDlg.cpp (.../SmallReplaceFilesDlg.cpp) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/SmallReplaceFilesDlg.cpp (.../SmallReplaceFilesDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -34,7 +34,7 @@ CSmallReplaceFilesDlg::CSmallReplaceFilesDlg() - : CHLanguageDialog(CSmallReplaceFilesDlg::IDD) + :ictranslate::CLanguageDialog(CSmallReplaceFilesDlg::IDD) { //{{AFX_DATA_INIT(CSmallReplaceFilesDlg) // NOTE: the ClassWizard will add member initialization here @@ -49,13 +49,13 @@ void CSmallReplaceFilesDlg::DoDataExchange(CDataExchange* pDX) { - CHLanguageDialog::DoDataExchange(pDX); + CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CSmallReplaceFilesDlg) // NOTE: the ClassWizard will add DDX and DDV calls here //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(CSmallReplaceFilesDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CSmallReplaceFilesDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CSmallReplaceFilesDlg) ON_BN_CLICKED(IDC_RECOPY_BUTTON, OnRecopyButton) ON_BN_CLICKED(IDC_RECOPY_ALL_BUTTON, OnRecopyAllButton) @@ -70,7 +70,7 @@ BOOL CSmallReplaceFilesDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // set on top SetWindowPos(&wndNoTopMost, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE /*| SWP_SHOWWINDOW*/); @@ -130,5 +130,5 @@ SetWindowText(m_strTitle+_T(" [")+CString(_itot(m_iTime/1000, xx, 10))+_T("]")); } - CHLanguageDialog::OnTimer(nIDEvent); + CLanguageDialog::OnTimer(nIDEvent); } Index: src/ch/SmallReplaceFilesDlg.h =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/SmallReplaceFilesDlg.h (.../SmallReplaceFilesDlg.h) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/SmallReplaceFilesDlg.h (.../SmallReplaceFilesDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -25,7 +25,7 @@ ///////////////////////////////////////////////////////////////////////////// // CSmallReplaceFilesDlg dialog -class CSmallReplaceFilesDlg : public CHLanguageDialog +class CSmallReplaceFilesDlg : public ictranslate::CLanguageDialog { // Construction public: Index: src/ch/StatusDlg.cpp =================================================================== diff -u -rebabad67cdda34ed4e36ab794e10d0ade8124bf3 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision ebabad67cdda34ed4e36ab794e10d0ade8124bf3) +++ src/ch/StatusDlg.cpp (.../StatusDlg.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -39,7 +39,7 @@ // CStatusDlg dialog CStatusDlg::CStatusDlg(CTaskArray* pTasks, CWnd* pParent /*=NULL*/) - : CHLanguageDialog(CStatusDlg::IDD, pParent, &m_bLock) + : ictranslate::CLanguageDialog(CStatusDlg::IDD, pParent, &m_bLock) { //{{AFX_DATA_INIT(CStatusDlg) //}}AFX_DATA_INIT @@ -58,7 +58,7 @@ void CStatusDlg::DoDataExchange(CDataExchange* pDX) { - CHLanguageDialog::DoDataExchange(pDX); + CLanguageDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(CStatusDlg) DDX_Control(pDX, IDC_ERRORS_EDIT, m_ctlErrors); DDX_Control(pDX, IDC_TASK_PROGRESS, m_ctlCurrentProgress); @@ -67,7 +67,7 @@ //}}AFX_DATA_MAP } -BEGIN_MESSAGE_MAP(CStatusDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CStatusDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CStatusDlg) ON_WM_TIMER() ON_BN_CLICKED(IDC_PAUSE_BUTTON, OnPauseButton) @@ -97,7 +97,7 @@ BOOL CStatusDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // get size of list ctrl CRect rcList; @@ -220,7 +220,7 @@ SetTimer(777, (UINT)GetConfig()->get_signed_num(PP_STATUSREFRESHINTERVAL), NULL); } - CHLanguageDialog::OnTimer(nIDEvent); + CLanguageDialog::OnTimer(nIDEvent); } void CStatusDlg::AddTaskInfo(int nPos, CTask *pTask, DWORD dwCurrentTime) @@ -514,7 +514,7 @@ { // processing priority if ( (pSelectedItem=GetSelectedItemPointer()) == NULL ) - return CHLanguageDialog::OnCommand(wParam, lParam); + return ictranslate::CLanguageDialog::OnCommand(wParam, lParam); switch (LOWORD(wParam)) { @@ -549,7 +549,7 @@ } } } - return CHLanguageDialog::OnCommand(wParam, lParam); + return ictranslate::CLanguageDialog::OnCommand(wParam, lParam); } void CStatusDlg::OnPauseButton() @@ -803,7 +803,7 @@ void CStatusDlg::OnCancel() { PostCloseMessage(); - CHLanguageDialog::OnCancel(); + CLanguageDialog::OnCancel(); } void CStatusDlg::OnAdvancedButton() @@ -894,7 +894,7 @@ TRACE("Received WM_UPDATESTATUS\n"); RefreshStatus(); } - return CHLanguageDialog::WindowProc(message, wParam, lParam); + return ictranslate::CLanguageDialog::WindowProc(message, wParam, lParam); } void CStatusDlg::OnStickButton() Index: src/ch/StatusDlg.h =================================================================== diff -u -r4c272b19c74694c428c943011f279ec064fbd894 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/StatusDlg.h (.../StatusDlg.h) (revision 4c272b19c74694c428c943011f279ec064fbd894) +++ src/ch/StatusDlg.h (.../StatusDlg.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -28,7 +28,7 @@ ///////////////////////////////////////////////////////////////////////////// // CStatusDlg dialog -class CStatusDlg : public CHLanguageDialog +class CStatusDlg : public ictranslate::CLanguageDialog { // Construction public: Index: src/ch/Stdafx.h =================================================================== diff -u -rebabad67cdda34ed4e36ab794e10d0ade8124bf3 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/Stdafx.h (.../Stdafx.h) (revision ebabad67cdda34ed4e36ab794e10d0ade8124bf3) +++ src/ch/Stdafx.h (.../Stdafx.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -31,9 +31,8 @@ #include "afxmt.h" #pragma warning (disable: 4711) -#include "HelpLngDialog.h" -#include "htmlhelp.h" #include "debug.h" +#include "../libictranslate/LanguageDialog.h" #ifdef _UNICODE #if defined _M_IX86 Index: src/ch/af_defs.h =================================================================== diff -u -rcdf6a22ddf857f56ce2e27e26d8cd6f0b8034b2e -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/af_defs.h (.../af_defs.h) (revision cdf6a22ddf857f56ce2e27e26d8cd6f0b8034b2e) +++ src/ch/af_defs.h (.../af_defs.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -4,25 +4,5 @@ // messages used by the app framework's modules #define WM_TRAYNOTIFY (WM_USER+0) #define WM_CFGNOTIFY (WM_USER+1) -#define WM_RMNOTIFY (WM_USER+2) -// message routing -// types of routing -// sends a message everywhere it could be sent (hwnds, registered modules, ...) -#define ROT_EVERYWHERE 0x0000000000000000 -// sends a message to all hwnds in an app -#define ROT_HWNDS 0x0100000000000000 -// sends a message to all registered modules -#define ROT_REGISTERED 0x0200000000000000 -// sends a message to one exact module -#define ROT_EXACT 0x0300000000000000 - -// internal modules -#define IMID_CONFIGMANAGER 0x0001000000000000 -#define IMID_RESOURCEMANAGER 0x0001000000000001 -#define IMID_LOGFILE 0x0001000000000002 - -// callbacks -typedef void(*PFNNOTIFYCALLBACK)(ULONGLONG, UINT, WPARAM, LPARAM); - #endif \ No newline at end of file Index: src/ch/ch.cpp =================================================================== diff -u -r7c612814a43eb389fa1ac27ccd8f621fd4ff37e8 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/ch.cpp (.../ch.cpp) (revision 7c612814a43eb389fa1ac27ccd8f621fd4ff37e8) +++ src/ch/ch.cpp (.../ch.cpp) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -74,29 +74,15 @@ // CCopyHandlerApp construction // main routing function - routes any message that comes from modules -LRESULT MainRouter(ULONGLONG ullDst, UINT uiMsg, WPARAM wParam, LPARAM lParam) +void ResManCallback(uint_t uiMsg, uint_t uiParam) { - TRACE("Main routing func received ullDst=%I64u, uiMsg=%lu, wParam=%lu, lParam=%lu\n", ullDst, uiMsg, wParam, lParam); - ULONGLONG ullOperation=ullDst & 0xff00000000000000; - ullDst &= 0x00ffffffffffffff; // get rid of operation - - switch (ullOperation) + // now additional processing + switch(uiMsg) { - case ROT_EVERYWHERE: - { - // now additional processing - switch (uiMsg) - { - case WM_RMNOTIFY: - theApp.OnResManNotify((UINT)wParam, lParam); - break; - } - - break; - } + case WM_RMNOTIFY: + theApp.OnResManNotify((UINT)uiParam, 0); + break; } - - return (LRESULT)TRUE; } void ConfigPropertyChangedCallback(uint_t uiPropID, ptr_t /*pParam*/) @@ -109,7 +95,6 @@ m_cfgSettings(icpf::config::eIni) { m_pMainWindow=NULL; - m_szHelpPath[0]=_T('\0'); // this is the one-instance application InitProtection(); @@ -136,7 +121,7 @@ return &theApp; } -CResourceManager* GetResManager() +ictranslate::CResourceManager* GetResManager() { return &theApp.m_resManager; } @@ -165,10 +150,11 @@ GetConfig()->get_string(PP_PHELPDIR, szBuffer, _MAX_PATH); ExpandPath(szBuffer); _tcscat(szBuffer, GetResManager()->m_ld.GetHelpName()); - if (_tcscmp(szBuffer, m_szHelpPath) != 0) + if(_tcscmp(szBuffer, m_pszHelpFilePath) != 0) { + free((void*)m_pszHelpFilePath); + m_pszHelpFilePath = _tcsdup(szBuffer); bChanged=true; - _tcscpy(m_szHelpPath, szBuffer); } return bChanged; @@ -225,6 +211,9 @@ BOOL CCopyHandlerApp::InitInstance() { + // set the exception handler to catch the crash dumps + SetUnhandledExceptionFilter(&MyUnhandledExceptionFilter); + // InitCommonControlsEx() is required on Windows XP if an application // manifest specifies use of ComCtl32.dll version 6 or later to enable // visual styles. Otherwise, any window creation will fail. @@ -235,8 +224,8 @@ InitCtrls.dwICC = ICC_WIN95_CLASSES; InitCommonControlsEx(&InitCtrls); - // set the exception handler to catch the crash dumps - SetUnhandledExceptionFilter(&MyUnhandledExceptionFilter); + EnableHtmlHelp(); + //SetHelpMode(afxHTMLHelp); CWinApp::InitInstance(); @@ -276,7 +265,7 @@ // set current language TCHAR szPath[_MAX_PATH]; m_resManager.Init(AfxGetInstanceHandle()); - m_resManager.SetCallback((PFNNOTIFYCALLBACK)MainRouter); + m_resManager.SetCallback(ResManCallback); m_cfgSettings.get_string(PP_PLANGUAGE, szPath, _MAX_PATH); TRACE(_T("Help path=%s\n"), szPath); if (!m_resManager.SetLanguage(ExpandPath(szPath))) @@ -287,8 +276,10 @@ return FALSE; } + UpdateHelpPaths(); + // for dialogs - CLanguageDialog::SetResManager(&m_resManager); + ictranslate::CLanguageDialog::SetResManager(&m_resManager); // initialize log file m_cfgSettings.get_string(PP_LOGPATH, szPath, _MAX_PATH); @@ -353,10 +344,10 @@ { PCTSTR pszPath=NULL; WIN32_FIND_DATA wfd; - HANDLE handle=::FindFirstFile(m_szHelpPath, &wfd); + HANDLE handle=::FindFirstFile(m_pszHelpFilePath, &wfd); if (handle != INVALID_HANDLE_VALUE) { - pszPath=m_szHelpPath; + pszPath=m_pszHelpFilePath; ::FindClose(handle); } @@ -374,25 +365,25 @@ return ::HtmlHelp(hwndCaller, pszPath, uCommand, dwData); } -bool CCopyHandlerApp::HtmlHelp(UINT uiCommand, LPARAM lParam) +void CCopyHandlerApp::HtmlHelp(DWORD_PTR dwData, UINT nCmd) { - switch (uiCommand) + switch (nCmd) { case HH_DISPLAY_TOPIC: case HH_HELP_CONTEXT: { - return HHelp(GetDesktopWindow(), NULL, uiCommand, lParam) != NULL; + HHelp(GetDesktopWindow(), NULL, nCmd, dwData); break; } case HH_CLOSE_ALL: - return ::HtmlHelp(NULL, NULL, HH_CLOSE_ALL, NULL) != NULL; + ::HtmlHelp(NULL, NULL, HH_CLOSE_ALL, NULL); break; case HH_DISPLAY_TEXT_POPUP: { - HELPINFO* pHelp=(HELPINFO*)lParam; + HELPINFO* pHelp=(HELPINFO*)dwData; if ( pHelp->dwContextId == 0 || pHelp->iCtrlId == 0 || ::GetWindowContextHelpId((HWND)pHelp->hItemHandle) == 0) - return false; + return; HH_POPUP hhp; hhp.cbStruct=sizeof(HH_POPUP); @@ -411,11 +402,9 @@ TCHAR szPath[_MAX_PATH]; _sntprintf(szPath, _MAX_PATH, _T("::/%lu.txt"), (pHelp->dwContextId >> 16) & 0x7fff); - return (HHelp(GetDesktopWindow(), szPath, HH_DISPLAY_TEXT_POPUP, (DWORD)&hhp) != NULL); + HHelp(GetDesktopWindow(), szPath, HH_DISPLAY_TEXT_POPUP, (DWORD)&hhp); break; } } - - return true; } Index: src/ch/ch.h =================================================================== diff -u -r7c612814a43eb389fa1ac27ccd8f621fd4ff37e8 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/ch.h (.../ch.h) (revision 7c612814a43eb389fa1ac27ccd8f621fd4ff37e8) +++ src/ch/ch.h (.../ch.h) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -27,12 +27,11 @@ #include "resource.h" // main symbols #include "AppHelper.h" -#include "ResourceManager.h" #include "CfgProperties.h" //#include "LogFile.h" #include "../libicpf/log.h" #include "../libicpf/cfg.h" - +#include "../libictranslate/ResourceManager.h" using namespace std; ///////////////////////////////////////////////////////////////////////////// @@ -54,14 +53,14 @@ virtual BOOL InitInstance(); //}}AFX_VIRTUAL - bool HtmlHelp(UINT uiCommand, LPARAM lParam); + virtual void HtmlHelp(DWORD_PTR dwData, UINT nCmd); - PCTSTR GetHelpPath() const { return m_szHelpPath; }; + PCTSTR GetHelpPath() const { return m_pszHelpFilePath; }; friend LRESULT MainRouter(ULONGLONG ullDst, UINT uiMsg, WPARAM wParam, LPARAM lParam); friend int MsgBox(UINT uiID, UINT nType=MB_OK, UINT nIDHelp=0); friend CCopyHandlerApp* GetApp(); - friend CResourceManager* GetResManager(); + friend ictranslate::CResourceManager* GetResManager(); friend icpf::config* GetConfig(); // friend CLogFile* GetLog(); @@ -72,7 +71,7 @@ HWND HHelp(HWND hwndCaller, LPCTSTR pszFile, UINT uCommand, DWORD dwData); public: - CResourceManager m_resManager; + ictranslate::CResourceManager m_resManager; // CConfigManager m_cfgManager; icpf::config m_cfgSettings; icpf::log_file m_lfLog; @@ -84,7 +83,7 @@ protected: // Implementation HANDLE m_hMapObject; - TCHAR m_szHelpPath[_MAX_PATH]; // full file path to the help file + //TCHAR m_szHelpPath[_MAX_PATH]; // full file path to the help file // CString m_strCrashInfo; // crash info text //{{AFX_MSG(CCopyHandlerApp) Index: src/ch/ch.rc =================================================================== diff -u -r27474113d5f01439c44834bf6088c2e112187997 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/ch.rc (.../ch.rc) (revision 27474113d5f01439c44834bf6088c2e112187997) +++ src/ch/ch.rc (.../ch.rc) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -282,7 +282,7 @@ PUSHBUTTON "&Cancel",IDCANCEL,227,193,50,14,0,0,HIDCANCEL LISTBOX IDC_PROPERTIES_LIST,7,7,382,179,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP,0,HIDC_PROPERTIES_LIST PUSHBUTTON "&Apply",IDC_APPLY_BUTTON,283,193,50,14,0,0,HIDC_APPLY_BUTTON - PUSHBUTTON "&Help",IDC_HELP_BUTTON,339,193,50,14,0,0,HIDC_HELP_BUTTON + PUSHBUTTON "&Help",IDHELP,339,193,50,14,0,0,HIDHELP END IDD_REPLACE_PATHS_DIALOG DIALOGEX 0, 0, 342, 148 Index: src/ch/ch.vc90.vcproj =================================================================== diff -u -rcb588a864d28da44cc192760595d3c5ad6f2fac9 -r328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf --- src/ch/ch.vc90.vcproj (.../ch.vc90.vcproj) (revision cb588a864d28da44cc192760595d3c5ad6f2fac9) +++ src/ch/ch.vc90.vcproj (.../ch.vc90.vcproj) (revision 328d5100c7f464a4b1fbbbd7ccfa07bf2aaae2cf) @@ -76,6 +76,7 @@ />