OSDN Git Service

Fixed Issue #135: Taskbar text says "TortoiseSVN"
authorFrank Li <lznuaa@gmail.com>
Fri, 14 Aug 2009 02:17:03 +0000 (10:17 +0800)
committerFrank Li <lznuaa@gmail.com>
Fri, 14 Aug 2009 02:17:03 +0000 (10:17 +0800)
Need clean manually.
HKEY_CURRENT_USER\Software\Microsoft\Windows\ShellNoRoam\MUICache

Signed-off-by: Frank Li <lznuaa@gmail.com>
16 files changed:
src/Git/GitStatusListCtrl.cpp
src/Resources/TortoiseProc.rc2
src/Resources/TortoiseShell.rc2
src/TortoiseProc/Commands/BlameCommand.cpp
src/TortoiseProc/Commands/CleanupCommand.cpp
src/TortoiseProc/Commands/DropCopyAddCommand.cpp
src/TortoiseProc/Commands/DropCopyCommand.cpp
src/TortoiseProc/Commands/DropExportCommand.cpp
src/TortoiseProc/Commands/DropMoveCommand.cpp
src/TortoiseProc/Commands/IgnoreCommand.cpp
src/TortoiseProc/Commands/RemoveCommand.cpp
src/TortoiseProc/Commands/RenameCommand.cpp
src/TortoiseProc/SVNProgressDlg.cpp
src/TortoiseProc/Settings/SettingsPropPage.h
src/TortoiseProc/StatGraphDlg.cpp
src/Utils/PathUtils.cpp

index 40a702f..a1e3cc9 100644 (file)
@@ -2976,7 +2976,7 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
                                                {\r
                                                        CString temp;\r
                                                        temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);\r
-                                                       CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                       CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
                                                        break;\r
                                                }\r
                                                if (GetCheck(selIndex))\r
@@ -3147,7 +3147,7 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
                                                {\r
                                                        CString temp;\r
                                                        temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);\r
-                                                       CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                       CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
                                                }\r
                                                else\r
                                                {\r
@@ -3301,7 +3301,7 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
 \r
                                                if (g_Git.Revert(targetList))\r
                                                {\r
-                                                       CMessageBox::Show(this->m_hWnd, _T("Revert Fail"), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                       CMessageBox::Show(this->m_hWnd, _T("Revert Fail"), _T("TortoiseGit"), MB_ICONERROR);\r
                                                }\r
                                                else\r
                                                {\r
@@ -3478,19 +3478,19 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
                                                        yes.LoadString(IDS_MSGBOX_YES);\r
                                                        no.LoadString(IDS_MSGBOX_NO);\r
                                                        yestoall.LoadString(IDS_PROC_YESTOALL);\r
-                                                       UINT ret = CMessageBox::Show(m_hWnd, msg, _T("TortoiseSVN"), 2, IDI_ERROR, yes, no, yestoall);\r
+                                                       UINT ret = CMessageBox::Show(m_hWnd, msg, _T("TortoiseGit"), 2, IDI_ERROR, yes, no, yestoall);\r
                                                        if ((ret == 1)||(ret==3))\r
                                                        {\r
                                                                if (!git.Remove(itemsToRemove, TRUE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))\r
                                                                {\r
-                                                                       CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                                       CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                                                }\r
                                                                else\r
                                                                        bSuccess = true;\r
                                                        }\r
                                                }\r
                                                else\r
-                                                       CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                       CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                        }\r
                                        if (bSuccess)\r
                                        {\r
@@ -3624,7 +3624,7 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
                                        }\r
                                        else\r
                                        {\r
-                                               CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                        }\r
                                        SaveColumnWidths();\r
                                        Show(m_dwShow, 0, m_bShowFolders);\r
@@ -3696,7 +3696,7 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
                                                                                SVN git;\r
                                                                                if (!git.Move(CTSVNPathList(entry1->GetPath()), entry2->GetPath(), TRUE))\r
                                                                                {\r
-                                                                                       CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                                                       CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                                                                }\r
                                                                                else\r
                                                                                {\r
@@ -3772,7 +3772,7 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
                                        }\r
                                        else\r
                                        {\r
-                                               CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                        }\r
                                        SetRedraw(TRUE);\r
                                }\r
@@ -3835,7 +3835,7 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
                                                }\r
                                                else\r
                                                {\r
-                                                       CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                       CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                                }\r
                                        }\r
                                        SetRedraw(TRUE);\r
@@ -5618,7 +5618,7 @@ bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium,
                                        }\r
                                        else\r
                                        {\r
-                                               CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                        }\r
                                }\r
                                else\r
@@ -5648,7 +5648,7 @@ bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium,
                                        }\r
                                        else\r
                                        {\r
-                                               CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                        }\r
                                }\r
                        }\r
index 14b6b51..fb143a9 100644 (file)
@@ -31,13 +31,13 @@ BEGIN
     BEGIN\r
         BLOCK "040004e4"\r
         BEGIN\r
-            VALUE "CompanyName", "http://tortoisesvn.net\0"\r
-            VALUE "FileDescription", "TortoiseSVN client\0"\r
+               VALUE "CompanyName", "http://code.google.com/p/tortoisegit\0"\r
+            VALUE "FileDescription", "TortoiseGit client\0"\r
             VALUE "FileVersion", STRFILEVER\r
             VALUE "InternalName", "TortoiseProc.exe\0"\r
-            VALUE "LegalCopyright", "Copyright (C) 2003-2008 - TortoiseSVN\0"\r
+            VALUE "LegalCopyright", "Copyright (C) 2008-2009 - TortoiseGit\0"\r
             VALUE "OriginalFilename", "TortoiseProc.exe\0"\r
-            VALUE "ProductName", "TortoiseSVN\0"\r
+            VALUE "ProductName", "TortoiseGit\0"\r
             VALUE "ProductVersion", STRPRODUCTVER\r
         END\r
     END\r
index 3cf927c..a5fde6c 100644 (file)
@@ -31,13 +31,13 @@ BEGIN
     BEGIN\r
         BLOCK "040004e4"\r
         BEGIN\r
-            VALUE "CompanyName", "http://tortoisesvn.net\0"\r
-            VALUE "FileDescription", "TortoiseSVN shell extension client\0"\r
+            VALUE "CompanyName", "http://code.google.com/p/tortoisegit\0"\r
+            VALUE "FileDescription", "TortoiseGit shell extension client\0"\r
             VALUE "FileVersion", STRFILEVER\r
-            VALUE "InternalName", "TortoiseSVN.dll\0"\r
-            VALUE "LegalCopyright", "Copyright (C) 2003-2008 - TortoiseSVN\0"\r
-            VALUE "OriginalFilename", "TortoiseSVN.dll\0"\r
-            VALUE "ProductName", "TortoiseSVN\0"\r
+            VALUE "InternalName", "TortoiseGit.dll\0"\r
+            VALUE "LegalCopyright", "Copyright (C) 2008-2009 - TortoiseGit\0"\r
+            VALUE "OriginalFilename", "TortoiseGit.dll\0"\r
+            VALUE "ProductName", "TortoiseGit\0"\r
             VALUE "ProductVersion", STRPRODUCTVER\r
         END\r
     END\r
index 3d889cb..a5aaf2a 100644 (file)
@@ -102,7 +102,7 @@ bool BlameCommand::Execute()
                }\r
                else\r
                {\r
-                       CMessageBox::Show(hwndExplorer, blame.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                       CMessageBox::Show(hwndExplorer, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                }\r
        }\r
 #endif\r
index 53920fa..4427341 100644 (file)
@@ -120,7 +120,7 @@ bool CleanupCommand::Execute()
                strMessage += tmp;\r
                bRet = false;\r
        }\r
-       CMessageBox::Show(hwndExplorer, strMessage, _T("TortoiseSVN"), MB_OK | (strFailedPaths.IsEmpty()?MB_ICONINFORMATION:MB_ICONERROR));\r
+       CMessageBox::Show(hwndExplorer, strMessage, _T("TortoiseGit"), MB_OK | (strFailedPaths.IsEmpty()?MB_ICONINFORMATION:MB_ICONERROR));\r
 #endif\r
        CShellUpdater::Instance().Flush();\r
        return bRet;\r
index 0f55bfb..712e7aa 100644 (file)
@@ -42,7 +42,7 @@ bool DropCopyAddCommand::Execute()
                        {\r
                                CString strMessage;\r
                                strMessage.Format(IDS_PROC_OVERWRITE_CONFIRM, (LPCTSTR)(droppath+_T("\\")+name));\r
-                               int ret = CMessageBox::Show(hwndExplorer, strMessage, _T("TortoiseSVN"), MB_YESNOCANCEL | MB_ICONQUESTION);\r
+                               int ret = CMessageBox::Show(hwndExplorer, strMessage, _T("TortoiseGit"), MB_YESNOCANCEL | MB_ICONQUESTION);\r
                                if (ret == IDYES)\r
                                {\r
                                        if (!::CopyFile(pathList[nPath].GetWinPath(), droppath+_T("\\")+name, FALSE))\r
@@ -61,7 +61,7 @@ bool DropCopyAddCommand::Execute()
                                                        );\r
                                                CString strMessage;\r
                                                strMessage.Format(IDS_ERR_COPYFILES, (LPTSTR)lpMsgBuf);\r
-                                               CMessageBox::Show(hwndExplorer, strMessage, _T("TortoiseSVN"), MB_OK | MB_ICONINFORMATION);\r
+                                               CMessageBox::Show(hwndExplorer, strMessage, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);\r
                                                LocalFree( lpMsgBuf );\r
                                                return FALSE;\r
                                        }\r
@@ -87,7 +87,7 @@ bool DropCopyAddCommand::Execute()
                                        );\r
                                CString strMessage;\r
                                strMessage.Format(IDS_ERR_COPYFILES, lpMsgBuf);\r
-                               CMessageBox::Show(hwndExplorer, strMessage, _T("TortoiseSVN"), MB_OK | MB_ICONINFORMATION);\r
+                               CMessageBox::Show(hwndExplorer, strMessage, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);\r
                                LocalFree( lpMsgBuf );\r
                                return FALSE;\r
                        }\r
index d27c6db..43f393f 100644 (file)
@@ -91,7 +91,7 @@ bool DropCopyCommand::Execute()
                if (!svn.Copy(CTSVNPathList(sourcePath), fullDropPath, SVNRev::REV_WC, SVNRev()))\r
                {\r
                        TRACE(_T("%s\n"), (LPCTSTR)svn.GetLastErrorMessage());\r
-                       CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                       CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                        return FALSE;           //get out of here\r
                }\r
                else\r
index 3c98f4a..0a2799b 100644 (file)
@@ -40,7 +40,7 @@ bool DropExportCommand::Execute()
                // remove all svn admin dirs, effectively unversion the 'exported' folder.\r
                CString msg;\r
                msg.Format(IDS_PROC_EXPORTUNVERSION, (LPCTSTR)droppath);\r
-               if (CMessageBox::Show(hwndExplorer, msg, _T("TortoiseSVN"), MB_ICONQUESTION|MB_YESNO) == IDYES)\r
+               if (CMessageBox::Show(hwndExplorer, msg, _T("TortoiseGit"), MB_ICONQUESTION|MB_YESNO) == IDYES)\r
                {\r
                        CProgressDlg progress;\r
                        progress.SetTitle(IDS_PROC_UNVERSION);\r
@@ -86,7 +86,7 @@ bool DropExportCommand::Execute()
                                CString sBtn2(MAKEINTRESOURCE(IDS_PROC_OVERWRITEEXPORT_RENAME));\r
                                CString sBtn3(MAKEINTRESOURCE(IDS_PROC_OVERWRITEEXPORT_CANCEL));\r
                                sMsg.Format(IDS_PROC_OVERWRITEEXPORT, (LPCTSTR)dropper);\r
-                               UINT ret = CMessageBox::Show(hwndExplorer, sMsg, _T("TortoiseSVN"), MB_DEFBUTTON1, IDI_QUESTION, sBtn1, sBtn2, sBtn3);\r
+                               UINT ret = CMessageBox::Show(hwndExplorer, sMsg, _T("TortoiseGit"), MB_DEFBUTTON1, IDI_QUESTION, sBtn1, sBtn2, sBtn3);\r
                                if (ret==2)\r
                                {\r
                                        dropper.Format(IDS_PROC_EXPORTFOLDERNAME, (LPCTSTR)droppath, (LPCTSTR)pathList[nPath].GetFileOrDirectoryName());\r
@@ -101,7 +101,7 @@ bool DropExportCommand::Execute()
                        }\r
                        if (!svn.Export(pathList[nPath], CTSVNPath(dropper), SVNRev::REV_WC ,SVNRev::REV_WC, FALSE, FALSE, svn_depth_infinity, hwndExplorer, parser.HasKey(_T("extended"))))\r
                        {\r
-                               CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_OK | MB_ICONERROR);\r
+                               CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);\r
                                bRet = false;\r
                        }\r
                }\r
index 977b60d..da7b2f1 100644 (file)
@@ -100,7 +100,7 @@ bool DropMoveCommand::Execute()
 #if 0\r
                                        if (!svn.Move(CTSVNPathList(pathList[nPath]), destPath, TRUE))\r
                                        {\r
-                                               CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                                return FALSE;           //get out of here\r
                                        }\r
                                        CShellUpdater::Instance().AddPathForUpdate(destPath);\r
index 16850fe..d58e52b 100644 (file)
@@ -89,7 +89,7 @@ bool IgnoreCommand::Execute()
                        temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);\r
                        temp += _T("\n");\r
                        temp += props.GetLastErrorMsg().c_str();\r
-                       CMessageBox::Show(hwndExplorer, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
+                       CMessageBox::Show(hwndExplorer, temp, _T("TortoiseGit"), MB_ICONERROR);\r
                        err = TRUE;\r
                        break;\r
                }\r
@@ -98,7 +98,7 @@ bool IgnoreCommand::Execute()
        {\r
                CString temp;\r
                temp.Format(IDS_PROC_IGNORESUCCESS, (LPCTSTR)filelist);\r
-               CMessageBox::Show(hwndExplorer, temp, _T("TortoiseSVN"), MB_ICONINFORMATION);\r
+               CMessageBox::Show(hwndExplorer, temp, _T("TortoiseGit"), MB_ICONINFORMATION);\r
                return true;\r
        }\r
 #endif\r
index 6a9698a..112df19 100644 (file)
@@ -54,7 +54,7 @@ bool RemoveCommand::Execute()
                {\r
                        if (!svn.Remove(pathList, TRUE, parser.HasKey(_T("keep")), dlg.GetLogMessage()))\r
                        {\r
-                               CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                               CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                return FALSE;\r
                        }\r
                        return true;\r
@@ -93,7 +93,7 @@ bool RemoveCommand::Execute()
                                        yes.LoadString(IDS_MSGBOX_YES);\r
                                        no.LoadString(IDS_MSGBOX_NO);\r
                                        yestoall.LoadString(IDS_PROC_YESTOALL);\r
-                                       UINT ret = CMessageBox::Show(hwndExplorer, msg, _T("TortoiseSVN"), 2, IDI_ERROR, yes, no, yestoall);\r
+                                       UINT ret = CMessageBox::Show(hwndExplorer, msg, _T("TortoiseGit"), 2, IDI_ERROR, yes, no, yestoall);\r
                                        if (ret == 3)\r
                                                bForce = TRUE;\r
                                        if ((ret == 1)||(ret==3))\r
@@ -102,14 +102,14 @@ bool RemoveCommand::Execute()
                                                delPath.Delete(true);\r
                                                if (!svn.Remove(removePathList, TRUE, parser.HasKey(_T("keep"))))\r
                                                {\r
-                                                       CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                       CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                                }\r
                                                else\r
                                                        bRet = true;\r
                                        }\r
                                }\r
                                else\r
-                                       CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                       CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                        }\r
                }\r
        }\r
index 7554b36..6bef587 100644 (file)
@@ -146,7 +146,7 @@ bool RenameCommand::Execute()
                                if (!svn.Move(CTSVNPathList(cmdLinePath), destinationPath, TRUE, sMsg))\r
                                {\r
                                        TRACE(_T("%s\n"), (LPCTSTR)svn.GetLastErrorMessage());\r
-                                       CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                       CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                }\r
                                else\r
                                        bRet = true;\r
@@ -170,7 +170,7 @@ bool RenameCommand::Execute()
                                        if (!svn.Move(CTSVNPathList(cmdLinePath), destinationPath, TRUE, sMsg))\r
                                        {\r
                                                TRACE(_T("%s\n"), (LPCTSTR)svn.GetLastErrorMessage());\r
-                                               CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                        }\r
                                        else\r
                                        {\r
@@ -194,7 +194,7 @@ bool RenameCommand::Execute()
                                        }\r
                                        CString sRenameMultipleQuestion;\r
                                        sRenameMultipleQuestion.Format(IDS_PROC_MULTIRENAME, (LPCTSTR)sRenList);\r
-                                       UINT idret = CMessageBox::Show(hwndExplorer, sRenameMultipleQuestion, _T("TortoiseSVN"), MB_ICONQUESTION|MB_YESNOCANCEL);\r
+                                       UINT idret = CMessageBox::Show(hwndExplorer, sRenameMultipleQuestion, _T("TortoiseGit"), MB_ICONQUESTION|MB_YESNOCANCEL);\r
                                        if (idret == IDYES)\r
                                        {\r
                                                CProgressDlg progress;\r
@@ -217,7 +217,7 @@ bool RenameCommand::Execute()
                                                                else\r
                                                                {\r
                                                                        TRACE(_T("%s\n"), (LPCTSTR)svn.GetLastErrorMessage());\r
-                                                                       CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                                       CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                                                        bRet = false;\r
                                                                }\r
                                                        }\r
@@ -235,7 +235,7 @@ bool RenameCommand::Execute()
                                                if (!svn.Move(CTSVNPathList(cmdLinePath), destinationPath, TRUE, sMsg))\r
                                                {\r
                                                        TRACE(_T("%s\n"), (LPCTSTR)svn.GetLastErrorMessage());\r
-                                                       CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                       CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                                }\r
                                                else\r
                                                {\r
index d57a24e..ec9ea41 100644 (file)
@@ -1577,7 +1577,7 @@ void CGitProgressDlg::OnContextMenu(CWnd* pWnd, CPoint point)
                                                                SVN svn;\r
                                                                if (!svn.Cat(data->path, SVNRev(SVNRev::REV_WC), rev, basefile))\r
                                                                {\r
-                                                                       CMessageBox::Show(m_hWnd, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                                       CMessageBox::Show(m_hWnd, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                                                        DialogEnableWindow(IDOK, TRUE);\r
                                                                        break;\r
                                                                }\r
@@ -1610,7 +1610,7 @@ void CGitProgressDlg::OnContextMenu(CWnd* pWnd, CPoint point)
                                                                SVN svn;\r
                                                                if (!svn.Cat(data->path, SVNRev(SVNRev::REV_WC), rev, tempfile))\r
                                                                {\r
-                                                                       CMessageBox::Show(m_hWnd, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                                       CMessageBox::Show(m_hWnd, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                                                        DialogEnableWindow(IDOK, TRUE);\r
                                                                        break;\r
                                                                }\r
@@ -1663,7 +1663,7 @@ void CGitProgressDlg::OnContextMenu(CWnd* pWnd, CPoint point)
                                                                        {\r
                                                                                if (!svn.Resolve(data->path, result, FALSE))\r
                                                                                {\r
-                                                                                       CMessageBox::Show(m_hWnd, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                                                       CMessageBox::Show(m_hWnd, svn.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                                                                        DialogEnableWindow(IDOK, TRUE);\r
                                                                                        break;\r
                                                                                }\r
@@ -1698,7 +1698,7 @@ void CGitProgressDlg::OnContextMenu(CWnd* pWnd, CPoint point)
                                                        {\r
                                                                CString msg;\r
                                                                msg.Format(IDS_SVNPROGRESS_RESOLVED, (LPCTSTR)sResolvedPaths);\r
-                                                               CMessageBox::Show(m_hWnd, msg, _T("TortoiseSVN"), MB_OK | MB_ICONINFORMATION);\r
+                                                               CMessageBox::Show(m_hWnd, msg, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);\r
                                                        }\r
                                                }\r
                                                break;\r
index 77fbfe2..0656ad4 100644 (file)
@@ -71,6 +71,6 @@ protected:
     {\r
        registryKey = value;\r
            if (registryKey.LastError != ERROR_SUCCESS)\r
-                   CMessageBox::Show (m_hWnd, registryKey.getErrorString(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                   CMessageBox::Show (m_hWnd, registryKey.getErrorString(), _T("TortoiseGit"), MB_ICONERROR);\r
     }\r
 };\r
index 698406d..2affb92 100644 (file)
@@ -1290,7 +1290,7 @@ void CStatGraphDlg::SaveGraph(CString sFilename)
        {\r
                // save the graph as an enhanced meta file\r
                CMyMetaFileDC wmfDC;\r
-               wmfDC.CreateEnhanced(NULL, sFilename, NULL, _T("TortoiseSVN\0Statistics\0\0"));\r
+               wmfDC.CreateEnhanced(NULL, sFilename, NULL, _T("TortoiseGit\0Statistics\0\0"));\r
                wmfDC.SetAttribDC(GetDC()->GetSafeHdc());\r
                RedrawGraph();\r
                m_graph.DrawGraph(wmfDC);\r
@@ -1421,14 +1421,14 @@ void CStatGraphDlg::SaveGraph(CString sFilename)
                        dc.DeleteDC();\r
                        if (!sErrormessage.IsEmpty())\r
                        {\r
-                               CMessageBox::Show(m_hWnd, sErrormessage, _T("TortoiseSVN"), MB_ICONERROR);\r
+                               CMessageBox::Show(m_hWnd, sErrormessage, _T("TortoiseGit"), MB_ICONERROR);\r
                        }\r
                }\r
                catch (CException * pE)\r
                {\r
                        TCHAR szErrorMsg[2048];\r
                        pE->GetErrorMessage(szErrorMsg, 2048);\r
-                       CMessageBox::Show(m_hWnd, szErrorMsg, _T("TortoiseSVN"), MB_ICONERROR);\r
+                       CMessageBox::Show(m_hWnd, szErrorMsg, _T("TortoiseGit"), MB_ICONERROR);\r
                }\r
        }\r
 }\r
index 227cf9f..ad76eb1 100644 (file)
@@ -356,7 +356,7 @@ CString CPathUtils::GetAppDataDirectory()
        if (SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, path)!=S_OK)\r
                return CString();\r
 \r
-       _tcscat_s(path, MAX_PATH, _T("\\TortoiseSVN"));\r
+       _tcscat_s(path, MAX_PATH, _T("\\TortoiseGit"));\r
        if (!PathIsDirectory(path))\r
                CreateDirectory(path, NULL);\r
 \r