1 // TortoiseSVN - a Windows shell extension for easy version control
\r
3 // Copyright (C) 2003-2007 - TortoiseSVN
\r
5 // This program is free software; you can redistribute it and/or
\r
6 // modify it under the terms of the GNU General Public License
\r
7 // as published by the Free Software Foundation; either version 2
\r
8 // of the License, or (at your option) any later version.
\r
10 // This program is distributed in the hope that it will be useful,
\r
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
13 // GNU General Public License for more details.
\r
15 // You should have received a copy of the GNU General Public License
\r
16 // along with this program; if not, write to the Free Software Foundation,
\r
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\r
20 #include "StandAloneDlg.h"
\r
21 #include "GitStatusListCtrl.h"
\r
25 * \ingroup TortoiseProc
\r
26 * Helper dialog, showing a list of conflicted files of the working copy.
\r
28 class CResolveDlg : public CResizableStandAloneDialog
\r
30 DECLARE_DYNAMIC(CResolveDlg)
\r
33 CResolveDlg(CWnd* pParent = NULL); // standard constructor
\r
34 virtual ~CResolveDlg();
\r
37 enum { IDD = IDD_RESOLVE };
\r
40 virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
\r
41 afx_msg void OnBnClickedSelectall();
\r
42 afx_msg void OnBnClickedHelp();
\r
43 afx_msg LRESULT OnFileDropped(WPARAM, LPARAM lParam);
\r
44 afx_msg void OnTimer(UINT_PTR nIDEvent);
\r
45 virtual BOOL PreTranslateMessage(MSG* pMsg);
\r
46 virtual BOOL OnInitDialog();
\r
47 virtual void OnOK();
\r
48 virtual void OnCancel();
\r
51 static UINT ResolveThreadEntry(LPVOID pVoid);
\r
52 UINT ResolveThread();
\r
53 afx_msg LRESULT OnSVNStatusListCtrlNeedsRefresh(WPARAM, LPARAM);
\r
55 DECLARE_MESSAGE_MAP()
\r
58 CTGitPathList m_pathList;
\r
61 CGitStatusListCtrl m_resolveListCtrl;
\r
62 volatile LONG m_bThreadRunning;
\r
63 CButton m_SelectAll;
\r