X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FTortoiseProc%2FSyncDlg.h;h=1ca5fa11cbaf3a3b4554054fe9cc887caff22e27;hp=4e6dfd7008f030dbfa0f24dca958e9af30954d82;hb=df8364f149a0874a7f450b3cb3c616ee6d0ba9a5;hpb=9d59228347247a34dbaa35a96a8f070a893b3951

diff --git a/src/TortoiseProc/SyncDlg.h b/src/TortoiseProc/SyncDlg.h
index 4e6dfd7..1ca5fa1 100644
--- a/src/TortoiseProc/SyncDlg.h
+++ b/src/TortoiseProc/SyncDlg.h
@@ -21,10 +21,18 @@
 #include "afxcmn.h"
 #include "afxwin.h"
 
-
+#include "StandAloneDlg.h"
+#include "HistoryCombo.h"
+#include "MenuButton.h"
+#include "registry.h"
+#include "Balloon.h"
+#include "BranchCombox.h"
+#include "GitLoglist.h"
 // CSyncDlg dialog
-
-class CSyncDlg : public CDialog
+#define IDC_SYNC_TAB 0x1000000
+#define IDC_OUT_LOGLIST 0x1
+#define IDC_OUT_CHANGELIST 0x2
+class CSyncDlg : public CResizableStandAloneDialog,public CBranchCombox
 {
 	DECLARE_DYNAMIC(CSyncDlg)
 
@@ -37,21 +45,56 @@ public:
 
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	BRANCH_COMBOX_EVENT_HANDLE();
+
+	CRegDWORD m_regPullButton;
+	CRegDWORD m_regPushButton;
+	CMFCTabCtrl m_ctrlTabCtrl;
+	CBalloon			m_tooltips;
+	
+	CGitLogList	m_OutLogList;
+	CGitLogList m_InLogList;
+
+	CGitStatusListCtrl m_OutChangeFileList;
+	CGitStatusListCtrl m_InChangeFileList;
+	CGitStatusListCtrl m_ConflictFileList;
+
+	virtual void LocalBranchChange(){FetchOutList();};
+	virtual void RemoteBranchChange(){FetchOutList();};
+
+	void FetchOutList();
+
+	bool IsURL();
+
+	void SetRemote(CString remote)
+	{
+		if(!remote.IsEmpty())
+		{
+			this->m_ctrlURL.AddString(remote);
+		}
+	}
+	
+	CString m_OutLocalBranch;
+	CString m_OutRemoteBranch;
 
 	DECLARE_MESSAGE_MAP()
 public:
 	BOOL m_bAutoLoadPuttyKey;
-	CComboBoxEx m_ctrlLocalBranch;
-	CComboBoxEx m_ctrlRemoteBranch;
-	CComboBoxEx m_ctrlURL;
+	
+	CHistoryCombo m_ctrlURL;
 	CButton m_ctrlDumyButton;
-	CButton m_ctrlPull;
-	CButton m_ctrlPush;
-	CStatic m_ctrlStatus;
+	CMenuButton m_ctrlPull;
+	CMenuButton m_ctrlPush;
+	CMenuButton m_ctrlStatus;
 	afx_msg void OnBnClickedButtonPull();
 	afx_msg void OnBnClickedButtonPush();
 	afx_msg void OnBnClickedButtonApply();
 	afx_msg void OnBnClickedButtonEmail();
 	CProgressCtrl m_ctrlProgress;
 	CAnimateCtrl m_ctrlAnimate;
+	virtual BOOL OnInitDialog();
+	afx_msg void OnBnClickedButtonManage();
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
+	afx_msg void OnCbenEndeditComboboxexUrl(NMHDR *pNMHDR, LRESULT *pResult);
+	afx_msg void OnCbnEditchangeComboboxexUrl();
 };