Index: src/ch/OptionsDlg.h
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d
--- src/ch/OptionsDlg.h	(.../OptionsDlg.h)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/OptionsDlg.h	(.../OptionsDlg.h)	(revision 44a2ec5f1eb0a435b56daef42ef5fe3b7a91da0d)
@@ -1,98 +1,78 @@
-/************************************************************************
-	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 __OPTIONSDLG_H__
-#define __OPTIONSDLG_H__
-
-#include "PropertyListCtrl.h"
-#include "structs.h"
-#include "shortcuts.h"
-#include "charvect.h"
-
-#define WM_CONFIGNOTIFY		WM_USER+13
-
-/////////////////////////////////////////////////////////////////////////////
-// COptionsDlg dialog
-
-class COptionsDlg : public CHLanguageDialog
-{
-// Construction
-public:
-	void SendClosingNotify();
-	COptionsDlg(CWnd* pParent = NULL);   // standard constructor
-
-	virtual void OnLanguageChanged(WORD wOld, WORD wNew);
-
-	static bool m_bLock;				// locker
-
-	char_vector m_cvRecent;
-	char_vector m_cvShortcuts;
-
-	// for languages
-	vector<CLangData> 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);
-	friend void ShortcutsPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
-	friend void RecentPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
-
-// Dialog Data
-	//{{AFX_DATA(COptionsDlg)
-	enum { IDD = IDD_OPTIONS_DIALOG };
-	CPropertyListCtrl	m_ctlProperties;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptionsDlg)
-	public:
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-	void FillPropertyList();
-	void ApplyProperties();
-
-	int GetIndexProp(int iPosition);
-	CString GetStringProp(int iPosition);
-	UINT GetUintProp(int iPosition);
-	bool GetBoolProp(int iPosition);
-	CString MakeCompoundString(UINT uiBase, int iCount, LPCTSTR lpszSeparator);
-
-	TCHAR m_szBuffer[_MAX_PATH];	// for macro use
-	CString m_strTemp;
-	int m_iSel;
-
-	// Generated message map functions
-	//{{AFX_MSG(COptionsDlg)
-	virtual BOOL OnInitDialog();
-	virtual void OnOK();
-	virtual void OnCancel();
-	afx_msg void OnApplyButton();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ 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 __OPTIONSDLG_H__
+#define __OPTIONSDLG_H__
+
+#include "PropertyListCtrl.h"
+
+#define WM_CONFIGNOTIFY		WM_USER+13
+
+/////////////////////////////////////////////////////////////////////////////
+// COptionsDlg dialog
+
+class COptionsDlg : public ictranslate::CLanguageDialog
+{
+public:
+	enum { IDD = IDD_OPTIONS_DIALOG };
+
+public:
+	explicit COptionsDlg(CWnd* pParent = NULL);   // standard constructor
+
+	virtual void OnLanguageChanged();
+
+	void SendClosingNotify();
+
+	friend void CustomPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
+	friend void ShortcutsPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
+	friend void RecentPropertyCallbackProc(LPVOID lpParam, int iParam, CPtrList* pList, int iIndex);
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+
+private:
+	void FillPropertyList();
+	void ApplyProperties();
+
+	int GetIndexProp(int iPosition);
+	CString GetStringProp(int iPosition);
+	UINT GetUintProp(int iPosition);
+	bool GetBoolProp(int iPosition);
+	CString MakeCompoundString(UINT uiBase, int iCount, LPCTSTR lpszSeparator);
+
+	// Generated message map functions
+	virtual BOOL OnInitDialog();
+	virtual void OnOK();
+	virtual void OnCancel();
+	afx_msg void OnApplyButton();
+
+	DECLARE_MESSAGE_MAP()
+
+private:
+	static bool m_bLock;				// locker
+
+	std::vector<CString> m_cvRecent;
+	std::vector<CString> m_cvShortcuts;
+
+	// for languages
+	vector<ictranslate::CLangData> m_vld;
+
+	CPropertyListCtrl m_ctlProperties;
+};
+
+#endif