For the inline diff, reverse the diff parts for the right view to get a diff consiste...
[TortoiseGit.git] / src / TortoiseMerge / EncodingDlg.h
blob9612808727e4b1a76d61737d93ee414bf136ecf6
1 // TortoiseGitMerge - a Diff/Patch program
3 // Copyright (C) 2013 - TortoiseSVN
5 // This program is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU General Public License
7 // as published by the Free Software Foundation; either version 2
8 // of the License, or (at your option) any later version.
10 // This program is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 // GNU General Public License for more details.
15 // You should have received a copy of the GNU General Public License
16 // along with this program; if not, write to the Free Software Foundation,
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19 #pragma once
20 #include "resource.h"
21 #include <afxcmn.h>
22 #include "HistoryCombo.h"
23 #include "FileTextLines.h"
25 extern const CFileTextLines::UnicodeType uctArray[9];
26 extern const EOL eolArray[10];
28 /**
29 * \ingroup TortoiseMerge
30 * Encoding dialog used in TortoiseMerge.
32 class CEncodingDlg : public CDialog
34 DECLARE_DYNAMIC(CEncodingDlg)
36 public:
37 CEncodingDlg(CWnd* pParent = NULL); // standard constructor
38 virtual ~CEncodingDlg();
39 void Create(CWnd * pParent = NULL) {CDialog::Create(IDD, pParent);ShowWindow(SW_SHOW);UpdateWindow();}
40 // Dialog Data
41 enum { IDD = IDD_ENCODING };
43 CFileTextLines::UnicodeType texttype;
44 EOL lineendings;
45 CString view;
46 protected:
47 virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
49 DECLARE_MESSAGE_MAP()
50 virtual void OnCancel();
51 virtual void OnOK();
52 virtual BOOL OnInitDialog();
53 CComboBox m_Encoding;
54 CComboBox m_EOL;