X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FTortoiseProc%2FProgressDlg.h;h=1a7456ffaacffc452f09de8f1c7bb885c3b5c52e;hp=f6460184cd0049f6ecc1c802c3019fc51bcd17c8;hb=28b0c304b0ab86373dc423c7e07a978387e86f74;hpb=6dcce231e72f67c494aac24b2653138500d8effd

diff --git a/src/TortoiseProc/ProgressDlg.h b/src/TortoiseProc/ProgressDlg.h
index f646018..1a7456f 100644
--- a/src/TortoiseProc/ProgressDlg.h
+++ b/src/TortoiseProc/ProgressDlg.h
@@ -5,7 +5,9 @@
 #define MSG_PROGRESSDLG_UPDATE_UI	(WM_USER+121)
 // CProgressDlg dialog
 #define MSG_PROGRESSDLG_START 0
+#define MSG_PROGRESSDLG_RUN   50
 #define MSG_PROGRESSDLG_END   110
+#define MSG_PROGRESSDLG_FAILED 111
 
 class CProgressDlg : public CResizableStandAloneDialog
 {
@@ -18,11 +20,16 @@ public:
 // Dialog Data
 	enum { IDD = IDD_GITPROGRESS };
 	CString m_GitCmd;
+	std::vector<CString> m_GitCmdList;
+	bool m_bAutoCloseOnSuccess;
+	CString m_changeAbortButtonOnSuccessTo;
+
 	CString m_LogFile;
 
 	CProgressCtrl m_Progress;
 	
 	CEdit		  m_Log;
+	CString m_Title;
 	CAnimateCtrl  m_Animate;
 	CStatic		  m_CurrentWork;
 	CWinThread*				m_pThread;	
@@ -30,6 +37,9 @@ public:
 	DWORD			  m_GitStatus;
 	BOOL		  m_bShowCommand;	// whether to display the command in the log window (default true)
 	CString		  m_PreText;		// optional text to show in log window before running command
+	CString		  m_LogText;
+
+	bool			m_bAbort;
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	static UINT ProgressThreadEntry(LPVOID pVoid);
@@ -41,6 +51,10 @@ protected:
 
 	LRESULT CProgressDlg::OnProgressUpdateUI(WPARAM wParam,LPARAM lParam);
 
-	CString		m_LogText;
+	void		OnCancel();
+
+	
 	DECLARE_MESSAGE_MAP()
+public:
+	afx_msg void OnBnClickedOk();
 };