#include "GitStatusListCtrl.h"\r
#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
// Dialog Data\r
enum { IDD = IDD_REBASE };\r
\r
+ enum REBASE_STAGE\r
+ {\r
+ CHOOSE_BRANCH,\r
+ CHOOSE_COMMIT_PICK_MODE,\r
+ REBASE_START,\r
+ REBASE_CONTINUE,\r
+ REBASE_ABORT,\r
+ };\r
+\r
protected:\r
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support\r
virtual BOOL OnInitDialog();\r
void SetSplitterRange();\r
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
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
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
+\r
+ REBASE_STAGE m_RebaseStage;\r
+\r
+ void AddBranchToolTips(CHistoryCombo *pBranch);\r
+ \r
+\r
};\r