TortoiseGit日本語言語ファイル作成
Revision | a392f315292bd35972d73640eabddfc6778cfff7 (tree) |
---|---|
Time | 2010-01-22 22:10:25 |
Author | Frank Li <lznuaa@gmai...> |
Commiter | Frank Li |
Add "remote update" command at Sync Dialog
Signed-off-by: Frank Li <lznuaa@gmail.com>
@@ -190,7 +190,24 @@ void CSyncDlg::OnBnClickedButtonPull() | ||
190 | 190 | } |
191 | 191 | } |
192 | 192 | |
193 | + ///Remote Update | |
194 | + if(CurrentEntry == 3) | |
195 | + { | |
196 | + m_CurrentCmd = GIT_COMMAND_REMOTE; | |
197 | + cmd=_T("git.exe remote update"); | |
198 | + m_GitCmdList.push_back(cmd); | |
193 | 199 | |
200 | + m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED); | |
201 | + if (m_pThread==NULL) | |
202 | + { | |
203 | + // ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED))); | |
204 | + } | |
205 | + else | |
206 | + { | |
207 | + m_pThread->m_bAutoDelete = TRUE; | |
208 | + m_pThread->ResumeThread(); | |
209 | + } | |
210 | + } | |
194 | 211 | |
195 | 212 | } |
196 | 213 |
@@ -631,6 +648,7 @@ BOOL CSyncDlg::OnInitDialog() | ||
631 | 648 | this->m_ctrlPull.AddEntry(CString(_T("&Pull"))); |
632 | 649 | this->m_ctrlPull.AddEntry(CString(_T("Fetc&h"))); |
633 | 650 | this->m_ctrlPull.AddEntry(CString(_T("Fetch&&Re&base"))); |
651 | + this->m_ctrlPull.AddEntry(CString(_T("Remote Update"))); | |
634 | 652 | |
635 | 653 | this->m_ctrlSubmodule.AddEntry(CString(_T("Submodule Update"))); |
636 | 654 | this->m_ctrlSubmodule.AddEntry(CString(_T("Submodule Init"))); |
@@ -837,6 +855,12 @@ LRESULT CSyncDlg::OnProgressUpdateUI(WPARAM wParam,LPARAM lParam) | ||
837 | 855 | EnableControlButton(true); |
838 | 856 | SwitchToInput(); |
839 | 857 | } |
858 | + if(this->m_CurrentCmd == GIT_COMMAND_REMOTE) | |
859 | + { | |
860 | + this->FetchOutList(true); | |
861 | + EnableControlButton(true); | |
862 | + SwitchToInput(); | |
863 | + } | |
840 | 864 | } |
841 | 865 | |
842 | 866 | if(lParam != 0) |
@@ -54,6 +54,7 @@ public: | ||
54 | 54 | GIT_COMMAND_FETCH, |
55 | 55 | GIT_COMMAND_FETCHANDREBASE, |
56 | 56 | GIT_COMMAND_SUBMODULE, |
57 | + GIT_COMMAND_REMOTE | |
57 | 58 | }; |
58 | 59 | protected: |
59 | 60 | virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support |