Update Gitignore file

[tortoisegit/TortoiseGitJp.git] / src / TortoiseGitBlame / TortoiseGitBlameView.h

diff --git a/src/TortoiseGitBlame/TortoiseGitBlameView.h b/src/TortoiseGitBlame/TortoiseGitBlameView.h
index bbee267..01a8667 100644 (file)
--- a/src/TortoiseGitBlame/TortoiseGitBlameView.h
+++ b/src/TortoiseGitBlame/TortoiseGitBlameView.h
@@ -11,6 +11,7 @@
 #include "SciEdit.h"\r
 \r
 #include "GitBlameLogList.h"\r
+#include "Balloon.h"\r
 \r
 const COLORREF black = RGB(0,0,0);\r
 const COLORREF white = RGB(0xff,0xff,0xff);\r
@@ -70,6 +71,9 @@ protected:
 \r
 // Generated message map functions\r
 protected:\r
+       BOOL PreTranslateMessage(MSG* pMsg);\r
+       afx_msg void OnEditFind();\r
+       afx_msg void OnEditGoto();\r
        afx_msg void OnFilePrintPreview();\r
        afx_msg void OnRButtonUp(UINT nFlags, CPoint point);\r
        afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);\r
@@ -79,14 +83,36 @@ protected:
        afx_msg void OnLButtonDown(UINT nFlags,CPoint point);\r
        afx_msg void OnRButtonDown(UINT nFlags,CPoint point){OnLButtonDown(nFlags,point);CView::OnRButtonDown(nFlags,point);};\r
        afx_msg void OnSciGetBkColor(NMHDR*, LRESULT*);\r
+       afx_msg void OnMouseHover(UINT nFlags, CPoint point);\r
+       afx_msg void OnMouseMove(UINT nFlags, CPoint point);\r
+    afx_msg LRESULT OnFindDialogMessage(WPARAM   wParam,   LPARAM   lParam);\r
+       afx_msg void OnViewNext();\r
+       afx_msg void OnViewPrev();\r
+       \r
+       int FindNextLine(CString commithash, bool bUpOrDown=false);\r
+       int FindFirstLine(CString commithash, int line)\r
+       {\r
+               while(line>=0)\r
+               {\r
+                       if( m_CommitHash[line] != commithash )\r
+                       {\r
+                               return line++;\r
+                       }\r
+                       line--;\r
+               }\r
+               return line;\r
+       }\r
+\r
        DECLARE_MESSAGE_MAP()\r
 \r
+    static UINT m_FindDialogMessage;\r
 public:\r
 \r
        void UpdateInfo();\r
        void FocusOn(GitRev *pRev);\r
 \r
        CSciEdit                        m_TextView;\r
+       CBalloon                        m_ToolTip;\r
 \r
        HINSTANCE hInstance;\r
        HINSTANCE hResource;\r
@@ -130,7 +156,7 @@ public:
        void BlamePreviousRevision();\r
        void DiffPreviousRevision();\r
        void ShowLog();\r
-       bool DoSearch(LPSTR what, DWORD flags);\r
+       bool DoSearch(CString what, DWORD flags);\r
        bool GotoLine(long line);\r
        bool ScrollToLine(long line);\r
        void GotoLineDlg();\r
@@ -139,7 +165,7 @@ public:
        void SetSelectedLine(LONG line) { m_SelectedLine=line;};\r
 \r
        LONG                                            m_mouserev;\r
-       CString                                         m_MouseHash;\r
+       LONG                                            m_MouseLine;\r
        LONG                                            m_selectedrev;\r
        LONG                                            m_selectedorigrev;\r
        CString                                         m_SelectedHash;\r
@@ -157,6 +183,8 @@ public:
        std::vector<CString>    m_Authors;\r
        std::vector<CString>    m_CommitHash;\r
 \r
+       std::map<CString,GitRev> m_NoListCommit;\r
+\r
 //     std::vector<CString>    m_Paths;\r
 //     std::map<LONG, CString> logmessages;\r
        char                                            m_szTip[MAX_LOG_LENGTH*2+6];\r
@@ -204,6 +232,9 @@ protected:
 \r
        CGitBlameLogList * GetLogList();\r
 \r
+    CFindReplaceDialog          *m_pFindDialog;\r
+\r
+       DWORD                                           m_DateFormat;   // DATE_SHORTDATE or DATE_LONGDATE\r
 };\r
 \r
 #ifndef _DEBUG  // debug version in TortoiseGitBlameView.cpp\r