Index: src/ch/ch.h
===================================================================
diff -u -rcdf6a22ddf857f56ce2e27e26d8cd6f0b8034b2e -rd2b121c78f510b5384b8ef0ca80afbfd7f77fef7
--- src/ch/ch.h	(.../ch.h)	(revision cdf6a22ddf857f56ce2e27e26d8cd6f0b8034b2e)
+++ src/ch/ch.h	(.../ch.h)	(revision d2b121c78f510b5384b8ef0ca80afbfd7f77fef7)
@@ -1,23 +1,21 @@
-/************************************************************************
-	Copy Handler 1.x - program for copying data in Microsoft Windows
-						 systems.
-	Copyright (C) 2001-2004 Ixen Gerthannes (copyhandler@o2.pl)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*************************************************************************/
-
+/***************************************************************************
+*   Copyright (C) 2001-2008 by J�zef Starosczyk                           *
+*   ixen@copyhandler.com                                                  *
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU Library General Public License          *
+*   (version 2) as published by the Free Software Foundation;             *
+*                                                                         *
+*   This program is distributed in the hope that it will be useful,       *
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+*   GNU General Public License for more details.                          *
+*                                                                         *
+*   You should have received a copy of the GNU Library General Public     *
+*   License along with this program; if not, write to the                 *
+*   Free Software Foundation, Inc.,                                       *
+*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+***************************************************************************/
 #ifndef __COPYHANDLER_H__
 #define __COPYHANDLER_H__
 
@@ -27,17 +25,11 @@
 
 #include "resource.h"       // main symbols
 #include "AppHelper.h"
-#include "ResourceManager.h"
-
-#define DISABLE_CRYPT
-#include "ConfigManager.h"
-
 #include "CfgProperties.h"
 //#include "LogFile.h"
 #include "../libicpf/log.h"
 #include "../libicpf/cfg.h"
-#include "../libicpf/cfg_ini.h"
-
+#include "../libictranslate/ResourceManager.h"
 using namespace std;
 
 /////////////////////////////////////////////////////////////////////////////
@@ -59,25 +51,25 @@
 	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();
 
 	void OnConfigNotify(uint_t uiPropID);
-	void OnResManNotify(UINT uiType, LPARAM lParam);
+	void OnResManNotify(UINT uiType);
 protected:
 	bool UpdateHelpPaths();
 	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;
@@ -89,8 +81,8 @@
 protected:
 // Implementation
 	HANDLE m_hMapObject;
-	TCHAR m_szHelpPath[_MAX_PATH];	// full file path to the help file
-	CString m_strCrashInfo;			// crash info text
+	//TCHAR m_szHelpPath[_MAX_PATH];	// full file path to the help file
+//	CString m_strCrashInfo;			// crash info text
 
 	//{{AFX_MSG(CCopyHandlerApp)
 	//}}AFX_MSG