1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2007-2009,2013 - 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.
23 #include "StandAloneDlg.h"
24 #include "HistoryCombo.h"
25 #include "ChooseVersion.h"
27 #include "RegHistory.h"
31 class CMergeDlg
: public CResizableStandAloneDialog
,public CChooseVersion
, public CSciEditContextMenuInterface
33 DECLARE_DYNAMIC(CMergeDlg
)
36 CMergeDlg(CWnd
* pParent
= NULL
); // standard constructor
40 enum { IDD
= IDD_MERGE
};
47 CString m_MergeStrategy
;
48 CString m_StrategyOption
;
49 CString m_StrategyParam
;
53 virtual void DoDataExchange(CDataExchange
* pDX
); // DDX/DDV support
54 virtual BOOL
OnInitDialog();
56 CSciEdit m_cLogMessage
;
57 ProjectProperties m_ProjectProperties
;
59 TCHAR
* m_pDefaultText
;
61 CHOOSE_EVENT_RADIO() ;
63 // CSciEditContextMenuInterface
64 virtual void InsertMenuItems(CMenu
& mPopup
, int& nCmd
);
65 virtual bool HandleMenuItemClick(int cmd
, CSciEdit
* pSciEdit
);
68 CString m_strLogMesage
;
71 CRegHistory m_History
;
72 int m_nPopupPasteLastMessage
;
73 int m_nPopupRecentMessage
;
75 afx_msg
void OnBnClickedOk();
76 virtual void OnCancel();
77 afx_msg
void OnDestroy();
78 afx_msg
void OnBnClickedCheckMergeLog();
79 afx_msg
void OnCbnSelchangeComboMergestrategy();
80 afx_msg
void OnCbnSelchangeComboStrategyoption();