Index: src/ch/ch.h
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -ra27d1acf1bda3c25b6dcce0d0eb0278009ce63ae
--- src/ch/ch.h	(.../ch.h)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/ch.h	(.../ch.h)	(revision a27d1acf1bda3c25b6dcce0d0eb0278009ce63ae)
@@ -1,102 +1,79 @@
-/************************************************************************
-	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.
-*************************************************************************/
-
-#ifndef __COPYHANDLER_H__
-#define __COPYHANDLER_H__
-
-#ifndef __AFXWIN_H__
-	#error include 'stdafx.h' before including this file for PCH
-#endif
-
-#include "resource.h"       // main symbols
-#include "AppHelper.h"
-#include "ResourceManager.h"
-
-#define DISABLE_CRYPT
-#include "ConfigManager.h"
-
-#include "CfgProperties.h"
-//#include "LogFile.h"
-#include <log.h>
-
-using namespace std;
-
-/////////////////////////////////////////////////////////////////////////////
-// CCopyHandlerApp:
-// See CopyHandler.cpp for the implementation of this class
-//
-
-class CCopyHandlerApp : public CWinApp, public CAppHelper
-{
-public:
-//	BOOL RegisterShellExt();
-	CCopyHandlerApp();
-	~CCopyHandlerApp();
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CCopyHandlerApp)
-	public:
-	virtual BOOL InitInstance();
-	//}}AFX_VIRTUAL
-
-	bool HtmlHelp(UINT uiCommand, LPARAM lParam);
-
-	PCTSTR GetHelpPath() const { return m_szHelpPath; };
-
-	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 CConfigManager* GetConfig();
-//	friend CLogFile* GetLog();
-
-	void OnConfigNotify(UINT uiType, LPARAM lParam);
-	void OnResManNotify(UINT uiType, LPARAM lParam);
-protected:
-	bool UpdateHelpPaths();
-	HWND HHelp(HWND hwndCaller, LPCSTR pszFile, UINT uCommand, DWORD dwData);
-
-public:
-	CResourceManager m_resManager;
-	CConfigManager m_cfgManager;
-	icpf::log_file m_lfLog;
-
-	CWnd *m_pMainWindow;
-	// currently opened dialogs
-//	list<CWnd*> m_lhDialogs;
-
-protected:
-// Implementation
-	HANDLE m_hMapObject;
-	TCHAR m_szHelpPath[_MAX_PATH];	// full file path to the help file
-
-	//{{AFX_MSG(CCopyHandlerApp)
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Developer Studio will insert additional declarations immediately before the previous line.
-
-#endif
+/***************************************************************************
+*   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__
+
+#include "resource.h"       // main symbols
+#include "AppHelper.h"
+#include "CfgProperties.h"
+#include "../libictranslate/ResourceManager.h"
+#include "../libchcore/TConfig.h"
+#include "TShellExtensionClient.h"
+#include "TCommandLineParser.h"
+
+/////////////////////////////////////////////////////////////////////////////
+// CCopyHandlerApp:
+// See CopyHandler.cpp for the implementation of this class
+//
+
+class CCopyHandlerApp : public CWinApp, public CAppHelper
+{
+public:
+	CCopyHandlerApp();
+	~CCopyHandlerApp();
+
+	virtual BOOL InitInstance();
+	virtual int ExitInstance();
+
+	virtual void HtmlHelp(DWORD_PTR dwData, UINT nCmd);
+
+	PCTSTR GetHelpPath() const { return m_pszHelpFilePath; };
+
+	friend int MsgBox(UINT uiID, UINT nType=MB_OK, UINT nIDHelp=0);
+
+	friend LRESULT MainRouter(ULONGLONG ullDst, UINT uiMsg, WPARAM wParam, LPARAM lParam);
+	friend CCopyHandlerApp& GetApp();
+	friend ictranslate::CResourceManager& GetResManager();
+	friend chcore::TConfig& GetConfig();
+
+	void RegisterShellExtension();
+	void UnregisterShellExtension();
+
+	void OnConfigNotify(const chcore::TStringSet& setPropNames);
+	void OnResManNotify(UINT uiType);
+
+	const TCommandLineParser& GetCommandLine() const { return m_cmdLineParser; }
+
+protected:
+	bool UpdateHelpPaths();
+	HWND HHelp(HWND hwndCaller, LPCTSTR pszFile, UINT uCommand, DWORD_PTR dwData);
+
+	void InitShellExtension();
+	bool ParseCommandLine();
+
+protected:
+	TShellExtensionClient m_tShellExtClient;
+	TCommandLineParser m_cmdLineParser;
+
+	CWnd *m_pMainWindow;
+
+	DECLARE_MESSAGE_MAP()
+};
+
+#endif