From 18faa65017950e1d89e71bddcfb7d77d518cce89 Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Sun, 19 Jul 2009 23:33:24 +0800
Subject: [PATCH] Add commit list and change list ctrl at SyncDlg

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/TortoiseProc/SyncDlg.cpp | 29 +++++++++++++++++++++++++++++
 src/TortoiseProc/SyncDlg.h   | 13 ++++++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp
index 2ba67e9..11231a8 100644
--- a/src/TortoiseProc/SyncDlg.cpp
+++ b/src/TortoiseProc/SyncDlg.cpp
@@ -108,6 +108,29 @@ BOOL CSyncDlg::OnInitDialog()
 	}
 	m_ctrlTabCtrl.SetResizeMode(CMFCTabCtrl::RESIZE_NO);
 
+	DWORD dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP;
+
+	if( !m_OutLogList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_LOGLIST))
+	{
+		TRACE0("Failed to create output commits window\n");
+		return FALSE;      // fail to create
+
+	}
+	m_ctrlTabCtrl.InsertTab(&m_OutLogList,_T("Out Commits"),0);
+
+	m_OutLogList.InsertGitColumn();
+
+	dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;
+	
+	if( !m_OutChangeFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_CHANGELIST))
+	{
+		TRACE0("Failed to create output change files window\n");
+		return FALSE;      // fail to create
+	}
+	m_ctrlTabCtrl.InsertTab(&m_OutChangeFileList,_T("Out ChangeList"),1);
+
+	m_OutChangeFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("RebaseDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);
+
 	this->m_tooltips.Create(this);
 
 	AddAnchor(IDC_SYNC_TAB,TOP_LEFT,BOTTOM_RIGHT);
@@ -163,6 +186,8 @@ BOOL CSyncDlg::OnInitDialog()
 	EnableSaveRestore(_T("SyncDlg"));
 
 	this->LoadBranchInfo();
+
+	
 	return TRUE;  // return TRUE unless you set the focus to a control
 	// EXCEPTION: OCX Property Pages should return FALSE
 }
@@ -179,3 +204,7 @@ BOOL CSyncDlg::PreTranslateMessage(MSG* pMsg)
 	m_tooltips.RelayEvent(pMsg);
 	return __super::PreTranslateMessage(pMsg);
 }
+void CSyncDlg::FetchOutList()
+{
+	
+}
diff --git a/src/TortoiseProc/SyncDlg.h b/src/TortoiseProc/SyncDlg.h
index a2222a7..b5b2e49 100644
--- a/src/TortoiseProc/SyncDlg.h
+++ b/src/TortoiseProc/SyncDlg.h
@@ -27,9 +27,11 @@
 #include "registry.h"
 #include "Balloon.h"
 #include "BranchCombox.h"
+#include "GitLoglist.h"
 // CSyncDlg dialog
 #define IDC_SYNC_TAB 0x1000000
-
+#define IDC_OUT_LOGLIST 0x1
+#define IDC_OUT_CHANGELIST 0x2
 class CSyncDlg : public CResizableStandAloneDialog,public CBranchCombox
 {
 	DECLARE_DYNAMIC(CSyncDlg)
@@ -50,6 +52,15 @@ protected:
 	CMFCTabCtrl m_ctrlTabCtrl;
 	CBalloon			m_tooltips;
 	
+	CGitLogList	m_OutLogList;
+	CGitLogList m_InLogList;
+
+	CGitStatusListCtrl m_OutChangeFileList;
+	CGitStatusListCtrl m_InChangeFileList;
+	CGitStatusListCtrl m_ConflictFileList;
+
+	void FetchOutList();
+
 	void SetRemote(CString remote)
 	{
 		if(!remote.IsEmpty())
-- 
2.11.0