Add work dir copy at log dialog

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

diff --git a/src/TortoiseProc/GitLogListBase.h b/src/TortoiseProc/GitLogListBase.h
index ac6f6ca..97ca779 100644 (file)
--- a/src/TortoiseProc/GitLogListBase.h
+++ b/src/TortoiseProc/GitLogListBase.h
@@ -70,6 +70,8 @@ public:
        BOOL m_IsOldFirst;\r
        BOOL m_IsRebaseReplaceGraph;\r
 \r
+       void MeasureItem(LPMEASUREITEMSTRUCT lpMeasureItemStruct);\r
+       void OnMeasureItem(int nIDCtl, LPMEASUREITEMSTRUCT lpMeasureItemStruct);\r
 \r
        BOOL m_bStrictStopped;\r
        BOOL m_bShowBugtraqColumn;\r
@@ -78,6 +80,7 @@ public:
        unsigned __int64 m_ContextMenuMask;\r
 \r
        bool                            m_hasWC;\r
+       bool                            m_bShowWC;\r
        GitRev                          m_wcRev;\r
        volatile LONG           m_bThreadRunning;\r
        CLogCache                       m_LogCache;\r
@@ -143,6 +146,8 @@ public:
        ID_STASH_APPLY,\r
        ID_REFLOG_DEL,\r
        ID_REBASE_TO_VERSION,\r
+       ID_CREATE_PATCH,\r
+       ID_DELETE,\r
        };\r
        inline unsigned __int64 GetContextMenuBit(int i){ return ((unsigned __int64 )0x1)<<i ;}\r
        void InsertGitColumn();\r
@@ -151,7 +156,7 @@ public:
        void DiffSelectedRevWithPrevious();\r
        bool IsSelectionContinuous();\r
        int  FillGitShortLog();\r
-       int  FillGitLog(CTGitPath *path,int infomask=CGit::     LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE,CString *from=NULL,CString *to=NULL);\r
+       int  FillGitLog(CTGitPath *path,int infomask=CGit::     LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,CString *from=NULL,CString *to=NULL);\r
 \r
        inline int ShownCountWithStopped() const { return (int)m_arShownList.GetCount() + (m_bStrictStopped ? 1 : 0); }\r
        int FetchLogAsync(void * data=NULL);\r
@@ -197,6 +202,8 @@ public:
                m_StartRef=StartRef;\r
        }\r
 \r
+       CString GetStartRef() const {return m_StartRef;}\r
+\r
        \r
        volatile bool           m_bExitThread;\r
        CWinThread*                     m_LoadingThread;\r
@@ -222,7 +229,7 @@ protected:
 \r
        BOOL GetShortName(CString ref, CString &shortname,CString prefix);\r
        void paintGraphLane(HDC hdc,int laneHeight, int type, int x1, int x2,\r
-                                      const COLORREF& col,int top) ; \r
+                                      const COLORREF& col,const COLORREF& activeColor, int top) ; \r
        void DrawLine(HDC hdc, int x1, int y1, int x2, int y2){::MoveToEx(hdc,x1,y1,NULL);::LineTo(hdc,x2,y2);}\r
        /**\r
        * Save column widths to the registry\r