1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2007-2011, 2013-2015 - TortoiseGit
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.
21 #include "StandAloneDlg.h"
22 #include "ChooseVersion.h"
24 #include "RegHistory.h"
28 class CMergeDlg
: public CResizableStandAloneDialog
,public CChooseVersion
, public CSciEditContextMenuInterface
30 DECLARE_DYNAMIC(CMergeDlg
)
33 CMergeDlg(CWnd
* pParent
= NULL
); // standard constructor
37 enum { IDD
= IDD_MERGE
};
44 CString m_MergeStrategy
;
45 CString m_StrategyOption
;
46 CString m_StrategyParam
;
50 virtual void DoDataExchange(CDataExchange
* pDX
); // DDX/DDV support
51 virtual BOOL
OnInitDialog();
53 CSciEdit m_cLogMessage
;
54 ProjectProperties m_ProjectProperties
;
56 TCHAR
* m_pDefaultText
;
58 CHOOSE_EVENT_RADIO() ;
60 // CSciEditContextMenuInterface
61 virtual void InsertMenuItems(CMenu
& mPopup
, int& nCmd
);
62 virtual bool HandleMenuItemClick(int cmd
, CSciEdit
* pSciEdit
);
65 CString m_strLogMesage
;
68 CRegHistory m_History
;
69 int m_nPopupPasteLastMessage
;
70 int m_nPopupRecentMessage
;
72 afx_msg
void OnBnClickedOk();
73 virtual void OnCancel();
74 afx_msg
void OnDestroy();
75 afx_msg
void OnBnClickedCheckSquash();
76 afx_msg
void OnBnClickedCheckMergeLog();
77 afx_msg
void OnCbnSelchangeComboMergestrategy();
78 afx_msg
void OnCbnSelchangeComboStrategyoption();