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.
20 #include "StandAloneDlg.h"
21 #include "GitStatusListCtrl.h"
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
)
33 CResolveDlg(CWnd
* pParent
= NULL
); // standard constructor
34 virtual ~CResolveDlg();
37 enum { IDD
= IDD_RESOLVE
};
40 virtual void DoDataExchange(CDataExchange
* pDX
); // 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
);
45 virtual BOOL
OnInitDialog();
47 virtual void OnCancel();
50 static UINT
ResolveThreadEntry(LPVOID pVoid
);
52 afx_msg LRESULT
OnSVNStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
);
57 CTGitPathList m_pathList
;
60 CGitStatusListCtrl m_resolveListCtrl
;
61 volatile LONG m_bThreadRunning
;