Add commit list and change list ctrl at SyncDlg

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

diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp
index 2ba67e9..11231a8 100644 (file)
--- a/src/TortoiseProc/SyncDlg.cpp
+++ b/src/TortoiseProc/SyncDlg.cpp
@@ -108,6 +108,29 @@ 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
+\r
+       if( !m_OutLogList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_LOGLIST))\r
+       {\r
+               TRACE0("Failed to create output commits window\n");\r
+               return FALSE;      // fail to create\r
+\r
+       }\r
+       m_ctrlTabCtrl.InsertTab(&m_OutLogList,_T("Out Commits"),0);\r
+\r
+       m_OutLogList.InsertGitColumn();\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
+       {\r
+               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
+\r
+       m_OutChangeFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("RebaseDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);\r
+\r
        this->m_tooltips.Create(this);\r
 \r
        AddAnchor(IDC_SYNC_TAB,TOP_LEFT,BOTTOM_RIGHT);\r
@@ -163,6 +186,8 @@ BOOL CSyncDlg::OnInitDialog()
        EnableSaveRestore(_T("SyncDlg"));\r
 \r
        this->LoadBranchInfo();\r
+\r
+       \r
        return TRUE;  // return TRUE unless you set the focus to a control\r
        // EXCEPTION: OCX Property Pages should return FALSE\r
 }\r
@@ -179,3 +204,7 @@ BOOL CSyncDlg::PreTranslateMessage(MSG* pMsg)
        m_tooltips.RelayEvent(pMsg);\r
        return __super::PreTranslateMessage(pMsg);\r
 }\r
+void CSyncDlg::FetchOutList()\r
+{\r
+       \r
+}\r

diff --git a/src/TortoiseProc/SyncDlg.h b/src/TortoiseProc/SyncDlg.h
index a2222a7..b5b2e49 100644 (file)
--- a/src/TortoiseProc/SyncDlg.h
+++ b/src/TortoiseProc/SyncDlg.h
@@ -27,9 +27,11 @@
 #include "registry.h"\r
 #include "Balloon.h"\r
 #include "BranchCombox.h"\r
+#include "GitLoglist.h"\r
 // CSyncDlg dialog\r
 #define IDC_SYNC_TAB 0x1000000\r
-\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
@@ -50,6 +52,15 @@ protected:
        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
+       void FetchOutList();\r
+\r
        void SetRemote(CString remote)\r
        {\r
                if(!remote.IsEmpty())\r