OSDN Git Service

Add url error message at syncdlg
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / SyncDlg.h
index a2222a7..1ca5fa1 100644 (file)
 #include "registry.h"\r
 #include "Balloon.h"\r
 #include "BranchCombox.h"\r
+#include "GitLoglist.h"\r
 // CSyncDlg dialog\r
 #define IDC_SYNC_TAB 0x1000000\r
-\r
+#define IDC_OUT_LOGLIST 0x1\r
+#define IDC_OUT_CHANGELIST 0x2\r
 class CSyncDlg : public CResizableStandAloneDialog,public CBranchCombox\r
 {\r
        DECLARE_DYNAMIC(CSyncDlg)\r
@@ -50,6 +52,20 @@ protected:
        CMFCTabCtrl m_ctrlTabCtrl;\r
        CBalloon                        m_tooltips;\r
        \r
+       CGitLogList     m_OutLogList;\r
+       CGitLogList m_InLogList;\r
+\r
+       CGitStatusListCtrl m_OutChangeFileList;\r
+       CGitStatusListCtrl m_InChangeFileList;\r
+       CGitStatusListCtrl m_ConflictFileList;\r
+\r
+       virtual void LocalBranchChange(){FetchOutList();};\r
+       virtual void RemoteBranchChange(){FetchOutList();};\r
+\r
+       void FetchOutList();\r
+\r
+       bool IsURL();\r
+\r
        void SetRemote(CString remote)\r
        {\r
                if(!remote.IsEmpty())\r
@@ -57,6 +73,10 @@ protected:
                        this->m_ctrlURL.AddString(remote);\r
                }\r
        }\r
+       \r
+       CString m_OutLocalBranch;\r
+       CString m_OutRemoteBranch;\r
+\r
        DECLARE_MESSAGE_MAP()\r
 public:\r
        BOOL m_bAutoLoadPuttyKey;\r
@@ -75,4 +95,6 @@ public:
        virtual BOOL OnInitDialog();\r
        afx_msg void OnBnClickedButtonManage();\r
        virtual BOOL PreTranslateMessage(MSG* pMsg);\r
+       afx_msg void OnCbenEndeditComboboxexUrl(NMHDR *pNMHDR, LRESULT *pResult);\r
+       afx_msg void OnCbnEditchangeComboboxexUrl();\r
 };\r