Fixed issue #3089: Show parent SHA1 on cherry picking a merge commit
[TortoiseGit.git] / src / TortoiseProc / ResolveDlg.h
blob12212a9df627a21acc1d194f266be6bcca2aad89
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2007 - 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 "StandAloneDlg.h"
21 #include "GitStatusListCtrl.h"
24 /**
25 * \ingroup TortoiseProc
26 * Helper dialog, showing a list of conflicted files of the working copy.
28 class CResolveDlg : public CResizableStandAloneDialog
30 DECLARE_DYNAMIC(CResolveDlg)
32 public:
33 CResolveDlg(CWnd* pParent = nullptr); // standard constructor
34 virtual ~CResolveDlg();
36 // Dialog Data
37 enum { IDD = IDD_RESOLVE };
39 protected:
40 virtual void DoDataExchange(CDataExchange* pDX) override; // DDX/DDV support
41 afx_msg void OnBnClickedSelectall();
42 afx_msg LRESULT OnFileDropped(WPARAM, LPARAM lParam);
43 afx_msg void OnTimer(UINT_PTR nIDEvent);
44 virtual BOOL PreTranslateMessage(MSG* pMsg) override;
45 virtual BOOL OnInitDialog() override;
46 virtual void OnOK() override;
47 virtual void OnCancel() override;
49 private:
50 static UINT ResolveThreadEntry(LPVOID pVoid);
51 UINT ResolveThread();
52 afx_msg LRESULT OnSVNStatusListCtrlNeedsRefresh(WPARAM, LPARAM);
54 DECLARE_MESSAGE_MAP()
56 public:
57 CTGitPathList m_pathList;
59 private:
60 CGitStatusListCtrl m_resolveListCtrl;
61 volatile LONG m_bThreadRunning;
62 CButton m_SelectAll;
63 bool m_bCancelled;