RebaseDlg: Fetch log when change branch and upstream

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

diff --git a/src/TortoiseProc/RebaseDlg.h b/src/TortoiseProc/RebaseDlg.h
index e00cc4f..5673bb5 100644 (file)
--- a/src/TortoiseProc/RebaseDlg.h
+++ b/src/TortoiseProc/RebaseDlg.h
@@ -6,6 +6,8 @@
 #include "SciEdit.h"\r
 #include "SplitterControl.h"\r
 #include "HistoryCombo.h"\r
+#include "Balloon.h"\r
+#include "GitLogList.h"\r
 // CRebaseDlg dialog\r
 #define IDC_REBASE_TAB 0x1000000\r
 \r
@@ -42,9 +44,11 @@ protected:
        void SaveSplitterPos();\r
        \r
        void LoadBranchInfo();\r
+       void FetchLogList();\r
 \r
        CRect                           m_DlgOrigRect;\r
        CRect                           m_CommitListOrigRect;\r
+       BOOL PreTranslateMessage(MSG* pMsg);\r
 \r
 public:\r
    \r
@@ -53,9 +57,13 @@ public:
     afx_msg void OnBnClickedEditAll();\r
     afx_msg void OnBnClickedRebaseSplit();\r
        afx_msg void OnSize(UINT nType, int cx, int cy);\r
+       afx_msg void OnCbnSelchangeBranch();\r
+       afx_msg void OnCbnSelchangeUpstream();\r
 \r
     CProgressCtrl m_ProgressBar;\r
     CStatic m_CtrlStatusText;\r
+       CBalloon                        m_tooltips;\r
+\r
     BOOL m_bPickAll;\r
     BOOL m_bSquashAll;\r
     BOOL m_bEditAll;\r
@@ -64,13 +72,15 @@ public:
        CMFCTabCtrl m_ctrlTabCtrl;\r
        CGitStatusListCtrl m_FileListCtrl;\r
        CSciEdit                   m_LogMessageCtrl;\r
-       CListCtrl                  m_CommitList;\r
+       \r
+       CGitLogList                m_CommitList;\r
 \r
-       CHistoryCombo      m_BranchCtrl;\r
-       CHistoryCombo      m_UpstreamCtrl;\r
+       CHistoryCombo m_BranchCtrl;\r
+       CHistoryCombo m_UpstreamCtrl;\r
 \r
        REBASE_STAGE       m_RebaseStage;\r
 \r
-\r
+       void AddBranchToolTips(CHistoryCombo *pBranch);\r
+       \r
 \r
 };\r