Prepare release and bump version numbers to 2.17.0
[TortoiseGit.git] / src / TortoiseProc / DeleteConflictDlg.h
blobd32732d3f23921285fbeb269433ab78714d4d497
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2009-2011, 2017, 2019-2020, 2023 - 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.
19 #pragma once
21 #include "StandAloneDlg.h"
22 #include "TGitPath.h"
23 // CDeleteConflictDlg dialog
25 class CDeleteConflictDlg : public CStandAloneDialog
27 DECLARE_DYNAMIC(CDeleteConflictDlg)
29 public:
30 CDeleteConflictDlg(CWnd* pParent = nullptr); // standard constructor
31 virtual ~CDeleteConflictDlg();
33 // Dialog Data
34 enum { IDD = IDD_RESOLVE_CONFLICT };
36 protected:
37 void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
38 afx_msg void OnBnClickedLog();
39 afx_msg void OnBnClickedLog2();
40 afx_msg void OnBnClickedDelete();
41 afx_msg void OnBnClickedModify();
42 afx_msg void OnBnClickedShowdiff();
43 BOOL OnInitDialog() override;
44 void ShowLog(CString hash);
45 DECLARE_MESSAGE_MAP()
47 public:
48 CString m_LocalStatus;
49 CString m_RemoteStatus;
50 CGitHash m_LocalHash;
51 CGitHash m_RemoteHash;
52 CString m_LocalRef;
53 CString m_RemoteRef;
54 BOOL m_bShowModifiedButton;
55 CTGitPath m_File;
56 CTGitPath m_FileBaseVersion;
57 BOOL m_bIsDelete;
58 bool m_bDiffMine;