From 9be52fb6cac4a5460b6db9fb63f84d1e5c54952f Mon Sep 17 00:00:00 2001 From: Frank Li Date: Tue, 24 Feb 2009 21:19:07 +0800 Subject: [PATCH] Change Progress.h to SysProgress.h because there are two progress.h file. Signed-off-by: Frank Li --- Languages/TortoiseLang.vcproj | 16 +++--- doc/source/en/TortoiseGit/tortoisegit.xml | 6 +-- doc/source/en/TortoiseGit/tsvn_dug/dug.xml | 8 +++ .../en/TortoiseGit/tsvn_dug/dug_checkout.xml | 2 +- doc/source/en/TortoiseGit/tsvn_dug/dug_commit.xml | 2 +- doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml | 56 +++++++++++++++----- src/Git/Git.vcproj | 46 ++++++++--------- src/TortoiseProc/Commands/Command.cpp | 45 +++++++--------- src/TortoiseProc/Commands/DropCopyAddCommand.cpp | 2 + src/TortoiseProc/Commands/DropCopyCommand.cpp | 10 ++-- src/TortoiseProc/Commands/DropExportCommand.cpp | 11 ++-- src/TortoiseProc/Commands/DropMoveCommand.cpp | 49 ++++++++++-------- src/TortoiseProc/TortoiseProc.vcproj | 60 +++++++++++++++++----- src/Utils/MiscUI/ProgressDlg.cpp | 48 ++++++++--------- .../MiscUI/{ProgressDlg.h => SysProgressDlg.h} | 6 +-- 15 files changed, 225 insertions(+), 142 deletions(-) rename src/Utils/MiscUI/{ProgressDlg.h => SysProgressDlg.h} (96%) diff --git a/Languages/TortoiseLang.vcproj b/Languages/TortoiseLang.vcproj index 9169f2c..05e53c2 100644 --- a/Languages/TortoiseLang.vcproj +++ b/Languages/TortoiseLang.vcproj @@ -1,7 +1,7 @@ First - + ` Lübbe - Onken + Onken (TortoiseSVN) Simon - Large + Large (TortoiseSVN) Frank diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug.xml index 1797616..e7d8258 100644 --- a/doc/source/en/TortoiseGit/tsvn_dug/dug.xml +++ b/doc/source/en/TortoiseGit/tsvn_dug/dug.xml @@ -64,10 +64,14 @@ --> + + @@ -75,8 +79,12 @@ + + - <-- + - <-- + @@ -108,7 +109,7 @@ - If a revision replaced a file or directory, the + If a revision replaced(rename) a file, the replaced icon is shown in the fourth column. @@ -137,6 +138,7 @@ + Show changes as unified diff @@ -172,6 +175,7 @@ + + Open / Open with... @@ -209,6 +216,7 @@ + - Create branch/tag from revision + Create branch from revision - Create a branch or tag from a selected revision. - This is useful e.g. if you forgot to create a tag and already - committed some changes which weren't supposed to get into - that release. + Create a branch from a selected revision. + This is useful e.g. - Update item to revision + Create tag from revision + + + Create a tag from a selected revision. + This is useful e.g. + + + + + Switch\Checkout to revision Update your working copy to the selected revision. Useful if you want to have your working copy reflect a time in the past, or if there have been further commits to the repository and you want to update your working copy one - step at a time. It is best to update a whole directory - in your working copy, not just one file, otherwise your - working copy could be inconsistent. + step at a time. + + + + Export... @@ -312,6 +334,7 @@ + + Copy to clipboard @@ -371,14 +397,17 @@ difference tool. The default Diff-Tool is TortoiseMerge which is supplied with TortoiseGit. + + Show differences as unified diff @@ -416,6 +446,7 @@ + You can also choose to merge the selected revisions to another working copy, as described above. diff --git a/src/Git/Git.vcproj b/src/Git/Git.vcproj index c957810..f438b99 100644 --- a/src/Git/Git.vcproj +++ b/src/Git/Git.vcproj @@ -85,13 +85,13 @@ /> apr_err == SVN_ERR_UNVERSIONED_RESOURCE || - svn.Err->apr_err == SVN_ERR_CLIENT_MODIFIED)) + if (CMessageBox::Show(hwndExplorer, out, _T("TortoiseGit"), MB_YESNO)==IDYES) { - // file/folder seems to have local modifications. Ask the user if - // a force is requested. - CString temp = svn.GetLastErrorMessage(); - CString sQuestion(MAKEINTRESOURCE(IDS_PROC_FORCEMOVE)); - temp += _T("\n") + sQuestion; - if (CMessageBox::Show(hwndExplorer, temp, _T("TortoiseSVN"), MB_YESNO)==IDYES) - { +#if 0 if (!svn.Move(CTSVNPathList(pathList[nPath]), destPath, TRUE)) { CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR); return FALSE; //get out of here } CShellUpdater::Instance().AddPathForUpdate(destPath); - } +#endif } else { - TRACE(_T("%s\n"), (LPCTSTR)svn.GetLastErrorMessage()); - CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR); + //TRACE(_T("%s\n"), (LPCTSTR)svn.GetLastErrorMessage()); + CMessageBox::Show(hwndExplorer, _T("Cancel"), _T("TortoiseGit"), MB_ICONERROR); return FALSE; //get out of here } } diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj index 2594c42..1b90dc1 100644 --- a/src/TortoiseProc/TortoiseProc.vcproj +++ b/src/TortoiseProc/TortoiseProc.vcproj @@ -586,11 +586,11 @@ > + + + + @@ -1369,6 +1377,14 @@ Name="Export" > + + + + @@ -1769,6 +1785,26 @@ > + + + + + + + + + + SetTitle(T2COLE(szTitle)); } } -void CProgressDlg::SetTitle ( UINT idTitle) +void CSysProgressDlg::SetTitle ( UINT idTitle) { SetTitle(CString(MAKEINTRESOURCE(idTitle))); } -void CProgressDlg::SetLine(DWORD dwLine, LPCTSTR szText, bool bCompactPath /* = false */) +void CSysProgressDlg::SetLine(DWORD dwLine, LPCTSTR szText, bool bCompactPath /* = false */) { USES_CONVERSION; if (m_bValid) @@ -76,13 +76,13 @@ void CProgressDlg::SetLine(DWORD dwLine, LPCTSTR szText, bool bCompactPath /* = } #ifdef _MFC_VER -void CProgressDlg::SetCancelMsg ( UINT idMessage ) +void CSysProgressDlg::SetCancelMsg ( UINT idMessage ) { SetCancelMsg(CString(MAKEINTRESOURCE(idMessage))); } #endif // _MFC_VER -void CProgressDlg::SetCancelMsg(LPCTSTR szMessage) +void CSysProgressDlg::SetCancelMsg(LPCTSTR szMessage) { USES_CONVERSION; if (m_bValid) @@ -91,7 +91,7 @@ void CProgressDlg::SetCancelMsg(LPCTSTR szMessage) } } -void CProgressDlg::SetAnimation(HINSTANCE hinst, UINT uRsrcID) +void CSysProgressDlg::SetAnimation(HINSTANCE hinst, UINT uRsrcID) { if (m_bValid) { @@ -99,7 +99,7 @@ void CProgressDlg::SetAnimation(HINSTANCE hinst, UINT uRsrcID) } } #ifdef _MFC_VER -void CProgressDlg::SetAnimation(UINT uRsrcID) +void CSysProgressDlg::SetAnimation(UINT uRsrcID) { if (m_bValid) { @@ -107,7 +107,7 @@ void CProgressDlg::SetAnimation(UINT uRsrcID) } } #endif -void CProgressDlg::SetTime(bool bTime /* = true */) +void CSysProgressDlg::SetTime(bool bTime /* = true */) { m_dwDlgFlags &= ~(PROGDLG_NOTIME | PROGDLG_AUTOTIME); @@ -117,7 +117,7 @@ void CProgressDlg::SetTime(bool bTime /* = true */) m_dwDlgFlags |= PROGDLG_NOTIME; } -void CProgressDlg::SetShowProgressBar(bool bShow /* = true */) +void CSysProgressDlg::SetShowProgressBar(bool bShow /* = true */) { if (bShow) m_dwDlgFlags &= ~PROGDLG_NOPROGRESSBAR; @@ -125,19 +125,19 @@ void CProgressDlg::SetShowProgressBar(bool bShow /* = true */) m_dwDlgFlags |= PROGDLG_NOPROGRESSBAR; } #ifdef _MFC_VER -HRESULT CProgressDlg::ShowModal (CWnd* pwndParent) +HRESULT CSysProgressDlg::ShowModal (CWnd* pwndParent) { EnsureValid(); return ShowModal(pwndParent->GetSafeHwnd()); } -HRESULT CProgressDlg::ShowModeless(CWnd* pwndParent) +HRESULT CSysProgressDlg::ShowModeless(CWnd* pwndParent) { EnsureValid(); return ShowModeless(pwndParent->GetSafeHwnd()); } -void CProgressDlg::FormatPathLine ( DWORD dwLine, UINT idFormatText, ...) +void CSysProgressDlg::FormatPathLine ( DWORD dwLine, UINT idFormatText, ...) { va_list args; va_start(args, idFormatText); @@ -149,7 +149,7 @@ void CProgressDlg::FormatPathLine ( DWORD dwLine, UINT idFormatText, ...) va_end(args); } -void CProgressDlg::FormatNonPathLine(DWORD dwLine, UINT idFormatText, ...) +void CSysProgressDlg::FormatNonPathLine(DWORD dwLine, UINT idFormatText, ...) { va_list args; va_start(args, idFormatText); @@ -162,7 +162,7 @@ void CProgressDlg::FormatNonPathLine(DWORD dwLine, UINT idFormatText, ...) } #endif -HRESULT CProgressDlg::ShowModal (HWND hWndParent) +HRESULT CSysProgressDlg::ShowModal (HWND hWndParent) { EnsureValid(); HRESULT hr; @@ -183,7 +183,7 @@ HRESULT CProgressDlg::ShowModal (HWND hWndParent) return E_FAIL; } -HRESULT CProgressDlg::ShowModeless(HWND hWndParent) +HRESULT CSysProgressDlg::ShowModeless(HWND hWndParent) { EnsureValid(); HRESULT hr = E_FAIL; @@ -217,7 +217,7 @@ HRESULT CProgressDlg::ShowModeless(HWND hWndParent) return hr; } -void CProgressDlg::SetProgress(DWORD dwProgress, DWORD dwMax) +void CSysProgressDlg::SetProgress(DWORD dwProgress, DWORD dwMax) { if (m_bValid) { @@ -226,7 +226,7 @@ void CProgressDlg::SetProgress(DWORD dwProgress, DWORD dwMax) } -void CProgressDlg::SetProgress64(ULONGLONG u64Progress, ULONGLONG u64ProgressMax) +void CSysProgressDlg::SetProgress64(ULONGLONG u64Progress, ULONGLONG u64ProgressMax) { if (m_bValid) { @@ -235,7 +235,7 @@ void CProgressDlg::SetProgress64(ULONGLONG u64Progress, ULONGLONG u64ProgressMax } -bool CProgressDlg::HasUserCancelled() +bool CSysProgressDlg::HasUserCancelled() { if (m_bValid) { @@ -244,7 +244,7 @@ bool CProgressDlg::HasUserCancelled() return FALSE; } -void CProgressDlg::Stop() +void CSysProgressDlg::Stop() { if ((m_isVisible)&&(m_bValid)) { @@ -272,7 +272,7 @@ void CProgressDlg::Stop() } } -void CProgressDlg::ResetTimer() +void CSysProgressDlg::ResetTimer() { if (m_bValid) { diff --git a/src/Utils/MiscUI/ProgressDlg.h b/src/Utils/MiscUI/SysProgressDlg.h similarity index 96% rename from src/Utils/MiscUI/ProgressDlg.h rename to src/Utils/MiscUI/SysProgressDlg.h index 2398ac9..95aa626 100644 --- a/src/Utils/MiscUI/ProgressDlg.h +++ b/src/Utils/MiscUI/SysProgressDlg.h @@ -27,11 +27,11 @@ * \remark you need to call AfxOleInit() before using this class, preferably in * your app's InitInistance() method. */ -class CProgressDlg +class CSysProgressDlg { public: - CProgressDlg(); - ~CProgressDlg(); + CSysProgressDlg(); + ~CSysProgressDlg(); /** * sets the title of the progress dialog box. -- 2.11.0