From: Frank Li <lznuaa@gmail.com>
Date: Wed, 22 Jul 2009 05:52:10 +0000 (+0800)
Subject: Add command output at SyncDlg
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=232e127ae30552f50ad53b17a9fca298c8469c15;p=tortoisegit%2FTortoiseGitJp.git

Add command output at SyncDlg

Signed-off-by: Frank Li <lznuaa@gmail.com>
---

diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp
index 43df3a0..af05f00 100644
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@ -206,7 +206,7 @@ void CGitLogListBase::InsertGitColumn()
 {
 	CString temp;
 
-	int c = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
+	int c = GetHeaderCtrl()->GetItemCount()-1;
 	
 	while (c>=0)
 		DeleteColumn(c--);
diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp
index f5be994..7f87a6a 100644
--- a/src/TortoiseProc/SyncDlg.cpp
+++ b/src/TortoiseProc/SyncDlg.cpp
@@ -130,7 +130,7 @@ BOOL CSyncDlg::OnInitDialog()
 	this->m_ctrlAnimate.Play(0,-1,-1);
     */
 
-	//Create Tabctrl
+	// ------------------ Create Tabctrl -----------
 	CWnd *pwnd=this->GetDlgItem(IDC_BUTTON_TABCTRL);
 	CRect rectDummy;
 	pwnd->GetWindowRect(&rectDummy);
@@ -143,7 +143,22 @@ BOOL CSyncDlg::OnInitDialog()
 	}
 	m_ctrlTabCtrl.SetResizeMode(CMFCTabCtrl::RESIZE_NO);
 
-	DWORD dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP;
+	// -------------Create Command Log Ctrl ---------
+	DWORD dwStyle;
+	dwStyle= ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE;
+
+	if( !m_ctrlCmdOut.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_CMD_LOG))
+	{
+		TRACE0("Failed to create Log commits window\n");
+		return FALSE;      // fail to create
+	}
+
+	m_ctrlTabCtrl.InsertTab(&m_ctrlCmdOut,_T("Log"),-1);
+	m_ctrlCmdOut.ReplaceSel(_T("Hello"));
+
+	//----------  Create Commit List Ctrl---------------
+			
+	dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP | WS_CHILD | WS_VISIBLE;;
 
 	if( !m_OutLogList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_LOGLIST))
 	{
@@ -151,10 +166,13 @@ BOOL CSyncDlg::OnInitDialog()
 		return FALSE;      // fail to create
 
 	}
-	m_ctrlTabCtrl.InsertTab(&m_OutLogList,_T("Out Commits"),0);
+
+	m_ctrlTabCtrl.InsertTab(&m_OutLogList,_T("Out Commits"),-1);
 
 	m_OutLogList.InsertGitColumn();
 
+	//------------- Create Change File List Control ----------------
+
 	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))
@@ -162,7 +180,7 @@ BOOL CSyncDlg::OnInitDialog()
 		TRACE0("Failed to create output change files window\n");
 		return FALSE;      // fail to create
 	}
-	m_ctrlTabCtrl.InsertTab(&m_OutChangeFileList,_T("Out ChangeList"),1);
+	m_ctrlTabCtrl.InsertTab(&m_OutChangeFileList,_T("Out ChangeList"),-1);
 
 	m_OutChangeFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("OutSyncDlg"),
 		                    (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_COMPARETWO)|
diff --git a/src/TortoiseProc/SyncDlg.h b/src/TortoiseProc/SyncDlg.h
index 5c445ac..4c83628 100644
--- a/src/TortoiseProc/SyncDlg.h
+++ b/src/TortoiseProc/SyncDlg.h
@@ -30,8 +30,9 @@
 #include "GitLoglist.h"
 // CSyncDlg dialog
 #define IDC_SYNC_TAB 0x1000000
-#define IDC_OUT_LOGLIST 0x1
-#define IDC_OUT_CHANGELIST 0x2
+#define IDC_CMD_LOG		0x1
+#define IDC_OUT_LOGLIST 0x2
+#define IDC_OUT_CHANGELIST 0x3
 class CSyncDlg : public CResizableStandAloneDialog,public CBranchCombox
 {
 	DECLARE_DYNAMIC(CSyncDlg)
@@ -60,6 +61,8 @@ protected:
 	CGitStatusListCtrl m_OutChangeFileList;
 	CGitStatusListCtrl m_InChangeFileList;
 	CGitStatusListCtrl m_ConflictFileList;
+	CRichEditCtrl	   m_ctrlCmdOut;
+
 	CTGitPathList	m_arOutChangeList;
 
 	virtual void LocalBranchChange(){FetchOutList();};