From 3faf501fcf9fe67e9767a8142085fcb05737336f Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 30 Sep 2011 19:40:35 +0200 Subject: [PATCH] TortoiseSVN -> TortoiseGit Signed-off-by: Sven Strickroth --- src/TortoiseIDiff/TortoiseIDiff.cpp | 4 ++-- src/TortoiseMerge/TortoiseMerge.cpp | 2 +- src/TortoiseProc/Commands/CrashCommand.h | 2 +- src/TortoiseProc/Commands/UnIgnoreCommand.cpp | 6 +++--- src/TortoiseProc/MergeDlg.cpp | 4 ---- src/TortoiseProc/PullFetchDlg.cpp | 8 ++------ src/TortoiseProc/PushDlg.cpp | 4 ---- src/TortoiseProc/RebaseDlg.cpp | 3 --- src/TortoiseProc/RefLogDlg.cpp | 4 ---- src/Utils/TaskbarUUID.cpp | 14 +++++++------- src/Utils/TaskbarUUID.h | 2 +- 11 files changed, 17 insertions(+), 36 deletions(-) diff --git a/src/TortoiseIDiff/TortoiseIDiff.cpp b/src/TortoiseIDiff/TortoiseIDiff.cpp index b891cbe45..ed75fff84 100644 --- a/src/TortoiseIDiff/TortoiseIDiff.cpp +++ b/src/TortoiseIDiff/TortoiseIDiff.cpp @@ -41,7 +41,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, SetDllDirectory(L""); SetTaskIDPerUUID(); - CRegStdDWORD loc = CRegStdDWORD(_T("Software\\TortoiseSVN\\LanguageID"), 1033); + CRegStdDWORD loc = CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), 1033); long langId = loc; CLangDll langDLL; @@ -77,7 +77,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, curHandDown = (HCURSOR)LoadImage(hInst, MAKEINTRESOURCE(IDC_PANDOWNCUR), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE); CMainWindow mainWindow(hResource); - mainWindow.SetRegistryPath(_T("Software\\TortoiseSVN\\TortoiseIDiffWindowPos")); + mainWindow.SetRegistryPath(_T("Software\\TortoiseGit\\TortoiseIDiffWindowPos")); mainWindow.SetLeft(parser.HasVal(_T("left")) ? parser.GetVal(_T("left")) : _T(""), parser.HasVal(_T("lefttitle")) ? parser.GetVal(_T("lefttitle")) : _T("")); mainWindow.SetRight(parser.HasVal(_T("right")) ? parser.GetVal(_T("right")) : _T(""), parser.HasVal(_T("righttitle")) ? parser.GetVal(_T("righttitle")) : _T("")); diff --git a/src/TortoiseMerge/TortoiseMerge.cpp b/src/TortoiseMerge/TortoiseMerge.cpp index 12308f4b6..1fff7ce46 100644 --- a/src/TortoiseMerge/TortoiseMerge.cpp +++ b/src/TortoiseMerge/TortoiseMerge.cpp @@ -56,7 +56,7 @@ BOOL CTortoiseMergeApp::InitInstance() CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows)); CMFCButton::EnableWindowsTheming(); //set the resource dll for the required language - CRegDWORD loc = CRegDWORD(_T("Software\\TortoiseSVN\\LanguageID"), 1033); + CRegDWORD loc = CRegDWORD(_T("Software\\TortoiseGit\\LanguageID"), 1033); long langId = loc; CString langDll; HINSTANCE hInst = NULL; diff --git a/src/TortoiseProc/Commands/CrashCommand.h b/src/TortoiseProc/Commands/CrashCommand.h index b783499ac..9538bc7f8 100644 --- a/src/TortoiseProc/Commands/CrashCommand.h +++ b/src/TortoiseProc/Commands/CrashCommand.h @@ -36,7 +36,7 @@ public: virtual bool Execute() { crasher.Enable(!parser.HasKey(_T("nocustom"))); - CMessageBox::Show(NULL, _T("You are testing the crashhandler.\nDo NOT send the crashreport!!!!"), _T("TortoiseSVN"), MB_ICONINFORMATION); + CMessageBox::Show(NULL, _T("You are testing the crashhandler.\nDo NOT send the crashreport!!!!"), _T("TortoiseGit"), MB_ICONINFORMATION); CrashProgram(); CMessageBox::Show(NULL, IDS_ERR_NOCOMMAND, IDS_APPNAME, MB_ICONERROR); return true; diff --git a/src/TortoiseProc/Commands/UnIgnoreCommand.cpp b/src/TortoiseProc/Commands/UnIgnoreCommand.cpp index c9114eb39..9844b0712 100644 --- a/src/TortoiseProc/Commands/UnIgnoreCommand.cpp +++ b/src/TortoiseProc/Commands/UnIgnoreCommand.cpp @@ -67,7 +67,7 @@ bool UnIgnoreCommand::Execute() { CString temp; temp.Format(IDS_ERR_FAILEDUNIGNOREPROPERTY, (LPCTSTR)name); - CMessageBox::Show(hwndExplorer, temp, _T("TortoiseSVN"), MB_ICONERROR); + CMessageBox::Show(hwndExplorer, temp, _T("TortoiseGit"), MB_ICONERROR); err = TRUE; break; } @@ -78,7 +78,7 @@ bool UnIgnoreCommand::Execute() { CString temp; temp.Format(IDS_ERR_FAILEDUNIGNOREPROPERTY, (LPCTSTR)name); - CMessageBox::Show(hwndExplorer, temp, _T("TortoiseSVN"), MB_ICONERROR); + CMessageBox::Show(hwndExplorer, temp, _T("TortoiseGit"), MB_ICONERROR); err = TRUE; break; } @@ -88,7 +88,7 @@ bool UnIgnoreCommand::Execute() { CString temp; temp.Format(IDS_PROC_UNIGNORESUCCESS, (LPCTSTR)filelist); - CMessageBox::Show(hwndExplorer, temp, _T("TortoiseSVN"), MB_ICONINFORMATION); + CMessageBox::Show(hwndExplorer, temp, _T("TortoiseGit"), MB_ICONINFORMATION); return true; } return false; diff --git a/src/TortoiseProc/MergeDlg.cpp b/src/TortoiseProc/MergeDlg.cpp index cf0e246da..cea2600d9 100644 --- a/src/TortoiseProc/MergeDlg.cpp +++ b/src/TortoiseProc/MergeDlg.cpp @@ -87,10 +87,6 @@ BOOL CMergeDlg::OnInitDialog() CheckRadioButton(IDC_RADIO_BRANCH,IDC_RADIO_VERSION,IDC_RADIO_BRANCH); this->SetDefaultChoose(IDC_RADIO_BRANCH); - CString sWindowTitle; - GetWindowText(sWindowTitle); - CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle); - Init(); m_ProjectProperties.ReadProps(CTGitPath(g_Git.m_CurrentDir)); diff --git a/src/TortoiseProc/PullFetchDlg.cpp b/src/TortoiseProc/PullFetchDlg.cpp index 005da45b3..da831dc63 100644 --- a/src/TortoiseProc/PullFetchDlg.cpp +++ b/src/TortoiseProc/PullFetchDlg.cpp @@ -149,14 +149,10 @@ BOOL CPullFetchDlg::OnInitDialog() m_RemoteBranch.LoadHistory(_T("Software\\TortoiseGit\\History\\PullRemoteBranch"), _T("br")); m_RemoteBranch.SetCurSel(0); - CString sWindowTitle; if(m_IsPull) - sWindowTitle = _T("Pull - "); + this->SetWindowTextW(CString(_T("Pull - ")) + g_Git.m_CurrentDir); else - sWindowTitle = _T("Fetch - "); - - GetWindowText(sWindowTitle); - CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle); + this->SetWindowTextW(CString(_T("Fetch - ")) + g_Git.m_CurrentDir); Refresh(); diff --git a/src/TortoiseProc/PushDlg.cpp b/src/TortoiseProc/PushDlg.cpp index ba86162c0..96bd2b46e 100644 --- a/src/TortoiseProc/PushDlg.cpp +++ b/src/TortoiseProc/PushDlg.cpp @@ -111,10 +111,6 @@ BOOL CPushDlg::OnInitDialog() AddOthersToAnchor(); - CString sWindowTitle; - GetWindowText(sWindowTitle); - CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle); - this->GetDlgItem(IDC_PUTTYKEY_AUTOLOAD)->EnableWindow(CAppUtils::IsSSHPutty()); EnableSaveRestore(_T("PushDlg")); diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp index 6358fbd4a..a1e362d93 100644 --- a/src/TortoiseProc/RebaseDlg.cpp +++ b/src/TortoiseProc/RebaseDlg.cpp @@ -194,9 +194,6 @@ BOOL CRebaseDlg::OnInitDialog() m_ctrlTabCtrl.AddTab(&m_LogMessageCtrl,_T("Commit Message"),1); AddRebaseAnchor(); - CString sWindowTitle; - GetWindowText(sWindowTitle); - CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle); EnableSaveRestore(_T("RebaseDlg")); diff --git a/src/TortoiseProc/RefLogDlg.cpp b/src/TortoiseProc/RefLogDlg.cpp index d97d2204c..8c0dace1f 100644 --- a/src/TortoiseProc/RefLogDlg.cpp +++ b/src/TortoiseProc/RefLogDlg.cpp @@ -76,10 +76,6 @@ BOOL CRefLogDlg::OnInitDialog() AddOthersToAnchor(); this->EnableSaveRestore(_T("RefLogDlg")); - CString sWindowTitle; - GetWindowText(sWindowTitle); - CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle); - STRING_VECTOR list; list.push_back(_T("HEAD")); g_Git.GetRefList(list); diff --git a/src/Utils/TaskbarUUID.cpp b/src/Utils/TaskbarUUID.cpp index 30ac9d6fc..434b5da67 100644 --- a/src/Utils/TaskbarUUID.cpp +++ b/src/Utils/TaskbarUUID.cpp @@ -1,4 +1,4 @@ -// TortoiseSVN - a Windows shell extension for easy version control +// TortoiseGit - a Windows shell extension for easy version control // Copyright (C) 2011 - TortoiseSVN @@ -26,7 +26,7 @@ #include "Win7.h" -#define APPID (_T("TSVN.TSVN.1")) +#define APPID (_T("TGIT.TGIT.1")) void SetTaskIDPerUUID() @@ -47,7 +47,7 @@ void SetTaskIDPerUUID() std::wstring GetTaskIDPerUUID(LPCTSTR uuid /*= NULL */) { - CRegStdDWORD r = CRegStdDWORD(_T("Software\\TortoiseSVN\\GroupTaskbarIconsPerRepo"), 0); + CRegStdDWORD r = CRegStdDWORD(_T("Software\\TortoiseGit\\GroupTaskbarIconsPerRepo"), 0); std::wstring id = APPID; if ((r < 2)||(r == 3)) { @@ -82,9 +82,9 @@ extern CString g_sGroupingUUID; void SetUUIDOverlayIcon( HWND hWnd ) { - if (CRegStdDWORD(_T("Software\\TortoiseSVN\\GroupTaskbarIconsPerRepo"), 0)) + if (CRegStdDWORD(_T("Software\\TortoiseGit\\GroupTaskbarIconsPerRepo"), 0)) { - if (CRegStdDWORD(_T("Software\\TortoiseSVN\\GroupTaskbarIconsPerRepoOverlay"), FALSE)) + if (CRegStdDWORD(_T("Software\\TortoiseGit\\GroupTaskbarIconsPerRepoOverlay"), FALSE)) { std::wstring uuid; #ifdef _MFC_VER @@ -105,7 +105,7 @@ void SetUUIDOverlayIcon( HWND hWnd ) do { wchar_t buf[MAX_PATH]; - swprintf_s(buf, _countof(buf), L"%s%d", L"Software\\TortoiseSVN\\LastUsedUUIDsForGrouping\\", foundUUIDIndex); + swprintf_s(buf, _countof(buf), L"%s%d", L"Software\\TortoiseGit\\LastUsedUUIDsForGrouping\\", foundUUIDIndex); CRegStdString r = CRegStdString(buf); std::wstring sr = r; if (sr.empty() || (sr.compare(uuid)==0)) @@ -117,7 +117,7 @@ void SetUUIDOverlayIcon( HWND hWnd ) } while (foundUUIDIndex < 20); if (foundUUIDIndex >= 20) { - CRegStdString r = CRegStdString(L"Software\\TortoiseSVN\\LastUsedUUIDsForGrouping\\1"); + CRegStdString r = CRegStdString(L"Software\\TortoiseGit\\LastUsedUUIDsForGrouping\\1"); r.removeKey(); } diff --git a/src/Utils/TaskbarUUID.h b/src/Utils/TaskbarUUID.h index d7e272c2b..f12cbfb5f 100644 --- a/src/Utils/TaskbarUUID.h +++ b/src/Utils/TaskbarUUID.h @@ -23,7 +23,7 @@ /** * Sets the Task ID (Win7) for the process according to settings * in the registry: - * HKCU\\Software\\TortoiseSVN\\GroupTaskbarIconsPerRepo + * HKCU\\Software\\TortoiseGit\\GroupTaskbarIconsPerRepo * determines how this is done. The Task ID is used by the windows * taskbar to determine how the app icons on the taskbar are grouped * together. -- 2.11.4.GIT