OSDN Git Service

Add url error message at syncdlg
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / SyncDlg.h
index bf3c94b..1ca5fa1 100644 (file)
 #include "HistoryCombo.h"\r
 #include "MenuButton.h"\r
 #include "registry.h"\r
+#include "Balloon.h"\r
+#include "BranchCombox.h"\r
+#include "GitLoglist.h"\r
 // CSyncDlg dialog\r
-\r
-class CSyncDlg : public CResizableStandAloneDialog\r
+#define IDC_SYNC_TAB 0x1000000\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
 \r
@@ -40,16 +45,43 @@ public:
 \r
 protected:\r
        virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support\r
+       BRANCH_COMBOX_EVENT_HANDLE();\r
 \r
        CRegDWORD m_regPullButton;\r
        CRegDWORD m_regPushButton;\r
+       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
+               {\r
+                       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
-       CComboBoxEx m_ctrlLocalBranch;\r
-       CComboBoxEx m_ctrlRemoteBranch;\r
-       CComboBoxEx m_ctrlURL;\r
+       \r
+       CHistoryCombo m_ctrlURL;\r
        CButton m_ctrlDumyButton;\r
        CMenuButton m_ctrlPull;\r
        CMenuButton m_ctrlPush;\r
@@ -61,4 +93,8 @@ public:
        CProgressCtrl m_ctrlProgress;\r
        CAnimateCtrl m_ctrlAnimate;\r
        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