Unified SyncDlg and progressdlg log handle

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / ProgressDlg.h

diff --git a/src/TortoiseProc/ProgressDlg.h b/src/TortoiseProc/ProgressDlg.h
index 920a4fd..7c4f1ab 100644 (file)
--- a/src/TortoiseProc/ProgressDlg.h
+++ b/src/TortoiseProc/ProgressDlg.h
@@ -28,7 +28,7 @@ public:
 \r
        CProgressCtrl m_Progress;\r
        \r
-       CEdit             m_Log;\r
+       CRichEditCtrl  m_Log;\r
        CString m_Title;\r
        CAnimateCtrl  m_Animate;\r
        CStatic           m_CurrentWork;\r
@@ -41,21 +41,34 @@ public:
 \r
        bool                    m_bAbort;\r
        bool                    m_bDone;\r
+       bool                    m_bAltAbortPress;\r
+       bool                    m_bBufferAll;   // Buffer All to improve speed when there are many file add at commit \r
 protected:\r
        virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
        static UINT ProgressThreadEntry(LPVOID pVoid);\r
        UINT            ProgressThread();\r
 \r
        void            ParserCmdOutput(TCHAR ch);\r
-       int                     FindPercentage(CString &log);\r
        void        RemoveLastLine(CString &str);\r
 \r
        LRESULT CProgressDlg::OnProgressUpdateUI(WPARAM wParam,LPARAM lParam);\r
 \r
        void            OnCancel();\r
 \r
+       std::vector<TCHAR> m_Databuf;\r
+       int                     m_BufStart;\r
        \r
+       void InsertCRLF(); //Insert \r before \n\r
+\r
        DECLARE_MESSAGE_MAP()\r
 public:\r
+\r
+       //Share with Sync Dailog\r
+       static int      FindPercentage(CString &log);\r
+       static void     ParserCmdOutput(CRichEditCtrl &log,CProgressCtrl &progressctrl,CString &oneline, TCHAR ch);\r
+\r
+       static UINT  RunCmdList(CWnd *pWnd,std::vector<CString> &cmdlist,bool bShowCommand,CString *pfilename,bool *bAbort,std::vector<TCHAR> *pdata=NULL);\r
+\r
        afx_msg void OnBnClickedOk();\r
+       afx_msg void OnBnClickedButton1();\r
 };\r