Update version number to 1.2.1.0

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

diff --git a/src/TortoiseProc/ProgressDlg.h b/src/TortoiseProc/ProgressDlg.h
index 4941958..8f33bb6 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
@@ -49,7 +49,6 @@ protected:
        UINT            ProgressThread();\r
 \r
        void            ParserCmdOutput(TCHAR ch);\r
-       \r
        void        RemoveLastLine(CString &str);\r
 \r
        LRESULT CProgressDlg::OnProgressUpdateUI(WPARAM wParam,LPARAM lParam);\r
@@ -66,6 +65,9 @@ public:
 \r
        //Share with Sync Dailog\r
        static int      FindPercentage(CString &log);\r
+       static void     ParserCmdOutput(CRichEditCtrl &log,CProgressCtrl &progressctrl,CString &oneline, TCHAR ch,CWnd *CurrentWork=NULL);\r
+       static void InsertColorText(CRichEditCtrl &edit,CString text,COLORREF rgb);\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