Add launch rebase option at fetch dialog.

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

diff --git a/src/TortoiseProc/PullFetchDlg.h b/src/TortoiseProc/PullFetchDlg.h
index 252fb39..813ac91 100644 (file)
--- a/src/TortoiseProc/PullFetchDlg.h
+++ b/src/TortoiseProc/PullFetchDlg.h
@@ -2,6 +2,8 @@
 \r
 #include "StandAloneDlg.h"\r
 #include "HistoryCombo.h"\r
+#include "HyperLink.h"\r
+#include "registry.h"\r
 // CPullFetchDlg dialog\r
 \r
 class CPullFetchDlg : public CResizableStandAloneDialog\r
@@ -19,13 +21,26 @@ protected:
        virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
        CHistoryCombo   m_Remote;\r
        CHistoryCombo   m_Other;\r
+       CHistoryCombo   m_RemoteBranch;\r
        virtual BOOL OnInitDialog();\r
+       CRegString m_RemoteReg;\r
+       CRegDWORD       m_regRebase;\r
 \r
-       \r
        DECLARE_MESSAGE_MAP()\r
 public:\r
-       BOOL m_IsPull;\r
+       BOOL        m_IsPull;\r
+    BOOL        m_bAutoLoad;\r
+       BOOL            m_bRebase;\r
+    BOOL        m_bAutoLoadEnable;\r
+    CHyperLink  m_RemoteManage;\r
+\r
        afx_msg void OnBnClickedRd();\r
        afx_msg void OnBnClickedOk();\r
        CString m_RemoteURL;\r
+       CString m_RemoteBranchName;\r
+    afx_msg void OnStnClickedRemoteManage();\r
+       afx_msg void OnBnClickedButtonBrowseRef();\r
+\r
+       CString         m_configPullRemote;\r
+       CString         m_configPullBranch;\r
 };\r