SyncDlg show animate when press push button and hide input control.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / SyncDlg.cpp

diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp
index 0d5c108..f5be994 100644 (file)
--- a/src/TortoiseProc/SyncDlg.cpp
+++ b/src/TortoiseProc/SyncDlg.cpp
@@ -34,6 +34,7 @@ CSyncDlg::CSyncDlg(CWnd* pParent /*=NULL*/)
        , m_bAutoLoadPuttyKey(FALSE)\r
 {\r
        m_pTooltip=&this->m_tooltips;\r
+       m_bInited=false;\r
 }\r
 \r
 CSyncDlg::~CSyncDlg()\r
@@ -80,7 +81,7 @@ void CSyncDlg::OnBnClickedButtonPush()
 {\r
        // TODO: Add your control notification handler code here\r
        this->m_regPushButton=this->m_ctrlPush.GetCurrentEntry();\r
-\r
+       this->SwitchToRun();\r
 }\r
 \r
 void CSyncDlg::OnBnClickedButtonApply()\r
@@ -92,11 +93,43 @@ void CSyncDlg::OnBnClickedButtonEmail()
 {\r
        // TODO: Add your control notification handler code here\r
 }\r
-\r
+void CSyncDlg::ShowProgressCtrl(bool bShow)\r
+{\r
+       int b=bShow?SW_NORMAL:SW_HIDE;\r
+       this->m_ctrlAnimate.ShowWindow(b);\r
+       this->m_ctrlProgress.ShowWindow(b);\r
+       this->m_ctrlAnimate.Open(IDR_DOWNLOAD);\r
+       if(b == SW_NORMAL)\r
+               this->m_ctrlAnimate.Play(0,-1,-1);\r
+       else\r
+               this->m_ctrlAnimate.Stop();\r
+}\r
+void CSyncDlg::ShowInputCtrl(bool bShow)\r
+{\r
+       int b=bShow?SW_NORMAL:SW_HIDE;\r
+       this->m_ctrlURL.ShowWindow(b);\r
+       this->m_ctrlLocalBranch.ShowWindow(b);\r
+       this->m_ctrlRemoteBranch.ShowWindow(b);\r
+       this->GetDlgItem(IDC_BUTTON_LOCAL_BRANCH)->ShowWindow(b);\r
+       this->GetDlgItem(IDC_BUTTON_REMOTE_BRANCH)->ShowWindow(b);\r
+       this->GetDlgItem(IDC_STATIC_LOCAL_BRANCH)->ShowWindow(b);\r
+       this->GetDlgItem(IDC_STATIC_REMOTE_BRANCH)->ShowWindow(b);\r
+       this->GetDlgItem(IDC_BUTTON_MANAGE)->ShowWindow(b);\r
+       this->GetDlgItem(IDC_CHECK_PUTTY_KEY)->ShowWindow(b);\r
+       this->GetDlgItem(IDC_CHECK_FORCE)->ShowWindow(b);\r
+       this->GetDlgItem(IDC_STATIC_REMOTE_URL)->ShowWindow(b);\r
+       \r
+}\r
 BOOL CSyncDlg::OnInitDialog()\r
 {\r
        CResizableStandAloneDialog::OnInitDialog();\r
 \r
+       /*\r
+       this->m_ctrlAnimate.ShowWindow(SW_NORMAL);\r
+       this->m_ctrlAnimate.Open(IDR_DOWNLOAD);\r
+       this->m_ctrlAnimate.Play(0,-1,-1);\r
+    */\r
+\r
        //Create Tabctrl\r
        CWnd *pwnd=this->GetDlgItem(IDC_BUTTON_TABCTRL);\r
        CRect rectDummy;\r
@@ -131,7 +164,9 @@ BOOL CSyncDlg::OnInitDialog()
        }\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
+       m_OutChangeFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("OutSyncDlg"),\r
+                                   (CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_COMPARETWO)|\r
+                                                       CGitStatusListCtrl::GetContextMenuBit(CGitStatusListCtrl::IDSVNLC_GNUDIFF2)),false);\r
 \r
        this->m_tooltips.Create(this);\r
 \r
@@ -144,11 +179,11 @@ BOOL CSyncDlg::OnInitDialog()
        AddAnchor(IDC_BUTTON_PUSH,BOTTOM_LEFT);\r
        AddAnchor(IDC_BUTTON_APPLY,BOTTOM_LEFT);\r
        AddAnchor(IDC_BUTTON_EMAIL,BOTTOM_LEFT);\r
-       AddAnchor(IDC_PROGRESS_SYNC,BOTTOM_LEFT,BOTTOM_RIGHT);\r
+       AddAnchor(IDC_PROGRESS_SYNC,TOP_LEFT,TOP_RIGHT);\r
        AddAnchor(IDOK,BOTTOM_RIGHT);\r
        AddAnchor(IDHELP,BOTTOM_RIGHT);\r
        AddAnchor(IDC_STATIC_STATUS,BOTTOM_LEFT);\r
-       AddAnchor(IDC_ANIMATE_SYNC,TOP_RIGHT);\r
+       AddAnchor(IDC_ANIMATE_SYNC,TOP_LEFT);\r
        \r
        BRANCH_COMBOX_ADD_ANCHOR();\r
 \r
@@ -189,6 +224,8 @@ BOOL CSyncDlg::OnInitDialog()
 \r
        this->LoadBranchInfo();\r
 \r
+       this->m_bInited=true;\r
+       FetchOutList();\r
        \r
        return TRUE;  // return TRUE unless you set the focus to a control\r
        // EXCEPTION: OCX Property Pages should return FALSE\r
@@ -208,6 +245,8 @@ BOOL CSyncDlg::PreTranslateMessage(MSG* pMsg)
 }\r
 void CSyncDlg::FetchOutList()\r
 {\r
+       if(!m_bInited)\r
+               return;\r
        m_OutChangeFileList.Clear();\r
        this->m_OutLogList.Clear();\r
 \r
@@ -242,11 +281,31 @@ void CSyncDlg::FetchOutList()
                CString localbranch;\r
                localbranch=this->m_ctrlLocalBranch.GetString();\r
 \r
-               if(localbranch != m_OutLocalBranch && m_OutRemoteBranch != remotebranch)\r
+               if(localbranch != m_OutLocalBranch || m_OutRemoteBranch != remotebranch)\r
                {\r
                        m_OutLogList.ClearText();\r
                        m_OutLogList.FillGitLog(NULL,CGit::     LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,\r
                                &remotebranch,&localbranch);\r
+                       \r
+                       CString str;\r
+                       if(m_OutLogList.GetItemCount() == 0)\r
+                       {                       \r
+                               str.Format(_T("No commits ahead \"%s\""),remotebranch);\r
+                               m_OutLogList.ShowText(str);\r
+                               this->m_ctrlStatus.SetWindowText(str);\r
+                               this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);\r
+                       }\r
+                       else\r
+                       {\r
+                               str.Format(_T("%d commits ahead \"%s\""),m_OutLogList.GetItemCount(),remotebranch);\r
+                               this->m_ctrlStatus.SetWindowText(str);\r
+                               g_Git.GetCommitDiffList(localbranch,remotebranch,m_arOutChangeList);\r
+                               m_OutChangeFileList.m_Rev1=localbranch;\r
+                               m_OutChangeFileList.m_Rev2=remotebranch;\r
+                               m_OutChangeFileList.Show(0,this->m_arOutChangeList);\r
+                               m_OutChangeFileList.SetEmptyString(CString(_T("No changed file")));\r
+                               this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,TRUE);\r
+                       }\r
                }\r
                this->m_OutLocalBranch=localbranch;\r
                this->m_OutRemoteBranch=remotebranch;\r