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 (file)
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@ -206,7 +206,7 @@ void CGitLogListBase::InsertGitColumn()
 {\r
        CString temp;\r
 \r
-       int c = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;\r
+       int c = GetHeaderCtrl()->GetItemCount()-1;\r
        \r
        while (c>=0)\r
                DeleteColumn(c--);\r

diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp
index f5be994..7f87a6a 100644 (file)
--- a/src/TortoiseProc/SyncDlg.cpp
+++ b/src/TortoiseProc/SyncDlg.cpp
@@ -130,7 +130,7 @@ BOOL CSyncDlg::OnInitDialog()
        this->m_ctrlAnimate.Play(0,-1,-1);\r
     */\r
 \r
-       //Create Tabctrl\r
+       // ------------------ Create Tabctrl -----------\r
        CWnd *pwnd=this->GetDlgItem(IDC_BUTTON_TABCTRL);\r
        CRect rectDummy;\r
        pwnd->GetWindowRect(&rectDummy);\r
@@ -143,7 +143,22 @@ BOOL CSyncDlg::OnInitDialog()
        }\r
        m_ctrlTabCtrl.SetResizeMode(CMFCTabCtrl::RESIZE_NO);\r
 \r
-       DWORD dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP;\r
+       // -------------Create Command Log Ctrl ---------\r
+       DWORD dwStyle;\r
+       dwStyle= ES_MULTILINE | ES_READONLY | WS_CHILD | WS_VISIBLE;\r
+\r
+       if( !m_ctrlCmdOut.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_CMD_LOG))\r
+       {\r
+               TRACE0("Failed to create Log commits window\n");\r
+               return FALSE;      // fail to create\r
+       }\r
+\r
+       m_ctrlTabCtrl.InsertTab(&m_ctrlCmdOut,_T("Log"),-1);\r
+       m_ctrlCmdOut.ReplaceSel(_T("Hello"));\r
+\r
+       //----------  Create Commit List Ctrl---------------\r
+                       \r
+       dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP | WS_CHILD | WS_VISIBLE;;\r
 \r
        if( !m_OutLogList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_LOGLIST))\r
        {\r
@@ -151,10 +166,13 @@ BOOL CSyncDlg::OnInitDialog()
                return FALSE;      // fail to create\r
 \r
        }\r
-       m_ctrlTabCtrl.InsertTab(&m_OutLogList,_T("Out Commits"),0);\r
+\r
+       m_ctrlTabCtrl.InsertTab(&m_OutLogList,_T("Out Commits"),-1);\r
 \r
        m_OutLogList.InsertGitColumn();\r
 \r
+       //------------- Create Change File List Control ----------------\r
+\r
        dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;\r
        \r
        if( !m_OutChangeFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_CHANGELIST))\r
@@ -162,7 +180,7 @@ BOOL CSyncDlg::OnInitDialog()
                TRACE0("Failed to create output change files window\n");\r
                return FALSE;      // fail to create\r
        }\r
-       m_ctrlTabCtrl.InsertTab(&m_OutChangeFileList,_T("Out ChangeList"),1);\r
+       m_ctrlTabCtrl.InsertTab(&m_OutChangeFileList,_T("Out ChangeList"),-1);\r
 \r
        m_OutChangeFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("OutSyncDlg"),\r
                                    (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_COMPARETWO)|\r

diff --git a/src/TortoiseProc/SyncDlg.h b/src/TortoiseProc/SyncDlg.h
index 5c445ac..4c83628 100644 (file)
--- a/src/TortoiseProc/SyncDlg.h
+++ b/src/TortoiseProc/SyncDlg.h
@@ -30,8 +30,9 @@
 #include "GitLoglist.h"\r
 // CSyncDlg dialog\r
 #define IDC_SYNC_TAB 0x1000000\r
-#define IDC_OUT_LOGLIST 0x1\r
-#define IDC_OUT_CHANGELIST 0x2\r
+#define IDC_CMD_LOG            0x1\r
+#define IDC_OUT_LOGLIST 0x2\r
+#define IDC_OUT_CHANGELIST 0x3\r
 class CSyncDlg : public CResizableStandAloneDialog,public CBranchCombox\r
 {\r
        DECLARE_DYNAMIC(CSyncDlg)\r
@@ -60,6 +61,8 @@ protected:
        CGitStatusListCtrl m_OutChangeFileList;\r
        CGitStatusListCtrl m_InChangeFileList;\r
        CGitStatusListCtrl m_ConflictFileList;\r
+       CRichEditCtrl      m_ctrlCmdOut;\r
+\r
        CTGitPathList   m_arOutChangeList;\r
 \r
        virtual void LocalBranchChange(){FetchOutList();};\r