Continued work on BrowserRefsDlg

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

diff --git a/src/TortoiseProc/GitLogListBase.h b/src/TortoiseProc/GitLogListBase.h
index 659c881..94be5ba 100644 (file)
--- a/src/TortoiseProc/GitLogListBase.h
+++ b/src/TortoiseProc/GitLogListBase.h
@@ -56,6 +56,7 @@ enum LISTITEMSTATES_MINE {
 //typedef void CALLBACK_PROCESS(void * data, int progress);\r
 #define MSG_LOADED                             (WM_USER+110)\r
 #define MSG_LOAD_PERCENTAGE            (WM_USER+111)\r
+#define MSG_REFLOG_CHANGED             (WM_USER+112)\r
 \r
 class CGitLogListBase : public CHintListCtrl\r
 {\r
@@ -138,6 +139,10 @@ public:
        ID_REBASE_EDIT,\r
        ID_REBASE_SQUASH,\r
        ID_REBASE_SKIP,\r
+       ID_COMBINE_COMMIT,\r
+       ID_STASH_APPLY,\r
+       ID_REFLOG_DEL,\r
+       ID_REBASE_TO_VERSION,\r
        };\r
        inline unsigned __int64 GetContextMenuBit(int i){ return ((unsigned __int64 )0x1)<<i ;}\r
        void InsertGitColumn();\r
@@ -174,6 +179,7 @@ public:
                m_HashMap.clear();\r
                g_Git.GetMapHashToFriendName(m_HashMap);\r
                m_CurrentBranch=g_Git.GetCurrentBranch();\r
+               this->m_HeadHash=g_Git.GetHash(CString(_T("HEAD"))).Left(40);\r
        }\r
        void TerminateThread()\r
        {\r
@@ -191,8 +197,8 @@ public:
 protected:\r
        DECLARE_MESSAGE_MAP()\r
        afx_msg void OnDestroy();\r
-       afx_msg void OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult);\r
-       afx_msg void OnLvnGetdispinfoLoglist(NMHDR *pNMHDR, LRESULT *pResult);\r
+       virtual afx_msg void OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult);\r
+       virtual afx_msg void OnLvnGetdispinfoLoglist(NMHDR *pNMHDR, LRESULT *pResult);\r
        afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);\r
        afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);\r
        afx_msg LRESULT OnLoad(WPARAM wParam, LPARAM lParam);\r
@@ -202,8 +208,8 @@ protected:
        virtual BOOL PreTranslateMessage(MSG* pMsg);\r
        static UINT LogThreadEntry(LPVOID pVoid);\r
        UINT LogThread();\r
-       void FetchFullLogInfoOrig();\r
-       void FetchFullLogInfo();\r
+       void FetchLastLogInfo();\r
+       void FetchFullLogInfo(CString &from, CString &to);\r
        void FillBackGround(HDC hdc, int Index,CRect &rect);\r
        void DrawTagBranch(HDC,CRect &rect,INT_PTR index);\r
        void DrawGraph(HDC,CRect &rect,INT_PTR index);\r
@@ -219,7 +225,7 @@ protected:
 \r
        BOOL IsEntryInDateRange(int i);\r
 \r
-\r
+       int GetHeadIndex();\r
 \r
        bool                            m_bFilterWithRegex;\r
 \r
@@ -244,7 +250,10 @@ protected:
        CColors                         m_Colors;\r
 \r
        CString                         m_CurrentBranch;\r
+       CString                         m_HeadHash;\r
        \r
+       CString                         m_ColumnRegKey;\r
+\r
        COLORREF                        m_LineColors[Lanes::COLORS_NUM];\r
        DWORD                           m_DateFormat;   // DATE_SHORTDATE or DATE_LONGDATE\r
        bool                            m_bRelativeTimes;       // Show relative times\r