OSDN Git Service

Add Setting Dialog
authorFrank Li <lznuaa@gmail.com>
Fri, 9 Jan 2009 15:18:01 +0000 (23:18 +0800)
committerFrank Li <lznuaa@gmail.com>
Fri, 9 Jan 2009 15:18:01 +0000 (23:18 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
73 files changed:
src/Git/GitStatusListCtrl.cpp
src/TGitCache/FolderCrawler.cpp
src/TGitCache/StatusCacheEntry.cpp
src/TGitCache/TSVNCache.cpp
src/TortoiseBlame/TortoiseBlame.cpp
src/TortoiseMerge/AppUtils.cpp
src/TortoiseMerge/TortoiseMerge.cpp
src/TortoiseProc/Blame.cpp
src/TortoiseProc/BlameDlg.cpp
src/TortoiseProc/CheckForUpdatesDlg.cpp
src/TortoiseProc/CheckoutDlg.cpp
src/TortoiseProc/Colors.cpp
src/TortoiseProc/Commands/CheckoutCommand.cpp
src/TortoiseProc/Commands/Command.cpp
src/TortoiseProc/Commands/CommitCommand.cpp
src/TortoiseProc/Commands/CopyCommand.cpp
src/TortoiseProc/Commands/LockCommand.cpp
src/TortoiseProc/Commands/LogCommand.cpp
src/TortoiseProc/CopyDlg.cpp
src/TortoiseProc/ILogReceiver.h
src/TortoiseProc/ImportDlg.cpp
src/TortoiseProc/InputDlg.cpp
src/TortoiseProc/InputLogDlg.cpp
src/TortoiseProc/LockDlg.cpp
src/TortoiseProc/LogFile.cpp
src/TortoiseProc/LogFile.h
src/TortoiseProc/MergeWizard.cpp
src/TortoiseProc/MergeWizardReintegrate.cpp
src/TortoiseProc/MergeWizardRevRange.cpp
src/TortoiseProc/MergeWizardTree.cpp
src/TortoiseProc/RelocateDlg.cpp
src/TortoiseProc/RepositoryBar.cpp
src/TortoiseProc/RepositoryBrowser.cpp
src/TortoiseProc/RevisionGraph/FullGraphFinalizer.cpp
src/TortoiseProc/RevisionGraph/FullHistory.cpp
src/TortoiseProc/RevisionGraph/RevisionGraphDlg.cpp
src/TortoiseProc/RevisionGraph/RevisionGraphWnd.cpp
src/TortoiseProc/SVNProgressDlg.cpp
src/TortoiseProc/Settings/SetDialogs.cpp
src/TortoiseProc/Settings/SetHooks.cpp
src/TortoiseProc/Settings/SetHooksAdv.cpp
src/TortoiseProc/Settings/SetLookAndFeelPage.cpp
src/TortoiseProc/Settings/SetMainPage.cpp
src/TortoiseProc/Settings/SetMisc.cpp
src/TortoiseProc/Settings/SetOverlayIcons.cpp
src/TortoiseProc/Settings/SetOverlayPage.cpp
src/TortoiseProc/Settings/SetProgsAdvDlg.cpp
src/TortoiseProc/Settings/SetProxyPage.cpp
src/TortoiseProc/Settings/SetSavedDataPage.cpp
src/TortoiseProc/Settings/Settings.cpp
src/TortoiseProc/Settings/Settings.h
src/TortoiseProc/Settings/SettingsLogCaches.cpp
src/TortoiseProc/Settings/SettingsLogCaches.h
src/TortoiseProc/Settings/SettingsProgsDiff.cpp
src/TortoiseProc/Settings/SettingsProgsMerge.cpp
src/TortoiseProc/Settings/SettingsProgsUniDiff.cpp
src/TortoiseProc/Settings/SettingsRevisionGraph.cpp
src/TortoiseProc/Settings/SettingsTBlame.cpp
src/TortoiseProc/StatGraphDlg.cpp
src/TortoiseProc/TortoiseProc.cpp
src/TortoiseProc/TortoiseProc.vcproj
src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
src/TortoiseProc/URLDlg.cpp
src/TortoiseProc/UpdateDlg.cpp
src/TortoiseProc/UrlDiffDlg.cpp
src/TortoiseShell/ColumnProvider.cpp
src/TortoiseShell/RemoteCacheLink.cpp
src/TortoiseShell/ShellExt.h
src/TortoiseUDiff/MainWindow.cpp
src/Utils/BugTraqAssociations.cpp
src/Utils/Hooks.cpp
src/Utils/MiscUI/SciEdit.cpp
src/Utils/Utils.vcproj

index 9b46458..49241ac 100644 (file)
@@ -1055,7 +1055,7 @@ void CGitStatusListCtrl::Show(DWORD dwShow, DWORD dwCheck /*=0*/, bool bShowFold
                pApp->DoWaitCursor(1);\r
 \r
        Locker lock(m_critSec);\r
-       WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), GetUserDefaultLangID());\r
+       WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());\r
        \r
        //SetItemCount(listIndex);\r
        SetRedraw(FALSE);\r
@@ -1282,7 +1282,7 @@ void CGitStatusListCtrl::Show(DWORD dwShow, const CTGitPathList& checkedList, bo
 #if 0\r
 \r
        Locker lock(m_critSec);\r
-       WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), GetUserDefaultLangID());\r
+       WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());\r
 \r
        CWinApp * pApp = AfxGetApp();\r
        if (pApp)\r
@@ -2800,7 +2800,7 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
                                                        if (entry->status != git_wc_status_added)\r
                                                                delList.AddPath(entry->GetPath());\r
                                                }\r
-                                               if (DWORD(CRegDWORD(_T("Software\\TortoiseSVN\\RevertWithRecycleBin"), TRUE)))\r
+                                               if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))\r
                                                        delList.DeleteAllFiles(true);\r
 \r
                                                if (!git.Revert(targetList, CStringArray(), FALSE))\r
index d4e4e24..bab47be 100644 (file)
@@ -132,7 +132,7 @@ void CFolderCrawler::WorkerThread()
 \r
        for(;;)\r
        {\r
-               bool bRecursive = !!(DWORD)CRegStdWORD(_T("Software\\TortoiseSVN\\RecursiveOverlay"), TRUE);\r
+               bool bRecursive = !!(DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\RecursiveOverlay"), TRUE);\r
 \r
                if (fullver >= 0x0600)\r
                {\r
index 0c90500..8e7b424 100644 (file)
@@ -22,7 +22,7 @@
 #include "CacheInterface.h"\r
 #include "registry.h"\r
 \r
-DWORD cachetimeout = (DWORD)CRegStdWORD(_T("Software\\TortoiseSVN\\Cachetimeout"), CACHETIMEOUT);\r
+DWORD cachetimeout = (DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\Cachetimeout"), CACHETIMEOUT);\r
 \r
 CStatusCacheEntry::CStatusCacheEntry()\r
        : m_bSet(false)\r
index 3b1091d..2b13785 100644 (file)
@@ -176,7 +176,7 @@ int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPSTR /*
        {\r
                return 0;\r
        }\r
-       if (CRegStdWORD(_T("Software\\TortoiseSVN\\CacheTrayIcon"), FALSE)==TRUE)\r
+       if (CRegStdWORD(_T("Software\\TortoiseGit\\CacheTrayIcon"), FALSE)==TRUE)\r
        {\r
                SecureZeroMemory(&niData,sizeof(NOTIFYICONDATA));\r
 \r
index 1144f8f..e629374 100644 (file)
@@ -410,9 +410,9 @@ void TortoiseBlame::InitialiseEditor()
        m_directFunction = SendMessage(wEditor, SCI_GETDIRECTFUNCTION, 0, 0);\r
        m_directPointer = SendMessage(wEditor, SCI_GETDIRECTPOINTER, 0, 0);\r
        // Set up the global default style. These attributes are used wherever no explicit choices are made.\r
-       SetAStyle(STYLE_DEFAULT, black, white, (DWORD)CRegStdWORD(_T("Software\\TortoiseSVN\\BlameFontSize"), 10), \r
-               ((stdstring)(CRegStdString(_T("Software\\TortoiseSVN\\BlameFontName"), _T("Courier New")))).c_str());\r
-       SendEditor(SCI_SETTABWIDTH, (DWORD)CRegStdWORD(_T("Software\\TortoiseSVN\\BlameTabSize"), 4));\r
+       SetAStyle(STYLE_DEFAULT, black, white, (DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\BlameFontSize"), 10), \r
+               ((stdstring)(CRegStdString(_T("Software\\TortoiseGit\\BlameFontName"), _T("Courier New")))).c_str());\r
+       SendEditor(SCI_SETTABWIDTH, (DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\BlameTabSize"), 4));\r
        SendEditor(SCI_SETREADONLY, TRUE);\r
        LRESULT pix = SendEditor(SCI_TEXTWIDTH, STYLE_LINENUMBER, (LPARAM)_T("_99999"));\r
        if (ShowLine)\r
@@ -427,8 +427,8 @@ void TortoiseBlame::InitialiseEditor()
        SendEditor(SCI_SETSELFORE, TRUE, ::GetSysColor(COLOR_HIGHLIGHTTEXT));\r
        SendEditor(SCI_SETSELBACK, TRUE, ::GetSysColor(COLOR_HIGHLIGHT));\r
        SendEditor(SCI_SETCARETFORE, ::GetSysColor(COLOR_WINDOWTEXT));\r
-       m_regOldLinesColor = CRegStdWORD(_T("Software\\TortoiseSVN\\BlameOldColor"), RGB(230, 230, 255));\r
-       m_regNewLinesColor = CRegStdWORD(_T("Software\\TortoiseSVN\\BlameNewColor"), RGB(255, 230, 230));\r
+       m_regOldLinesColor = CRegStdWORD(_T("Software\\TortoiseGit\\BlameOldColor"), RGB(230, 230, 255));\r
+       m_regNewLinesColor = CRegStdWORD(_T("Software\\TortoiseGit\\BlameNewColor"), RGB(255, 230, 230));\r
 }\r
 \r
 void TortoiseBlame::StartSearch()\r
@@ -932,9 +932,9 @@ void TortoiseBlame::CreateFont()
        LOGFONT lf = {0};\r
        lf.lfWeight = 400;\r
        HDC hDC = ::GetDC(wBlame);\r
-       lf.lfHeight = -MulDiv((DWORD)CRegStdWORD(_T("Software\\TortoiseSVN\\BlameFontSize"), 10), GetDeviceCaps(hDC, LOGPIXELSY), 72);\r
+       lf.lfHeight = -MulDiv((DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\BlameFontSize"), 10), GetDeviceCaps(hDC, LOGPIXELSY), 72);\r
        lf.lfCharSet = DEFAULT_CHARSET;\r
-       CRegStdString fontname = CRegStdString(_T("Software\\TortoiseSVN\\BlameFontName"), _T("Courier New"));\r
+       CRegStdString fontname = CRegStdString(_T("Software\\TortoiseGit\\BlameFontName"), _T("Courier New"));\r
        _tcscpy_s(lf.lfFaceName, 32, ((stdstring)fontname).c_str());\r
        m_font = ::CreateFontIndirect(&lf);\r
 \r
@@ -1187,7 +1187,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
        if (::LoadLibrary("SciLexer.DLL") == NULL)\r
                return FALSE;\r
 \r
-       CRegStdWORD loc = CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), 1033);\r
+       CRegStdWORD loc = CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), 1033);\r
        long langId = loc;\r
 \r
        CLangDll langDLL;\r
@@ -1391,9 +1391,9 @@ BOOL InitInstance(HINSTANCE hResource, int nCmdShow)
       return FALSE;\r
    }\r
 \r
-   CRegStdWORD pos(_T("Software\\TortoiseSVN\\TBlamePos"), 0);\r
-   CRegStdWORD width(_T("Software\\TortoiseSVN\\TBlameSize"), 0);\r
-   CRegStdWORD state(_T("Software\\TortoiseSVN\\TBlameState"), 0);\r
+   CRegStdWORD pos(_T("Software\\TortoiseGit\\TBlamePos"), 0);\r
+   CRegStdWORD width(_T("Software\\TortoiseGit\\TBlameSize"), 0);\r
+   CRegStdWORD state(_T("Software\\TortoiseGit\\TBlameState"), 0);\r
    if (DWORD(pos) && DWORD(width))\r
    {\r
           RECT rc;\r
@@ -1595,9 +1595,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                break;\r
        case WM_CLOSE:\r
                {\r
-                       CRegStdWORD pos(_T("Software\\TortoiseSVN\\TBlamePos"), 0);\r
-                       CRegStdWORD width(_T("Software\\TortoiseSVN\\TBlameSize"), 0);\r
-                       CRegStdWORD state(_T("Software\\TortoiseSVN\\TBlameState"), 0);\r
+                       CRegStdWORD pos(_T("Software\\TortoiseGit\\TBlamePos"), 0);\r
+                       CRegStdWORD width(_T("Software\\TortoiseGit\\TBlameSize"), 0);\r
+                       CRegStdWORD state(_T("Software\\TortoiseGit\\TBlameState"), 0);\r
                        RECT rc;\r
                        GetWindowRect(app.wMain, &rc);\r
                        if ((rc.left >= 0)&&(rc.top >= 0))\r
index 57b5476..87fcde2 100644 (file)
@@ -43,7 +43,7 @@ BOOL CAppUtils::GetVersionedFile(CString sPath, CString sVersion, CString sSaveP
        if (sSCMPath.IsEmpty())\r
        {\r
                // no path set, so use TortoiseSVN as default\r
-               sSCMPath = CRegString(_T("Software\\TortoiseSVN\\ProcPath"), _T(""), false, HKEY_LOCAL_MACHINE);\r
+               sSCMPath = CRegString(_T("Software\\TortoiseGit\\ProcPath"), _T(""), false, HKEY_LOCAL_MACHINE);\r
                if (sSCMPath.IsEmpty())\r
                {\r
                        TCHAR pszSCMPath[MAX_PATH];\r
index f478f0b..5c00d9c 100644 (file)
@@ -55,7 +55,7 @@ BOOL CTortoiseMergeApp::InitInstance()
        CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows));\r
        CMFCButton::EnableWindowsTheming();\r
        //set the resource dll for the required language\r
-       CRegDWORD loc = CRegDWORD(_T("Software\\TortoiseSVN\\LanguageID"), 1033);\r
+       CRegDWORD loc = CRegDWORD(_T("Software\\TortoiseGit\\LanguageID"), 1033);\r
        long langId = loc;\r
        CString langDll;\r
        HINSTANCE hInst = NULL;\r
index 86982bd..33658f9 100644 (file)
@@ -127,7 +127,7 @@ CString CBlame::BlameToTempFile(const CTGitPath& path, GitRev startrev, GitRev e
        // if the user specified to use another tool to show the blames, there's no\r
        // need to fetch the log later: only TortoiseBlame uses those logs to give \r
        // the user additional information for the blame.\r
-       BOOL extBlame = CRegDWORD(_T("Software\\TortoiseSVN\\TextBlame"), FALSE);\r
+       BOOL extBlame = CRegDWORD(_T("Software\\TortoiseGit\\TextBlame"), FALSE);\r
 \r
        CString temp;\r
        m_sSavePath = CTempFiles::Instance().GetTempFilePath(false).GetWinPathString();\r
index 782f884..3fb96b9 100644 (file)
@@ -31,7 +31,7 @@ CBlameDlg::CBlameDlg(CWnd* pParent /*=NULL*/)
        , m_bIgnoreEOL(TRUE)\r
        , m_bIncludeMerge(TRUE)\r
 {\r
-       m_regTextView = CRegDWORD(_T("Software\\TortoiseSVN\\TextBlame"), FALSE);\r
+       m_regTextView = CRegDWORD(_T("Software\\TortoiseGit\\TextBlame"), FALSE);\r
        m_bTextView = m_regTextView;\r
 }\r
 \r
@@ -109,7 +109,7 @@ void CBlameDlg::OnOK()
 //             ShowBalloon(IDC_REVISION_END, IDS_ERR_INVALIDREV);\r
 //             return;\r
 //     }\r
-       BOOL extBlame = CRegDWORD(_T("Software\\TortoiseSVN\\TextBlame"), FALSE);\r
+       BOOL extBlame = CRegDWORD(_T("Software\\TortoiseGit\\TextBlame"), FALSE);\r
        if (extBlame)\r
                m_bTextView = true;\r
 \r
index ce5bff5..79bbefa 100644 (file)
@@ -98,8 +98,8 @@ UINT CCheckForUpdatesDlg::CheckThread()
        CString temp;\r
        CString tempfile = CTempFiles::Instance().GetTempFilePath(true).GetWinPathString();\r
 \r
-       CRegString checkurluser = CRegString(_T("Software\\TortoiseSVN\\UpdateCheckURL"), _T(""));\r
-       CRegString checkurlmachine = CRegString(_T("Software\\TortoiseSVN\\UpdateCheckURL"), _T(""), FALSE, HKEY_LOCAL_MACHINE);\r
+       CRegString checkurluser = CRegString(_T("Software\\TortoiseGit\\UpdateCheckURL"), _T(""));\r
+       CRegString checkurlmachine = CRegString(_T("Software\\TortoiseGit\\UpdateCheckURL"), _T(""), FALSE, HKEY_LOCAL_MACHINE);\r
        CString sCheckURL = checkurluser;\r
        if (sCheckURL.IsEmpty())\r
        {\r
index 45ba852..1b5b31b 100644 (file)
@@ -81,7 +81,7 @@ BOOL CCheckoutDlg::OnInitDialog()
        CString sUrlSave = m_URL;\r
        m_URLCombo.SetURLHistory(TRUE);\r
        m_bAutoCreateTargetName = FALSE;\r
-       m_URLCombo.LoadHistory(_T("Software\\TortoiseSVN\\History\\repoURLS"), _T("url"));\r
+       m_URLCombo.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS"), _T("url"));\r
        m_bAutoCreateTargetName = !PathIsDirectoryEmpty(m_sCheckoutDirOrig);\r
        m_URLCombo.SetCurSel(0);\r
 \r
@@ -115,7 +115,7 @@ BOOL CCheckoutDlg::OnInitDialog()
        }\r
        if (m_strCheckoutDirectory.IsEmpty())\r
        {\r
-               CRegString lastCheckoutPath = CRegString(_T("Software\\TortoiseSVN\\History\\lastCheckoutPath"));\r
+               CRegString lastCheckoutPath = CRegString(_T("Software\\TortoiseGit\\History\\lastCheckoutPath"));\r
                m_strCheckoutDirectory = lastCheckoutPath;\r
                if (m_strCheckoutDirectory.GetLength() <= 2)\r
                        m_strCheckoutDirectory += _T("\\");\r
@@ -246,7 +246,7 @@ void CCheckoutDlg::OnOK()
                break;\r
        }\r
        UpdateData(FALSE);\r
-       CRegString lastCheckoutPath = CRegString(_T("Software\\TortoiseSVN\\History\\lastCheckoutPath"));\r
+       CRegString lastCheckoutPath = CRegString(_T("Software\\TortoiseGit\\History\\lastCheckoutPath"));\r
        lastCheckoutPath = m_strCheckoutDirectory.Left(m_strCheckoutDirectory.ReverseFind('\\'));\r
        CResizableStandAloneDialog::OnOK();\r
 }\r
@@ -269,8 +269,8 @@ void CCheckoutDlg::OnBnClickedBrowse()
        {\r
                SetRevision(rev);\r
 \r
-               CRegString regDefCheckoutUrl(_T("Software\\TortoiseSVN\\DefaultCheckoutUrl"));\r
-               CRegString regDefCheckoutPath(_T("Software\\TortoiseSVN\\DefaultCheckoutPath"));\r
+               CRegString regDefCheckoutUrl(_T("Software\\TortoiseGit\\DefaultCheckoutUrl"));\r
+               CRegString regDefCheckoutPath(_T("Software\\TortoiseGit\\DefaultCheckoutPath"));\r
                if (!CString(regDefCheckoutUrl).IsEmpty())\r
                {\r
                        m_URL = m_URLCombo.GetString();\r
@@ -286,7 +286,7 @@ void CCheckoutDlg::OnBnClickedBrowse()
                        m_strCheckoutDirectory = m_sCheckoutDirOrig.TrimRight('\\')+_T('\\')+name;\r
                if (m_strCheckoutDirectory.IsEmpty())\r
                {\r
-                       CRegString lastCheckoutPath = CRegString(_T("Software\\TortoiseSVN\\History\\lastCheckoutPath"));\r
+                       CRegString lastCheckoutPath = CRegString(_T("Software\\TortoiseGit\\History\\lastCheckoutPath"));\r
                        m_strCheckoutDirectory = lastCheckoutPath;\r
                        if (m_strCheckoutDirectory.GetLength() <= 2)\r
                                m_strCheckoutDirectory += _T("\\");\r
@@ -347,7 +347,7 @@ void CCheckoutDlg::OnBnClickedShowlog()
        {\r
                delete m_pLogDlg;\r
                m_pLogDlg = new CLogDlg();\r
-               m_pLogDlg->SetParams(CTSVNPath(m_URL), SVNRev::REV_HEAD, SVNRev::REV_HEAD, 1, (int)(DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100));\r
+               m_pLogDlg->SetParams(CTSVNPath(m_URL), SVNRev::REV_HEAD, SVNRev::REV_HEAD, 1, (int)(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100));\r
                m_pLogDlg->m_wParam = 1;\r
                m_pLogDlg->SetSelect(true);\r
                m_pLogDlg->m_pNotifyWindow = this;\r
@@ -405,7 +405,7 @@ void CCheckoutDlg::OnCbnEditchangeUrlcombo()
                m_strCheckoutDirectory = m_sCheckoutDirOrig.TrimRight('\\')+_T('\\')+name;\r
        if (m_strCheckoutDirectory.IsEmpty())\r
        {\r
-               CRegString lastCheckoutPath = CRegString(_T("Software\\TortoiseSVN\\History\\lastCheckoutPath"));\r
+               CRegString lastCheckoutPath = CRegString(_T("Software\\TortoiseGit\\History\\lastCheckoutPath"));\r
                m_strCheckoutDirectory = lastCheckoutPath;\r
                if (m_strCheckoutDirectory.GetLength() <= 2)\r
                        m_strCheckoutDirectory += _T("\\");\r
index be772fa..e8b7000 100644 (file)
 #include "StdAfx.h"\r
 #include ".\colors.h"\r
 \r
-CColors::CColors(void) : m_regAdded(_T("Software\\TortoiseSVN\\Colors\\Added"), RGB(100, 0, 100))\r
-       , m_regCmd(_T("Software\\TortoiseSVN\\Colors\\Cmd"), ::GetSysColor(COLOR_GRAYTEXT))\r
-       , m_regConflict(_T("Software\\TortoiseSVN\\Colors\\Conflict"), RGB(255, 0, 0))\r
-       , m_regModified(_T("Software\\TortoiseSVN\\Colors\\Modified"), RGB(0, 50, 160))\r
-       , m_regMerged(_T("Software\\TortoiseSVN\\Colors\\Merged"), RGB(0, 100, 0))\r
-       , m_regDeleted(_T("Software\\TortoiseSVN\\Colors\\Deleted"), RGB(100, 0, 0))\r
-       , m_regLastCommit(_T("Software\\TortoiseSVN\\Colors\\LastCommit"), RGB(100, 100, 100))\r
-       , m_regDeletedNode(_T("Software\\TortoiseSVN\\Colors\\DeletedNode"), RGB(255, 0, 0))\r
-       , m_regAddedNode(_T("Software\\TortoiseSVN\\Colors\\AddedNode"), RGB(0, 255, 0))\r
-       , m_regReplacedNode(_T("Software\\TortoiseSVN\\Colors\\ReplacedNode"), RGB(0, 255, 0))\r
-       , m_regRenamedNode(_T("Software\\TortoiseSVN\\Colors\\RenamedNode"), RGB(0, 0, 255))\r
-       , m_regLastCommitNode(_T("Software\\TortoiseSVN\\Colors\\LastCommitNode"), RGB(200, 200, 200))\r
-       , m_regPropertyChanged(_T("Software\\TortoiseSVN\\Colors\\PropertyChanged"), RGB(0, 50, 160))\r
+CColors::CColors(void) : m_regAdded(_T("Software\\TortoiseGit\\Colors\\Added"), RGB(100, 0, 100))\r
+       , m_regCmd(_T("Software\\TortoiseGit\\Colors\\Cmd"), ::GetSysColor(COLOR_GRAYTEXT))\r
+       , m_regConflict(_T("Software\\TortoiseGit\\Colors\\Conflict"), RGB(255, 0, 0))\r
+       , m_regModified(_T("Software\\TortoiseGit\\Colors\\Modified"), RGB(0, 50, 160))\r
+       , m_regMerged(_T("Software\\TortoiseGit\\Colors\\Merged"), RGB(0, 100, 0))\r
+       , m_regDeleted(_T("Software\\TortoiseGit\\Colors\\Deleted"), RGB(100, 0, 0))\r
+       , m_regLastCommit(_T("Software\\TortoiseGit\\Colors\\LastCommit"), RGB(100, 100, 100))\r
+       , m_regDeletedNode(_T("Software\\TortoiseGit\\Colors\\DeletedNode"), RGB(255, 0, 0))\r
+       , m_regAddedNode(_T("Software\\TortoiseGit\\Colors\\AddedNode"), RGB(0, 255, 0))\r
+       , m_regReplacedNode(_T("Software\\TortoiseGit\\Colors\\ReplacedNode"), RGB(0, 255, 0))\r
+       , m_regRenamedNode(_T("Software\\TortoiseGit\\Colors\\RenamedNode"), RGB(0, 0, 255))\r
+       , m_regLastCommitNode(_T("Software\\TortoiseGit\\Colors\\LastCommitNode"), RGB(200, 200, 200))\r
+       , m_regPropertyChanged(_T("Software\\TortoiseGit\\Colors\\PropertyChanged"), RGB(0, 50, 160))\r
 {\r
 }\r
 \r
index 42984a6..0707be1 100644 (file)
@@ -32,7 +32,7 @@ bool CheckoutCommand::Execute()
        // specified in the settings dialog, and fall back to the current \r
        // working directory instead if no such path was specified.\r
        CTSVNPath checkoutDirectory;\r
-       CRegString regDefCheckoutPath(_T("Software\\TortoiseSVN\\DefaultCheckoutPath"));\r
+       CRegString regDefCheckoutPath(_T("Software\\TortoiseGit\\DefaultCheckoutPath"));\r
        if (cmdLinePath.IsEmpty())\r
        {\r
                if (CString(regDefCheckoutPath).IsEmpty())\r
@@ -64,7 +64,7 @@ bool CheckoutCommand::Execute()
        dlg.m_URL = parser.GetVal(_T("url"));\r
        // if there is no url specified on the command line, check if there's one\r
        // specified in the settings dialog to use as the default and use that\r
-       CRegString regDefCheckoutUrl(_T("Software\\TortoiseSVN\\DefaultCheckoutUrl"));\r
+       CRegString regDefCheckoutUrl(_T("Software\\TortoiseGit\\DefaultCheckoutUrl"));\r
        if (!CString(regDefCheckoutUrl).IsEmpty())\r
        {\r
                // if the URL specified is a child of the default URL, we also\r
index e958761..014a0b6 100644 (file)
@@ -46,7 +46,7 @@
 #include "FormatPatchCommand.h"\r
 #include "ImportPatchCommand.h"\r
 #include "BlameCommand.h"\r
-\r
+#include "SettingsCommand.h"\r
 #if 0\r
 \r
 \r
@@ -87,7 +87,7 @@
 #include "RevertCommand.h"\r
 #include "RevisiongraphCommand.h"\r
 #include "RTFMCommand.h"\r
-#include "SettingsCommand.h"\r
+\r
 #include "ShowCompareCommand.h"\r
 \r
 #include "UnIgnoreCommand.h"\r
@@ -292,8 +292,8 @@ Command * CommandServer::GetCommand(const CString& sCmd)
                return new ImportPatchCommand;\r
        case cmdBlame:\r
                return new BlameCommand;\r
-       \r
-\r
+       case cmdSettings:\r
+               return new SettingsCommand;\r
 #if 0\r
 \r
        case cmdCat:\r
@@ -360,8 +360,7 @@ Command * CommandServer::GetCommand(const CString& sCmd)
 \r
        case cmdRevisionGraph:\r
                return new RevisionGraphCommand;\r
-       case cmdSettings:\r
-               return new SettingsCommand;\r
+\r
        case cmdShowCompare:\r
                return new ShowCompareCommand;\r
 \r
index 93ebf42..54f9521 100644 (file)
@@ -108,11 +108,11 @@ bool CommitCommand::Execute()
 //                     progDlg.SetItemCount(dlg.m_itemsCount);\r
 //                     progDlg.SetBugTraqProvider(dlg.m_BugTraqProvider);\r
 //                     progDlg.DoModal();\r
-//                     CRegDWORD err = CRegDWORD(_T("Software\\TortoiseSVN\\ErrorOccurred"), FALSE);\r
+//                     CRegDWORD err = CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE);\r
 //                     err = (DWORD)progDlg.DidErrorsOccur();\r
 //                     bFailed = progDlg.DidErrorsOccur();\r
 //                     bRet = progDlg.DidErrorsOccur();\r
-//                     CRegDWORD bFailRepeat = CRegDWORD(_T("Software\\TortoiseSVN\\CommitReopen"), FALSE);\r
+//                     CRegDWORD bFailRepeat = CRegDWORD(_T("Software\\TortoiseGit\\CommitReopen"), FALSE);\r
 //                     if (DWORD(bFailRepeat)==0)\r
 //                             bFailed = false;                // do not repeat if the user chose not to in the settings.\r
                }\r
index db33c72..b0e545e 100644 (file)
@@ -71,11 +71,11 @@ bool CopyCommand::Execute()
                        copyRev = dlg.m_CopyRev;\r
                        doSwitch = dlg.m_bDoSwitch;\r
                        progDlg.DoModal();\r
-                       CRegDWORD err = CRegDWORD(_T("Software\\TortoiseSVN\\ErrorOccurred"), FALSE);\r
+                       CRegDWORD err = CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE);\r
                        err = (DWORD)progDlg.DidErrorsOccur();\r
                        bRet = !progDlg.DidErrorsOccur();\r
                        repeat = progDlg.DidErrorsOccur();\r
-                       CRegDWORD bFailRepeat = CRegDWORD(_T("Software\\TortoiseSVN\\CommitReopen"), FALSE);\r
+                       CRegDWORD bFailRepeat = CRegDWORD(_T("Software\\TortoiseGit\\CommitReopen"), FALSE);\r
                        if (DWORD(bFailRepeat) == FALSE)\r
                                repeat = false;         // do not repeat if the user chose not to in the settings.\r
                }\r
index 7f32c9e..94a977d 100644 (file)
@@ -30,7 +30,7 @@ bool LockCommand::Execute()
        ProjectProperties props;\r
        props.ReadPropsPathList(pathList);\r
        lockDlg.SetProjectProperties(&props);\r
-       if (pathList.AreAllPathsFiles() && !DWORD(CRegDWORD(_T("Software\\TortoiseSVN\\ShowLockDlg"), TRUE)) && !props.nMinLockMsgSize)\r
+       if (pathList.AreAllPathsFiles() && !DWORD(CRegDWORD(_T("Software\\TortoiseGit\\ShowLockDlg"), TRUE)) && !props.nMinLockMsgSize)\r
        {\r
                // just lock the requested files\r
                CSVNProgressDlg progDlg;\r
index 54d1107..a5b78be 100644 (file)
@@ -56,10 +56,10 @@ bool LogCommand::Execute()
 \r
        if (limit == 0)\r
        {\r
-               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
                limit = (int)(LONG)reg;\r
        }\r
-       BOOL bStrict = (DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\LastLogStrict"), FALSE);\r
+       BOOL bStrict = (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE);\r
        if (parser.HasKey(_T("strict")))\r
        {\r
                bStrict = TRUE;\r
index faef245..c050411 100644 (file)
@@ -87,7 +87,7 @@ BOOL CCopyDlg::OnInitDialog()
 \r
        CTSVNPath path(m_path);\r
 \r
-       m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseSVN\\MaxHistoryItems"), 25));\r
+       m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));\r
 \r
        SetRevision(m_CopyRev);\r
 \r
@@ -112,7 +112,7 @@ BOOL CCopyDlg::OnInitDialog()
                this->EndDialog(IDCANCEL);              //exit\r
        }\r
        m_URLCombo.SetURLHistory(TRUE);\r
-       m_URLCombo.LoadHistory(_T("Software\\TortoiseSVN\\History\\repoURLS\\")+sUUID, _T("url"));\r
+       m_URLCombo.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS\\")+sUUID, _T("url"));\r
        m_URLCombo.AddString(CTSVNPath(m_wcURL).GetUIPathString(), 0);\r
        m_URLCombo.SelectString(-1, CTSVNPath(m_wcURL).GetUIPathString());\r
        SetDlgItemText(IDC_FROMURL, m_wcURL);\r
@@ -120,12 +120,12 @@ BOOL CCopyDlg::OnInitDialog()
                m_URLCombo.SetWindowText(m_URL);\r
 \r
        CString reg;\r
-       reg.Format(_T("Software\\TortoiseSVN\\History\\commit%s"), (LPCTSTR)sUUID);\r
+       reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)sUUID);\r
        m_History.Load(reg, _T("logmsgs"));\r
 \r
        m_ProjectProperties.ReadProps(m_path);\r
        m_cLogMessage.Init(m_ProjectProperties);\r
-       m_cLogMessage.SetFont((CString)CRegString(_T("Software\\TortoiseSVN\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\LogFontSize"), 8));\r
+       m_cLogMessage.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));\r
        if (m_ProjectProperties.sMessage.IsEmpty())\r
        {\r
                GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);\r
@@ -344,7 +344,7 @@ void CCopyDlg::OnBnClickedBrowsefrom()
        {\r
                delete m_pLogDlg;\r
                m_pLogDlg = new CLogDlg();\r
-               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
                int limit = (int)(LONG)reg;\r
                m_pLogDlg->SetParams(CTSVNPath(m_wcURL), SVNRev::REV_HEAD, SVNRev::REV_HEAD, 1, limit, TRUE);\r
                m_pLogDlg->SetSelect(true);\r
index 2931789..662fc03 100644 (file)
@@ -40,7 +40,7 @@ struct LogChangedPath
 {\r
        CString sPath;\r
 //     CString sCopyFromPath;\r
-       git_revnum_t lCopyFromRev;\r
+       CString lCopyFromRev;\r
        DWORD action;\r
 \r
        /// returns the action as a string\r
@@ -127,7 +127,7 @@ public:
        /// may throw a SVNError to cancel the log\r
 \r
        virtual void ReceiveLog ( LogChangedPathArray* changes\r
-                                                       , git_revnum_t rev\r
+                                                       , CString rev\r
                             , const StandardRevProps* stdRevProps\r
                             , UserRevPropArray* userRevProps\r
                             , bool mergesFollow) = 0;\r
index ae72c54..7f89899 100644 (file)
@@ -58,12 +58,12 @@ BOOL CImportDlg::OnInitDialog()
 {\r
        CResizableStandAloneDialog::OnInitDialog();\r
 \r
-       m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseSVN\\MaxHistoryItems"), 25));\r
+       m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));\r
 \r
        if (m_url.IsEmpty())\r
        {\r
                m_URLCombo.SetURLHistory(TRUE);\r
-               m_URLCombo.LoadHistory(_T("Software\\TortoiseSVN\\History\\repoURLS"), _T("url"));\r
+               m_URLCombo.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS"), _T("url"));\r
        }\r
        else\r
        {\r
@@ -77,10 +77,10 @@ BOOL CImportDlg::OnInitDialog()
        m_tooltips.Create(this);\r
        m_tooltips.AddTool(IDC_HISTORY, IDS_COMMITDLG_HISTORY_TT);\r
        \r
-       m_History.Load(_T("Software\\TortoiseSVN\\History\\commit"), _T("logmsgs"));\r
+       m_History.Load(_T("Software\\TortoiseGit\\History\\commit"), _T("logmsgs"));\r
        m_ProjectProperties.ReadProps(m_path);\r
        m_cMessage.Init(m_ProjectProperties);\r
-       m_cMessage.SetFont((CString)CRegString(_T("Software\\TortoiseSVN\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\LogFontSize"), 8));\r
+       m_cMessage.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));\r
 \r
        AdjustControlSize(IDC_IMPORTIGNORED);\r
 \r
index cb63eed..13aa600 100644 (file)
@@ -57,7 +57,7 @@ BOOL CInputDlg::OnInitDialog()
        else\r
                m_cInput.Init();\r
 \r
-       m_cInput.SetFont((CString)CRegString(_T("Software\\TortoiseSVN\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\LogFontSize"), 8));\r
+       m_cInput.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));\r
 \r
        if (m_pProjectProperties)\r
        {\r
index e7c2eef..59599f8 100644 (file)
@@ -70,7 +70,7 @@ BOOL CInputLogDlg::OnInitDialog()
        else\r
                m_cInput.Init();\r
 \r
-       m_cInput.SetFont((CString)CRegString(_T("Software\\TortoiseSVN\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\LogFontSize"), 8));\r
+       m_cInput.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));\r
 \r
        if (m_pProjectProperties)\r
        {\r
@@ -109,7 +109,7 @@ void CInputLogDlg::OnOK()
        m_sLogMsg = m_cInput.GetText();\r
        \r
        CString reg;\r
-       reg.Format(_T("Software\\TortoiseSVN\\History\\commit%s"), (LPCTSTR)m_sUUID);\r
+       reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_sUUID);\r
 \r
        CRegHistory history;\r
        history.Load(reg, _T("logmsgs"));\r
@@ -163,7 +163,7 @@ void CInputLogDlg::UpdateOKButton()
 void CInputLogDlg::OnBnClickedHistory()\r
 {\r
        CString reg;\r
-       reg.Format(_T("Software\\TortoiseSVN\\History\\commit%s"), (LPCTSTR)m_sUUID);\r
+       reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_sUUID);\r
        CRegHistory history;\r
        history.Load(reg, _T("logmsgs"));\r
        CHistoryDlg HistoryDlg;\r
index b1a419e..7f16d6e 100644 (file)
@@ -70,8 +70,8 @@ BOOL CLockDlg::OnInitDialog()
 {\r
        CResizableStandAloneDialog::OnInitDialog();\r
 \r
-       m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseSVN\\MaxHistoryItems"), 25));\r
-       m_History.Load(_T("Software\\TortoiseSVN\\History\\commit"), _T("logmsgs"));\r
+       m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));\r
+       m_History.Load(_T("Software\\TortoiseGit\\History\\commit"), _T("logmsgs"));\r
 \r
        m_cFileList.Init(SVNSLC_COLEXT | SVNSLC_COLLOCK | SVNSLC_COLSVNNEEDSLOCK, _T("LockDlg"));\r
        m_cFileList.SetSelectButton(&m_SelectAll);\r
@@ -83,7 +83,7 @@ BOOL CLockDlg::OnInitDialog()
                m_cEdit.Init(*m_ProjectProperties);\r
        else\r
                m_cEdit.Init();\r
-       m_cEdit.SetFont((CString)CRegString(_T("Software\\TortoiseSVN\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\LogFontSize"), 8));\r
+       m_cEdit.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));\r
 \r
        if (!m_sLockMessage.IsEmpty())\r
                m_cEdit.SetText(m_sLockMessage);\r
index 1bf2887..6e4916e 100644 (file)
@@ -22,7 +22,7 @@
 \r
 CLogFile::CLogFile(void)\r
 {\r
-       m_maxlines = CRegStdWORD(_T("Software\\TortoiseSVN\\MaxLinesInLogfile"), 4000);\r
+       m_maxlines = CRegStdWORD(_T("Software\\TortoiseGit\\MaxLinesInLogfile"), 4000);\r
 }\r
 \r
 CLogFile::~CLogFile(void)\r
index 9ff6011..f542003 100644 (file)
@@ -25,7 +25,7 @@
  * \ingroup TortoiseProc\r
  * CLogFile implements a log file with a limited size.\r
  * The log file consists of multiple lines. The amount of lines can\r
- * be limited with the registry entry Software\\TortoiseSVN\\MaxLinesInLogfile\r
+ * be limited with the registry entry Software\\TortoiseGit\\MaxLinesInLogfile\r
  * and defaults to 4000 lines.\r
  */\r
 class CLogFile\r
index 71501d7..c133dd9 100644 (file)
@@ -80,7 +80,7 @@ BOOL CMergeWizard::OnInitDialog()
 \r
 void CMergeWizard::SaveMode()\r
 {\r
-       CRegDWORD regMergeWizardMode(_T("Software\\TortoiseSVN\\MergeWizardMode"), 0);\r
+       CRegDWORD regMergeWizardMode(_T("Software\\TortoiseGit\\MergeWizardMode"), 0);\r
        if (DWORD(regMergeWizardMode))\r
        {\r
                switch (nRevRangeMerge)\r
index f1dd2c9..35a6178 100644 (file)
@@ -73,8 +73,8 @@ BOOL CMergeWizardReintegrate::OnInitDialog()
 \r
        CString sUUID = ((CMergeWizard*)GetParent())->sUUID;\r
        m_URLCombo.SetURLHistory(TRUE);\r
-       m_URLCombo.LoadHistory(_T("Software\\TortoiseSVN\\History\\repoURLS\\")+sUUID, _T("url"));\r
-       if (!(DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\MergeWCURL"), FALSE))\r
+       m_URLCombo.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS\\")+sUUID, _T("url"));\r
+       if (!(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\MergeWCURL"), FALSE))\r
                m_URLCombo.SetCurSel(0);\r
 \r
        SetDlgItemText(IDC_WCEDIT, ((CMergeWizard*)GetParent())->wcPath.GetWinPath());\r
@@ -136,7 +136,7 @@ void CMergeWizardReintegrate::OnBnClickedShowmergelog()
                        m_pLogDlg->DestroyWindow();\r
                delete m_pLogDlg;\r
                m_pLogDlg = new CLogDlg();\r
-               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
                int limit = (int)(LONG)reg;\r
                m_pLogDlg->SetDialogTitle(CString(MAKEINTRESOURCE(IDS_MERGE_SELECTRANGE)));\r
 \r
@@ -163,7 +163,7 @@ void CMergeWizardReintegrate::OnBnClickedShowlogwc()
                m_pLogDlg2->DestroyWindow();\r
        delete m_pLogDlg2;\r
        m_pLogDlg2 = new CLogDlg();\r
-       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
        int limit = (int)(LONG)reg;\r
        m_pLogDlg2->SetDialogTitle(CString(MAKEINTRESOURCE(IDS_MERGE_SELECTRANGE)));\r
 \r
index c5c8abb..7b9e374 100644 (file)
@@ -110,8 +110,8 @@ BOOL CMergeWizardRevRange::OnInitDialog()
 \r
        CString sUUID = pWizard->sUUID;\r
        m_URLCombo.SetURLHistory(TRUE);\r
-       m_URLCombo.LoadHistory(_T("Software\\TortoiseSVN\\History\\repoURLS\\")+sUUID, _T("url"));\r
-       if (!(DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\MergeWCURL"), FALSE))\r
+       m_URLCombo.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS\\")+sUUID, _T("url"));\r
+       if (!(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\MergeWCURL"), FALSE))\r
                m_URLCombo.SetCurSel(0);\r
        if (!pWizard->url.IsEmpty())\r
                m_URLCombo.SetWindowText(CPathUtils::PathUnescape(pWizard->url));\r
@@ -145,7 +145,7 @@ void CMergeWizardRevRange::OnBnClickedShowlog()
                        m_pLogDlg->DestroyWindow();\r
                delete m_pLogDlg;\r
                m_pLogDlg = new CLogDlg();\r
-               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
                int limit = (int)(LONG)reg;\r
                m_pLogDlg->SetDialogTitle(CString(MAKEINTRESOURCE(IDS_MERGE_SELECTRANGE)));\r
 \r
@@ -216,7 +216,7 @@ void CMergeWizardRevRange::OnBnClickedShowlogwc()
                m_pLogDlg2->DestroyWindow();\r
        delete m_pLogDlg2;\r
        m_pLogDlg2 = new CLogDlg();\r
-       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
        int limit = (int)(LONG)reg;\r
        m_pLogDlg2->SetDialogTitle(CString(MAKEINTRESOURCE(IDS_MERGE_SELECTRANGE)));\r
 \r
index ef43b13..8c07372 100644 (file)
@@ -91,14 +91,14 @@ BOOL CMergeWizardTree::OnInitDialog()
        CMergeWizard * pWizard = (CMergeWizard*)GetParent();\r
        CString sUUID = pWizard->sUUID;\r
        m_URLCombo.SetURLHistory(TRUE);\r
-       m_URLCombo.LoadHistory(_T("Software\\TortoiseSVN\\History\\repoURLS\\")+sUUID, _T("url"));\r
-       if (!(DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\MergeWCURL"), FALSE))\r
+       m_URLCombo.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS\\")+sUUID, _T("url"));\r
+       if (!(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\MergeWCURL"), FALSE))\r
                m_URLCombo.SetCurSel(0);\r
        // Only set the "From" Url if there is no url history available\r
        if (m_URLCombo.GetString().IsEmpty())\r
                m_URLCombo.SetWindowText(CPathUtils::PathUnescape(pWizard->url));\r
        m_URLCombo2.SetURLHistory(TRUE);\r
-       m_URLCombo2.LoadHistory(_T("Software\\TortoiseSVN\\History\\repoURLS\\")+sUUID, _T("url"));\r
+       m_URLCombo2.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS\\")+sUUID, _T("url"));\r
        m_URLCombo2.SetCurSel(0);\r
        if (m_URLCombo2.GetString().IsEmpty())\r
                m_URLCombo2.SetWindowText(CPathUtils::PathUnescape(pWizard->url));\r
@@ -263,7 +263,7 @@ void CMergeWizardTree::OnBnClickedFindbranchstart()
                        delete m_pLogDlg;\r
                }\r
                m_pLogDlg = new CLogDlg();\r
-               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
                int limit = (int)(LONG)reg;\r
                m_pLogDlg->m_wParam = MERGE_REVSELECTSTART;\r
                m_pLogDlg->SetDialogTitle(CString(MAKEINTRESOURCE(IDS_MERGE_SELECTSTARTREVISION)));\r
@@ -299,7 +299,7 @@ void CMergeWizardTree::OnBnClickedFindbranchend()
                        delete m_pLogDlg2;\r
                }\r
                m_pLogDlg2 = new CLogDlg();\r
-               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
                int limit = (int)(LONG)reg;\r
                m_pLogDlg2->m_wParam = MERGE_REVSELECTEND;\r
                m_pLogDlg2->SetDialogTitle(CString(MAKEINTRESOURCE(IDS_MERGE_SELECTENDREVISION)));\r
@@ -365,7 +365,7 @@ void CMergeWizardTree::OnBnClickedShowlogwc()
                m_pLogDlg3->DestroyWindow();\r
        delete m_pLogDlg3;\r
        m_pLogDlg3 = new CLogDlg();\r
-       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
        int limit = (int)(LONG)reg;\r
        m_pLogDlg3->SetDialogTitle(CString(MAKEINTRESOURCE(IDS_MERGE_SELECTRANGE)));\r
 \r
index 045aa84..bb43399 100644 (file)
@@ -53,7 +53,7 @@ BOOL CRelocateDlg::OnInitDialog()
        CResizableStandAloneDialog::OnInitDialog();\r
 \r
        m_URLCombo.SetURLHistory(TRUE);\r
-       m_URLCombo.LoadHistory(_T("Software\\TortoiseSVN\\History\\repoURLS"), _T("url"));\r
+       m_URLCombo.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS"), _T("url"));\r
        m_URLCombo.SetCurSel(0);\r
 \r
        RECT rect;\r
index 9f8145e..9f4e397 100644 (file)
@@ -104,7 +104,7 @@ bool CRepositoryBar::Create(CWnd* parent, UINT id, bool in_dialog)
                m_cbxUrl.Create(WS_CHILD | WS_TABSTOP | CBS_DROPDOWN, rect, this, IDC_URL_COMBO);\r
                m_cbxUrl.SetURLHistory(true);\r
                m_cbxUrl.SetFont(font);\r
-               m_cbxUrl.LoadHistory(_T("Software\\TortoiseSVN\\History\\repoURLS"), _T("url"));\r
+               m_cbxUrl.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS"), _T("url"));\r
                temp.LoadString(IDS_REPO_BROWSEURL);\r
                rbbi.lpText     = const_cast<LPTSTR>((LPCTSTR)temp);\r
                rbbi.hwndChild  = m_cbxUrl.m_hWnd;\r
index fd12073..454057a 100644 (file)
@@ -243,7 +243,7 @@ BOOL CRepositoryBrowser::OnInitDialog()
        // set up the list control\r
        // set the extended style of the list control\r
        // the style LVS_EX_FULLROWSELECT interferes with the background watermark image but it's more important to be able to select in the whole row.\r
-       CRegDWORD regFullRowSelect(_T("Software\\TortoiseSVN\\FullRowSelect"), TRUE);\r
+       CRegDWORD regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE);\r
        DWORD exStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_SUBITEMIMAGES;\r
        if (DWORD(regFullRowSelect))\r
                exStyle |= LVS_EX_FULLROWSELECT;\r
@@ -913,7 +913,7 @@ void CRepositoryBrowser::FillList(deque<CItem> * pItems)
                m_arColumnAutoWidths[col] = m_RepoList.GetColumnWidth(col);\r
        }\r
 \r
-       CRegString regColWidths(_T("Software\\TortoiseSVN\\RepoBrowserColumnWidth"));\r
+       CRegString regColWidths(_T("Software\\TortoiseGit\\RepoBrowserColumnWidth"));\r
        if (!CString(regColWidths).IsEmpty())\r
        {\r
                StringToWidthArray(regColWidths, m_arColumnWidths);\r
@@ -2914,7 +2914,7 @@ CString CRepositoryBrowser::WidthArrayToString(int WidthArray[])
 \r
 void CRepositoryBrowser::SaveColumnWidths(bool bSaveToRegistry /* = false */)\r
 {\r
-       CRegString regColWidth(_T("Software\\TortoiseSVN\\RepoBrowserColumnWidth"));\r
+       CRegString regColWidth(_T("Software\\TortoiseGit\\RepoBrowserColumnWidth"));\r
        int maxcol = ((CHeaderCtrl*)(m_RepoList.GetDlgItem(0)))->GetItemCount()-1;\r
        // first clear the width array\r
        for (int col = 0; col < 7; ++col)\r
index 04660ae..9219208 100644 (file)
@@ -38,9 +38,9 @@ CFullGraphFinalizer::CFullGraphFinalizer
 {\r
     // initialize path classificator\r
 \r
-    CRegStdString trunkPattern (_T("Software\\TortoiseSVN\\RevisionGraph\\TrunkPattern"), _T("trunk"));\r
-    CRegStdString branchesPattern (_T("Software\\TortoiseSVN\\RevisionGraph\\BranchPattern"), _T("branches"));\r
-    CRegStdString tagsPattern (_T("Software\\TortoiseSVN\\RevisionGraph\\TagsPattern"), _T("tags"));\r
+    CRegStdString trunkPattern (_T("Software\\TortoiseGit\\RevisionGraph\\TrunkPattern"), _T("trunk"));\r
+    CRegStdString branchesPattern (_T("Software\\TortoiseGit\\RevisionGraph\\BranchPattern"), _T("branches"));\r
+    CRegStdString tagsPattern (_T("Software\\TortoiseGit\\RevisionGraph\\TagsPattern"), _T("tags"));\r
 \r
     const CPathDictionary& paths = history.GetCache()->GetLogInfo().GetPaths();\r
     pathClassification.reset \r
index c050700..3ddb372 100644 (file)
@@ -78,7 +78,7 @@ CFullHistory::CFullHistory(void)
        ctx.cancel_baton = this;\r
 \r
        //set up the SVN_SSH param\r
-       CString tsvn_ssh = CRegString(_T("Software\\TortoiseSVN\\SSH"));\r
+       CString tsvn_ssh = CRegString(_T("Software\\TortoiseGit\\SSH"));\r
        if (tsvn_ssh.IsEmpty())\r
                tsvn_ssh = CPathUtils::GetAppDirectory() + _T("TortoisePlink.exe");\r
        tsvn_ssh.Replace('\\', '/');\r
index 5a5fd98..b3d9723 100644 (file)
@@ -56,7 +56,7 @@ CRevisionGraphDlg::CRevisionGraphDlg(CWnd* pParent /*=NULL*/)
 \r
     // restore option state\r
 \r
-       DWORD dwOpts = CRegStdWORD(_T("Software\\TortoiseSVN\\RevisionGraphOptions"), 0x211);\r
+       DWORD dwOpts = CRegStdWORD(_T("Software\\TortoiseGit\\RevisionGraphOptions"), 0x211);\r
     m_options.SetRegistryFlags (dwOpts, 0x3ff);\r
 }\r
 \r
@@ -64,7 +64,7 @@ CRevisionGraphDlg::~CRevisionGraphDlg()
 {\r
     // save option state\r
 \r
-       CRegStdWORD regOpts = CRegStdWORD(_T("Software\\TortoiseSVN\\RevisionGraphOptions"), 1);\r
+       CRegStdWORD regOpts = CRegStdWORD(_T("Software\\TortoiseGit\\RevisionGraphOptions"), 1);\r
     regOpts = m_options.GetRegistryFlags();\r
 \r
     // GDI+ cleanup\r
@@ -247,7 +247,7 @@ BOOL CRevisionGraphDlg::OnInitDialog()
        CMenu * pMenu = GetMenu();\r
        if (pMenu)\r
        {\r
-               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\ShowRevGraphOverview"), FALSE);\r
+               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowRevGraphOverview"), FALSE);\r
                m_Graph.SetShowOverview ((DWORD)reg != FALSE);\r
                pMenu->CheckMenuItem(ID_VIEW_SHOWOVERVIEW, MF_BYCOMMAND | (DWORD(reg) ? MF_CHECKED : 0));\r
                int tbstate = m_ToolBar.GetToolBarCtrl().GetState(ID_VIEW_SHOWOVERVIEW);\r
@@ -740,7 +740,7 @@ void CRevisionGraphDlg::OnViewShowoverview()
                m_Graph.SetShowOverview (true);\r
        }\r
 \r
-       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\ShowRevGraphOverview"), FALSE);\r
+       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowRevGraphOverview"), FALSE);\r
        reg = m_Graph.GetShowOverview();\r
        m_Graph.Invalidate(FALSE);\r
 }\r
index 42048c1..3f7d0d2 100644 (file)
@@ -94,9 +94,9 @@ CRevisionGraphWnd::CRevisionGraphWnd()
                RegisterClass(&wndcls);\r
        }\r
 \r
-       m_bShowOverview = CRegDWORD(_T("Software\\TortoiseSVN\\RevisionGraph\\ShowRevGraphOverview"), TRUE);\r
-       m_bTweakTrunkColors = CRegDWORD(_T("Software\\TortoiseSVN\\RevisionGraph\\TweakTrunkColors"), TRUE) != FALSE;\r
-       m_bTweakTagsColors = CRegDWORD(_T("Software\\TortoiseSVN\\RevisionGraph\\TweakTagsColors"), TRUE) != FALSE;\r
+       m_bShowOverview = CRegDWORD(_T("Software\\TortoiseGit\\RevisionGraph\\ShowRevGraphOverview"), TRUE);\r
+       m_bTweakTrunkColors = CRegDWORD(_T("Software\\TortoiseGit\\RevisionGraph\\TweakTrunkColors"), TRUE) != FALSE;\r
+       m_bTweakTagsColors = CRegDWORD(_T("Software\\TortoiseGit\\RevisionGraph\\TweakTagsColors"), TRUE) != FALSE;\r
 }\r
 \r
 CRevisionGraphWnd::~CRevisionGraphWnd()\r
index 4bfe9b0..95497b0 100644 (file)
@@ -944,7 +944,7 @@ UINT CGitProgressDlg::ProgressThread()
        InterlockedExchange(&m_bThreadRunning, FALSE);\r
        RefreshCursor();\r
 \r
-       DWORD dwAutoClose = CRegStdWORD(_T("Software\\TortoiseSVN\\AutoClose"));\r
+       DWORD dwAutoClose = CRegStdWORD(_T("Software\\TortoiseGit\\AutoClose"));\r
        if (m_options & ProgOptDryRun)\r
                dwAutoClose = 0;                // dry run means progress dialog doesn't auto close at all\r
        if (!m_bLastVisible)\r
@@ -1515,7 +1515,7 @@ void CGitProgressDlg::OnContextMenu(CWnd* pWnd, CPoint point)
                                                                        break;\r
                                                                }\r
                                                                // If necessary, convert the line-endings on the file before diffing\r
-                                                               if ((DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\ConvertBase"), TRUE))\r
+                                                               if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\ConvertBase"), TRUE))\r
                                                                {\r
                                                                        CTSVNPath temporaryFile = CTempFiles::Instance().GetTempFilePath(false, data->path, SVNRev::REV_BASE);\r
                                                                        if (!svn.Cat(data->path, SVNRev(SVNRev::REV_BASE), SVNRev(SVNRev::REV_BASE), temporaryFile))\r
@@ -1637,7 +1637,7 @@ void CGitProgressDlg::OnContextMenu(CWnd* pWnd, CPoint point)
                                                break;\r
                                        case ID_LOG:\r
                                                {\r
-                                                       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+                                                       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
                                                        int limit = (int)(DWORD)reg;\r
                                                        svn_revnum_t rev = m_RevisionEnd;\r
                                                        if (!data->basepath.IsEmpty())\r
@@ -2051,7 +2051,7 @@ bool CGitProgressDlg::CmdLock(CString& sWindowTitle, bool& /*localoperation*/)
                // if the locking-dialog is skipped in the settings, tell the\r
                // user how to steal the lock anyway (i.e., how to get the lock\r
                // dialog back without changing the settings)\r
-               if (!DWORD(CRegDWORD(_T("Software\\TortoiseSVN\\ShowLockDlg"), TRUE)))\r
+               if (!DWORD(CRegDWORD(_T("Software\\TortoiseGit\\ShowLockDlg"), TRUE)))\r
                {\r
                        ReportString(CString(MAKEINTRESOURCE(IDS_SVNPROGRESS_LOCKHINT)), CString(MAKEINTRESOURCE(IDS_WARN_NOTE)));\r
                }\r
@@ -2078,7 +2078,7 @@ bool CGitProgressDlg::CmdMerge(CString& sWindowTitle, bool& /*localoperation*/)
 \r
        GetDlgItem(IDC_INFOTEXT)->ShowWindow(SW_HIDE);\r
        GetDlgItem(IDC_NONINTERACTIVE)->ShowWindow(SW_SHOW);\r
-       CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseSVN\\MergeNonInteractive"), FALSE);\r
+       CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseGit\\MergeNonInteractive"), FALSE);\r
        if (DWORD(nonint))\r
        {\r
                ::SendMessage(GetDlgItem(IDC_NONINTERACTIVE)->GetSafeHwnd(), BM_SETCHECK, BST_CHECKED, 0);\r
@@ -2091,7 +2091,7 @@ bool CGitProgressDlg::CmdMerge(CString& sWindowTitle, bool& /*localoperation*/)
        {\r
                CString sSuggestedMessage;\r
                CString sMergedLogMessage;\r
-               CString sSeparator = CRegString(_T("Software\\TortoiseSVN\\MergeLogSeparator"), _T("........"));\r
+               CString sSeparator = CRegString(_T("Software\\TortoiseGit\\MergeLogSeparator"), _T("........"));\r
                CString temp;\r
 \r
                // Merging revisions %s of %s to %s into %s, %s%s\r
@@ -2174,7 +2174,7 @@ bool CGitProgressDlg::CmdMergeAll(CString& sWindowTitle, bool& /*localoperation*
        ReportCmd(sCmdInfo);\r
 \r
        GetDlgItem(IDC_NONINTERACTIVE)->ShowWindow(SW_SHOW);\r
-       CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseSVN\\MergeNonInteractive"), FALSE);\r
+       CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseGit\\MergeNonInteractive"), FALSE);\r
        if (DWORD(nonint))\r
        {\r
                ::SendMessage(GetDlgItem(IDC_NONINTERACTIVE)->GetSafeHwnd(), BM_SETCHECK, BST_CHECKED, 0);\r
@@ -2209,7 +2209,7 @@ bool CGitProgressDlg::CmdMergeReintegrate(CString& sWindowTitle, bool& /*localop
        ReportCmd(sCmdInfo);\r
 \r
        GetDlgItem(IDC_NONINTERACTIVE)->ShowWindow(SW_SHOW);\r
-       CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseSVN\\MergeNonInteractive"), FALSE);\r
+       CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseGit\\MergeNonInteractive"), FALSE);\r
        if (DWORD(nonint))\r
        {\r
                ::SendMessage(GetDlgItem(IDC_NONINTERACTIVE)->GetSafeHwnd(), BM_SETCHECK, BST_CHECKED, 0);\r
@@ -2312,7 +2312,7 @@ bool CGitProgressDlg::CmdRevert(CString& sWindowTitle, bool& localoperation)
        SetBackgroundImage(IDI_REVERT_BKG);\r
 \r
        CTSVNPathList delList = m_selectedPaths;\r
-       if (DWORD(CRegDWORD(_T("Software\\TortoiseSVN\\RevertWithRecycleBin"), TRUE)))\r
+       if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))\r
                delList.DeleteAllFiles(true);\r
 \r
        ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_REVERT)));\r
@@ -2536,7 +2536,7 @@ void CGitProgressDlg::OnBnClickedNoninteractive()
 {\r
        LRESULT res = ::SendMessage(GetDlgItem(IDC_NONINTERACTIVE)->GetSafeHwnd(), BM_GETCHECK, 0, 0);\r
        m_AlwaysConflicted = (res == BST_CHECKED);\r
-       CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseSVN\\MergeNonInteractive"), FALSE);\r
+       CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseGit\\MergeNonInteractive"), FALSE);\r
        nonint = m_AlwaysConflicted;\r
 }\r
 \r
index 56a0453..3826ea8 100644 (file)
@@ -24,7 +24,7 @@
 #include "SVNProgressDlg.h"\r
 #include "..\version.h"\r
 #include ".\setdialogs.h"\r
-#include "SVN.h"\r
+#include "Git.h"\r
 #include "MessageBox.h"\r
 #include "BrowseFolder.h"\r
 \r
@@ -42,17 +42,17 @@ CSetDialogs::CSetDialogs()
        , m_bUseSystemLocaleForDates(FALSE)\r
        , m_bUseRecycleBin(TRUE)\r
 {\r
-       m_regAutoClose = CRegDWORD(_T("Software\\TortoiseSVN\\AutoClose"));\r
-       m_regDefaultLogs = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
-       m_regShortDateFormat = CRegDWORD(_T("Software\\TortoiseSVN\\LogDateFormat"), FALSE);\r
-       m_regUseSystemLocaleForDates = CRegDWORD(_T("Software\\TortoiseSVN\\UseSystemLocaleForDates"), TRUE);\r
-       m_regFontName = CRegString(_T("Software\\TortoiseSVN\\LogFontName"), _T("Courier New"));\r
-       m_regFontSize = CRegDWORD(_T("Software\\TortoiseSVN\\LogFontSize"), 8);\r
-       m_regUseWCURL = CRegDWORD(_T("Software\\TortoiseSVN\\MergeWCURL"), FALSE);\r
-       m_regDefaultCheckoutPath = CRegString(_T("Software\\TortoiseSVN\\DefaultCheckoutPath"));\r
-       m_regDefaultCheckoutUrl = CRegString(_T("Software\\TortoiseSVN\\DefaultCheckoutUrl"));\r
-       m_regDiffByDoubleClick = CRegDWORD(_T("Software\\TortoiseSVN\\DiffByDoubleClickInLog"), FALSE);\r
-       m_regUseRecycleBin = CRegDWORD(_T("Software\\TortoiseSVN\\RevertWithRecycleBin"), TRUE);\r
+       m_regAutoClose = CRegDWORD(_T("Software\\TortoiseGit\\AutoClose"));\r
+       m_regDefaultLogs = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
+       m_regShortDateFormat = CRegDWORD(_T("Software\\TortoiseGit\\LogDateFormat"), FALSE);\r
+       m_regUseSystemLocaleForDates = CRegDWORD(_T("Software\\TortoiseGit\\UseSystemLocaleForDates"), TRUE);\r
+       m_regFontName = CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New"));\r
+       m_regFontSize = CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8);\r
+       m_regUseWCURL = CRegDWORD(_T("Software\\TortoiseGit\\MergeWCURL"), FALSE);\r
+       m_regDefaultCheckoutPath = CRegString(_T("Software\\TortoiseGit\\DefaultCheckoutPath"));\r
+       m_regDefaultCheckoutUrl = CRegString(_T("Software\\TortoiseGit\\DefaultCheckoutUrl"));\r
+       m_regDiffByDoubleClick = CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE);\r
+       m_regUseRecycleBin = CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE);\r
 }\r
 \r
 CSetDialogs::~CSetDialogs()\r
index 8fdadd1..e9fdccd 100644 (file)
@@ -112,6 +112,7 @@ void CSetHooks::RebuildHookList()
 \r
 void CSetHooks::OnBnClickedRemovebutton()\r
 {\r
+#if 0\r
        // traversing from the end to the beginning so that the indices are not skipped\r
        int index = m_cHookList.GetItemCount()-1;\r
        while (index >= 0)\r
@@ -127,10 +128,12 @@ void CSetHooks::OnBnClickedRemovebutton()
                }\r
                index--;\r
        }\r
+#endif\r
 }\r
 \r
 void CSetHooks::OnBnClickedEditbutton()\r
 {\r
+#if 0\r
        if (m_cHookList.GetSelectedCount() > 1)\r
                return;\r
        POSITION pos = m_cHookList.GetFirstSelectedItemPosition();\r
@@ -152,6 +155,7 @@ void CSetHooks::OnBnClickedEditbutton()
                        SetModified();\r
                }\r
        }\r
+#endif\r
 }\r
 \r
 void CSetHooks::OnBnClickedAddbutton()\r
index cd1f9c9..12f34ab 100644 (file)
@@ -110,6 +110,7 @@ BOOL CSetHooksAdv::OnInitDialog()
 \r
 void CSetHooksAdv::OnOK()\r
 {\r
+#if 0\r
        UpdateData();\r
        int cursel = m_cHookTypeCombo.GetCurSel();\r
        key.htype = unknown_hook;\r
@@ -136,11 +137,13 @@ void CSetHooksAdv::OnOK()
                ShowBalloon(IDC_HOOKCOMMANDLINE, IDS_ERR_NOHOOKCOMMANDPECIFIED);\r
                return;\r
        }\r
+#endif\r
        CResizableStandAloneDialog::OnOK();\r
 }\r
 \r
 void CSetHooksAdv::OnBnClickedHookbrowse()\r
 {\r
+#if 0\r
        UpdateData();\r
        CBrowseFolder browser;\r
        CString sPath;\r
@@ -151,6 +154,7 @@ void CSetHooksAdv::OnBnClickedHookbrowse()
                m_sPath = sPath;\r
                UpdateData(FALSE);\r
        }\r
+#endif\r
 }\r
 \r
 void CSetHooksAdv::OnBnClickedHookcommandbrowse()\r
index 5c49cf4..d1df39c 100644 (file)
@@ -32,16 +32,16 @@ CSetLookAndFeelPage::CSetLookAndFeelPage()
        , m_bGetLockTop(FALSE)\r
        , m_bBlock(false)\r
 {\r
-       m_regTopmenu = CRegDWORD(_T("Software\\TortoiseSVN\\ContextMenuEntries"), MENUCHECKOUT | MENUUPDATE | MENUCOMMIT);\r
-       m_regTopmenuhigh = CRegDWORD(_T("Software\\TortoiseSVN\\ContextMenuEntrieshigh"), 0);\r
+       m_regTopmenu = CRegDWORD(_T("Software\\TortoiseGit\\ContextMenuEntries"), MENUCHECKOUT | MENUUPDATE | MENUCOMMIT);\r
+       m_regTopmenuhigh = CRegDWORD(_T("Software\\TortoiseGit\\ContextMenuEntrieshigh"), 0);\r
 \r
        m_topmenu = unsigned __int64(DWORD(m_regTopmenuhigh))<<32;\r
        m_topmenu |= unsigned __int64(DWORD(m_regTopmenu));\r
 \r
-       m_regGetLockTop = CRegDWORD(_T("Software\\TortoiseSVN\\GetLockTop"), TRUE);\r
+       m_regGetLockTop = CRegDWORD(_T("Software\\TortoiseGit\\GetLockTop"), TRUE);\r
        m_bGetLockTop = m_regGetLockTop;\r
 \r
-       m_regNoContextPaths = CRegString(_T("Software\\TortoiseSVN\\NoContextPaths"), _T(""));\r
+       m_regNoContextPaths = CRegString(_T("Software\\TortoiseGit\\NoContextPaths"), _T(""));\r
        m_sNoContextPaths = m_regNoContextPaths;\r
        m_sNoContextPaths.Replace(_T("\n"), _T("\r\n"));\r
 }\r
index ba3ecc0..a55b1ee 100644 (file)
@@ -25,7 +25,7 @@
 #include "SVNProgressDlg.h"\r
 #include "..\version.h"\r
 #include ".\setmainpage.h"\r
-#include "SVN.h"\r
+#include "Git.h"\r
 #include "MessageBox.h"\r
 \r
 \r
@@ -37,10 +37,10 @@ CSetMainPage::CSetMainPage()
        , m_bLastCommitTime(FALSE)\r
        , m_bUseDotNetHack(FALSE)\r
 {\r
-       m_regLanguage = CRegDWORD(_T("Software\\TortoiseSVN\\LanguageID"), 1033);\r
-       CString temp(SVN_CONFIG_DEFAULT_GLOBAL_IGNORES);\r
-       m_regExtensions = CRegString(_T("Software\\Tigris.org\\Subversion\\Config\\miscellany\\global-ignores"), temp);\r
-       m_regCheckNewer = CRegDWORD(_T("Software\\TortoiseSVN\\CheckNewer"), TRUE);\r
+       m_regLanguage = CRegDWORD(_T("Software\\TortoiseGit\\LanguageID"), 1033);\r
+//     CString temp(SVN_CONFIG_DEFAULT_GLOBAL_IGNORES);\r
+//     m_regExtensions = CRegString(_T("Software\\Tigris.org\\Subversion\\Config\\miscellany\\global-ignores"), temp);\r
+       m_regCheckNewer = CRegDWORD(_T("Software\\TortoiseGit\\CheckNewer"), TRUE);\r
        m_regLastCommitTime = CRegString(_T("Software\\Tigris.org\\Subversion\\Config\\miscellany\\use-commit-times"), _T(""));\r
        if ((GetEnvironmentVariable(_T("SVN_ASP_DOT_NET_HACK"), NULL, 0)==0)&&(GetLastError()==ERROR_ENVVAR_NOT_FOUND))\r
                m_bUseDotNetHack = false;\r
@@ -202,12 +202,14 @@ BOOL CSetMainPage::OnApply()
 \r
 void CSetMainPage::OnBnClickedEditconfig()\r
 {\r
+#if 0\r
        TCHAR buf[MAX_PATH];\r
        SVN::EnsureConfigFile();\r
        SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, buf);\r
        CString path = buf;\r
        path += _T("\\Subversion\\config");\r
        CAppUtils::StartTextViewer(path);\r
+#endif\r
 }\r
 \r
 void CSetMainPage::OnBnClickedChecknewerbutton()\r
index 1066fe4..4195ab9 100644 (file)
@@ -35,23 +35,23 @@ CSetMisc::CSetMisc()
        , m_bShowLockDlg(FALSE)\r
        , m_bAutoSelect(TRUE)\r
 {\r
-       m_regUnversionedRecurse = CRegDWORD(_T("Software\\TortoiseSVN\\UnversionedRecurse"), TRUE);\r
+       m_regUnversionedRecurse = CRegDWORD(_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE);\r
        m_bUnversionedRecurse = (DWORD)m_regUnversionedRecurse;\r
-       m_regAutocompletion = CRegDWORD(_T("Software\\TortoiseSVN\\Autocompletion"), TRUE);\r
+       m_regAutocompletion = CRegDWORD(_T("Software\\TortoiseGit\\Autocompletion"), TRUE);\r
        m_bAutocompletion = (DWORD)m_regAutocompletion;\r
-       m_regAutocompletionTimeout = CRegDWORD(_T("Software\\TortoiseSVN\\AutocompleteParseTimeout"), 5);\r
+       m_regAutocompletionTimeout = CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseTimeout"), 5);\r
        m_dwAutocompletionTimeout = (DWORD)m_regAutocompletionTimeout;\r
-       m_regSpell = CRegDWORD(_T("Software\\TortoiseSVN\\Spellchecker"), FALSE);\r
+       m_regSpell = CRegDWORD(_T("Software\\TortoiseGit\\Spellchecker"), FALSE);\r
        m_bSpell = (DWORD)m_regSpell;\r
-       m_regCheckRepo = CRegDWORD(_T("Software\\TortoiseSVN\\CheckRepo"), FALSE);\r
+       m_regCheckRepo = CRegDWORD(_T("Software\\TortoiseGit\\CheckRepo"), FALSE);\r
        m_bCheckRepo = (DWORD)m_regCheckRepo;\r
-       m_regMaxHistory = CRegDWORD(_T("Software\\TortoiseSVN\\MaxHistoryItems"), 25);\r
+       m_regMaxHistory = CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25);\r
        m_dwMaxHistory = (DWORD)m_regMaxHistory;\r
-       m_regCommitReopen = CRegDWORD(_T("Software\\TortoiseSVN\\CommitReopen"), FALSE);\r
+       m_regCommitReopen = CRegDWORD(_T("Software\\TortoiseGit\\CommitReopen"), FALSE);\r
        m_bCommitReopen = (BOOL)(DWORD)m_regCommitReopen;\r
-       m_regShowLockDlg = CRegDWORD(_T("Software\\TortoiseSVN\\ShowLockDlg"), TRUE);\r
+       m_regShowLockDlg = CRegDWORD(_T("Software\\TortoiseGit\\ShowLockDlg"), TRUE);\r
        m_bShowLockDlg = (BOOL)(DWORD)m_regShowLockDlg;\r
-       m_regAutoSelect = CRegDWORD(_T("Software\\TortoiseSVN\\SelectFilesForCommit"), TRUE);\r
+       m_regAutoSelect = CRegDWORD(_T("Software\\TortoiseGit\\SelectFilesForCommit"), TRUE);\r
        m_bAutoSelect = (BOOL)(DWORD)m_regAutoSelect;\r
 }\r
 \r
index 0b181be..91d081a 100644 (file)
@@ -21,7 +21,7 @@
 #include "DirFileEnum.h"\r
 #include "MessageBox.h"\r
 #include ".\setoverlayicons.h"\r
-#include "SVNStatus.h"\r
+#include "GitStatus.h"\r
 #include "AppUtils.h"\r
 #include "PathUtils.h"\r
 #include "ShellUpdater.h"\r
@@ -105,7 +105,8 @@ BOOL CSetOverlayIcons::OnInitDialog()
                if (ComboItem.CompareNoCase(m_sOriginalIconSet)==0)\r
                        m_cIconSet.SetCurSel(i);\r
        }\r
-       WORD langID = (WORD)(DWORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), GetUserDefaultLangID());\r
+#if 0\r
+       WORD langID = (WORD)(DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());\r
        TCHAR statustext[MAX_STATUS_STRING_LENGTH];\r
        SVNStatus::GetStatusString(AfxGetResourceHandle(), svn_wc_status_normal, statustext, sizeof(statustext)/sizeof(TCHAR), langID);\r
        m_sNormal = statustext;\r
@@ -121,7 +122,7 @@ BOOL CSetOverlayIcons::OnInitDialog()
        m_sIgnored = statustext;\r
        SVNStatus::GetStatusString(AfxGetResourceHandle(), svn_wc_status_unversioned, statustext, sizeof(statustext)/sizeof(TCHAR), langID);\r
        m_sUnversioned = statustext;\r
-\r
+#endif\r
        m_sReadOnly.LoadString(IDS_SETTINGS_READONLYNAME);\r
        m_sLocked.LoadString(IDS_SETTINGS_LOCKEDNAME);\r
 \r
index 2c1802c..c729d20 100644 (file)
@@ -22,7 +22,7 @@
 #include "SetOverlayIcons.h"\r
 #include "Globals.h"\r
 #include "ShellUpdater.h"\r
-#include "..\TSVNCache\CacheInterface.h"\r
+#include "..\TGitCache\CacheInterface.h"\r
 #include ".\setoverlaypage.h"\r
 #include "MessageBox.h"\r
 \r
@@ -45,21 +45,21 @@ CSetOverlayPage::CSetOverlayPage()
        , m_bShowIgnoredOverlay(FALSE)\r
        , m_bShowUnversionedOverlay(FALSE)\r
 {\r
-       m_regOnlyExplorer = CRegDWORD(_T("Software\\TortoiseSVN\\LoadDllOnlyInExplorer"), FALSE);\r
-       m_regDriveMaskRemovable = CRegDWORD(_T("Software\\TortoiseSVN\\DriveMaskRemovable"));\r
-       m_regDriveMaskFloppy = CRegDWORD(_T("Software\\TortoiseSVN\\DriveMaskFloppy"));\r
-       m_regDriveMaskRemote = CRegDWORD(_T("Software\\TortoiseSVN\\DriveMaskRemote"));\r
-       m_regDriveMaskFixed = CRegDWORD(_T("Software\\TortoiseSVN\\DriveMaskFixed"), TRUE);\r
-       m_regDriveMaskCDROM = CRegDWORD(_T("Software\\TortoiseSVN\\DriveMaskCDROM"));\r
-       m_regDriveMaskRAM = CRegDWORD(_T("Software\\TortoiseSVN\\DriveMaskRAM"));\r
-       m_regDriveMaskUnknown = CRegDWORD(_T("Software\\TortoiseSVN\\DriveMaskUnknown"));\r
-       m_regExcludePaths = CRegString(_T("Software\\TortoiseSVN\\OverlayExcludeList"));\r
-       m_regIncludePaths = CRegString(_T("Software\\TortoiseSVN\\OverlayIncludeList"));\r
-       m_regCacheType = CRegDWORD(_T("Software\\TortoiseSVN\\CacheType"), GetSystemMetrics(SM_REMOTESESSION) ? 2 : 1);\r
-       m_regUnversionedAsModified = CRegDWORD(_T("Software\\TortoiseSVN\\UnversionedAsModified"), FALSE);\r
-       m_regShowExcludedAsNormal = CRegDWORD(_T("Software\\TortoiseSVN\\ShowExcludedAsNormal"), TRUE);\r
-       m_regShowIgnoredOverlay = CRegDWORD(_T("Software\\TortoiseSVN\\ShowIgnoredOverlay"), TRUE);\r
-       m_regShowUnversionedOverlay = CRegDWORD(_T("Software\\TortoiseSVN\\ShowUnversionedOverlay"), TRUE);\r
+       m_regOnlyExplorer = CRegDWORD(_T("Software\\TortoiseGit\\LoadDllOnlyInExplorer"), FALSE);\r
+       m_regDriveMaskRemovable = CRegDWORD(_T("Software\\TortoiseGit\\DriveMaskRemovable"));\r
+       m_regDriveMaskFloppy = CRegDWORD(_T("Software\\TortoiseGit\\DriveMaskFloppy"));\r
+       m_regDriveMaskRemote = CRegDWORD(_T("Software\\TortoiseGit\\DriveMaskRemote"));\r
+       m_regDriveMaskFixed = CRegDWORD(_T("Software\\TortoiseGit\\DriveMaskFixed"), TRUE);\r
+       m_regDriveMaskCDROM = CRegDWORD(_T("Software\\TortoiseGit\\DriveMaskCDROM"));\r
+       m_regDriveMaskRAM = CRegDWORD(_T("Software\\TortoiseGit\\DriveMaskRAM"));\r
+       m_regDriveMaskUnknown = CRegDWORD(_T("Software\\TortoiseGit\\DriveMaskUnknown"));\r
+       m_regExcludePaths = CRegString(_T("Software\\TortoiseGit\\OverlayExcludeList"));\r
+       m_regIncludePaths = CRegString(_T("Software\\TortoiseGit\\OverlayIncludeList"));\r
+       m_regCacheType = CRegDWORD(_T("Software\\TortoiseGit\\CacheType"), GetSystemMetrics(SM_REMOTESESSION) ? 2 : 1);\r
+       m_regUnversionedAsModified = CRegDWORD(_T("Software\\TortoiseGit\\UnversionedAsModified"), FALSE);\r
+       m_regShowExcludedAsNormal = CRegDWORD(_T("Software\\TortoiseGit\\ShowExcludedAsNormal"), TRUE);\r
+       m_regShowIgnoredOverlay = CRegDWORD(_T("Software\\TortoiseGit\\ShowIgnoredOverlay"), TRUE);\r
+       m_regShowUnversionedOverlay = CRegDWORD(_T("Software\\TortoiseGit\\ShowUnversionedOverlay"), TRUE);\r
 \r
        m_bOnlyExplorer = m_regOnlyExplorer;\r
        m_bRemovable = m_regDriveMaskRemovable;\r
index bc4836f..59ad9e3 100644 (file)
@@ -28,7 +28,7 @@ IMPLEMENT_DYNAMIC(CSetProgsAdvDlg, CDialog)
 CSetProgsAdvDlg::CSetProgsAdvDlg(const CString& type, CWnd* pParent /*=NULL*/)\r
        : CDialog(CSetProgsAdvDlg::IDD, pParent)\r
        , m_sType(type)\r
-       , m_regToolKey(_T("Software\\TortoiseSVN\\") + type + _T("Tools"))\r
+       , m_regToolKey(_T("Software\\TortoiseGit\\") + type + _T("Tools"))\r
        , m_ToolsValid(false)\r
 {\r
 }\r
@@ -302,7 +302,7 @@ void CSetProgsAdvDlg::OnBnClickedRestoredefaults()
                {\r
                        if (filename.Left(5).CompareNoCase(_T("diff-"))==0)\r
                        {\r
-                               CRegString diffreg = CRegString(_T("Software\\TortoiseSVN\\DiffTools\\")+ext);\r
+                               CRegString diffreg = CRegString(_T("Software\\TortoiseGit\\DiffTools\\")+ext);\r
                                diffreg = _T("wscript.exe \"") + file + _T("\" %base %mine") + kind;\r
                        }\r
                }\r
@@ -310,7 +310,7 @@ void CSetProgsAdvDlg::OnBnClickedRestoredefaults()
                {\r
                        if (filename.Left(6).CompareNoCase(_T("merge-"))==0)\r
                        {\r
-                               CRegString diffreg = CRegString(_T("Software\\TortoiseSVN\\MergeTools\\")+ext);\r
+                               CRegString diffreg = CRegString(_T("Software\\TortoiseGit\\MergeTools\\")+ext);\r
                                diffreg = _T("wscript.exe \"") + file + _T("\" %merged %theirs %mine %base") + kind;\r
                        }\r
                }\r
index 9ed9554..5f4d9d3 100644 (file)
@@ -21,7 +21,7 @@
 #include "SetProxyPage.h"\r
 #include "AppUtils.h"\r
 #include "StringUtils.h"\r
-#include "SVN.h"\r
+#include "git.h"\r
 #include ".\setproxypage.h"\r
 #include "MessageBox.h"\r
 \r
@@ -42,16 +42,16 @@ CSetProxyPage::CSetProxyPage()
        m_regUsername = CRegString(_T("Software\\Tigris.org\\Subversion\\Servers\\global\\http-proxy-username"), _T(""));\r
        m_regPassword = CRegString(_T("Software\\Tigris.org\\Subversion\\Servers\\global\\http-proxy-password"), _T(""));\r
        m_regTimeout = CRegString(_T("Software\\Tigris.org\\Subversion\\Servers\\global\\http-proxy-timeout"), _T(""));\r
-       m_regSSHClient = CRegString(_T("Software\\TortoiseSVN\\SSH"));\r
+       m_regSSHClient = CRegString(_T("Software\\TortoiseGit\\SSH"));\r
        m_SSHClient = m_regSSHClient;\r
        m_regExceptions = CRegString(_T("Software\\Tigris.org\\Subversion\\Servers\\global\\http-proxy-exceptions"), _T(""));\r
 \r
-       m_regServeraddress_copy = CRegString(_T("Software\\TortoiseSVN\\Servers\\global\\http-proxy-host"), _T(""));\r
-       m_regServerport_copy = CRegString(_T("Software\\TortoiseSVN\\Servers\\global\\http-proxy-port"), _T(""));\r
-       m_regUsername_copy = CRegString(_T("Software\\TortoiseSVN\\Servers\\global\\http-proxy-username"), _T(""));\r
-       m_regPassword_copy = CRegString(_T("Software\\TortoiseSVN\\Servers\\global\\http-proxy-password"), _T(""));\r
-       m_regTimeout_copy = CRegString(_T("Software\\TortoiseSVN\\Servers\\global\\http-proxy-timeout"), _T(""));\r
-       m_regExceptions_copy = CRegString(_T("Software\\TortoiseSVN\\Servers\\global\\http-proxy-exceptions"), _T(""));\r
+       m_regServeraddress_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-host"), _T(""));\r
+       m_regServerport_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-port"), _T(""));\r
+       m_regUsername_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-username"), _T(""));\r
+       m_regPassword_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-password"), _T(""));\r
+       m_regTimeout_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-timeout"), _T(""));\r
+       m_regExceptions_copy = CRegString(_T("Software\\TortoiseGit\\Servers\\global\\http-proxy-exceptions"), _T(""));\r
 }\r
 \r
 CSetProxyPage::~CSetProxyPage()\r
@@ -243,10 +243,12 @@ void CSetProxyPage::OnBnClickedSshbrowse()
 \r
 void CSetProxyPage::OnBnClickedEditservers()\r
 {\r
+#if 0\r
        TCHAR buf[MAX_PATH];\r
        SVN::EnsureConfigFile();\r
        SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, buf);\r
        CString path = buf;\r
        path += _T("\\Subversion\\servers");\r
        CAppUtils::StartTextViewer(path);\r
+#endif\r
 }\r
index f104eb1..addaa1f 100644 (file)
@@ -31,7 +31,7 @@ CSetSavedDataPage::CSetSavedDataPage()
        : ISettingsPropPage(CSetSavedDataPage::IDD)\r
        , m_maxLines(0)\r
 {\r
-       m_regMaxLines = CRegDWORD(_T("Software\\TortoiseSVN\\MaxLinesInLogfile"), 4000);\r
+       m_regMaxLines = CRegDWORD(_T("Software\\TortoiseGit\\MaxLinesInLogfile"), 4000);\r
        m_maxLines = m_regMaxLines;\r
 }\r
 \r
@@ -62,7 +62,7 @@ BOOL CSetSavedDataPage::OnInitDialog()
        int nUrlHistWC = 0;\r
        INT_PTR nUrlHistItems = 0;\r
        int nLogHistRepo = 0;\r
-       CRegistryKey regloghist(_T("Software\\TortoiseSVN\\History"));\r
+       CRegistryKey regloghist(_T("Software\\TortoiseGit\\History"));\r
        CStringList loghistlist;\r
        regloghist.getSubKeys(loghistlist);\r
        for (POSITION pos = loghistlist.GetHeadPosition(); pos != NULL; )\r
@@ -71,7 +71,7 @@ BOOL CSetSavedDataPage::OnInitDialog()
                if (sHistName.Left(6).CompareNoCase(_T("commit"))==0)\r
                {\r
                        nLogHistWC++;\r
-                       CRegistryKey regloghistwc(_T("Software\\TortoiseSVN\\History\\")+sHistName);\r
+                       CRegistryKey regloghistwc(_T("Software\\TortoiseGit\\History\\")+sHistName);\r
                        CStringList loghistlistwc;\r
                        regloghistwc.getValues(loghistlistwc);\r
                        nLogHistMsg += loghistlistwc.GetCount();\r
@@ -81,7 +81,7 @@ BOOL CSetSavedDataPage::OnInitDialog()
                        // repoURLs\r
                        CStringList urlhistlistmain;\r
                        CStringList urlhistlistmainvalues;\r
-                       CRegistryKey regurlhistlist(_T("Software\\TortoiseSVN\\History\\repoURLS"));\r
+                       CRegistryKey regurlhistlist(_T("Software\\TortoiseGit\\History\\repoURLS"));\r
                        regurlhistlist.getSubKeys(urlhistlistmain);\r
                        regurlhistlist.getValues(urlhistlistmainvalues);\r
                        nUrlHistItems += urlhistlistmainvalues.GetCount();\r
@@ -90,7 +90,7 @@ BOOL CSetSavedDataPage::OnInitDialog()
                                CString sWCUID = urlhistlistmain.GetNext(urlpos);\r
                                nUrlHistWC++;\r
                                CStringList urlhistlistwc;\r
-                               CRegistryKey regurlhistlistwc(_T("Software\\TortoiseSVN\\History\\repoURLS\\")+sWCUID);\r
+                               CRegistryKey regurlhistlistwc(_T("Software\\TortoiseGit\\History\\repoURLS\\")+sWCUID);\r
                                regurlhistlistwc.getValues(urlhistlistwc);\r
                                nUrlHistItems += urlhistlistwc.GetCount();\r
                        }\r
@@ -99,7 +99,7 @@ BOOL CSetSavedDataPage::OnInitDialog()
        \r
        // find out how many dialog sizes / positions we've stored\r
        INT_PTR nResizableDialogs = 0;\r
-       CRegistryKey regResizable(_T("Software\\TortoiseSVN\\TortoiseProc\\ResizableState"));\r
+       CRegistryKey regResizable(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState"));\r
        CStringList resizablelist;\r
        regResizable.getValues(resizablelist);\r
        nResizableDialogs += resizablelist.GetCount();\r
@@ -194,7 +194,7 @@ END_MESSAGE_MAP()
 \r
 void CSetSavedDataPage::OnBnClickedUrlhistclear()\r
 {\r
-       CRegistryKey reg(_T("Software\\TortoiseSVN\\History\\repoURLS"));\r
+       CRegistryKey reg(_T("Software\\TortoiseGit\\History\\repoURLS"));\r
        reg.removeKey();\r
        m_btnUrlHistClear.EnableWindow(FALSE);\r
        m_tooltips.DelTool(GetDlgItem(IDC_URLHISTCLEAR));\r
@@ -203,7 +203,7 @@ void CSetSavedDataPage::OnBnClickedUrlhistclear()
 \r
 void CSetSavedDataPage::OnBnClickedLoghistclear()\r
 {\r
-       CRegistryKey reg(_T("Software\\TortoiseSVN\\History"));\r
+       CRegistryKey reg(_T("Software\\TortoiseGit\\History"));\r
        CStringList histlist;\r
        reg.getSubKeys(histlist);\r
        for (POSITION pos = histlist.GetHeadPosition(); pos != NULL; )\r
@@ -211,7 +211,7 @@ void CSetSavedDataPage::OnBnClickedLoghistclear()
                CString sHist = histlist.GetNext(pos);\r
                if (sHist.Left(6).CompareNoCase(_T("commit"))==0)\r
                {\r
-                       CRegistryKey regkey(_T("Software\\TortoiseSVN\\History\\")+sHist);\r
+                       CRegistryKey regkey(_T("Software\\TortoiseGit\\History\\")+sHist);\r
                        regkey.removeKey();\r
                }\r
        }\r
@@ -223,7 +223,7 @@ void CSetSavedDataPage::OnBnClickedLoghistclear()
 \r
 void CSetSavedDataPage::OnBnClickedResizablehistclear()\r
 {\r
-       CRegistryKey reg(_T("Software\\TortoiseSVN\\TortoiseProc\\ResizableState"));\r
+       CRegistryKey reg(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState"));\r
        reg.removeKey();\r
        m_btnResizableHistClear.EnableWindow(FALSE);\r
        m_tooltips.DelTool(GetDlgItem(IDC_RESIZABLEHISTCLEAR));\r
@@ -232,7 +232,7 @@ void CSetSavedDataPage::OnBnClickedResizablehistclear()
 \r
 void CSetSavedDataPage::OnBnClickedAuthhistclear()\r
 {\r
-       CRegStdString auth = CRegStdString(_T("Software\\TortoiseSVN\\Auth\\"));\r
+       CRegStdString auth = CRegStdString(_T("Software\\TortoiseGit\\Auth\\"));\r
        auth.removeKey();\r
        TCHAR pathbuf[MAX_PATH] = {0};\r
        if (SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, pathbuf)==S_OK)\r
index 64d360b..2f5f1d7 100644 (file)
@@ -20,7 +20,7 @@
 #include "TortoiseProc.h"\r
 #include "Settings.h"\r
 #include "MessageBox.h"\r
-#include "..\..\TSVNCache\CacheInterface.h"\r
+#include "..\..\TGitCache\CacheInterface.h"\r
 \r
 \r
 \r
@@ -43,18 +43,18 @@ void CSettings::AddPropPages()
        m_pOverlayPage = new CSetOverlayPage();\r
        m_pOverlaysPage = new CSetOverlayIcons();\r
        m_pProxyPage = new CSetProxyPage();\r
-       m_pProgsDiffPage = new CSettingsProgsDiff();\r
-       m_pProgsMergePage = new CSettingsProgsMerge();\r
-       m_pProgsUniDiffPage = new CSettingsProgsUniDiff();\r
+//     m_pProgsDiffPage = new CSettingsProgsDiff();\r
+//     m_pProgsMergePage = new CSettingsProgsMerge();\r
+//     m_pProgsUniDiffPage = new CSettingsProgsUniDiff();\r
        m_pLookAndFeelPage = new CSetLookAndFeelPage();\r
        m_pDialogsPage = new CSetDialogs();\r
        m_pMiscPage = new CSetMisc();\r
        m_pRevisionGraphPage = new CSettingsRevisionGraph();\r
-       m_pLogCachePage = new CSetLogCache();\r
-       m_pLogCacheListPage = new CSettingsLogCaches();\r
+//     m_pLogCachePage = new CSetLogCache();\r
+//     m_pLogCacheListPage = new CSettingsLogCaches();\r
        m_pColorsPage = new CSettingsColors();\r
        m_pSavedPage = new CSetSavedDataPage();\r
-       m_pHooksPage = new CSetHooks();\r
+//     m_pHooksPage = new CSetHooks();\r
        m_pBugTraqPage = new CSetBugTraq();\r
        m_pTBlamePage = new CSettingsTBlame();\r
 \r
@@ -62,18 +62,18 @@ void CSettings::AddPropPages()
        SetPageIcon(m_pOverlayPage, m_pOverlayPage->GetIconID());\r
        SetPageIcon(m_pOverlaysPage, m_pOverlaysPage->GetIconID());\r
        SetPageIcon(m_pProxyPage, m_pProxyPage->GetIconID());\r
-       SetPageIcon(m_pProgsDiffPage, m_pProgsDiffPage->GetIconID());\r
-       SetPageIcon(m_pProgsMergePage, m_pProgsMergePage->GetIconID());\r
-       SetPageIcon(m_pProgsUniDiffPage, m_pProgsUniDiffPage->GetIconID());\r
+////   SetPageIcon(m_pProgsDiffPage, m_pProgsDiffPage->GetIconID());\r
+////   SetPageIcon(m_pProgsMergePage, m_pProgsMergePage->GetIconID());\r
+////// SetPageIcon(m_pProgsUniDiffPage, m_pProgsUniDiffPage->GetIconID());\r
        SetPageIcon(m_pLookAndFeelPage, m_pLookAndFeelPage->GetIconID());\r
        SetPageIcon(m_pDialogsPage, m_pDialogsPage->GetIconID());\r
        SetPageIcon(m_pRevisionGraphPage, m_pRevisionGraphPage->GetIconID());\r
        SetPageIcon(m_pMiscPage, m_pMiscPage->GetIconID());\r
-       SetPageIcon(m_pLogCachePage, m_pLogCachePage->GetIconID());\r
-       SetPageIcon(m_pLogCacheListPage, m_pLogCacheListPage->GetIconID());\r
+////   SetPageIcon(m_pLogCachePage, m_pLogCachePage->GetIconID());\r
+//     SetPageIcon(m_pLogCacheListPage, m_pLogCacheListPage->GetIconID());\r
        SetPageIcon(m_pColorsPage, m_pColorsPage->GetIconID());\r
        SetPageIcon(m_pSavedPage, m_pSavedPage->GetIconID());\r
-       SetPageIcon(m_pHooksPage, m_pHooksPage->GetIconID());\r
+//     SetPageIcon(m_pHooksPage, m_pHooksPage->GetIconID());\r
        SetPageIcon(m_pBugTraqPage, m_pBugTraqPage->GetIconID());\r
        SetPageIcon(m_pTBlamePage, m_pTBlamePage->GetIconID());\r
 \r
@@ -81,18 +81,18 @@ void CSettings::AddPropPages()
        AddPage(m_pOverlayPage);\r
        AddPage(m_pOverlaysPage);\r
        AddPage(m_pProxyPage);\r
-       AddPage(m_pProgsDiffPage);\r
-       AddPage(m_pProgsMergePage);\r
-       AddPage(m_pProgsUniDiffPage);\r
+//     AddPage(m_pProgsDiffPage);\r
+//     AddPage(m_pProgsMergePage);\r
+//     AddPage(m_pProgsUniDiffPage);\r
        AddPage(m_pLookAndFeelPage);\r
        AddPage(m_pDialogsPage);\r
        AddPage(m_pMiscPage);\r
        AddPage(m_pRevisionGraphPage);\r
        AddPage(m_pColorsPage);\r
        AddPage(m_pSavedPage);\r
-       AddPage(m_pLogCachePage);\r
-    AddPage(m_pLogCacheListPage);\r
-       AddPage(m_pHooksPage);\r
+//     AddPage(m_pLogCachePage);\r
+//    AddPage(m_pLogCacheListPage);\r
+//     AddPage(m_pHooksPage);\r
        AddPage(m_pBugTraqPage);\r
        AddPage(m_pTBlamePage);\r
 }\r
@@ -103,18 +103,18 @@ void CSettings::RemovePropPages()
        delete m_pOverlayPage;\r
        delete m_pOverlaysPage;\r
        delete m_pProxyPage;\r
-       delete m_pProgsDiffPage;\r
-       delete m_pProgsMergePage;\r
-       delete m_pProgsUniDiffPage;\r
+////   delete m_pProgsDiffPage;\r
+//     delete m_pProgsMergePage;\r
+////   delete m_pProgsUniDiffPage;\r
        delete m_pLookAndFeelPage;\r
        delete m_pDialogsPage;\r
     delete m_pRevisionGraphPage;\r
        delete m_pMiscPage;\r
-       delete m_pLogCachePage;\r
-       delete m_pLogCacheListPage;\r
+////   delete m_pLogCachePage;\r
+////   delete m_pLogCacheListPage;\r
        delete m_pColorsPage;\r
        delete m_pSavedPage;\r
-       delete m_pHooksPage;\r
+//     delete m_pHooksPage;\r
        delete m_pBugTraqPage;\r
        delete m_pTBlamePage;\r
 }\r
@@ -126,18 +126,18 @@ void CSettings::HandleRestart()
        restart |= m_pOverlayPage->GetRestart();\r
        restart |= m_pOverlaysPage->GetRestart();\r
        restart |= m_pProxyPage->GetRestart();\r
-       restart |= m_pProgsDiffPage->GetRestart();\r
-       restart |= m_pProgsMergePage->GetRestart();\r
-       restart |= m_pProgsUniDiffPage->GetRestart();\r
+//     restart |= m_pProgsDiffPage->GetRestart();\r
+//     restart |= m_pProgsMergePage->GetRestart();\r
+////   restart |= m_pProgsUniDiffPage->GetRestart();\r
        restart |= m_pLookAndFeelPage->GetRestart();\r
        restart |= m_pDialogsPage->GetRestart();\r
     restart |= m_pRevisionGraphPage->GetRestart();\r
        restart |= m_pMiscPage->GetRestart();\r
-       restart |= m_pLogCachePage->GetRestart();\r
-       restart |= m_pLogCacheListPage->GetRestart();\r
+////   restart |= m_pLogCachePage->GetRestart();\r
+//     restart |= m_pLogCacheListPage->GetRestart();\r
        restart |= m_pColorsPage->GetRestart();\r
        restart |= m_pSavedPage->GetRestart();\r
-       restart |= m_pHooksPage->GetRestart();\r
+////   restart |= m_pHooksPage->GetRestart();\r
        restart |= m_pBugTraqPage->GetRestart();\r
        restart |= m_pTBlamePage->GetRestart();\r
        if (restart & ISettingsPropPage::Restart_System)\r
index 6774c02..a97961b 100644 (file)
@@ -68,18 +68,18 @@ private:
        CSetProxyPage *                 m_pProxyPage;\r
        CSetOverlayPage *               m_pOverlayPage;\r
        CSetOverlayIcons *              m_pOverlaysPage;\r
-       CSettingsProgsDiff*             m_pProgsDiffPage;\r
-       CSettingsProgsMerge *   m_pProgsMergePage;\r
-       CSettingsProgsUniDiff * m_pProgsUniDiffPage;\r
+//     CSettingsProgsDiff*             m_pProgsDiffPage;\r
+//     CSettingsProgsMerge *   m_pProgsMergePage;\r
+//     CSettingsProgsUniDiff * m_pProgsUniDiffPage;\r
        CSetLookAndFeelPage *   m_pLookAndFeelPage;\r
        CSetDialogs *                   m_pDialogsPage;\r
     CSettingsRevisionGraph* m_pRevisionGraphPage;\r
        CSettingsColors *               m_pColorsPage;\r
        CSetMisc *                              m_pMiscPage;\r
-       CSetLogCache *                  m_pLogCachePage;\r
-    CSettingsLogCaches*     m_pLogCacheListPage;\r
+//     CSetLogCache *                  m_pLogCachePage;\r
+//    CSettingsLogCaches*     m_pLogCacheListPage;\r
        CSetSavedDataPage *             m_pSavedPage;\r
-       CSetHooks *                             m_pHooksPage;\r
+//     CSetHooks *                             m_pHooksPage;\r
        CSetBugTraq *                   m_pBugTraqPage;\r
        CSettingsTBlame *               m_pTBlamePage;\r
 \r
index f82056b..54c4347 100644 (file)
@@ -20,7 +20,7 @@
 #include "TortoiseProc.h"\r
 #include "SettingsLogCaches.h"\r
 #include "MessageBox.h"\r
-#include "SVN.h"\r
+#include "Git.h"\r
 #include "SVNError.h"\r
 #include "LogCachePool.h"\r
 #include "LogCacheStatistics.h"\r
index e5a1a8a..e2015dc 100644 (file)
@@ -82,10 +82,10 @@ private:
     /// used by cache update\r
 \r
     CProgressDlg*   progress;\r
-    git_revnum_t    headRevision;\r
+    CString    headRevision;\r
 \r
     void ReceiveLog ( LogChangedPathArray* changes\r
-                       , git_revnum_t rev\r
+                       , CString rev\r
                     , const StandardRevProps* stdRevProps\r
                     , UserRevPropArray* userRevProps\r
                     , bool mergesFollow);\r
index fdc8c83..3cae954 100644 (file)
@@ -31,11 +31,11 @@ CSettingsProgsDiff::CSettingsProgsDiff()
        , m_sDiffPath(_T(""))\r
        , m_iExtDiffProps(0)\r
        , m_sDiffPropsPath(_T(""))\r
-       , m_regConvertBase(_T("Software\\TortoiseSVN\\ConvertBase"), TRUE)\r
+       , m_regConvertBase(_T("Software\\TortoiseGit\\ConvertBase"), TRUE)\r
        , m_bConvertBase(false)\r
 {\r
-       m_regDiffPath = CRegString(_T("Software\\TortoiseSVN\\Diff"));\r
-       m_regDiffPropsPath = CRegString(_T("Software\\TortoiseSVN\\DiffProps"));\r
+       m_regDiffPath = CRegString(_T("Software\\TortoiseGit\\Diff"));\r
+       m_regDiffPropsPath = CRegString(_T("Software\\TortoiseGit\\DiffProps"));\r
 }\r
 \r
 CSettingsProgsDiff::~CSettingsProgsDiff()\r
index 8d34fa7..a079568 100644 (file)
@@ -30,7 +30,7 @@ CSettingsProgsMerge::CSettingsProgsMerge()
        , m_iExtMerge(0)\r
        , m_dlgAdvMerge(_T("Merge"))\r
 {\r
-       m_regMergePath = CRegString(_T("Software\\TortoiseSVN\\Merge"));\r
+       m_regMergePath = CRegString(_T("Software\\TortoiseGit\\Merge"));\r
 }\r
 \r
 CSettingsProgsMerge::~CSettingsProgsMerge()\r
index 720e940..6e9f872 100644 (file)
@@ -29,7 +29,7 @@ CSettingsProgsUniDiff::CSettingsProgsUniDiff()
        , m_sDiffViewerPath(_T(""))\r
        , m_iDiffViewer(0)\r
 {\r
-       m_regDiffViewerPath = CRegString(_T("Software\\TortoiseSVN\\DiffViewer"));\r
+       m_regDiffViewerPath = CRegString(_T("Software\\TortoiseGit\\DiffViewer"));\r
 }\r
 \r
 CSettingsProgsUniDiff::~CSettingsProgsUniDiff()\r
index 851fae9..c2cdcd9 100644 (file)
@@ -25,11 +25,11 @@ IMPLEMENT_DYNAMIC(CSettingsRevisionGraph, ISettingsPropPage)
 \r
 CSettingsRevisionGraph::CSettingsRevisionGraph()\r
        : ISettingsPropPage(CSettingsRevisionGraph::IDD)\r
-    , regTrunkPattern (_T("Software\\TortoiseSVN\\RevisionGraph\\TrunkPattern"), _T("trunk"))\r
-    , regBranchesPattern (_T("Software\\TortoiseSVN\\RevisionGraph\\BranchPattern"), _T("branches"))\r
-    , regTagsPattern (_T("Software\\TortoiseSVN\\RevisionGraph\\TagsPattern"), _T("tags"))\r
-    , regTweakTrunkColors (_T("Software\\TortoiseSVN\\RevisionGraph\\TweakTrunkColors"), TRUE)\r
-    , regTweakTagsColors (_T("Software\\TortoiseSVN\\RevisionGraph\\TweakTagsColors"), TRUE)\r
+    , regTrunkPattern (_T("Software\\TortoiseGit\\RevisionGraph\\TrunkPattern"), _T("trunk"))\r
+    , regBranchesPattern (_T("Software\\TortoiseGit\\RevisionGraph\\BranchPattern"), _T("branches"))\r
+    , regTagsPattern (_T("Software\\TortoiseGit\\RevisionGraph\\TagsPattern"), _T("tags"))\r
+    , regTweakTrunkColors (_T("Software\\TortoiseGit\\RevisionGraph\\TweakTrunkColors"), TRUE)\r
+    , regTweakTagsColors (_T("Software\\TortoiseGit\\RevisionGraph\\TweakTagsColors"), TRUE)\r
     , trunkPattern (regTrunkPattern)\r
     , branchesPattern (regBranchesPattern)\r
     , tagsPattern (regTagsPattern)\r
index 96e7237..5d6ba9d 100644 (file)
@@ -32,11 +32,11 @@ CSettingsTBlame::CSettingsTBlame()
        , m_sFontName(_T(""))\r
        , m_dwTabSize(4)\r
 {\r
-       m_regNewLinesColor = CRegDWORD(_T("Software\\TortoiseSVN\\BlameNewColor"), RGB(255, 230, 230));\r
-       m_regOldLinesColor = CRegDWORD(_T("Software\\TortoiseSVN\\BlameOldColor"), RGB(230, 230, 255));\r
-       m_regFontName = CRegString(_T("Software\\TortoiseSVN\\BlameFontName"), _T("Courier New"));\r
-       m_regFontSize = CRegDWORD(_T("Software\\TortoiseSVN\\BlameFontSize"), 10);\r
-       m_regTabSize = CRegDWORD(_T("Software\\TortoiseSVN\\BlameTabSize"), 4);\r
+       m_regNewLinesColor = CRegDWORD(_T("Software\\TortoiseGit\\BlameNewColor"), RGB(255, 230, 230));\r
+       m_regOldLinesColor = CRegDWORD(_T("Software\\TortoiseGit\\BlameOldColor"), RGB(230, 230, 255));\r
+       m_regFontName = CRegString(_T("Software\\TortoiseGit\\BlameFontName"), _T("Courier New"));\r
+       m_regFontSize = CRegDWORD(_T("Software\\TortoiseGit\\BlameFontSize"), 10);\r
+       m_regTabSize = CRegDWORD(_T("Software\\TortoiseGit\\BlameTabSize"), 4);\r
 }\r
 \r
 CSettingsTBlame::~CSettingsTBlame()\r
index c56de37..5f36048 100644 (file)
@@ -129,8 +129,8 @@ BOOL CStatGraphDlg::OnInitDialog()
                m_pToolTip->Activate(TRUE);\r
        }\r
        \r
-       m_bAuthorsCaseSensitive = DWORD(CRegDWORD(_T("Software\\TortoiseSVN\\StatAuthorsCaseSensitive")));\r
-       m_bSortByCommitCount = DWORD(CRegDWORD(_T("Software\\TortoiseSVN\\StatSortByCommitCount")));\r
+       m_bAuthorsCaseSensitive = DWORD(CRegDWORD(_T("Software\\TortoiseGit\\StatAuthorsCaseSensitive")));\r
+       m_bSortByCommitCount = DWORD(CRegDWORD(_T("Software\\TortoiseGit\\StatSortByCommitCount")));\r
        UpdateData(FALSE);\r
 \r
        CString temp;\r
@@ -231,7 +231,7 @@ BOOL CStatGraphDlg::OnInitDialog()
        m_Skipper.SetPageSize(5);\r
 \r
        // we use a stats page encoding here, 0 stands for the statistics dialog\r
-       CRegDWORD lastStatsPage = CRegDWORD(_T("Software\\TortoiseSVN\\LastViewedStatsPage"), 0);\r
+       CRegDWORD lastStatsPage = CRegDWORD(_T("Software\\TortoiseGit\\LastViewedStatsPage"), 0);\r
 \r
        // open last viewed statistics page as first page\r
        int graphtype = lastStatsPage / 10;\r
@@ -265,9 +265,9 @@ BOOL CStatGraphDlg::OnInitDialog()
                default : return TRUE;\r
        }\r
 \r
-       LCID m_locale = MAKELCID((DWORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)), SORT_DEFAULT);\r
+       LCID m_locale = MAKELCID((DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)), SORT_DEFAULT);\r
 \r
-       bool bUseSystemLocale = !!(DWORD)CRegStdWORD(_T("Software\\TortoiseSVN\\UseSystemLocaleForDates"), TRUE);\r
+       bool bUseSystemLocale = !!(DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\UseSystemLocaleForDates"), TRUE);\r
        LCID locale = bUseSystemLocale ? MAKELCID(MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), SORT_DEFAULT) : m_locale;\r
 \r
        TCHAR l = 0;\r
@@ -1493,12 +1493,12 @@ void CStatGraphDlg::StoreCurrentGraphType()
        }\r
        \r
        // store current chart type in registry\r
-       CRegDWORD lastStatsPage = CRegDWORD(_T("Software\\TortoiseSVN\\LastViewedStatsPage"), 0);\r
+       CRegDWORD lastStatsPage = CRegDWORD(_T("Software\\TortoiseGit\\LastViewedStatsPage"), 0);\r
        lastStatsPage = statspage;\r
 \r
-       CRegDWORD regAuthors = CRegDWORD(_T("Software\\TortoiseSVN\\StatAuthorsCaseSensitive"));\r
+       CRegDWORD regAuthors = CRegDWORD(_T("Software\\TortoiseGit\\StatAuthorsCaseSensitive"));\r
        regAuthors = m_bAuthorsCaseSensitive;\r
 \r
-       CRegDWORD regSort = CRegDWORD(_T("Software\\TortoiseSVN\\StatSortByCommitCount"));\r
+       CRegDWORD regSort = CRegDWORD(_T("Software\\TortoiseGit\\StatSortByCommitCount"));\r
        regSort = m_bSortByCommitCount;\r
 }\r
index 6577963..ae9d085 100644 (file)
@@ -359,7 +359,7 @@ Click Yes to open setting dialog to setup MSysGit Path"),
        }\r
 \r
        // check for newer versions\r
-       if (CRegDWORD(_T("Software\\TortoiseSVN\\CheckNewer"), TRUE) != FALSE)\r
+       if (CRegDWORD(_T("Software\\TortoiseGit\\CheckNewer"), TRUE) != FALSE)\r
        {\r
                time_t now;\r
                struct tm ptm;\r
@@ -373,7 +373,7 @@ Click Yes to open setting dialog to setup MSysGit Path"),
                        // that's not needed.\r
                        week = ptm.tm_yday / 7;\r
 \r
-                       CRegDWORD oldweek = CRegDWORD(_T("Software\\TortoiseSVN\\CheckNewerWeek"), (DWORD)-1);\r
+                       CRegDWORD oldweek = CRegDWORD(_T("Software\\TortoiseGit\\CheckNewerWeek"), (DWORD)-1);\r
                        if (((DWORD)oldweek) == -1)\r
                                oldweek = week;         // first start of TortoiseProc, no update check needed\r
                        else\r
@@ -502,7 +502,7 @@ Click Yes to open setting dialog to setup MSysGit Path"),
 \r
 void CTortoiseProcApp::CheckUpgrade()\r
 {\r
-       CRegString regVersion = CRegString(_T("Software\\TortoiseSVN\\CurrentVersion"));\r
+       CRegString regVersion = CRegString(_T("Software\\TortoiseGit\\CurrentVersion"));\r
        CString sVersion = regVersion;\r
        if (sVersion.Compare(_T(STRPRODUCTVER))==0)\r
                return;\r
@@ -518,11 +518,11 @@ void CTortoiseProcApp::CheckUpgrade()
                lVersion |= (_ttol(sVersion.Mid(pos+1))<<8);\r
        }\r
        \r
-       CRegDWORD regval = CRegDWORD(_T("Software\\TortoiseSVN\\DontConvertBase"), 999);\r
+       CRegDWORD regval = CRegDWORD(_T("Software\\TortoiseGit\\DontConvertBase"), 999);\r
        if ((DWORD)regval != 999)\r
        {\r
                // there's a leftover registry setting we have to convert and then delete it\r
-               CRegDWORD newregval = CRegDWORD(_T("Software\\TortoiseSVN\\ConvertBase"));\r
+               CRegDWORD newregval = CRegDWORD(_T("Software\\TortoiseGit\\ConvertBase"));\r
                newregval = !regval;\r
                regval.removeValue();\r
        }\r
@@ -531,22 +531,22 @@ void CTortoiseProcApp::CheckUpgrade()
        {\r
                CSoundUtils::RegisterTSVNSounds();\r
                // remove all saved dialog positions\r
-               CRegString(_T("Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\")).removeKey();\r
-               CRegDWORD(_T("Software\\TortoiseSVN\\RecursiveOverlay")).removeValue();\r
+               CRegString(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\")).removeKey();\r
+               CRegDWORD(_T("Software\\TortoiseGit\\RecursiveOverlay")).removeValue();\r
                // remove the external cache key\r
-               CRegDWORD(_T("Software\\TortoiseSVN\\ExternalCache")).removeValue();\r
+               CRegDWORD(_T("Software\\TortoiseGit\\ExternalCache")).removeValue();\r
        }\r
 #endif \r
        if (lVersion <= 0x01020200)\r
        {\r
                // upgrade to > 1.2.3 means the doc diff scripts changed from vbs to js\r
                // so remove the diff/merge scripts if they're the defaults\r
-               CRegString diffreg = CRegString(_T("Software\\TortoiseSVN\\DiffTools\\.doc"));\r
+               CRegString diffreg = CRegString(_T("Software\\TortoiseGit\\DiffTools\\.doc"));\r
                CString sDiff = diffreg;\r
                CString sCL = _T("wscript.exe \"") + CPathUtils::GetAppParentDirectory()+_T("Diff-Scripts\\diff-doc.vbs\"");\r
                if (sDiff.Left(sCL.GetLength()).CompareNoCase(sCL)==0)\r
                        diffreg = _T("");\r
-               CRegString mergereg = CRegString(_T("Software\\TortoiseSVN\\MergeTools\\.doc"));\r
+               CRegString mergereg = CRegString(_T("Software\\TortoiseGit\\MergeTools\\.doc"));\r
                sDiff = mergereg;\r
                sCL = _T("wscript.exe \"") + CPathUtils::GetAppParentDirectory()+_T("Diff-Scripts\\merge-doc.vbs\"");\r
                if (sDiff.Left(sCL.GetLength()).CompareNoCase(sCL)==0)\r
@@ -554,7 +554,7 @@ void CTortoiseProcApp::CheckUpgrade()
        }\r
        if (lVersion <= 0x01040000)\r
        {\r
-               CRegStdWORD(_T("Software\\TortoiseSVN\\OwnerdrawnMenus")).removeValue();\r
+               CRegStdWORD(_T("Software\\TortoiseGit\\OwnerdrawnMenus")).removeValue();\r
        }\r
        \r
        // set the custom diff scripts for every user\r
@@ -579,26 +579,26 @@ void CTortoiseProcApp::CheckUpgrade()
                \r
                if (filename.Left(5).CompareNoCase(_T("diff-"))==0)\r
                {\r
-                       CRegString diffreg = CRegString(_T("Software\\TortoiseSVN\\DiffTools\\")+ext);\r
+                       CRegString diffreg = CRegString(_T("Software\\TortoiseGit\\DiffTools\\")+ext);\r
                        CString diffregstring = diffreg;\r
                        if ((diffregstring.IsEmpty()) || (diffregstring.Find(filename)>=0))\r
                                diffreg = _T("wscript.exe \"") + file + _T("\" %base %mine") + kind;\r
                }\r
                if (filename.Left(6).CompareNoCase(_T("merge-"))==0)\r
                {\r
-                       CRegString diffreg = CRegString(_T("Software\\TortoiseSVN\\MergeTools\\")+ext);\r
+                       CRegString diffreg = CRegString(_T("Software\\TortoiseGit\\MergeTools\\")+ext);\r
                        CString diffregstring = diffreg;\r
                        if ((diffregstring.IsEmpty()) || (diffregstring.Find(filename)>=0))\r
                                diffreg = _T("wscript.exe \"") + file + _T("\" %merged %theirs %mine %base") + kind;\r
                }\r
        }\r
 \r
-       // Initialize "Software\\TortoiseSVN\\DiffProps" once with the same value as "Software\\TortoiseSVN\\Diff"\r
-       CRegString regDiffPropsPath = CRegString(_T("Software\\TortoiseSVN\\DiffProps"),_T("non-existant"));\r
+       // Initialize "Software\\TortoiseGit\\DiffProps" once with the same value as "Software\\TortoiseGit\\Diff"\r
+       CRegString regDiffPropsPath = CRegString(_T("Software\\TortoiseGit\\DiffProps"),_T("non-existant"));\r
        CString strDiffPropsPath = regDiffPropsPath;\r
        if ( strDiffPropsPath==_T("non-existant") )\r
        {\r
-               CString strDiffPath = CRegString(_T("Software\\TortoiseSVN\\Diff"));\r
+               CString strDiffPath = CRegString(_T("Software\\TortoiseGit\\Diff"));\r
                regDiffPropsPath = strDiffPath;\r
        }\r
 \r
index 918be98..aad8a5a 100644 (file)
@@ -48,7 +48,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r
+                               AdditionalIncludeDirectories="&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="2"\r
                                Optimization="1"\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r
+                               AdditionalIncludeDirectories="&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"\r
                                StringPooling="true"\r
                                MinimalRebuild="false"\r
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;h;hpp;hxx;hm;inl;inc"\r
                        >\r
                        <File\r
+                               RelativePath="..\TGitCache\CacheInterface.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\ProjectProperties.cpp"\r
                                >\r
                        </File>\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\Settings\SetHooks.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SetHooks.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SetHooksAdv.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SetHooksAdv.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SetLogCache.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SetLogCache.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
                                        RelativePath=".\Settings\SetLookAndFeelPage.cpp"\r
                                        >\r
                                </File>\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\Settings\SettingsLogCaches.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SettingsLogCaches.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SettingsProgsDiff.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SettingsProgsDiff.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SettingsProgsMerge.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SettingsProgsMerge.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SettingsProgsUniDiff.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Settings\SettingsProgsUniDiff.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
                                        RelativePath=".\Settings\SettingsPropPage.cpp"\r
                                        >\r
                                </File>\r
index 3dafcec..2efbcb3 100644 (file)
@@ -11,7 +11,7 @@
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
                                WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
-                               CommandArguments="/command:clone /path:&quot;D:\\Profiles\\b20596\\git&quot;"\r
+                               CommandArguments="/command:settings /path:&quot;D:\\Profiles\\b20596\\git&quot;"\r
                                Attach="false"\r
                                DebuggerType="3"\r
                                Remote="1"\r
index 3a794c6..4506e91 100644 (file)
@@ -49,7 +49,7 @@ BOOL CURLDlg::OnInitDialog()
        CResizableStandAloneDialog::OnInitDialog();\r
 \r
        m_URLCombo.SetURLHistory(TRUE);\r
-       m_URLCombo.LoadHistory(_T("Software\\TortoiseSVN\\History\\repoURLS"), _T("url"));\r
+       m_URLCombo.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS"), _T("url"));\r
        m_URLCombo.SetCurSel(0);\r
        m_URLCombo.SetFocus();\r
 \r
index da11a08..a28296f 100644 (file)
@@ -125,7 +125,7 @@ void CUpdateDlg::OnBnClickedShowLog()
        {\r
                delete m_pLogDlg;\r
                m_pLogDlg = new CLogDlg();\r
-               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
                int limit = (int)(LONG)reg;\r
                m_pLogDlg->SetSelect(true);\r
                m_pLogDlg->m_pNotifyWindow = this;\r
index ad4b232..d6cb5f4 100644 (file)
@@ -66,7 +66,7 @@ BOOL CUrlDiffDlg::OnInitDialog()
        CString url = svn.GetURLFromPath(svnPath);\r
        CString sUUID = svn.GetUUIDFromPath(svnPath);\r
        m_URLCombo.SetURLHistory(TRUE);\r
-       m_URLCombo.LoadHistory(_T("Software\\TortoiseSVN\\History\\repoURLS\\")+sUUID, _T("url"));\r
+       m_URLCombo.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS\\")+sUUID, _T("url"));\r
        m_URLCombo.SetCurSel(0);\r
 \r
        if (!url.IsEmpty())\r
@@ -173,7 +173,7 @@ void CUrlDiffDlg::OnBnClickedLog()
        {\r
                delete m_pLogDlg;\r
                m_pLogDlg = new CLogDlg();\r
-               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+               CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
                int limit = (int)(LONG)reg;\r
                m_pLogDlg->SetSelect(true);\r
                m_pLogDlg->m_pNotifyWindow = this;\r
index 56c549c..287e40e 100644 (file)
@@ -211,7 +211,7 @@ STDMETHODIMP CShellExt::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, V
                {\r
                        case 0: // SVN Status\r
                                GetColumnStatus(path, pscd->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);\r
-                               GitStatus::GetStatusString(g_hResInst, filestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)));\r
+                               GitStatus::GetStatusString(g_hResInst, filestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)));\r
                                szInfo = buf;\r
                                break;\r
                        case 1: // SVN Revision\r
index 01292cf..48ae11c 100644 (file)
@@ -227,7 +227,7 @@ bool CRemoteCacheLink::GetStatusFromRemoteCache(const CTSVNPath& Path, TSVNCache
                startup.cb = sizeof(startup);\r
                memset(&process, 0, sizeof(process));\r
 \r
-               CRegString cachePath(_T("Software\\TortoiseSVN\\CachePath"), _T("TSVNCache.exe"), false, HKEY_LOCAL_MACHINE);\r
+               CRegString cachePath(_T("Software\\TortoiseGit\\CachePath"), _T("TSVNCache.exe"), false, HKEY_LOCAL_MACHINE);\r
                CString sCachePath = cachePath;\r
                if (CreateProcess(sCachePath.GetBuffer(sCachePath.GetLength()+1), _T(""), NULL, NULL, FALSE, 0, 0, 0, &startup, &process)==0)\r
                {\r
index 2ec5341..46b9ea0 100644 (file)
@@ -215,7 +215,7 @@ protected:
        FN_BeginBufferedPaint pfnBeginBufferedPaint;\r
        FN_EndBufferedPaint pfnEndBufferedPaint;\r
 \r
-#define MAKESTRING(ID) LoadStringEx(g_hResInst, ID, stringtablebuffer, sizeof(stringtablebuffer)/sizeof(TCHAR), (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)))\r
+#define MAKESTRING(ID) LoadStringEx(g_hResInst, ID, stringtablebuffer, sizeof(stringtablebuffer)/sizeof(TCHAR), (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)))\r
 private:\r
        void                    InsertGitMenu(BOOL istop, HMENU menu, UINT pos, UINT_PTR id, UINT stringid, UINT icon, UINT idCmdFirst, GitCommands com, UINT uFlags);\r
        void                    InsertIgnoreSubmenus(UINT &idCmd, UINT idCmdFirst, HMENU hMenu, HMENU subMenu, UINT &indexMenu, int &indexSubMenu, unsigned __int64 topmenu, bool bShowIcons);\r
index 9b43c26..d8b545f 100644 (file)
@@ -126,9 +126,9 @@ LRESULT CALLBACK CMainWindow::WinMsgHandler(HWND hwnd, UINT uMsg, WPARAM wParam,
                break;\r
        case WM_CLOSE:\r
                {\r
-                       CRegStdWORD w = CRegStdWORD(_T("Software\\TortoiseSVN\\UDiffViewerWidth"), (DWORD)CW_USEDEFAULT);\r
-                       CRegStdWORD h = CRegStdWORD(_T("Software\\TortoiseSVN\\UDiffViewerHeight"), (DWORD)CW_USEDEFAULT);\r
-                       CRegStdWORD p = CRegStdWORD(_T("Software\\TortoiseSVN\\UDiffViewerPos"), 0);\r
+                       CRegStdWORD w = CRegStdWORD(_T("Software\\TortoiseGit\\UDiffViewerWidth"), (DWORD)CW_USEDEFAULT);\r
+                       CRegStdWORD h = CRegStdWORD(_T("Software\\TortoiseGit\\UDiffViewerHeight"), (DWORD)CW_USEDEFAULT);\r
+                       CRegStdWORD p = CRegStdWORD(_T("Software\\TortoiseGit\\UDiffViewerPos"), 0);\r
 \r
                        RECT rect;\r
                        ::GetWindowRect(*this, &rect);\r
@@ -257,9 +257,9 @@ LRESULT CMainWindow::SendEditor(UINT Msg, WPARAM wParam, LPARAM lParam)
 \r
 bool CMainWindow::Initialize()\r
 {\r
-       CRegStdWORD pos(_T("Software\\TortoiseSVN\\UDiffViewerPos"), 0);\r
-       CRegStdWORD width(_T("Software\\TortoiseSVN\\UDiffViewerWidth"), (DWORD)640);\r
-       CRegStdWORD height(_T("Software\\TortoiseSVN\\UDiffViewerHeight"), (DWORD)480);\r
+       CRegStdWORD pos(_T("Software\\TortoiseGit\\UDiffViewerPos"), 0);\r
+       CRegStdWORD width(_T("Software\\TortoiseGit\\UDiffViewerWidth"), (DWORD)640);\r
+       CRegStdWORD height(_T("Software\\TortoiseGit\\UDiffViewerHeight"), (DWORD)480);\r
        if (DWORD(pos) && DWORD(width) && DWORD(height))\r
        {\r
                RECT rc;\r
@@ -304,8 +304,8 @@ bool CMainWindow::Initialize()
                // Reusing TortoiseBlame's setting which already have an user friendly\r
                // pane in TortoiseSVN's Settings dialog, while there is no such\r
                // pane for TortoiseUDiff.\r
-               CRegStdWORD(_T("Software\\TortoiseSVN\\BlameFontSize"), 10),\r
-               WideToMultibyte(CRegStdString(_T("Software\\TortoiseSVN\\BlameFontName"), _T("Courier New"))).c_str());\r
+               CRegStdWORD(_T("Software\\TortoiseGit\\BlameFontSize"), 10),\r
+               WideToMultibyte(CRegStdString(_T("Software\\TortoiseGit\\BlameFontName"), _T("Courier New"))).c_str());\r
        SendEditor(SCI_SETTABWIDTH, 4);\r
        SendEditor(SCI_SETREADONLY, TRUE);\r
        LRESULT pix = SendEditor(SCI_TEXTWIDTH, STYLE_LINENUMBER, (LPARAM)"_99999");\r
index faffabd..fede37a 100644 (file)
@@ -25,7 +25,7 @@
 DEFINE_GUID(CATID_BugTraqProvider, \r
                        0x3494fa92, 0xb139, 0x4730, 0x95, 0x91, 0x1, 0x13, 0x5d, 0x5e, 0x78, 0x31);\r
 \r
-#define BUGTRAQ_ASSOCIATIONS_REGPATH _T("Software\\TortoiseSVN\\BugTraq Associations")\r
+#define BUGTRAQ_ASSOCIATIONS_REGPATH _T("Software\\TortoiseGit\\BugTraq Associations")\r
 \r
 CBugTraqAssociations::~CBugTraqAssociations()\r
 {\r
@@ -81,16 +81,16 @@ void CBugTraqAssociations::Add(const CBugTraqAssociation &assoc)
        m_inner.push_back(new CBugTraqAssociation(assoc));\r
 }\r
 \r
-bool CBugTraqAssociations::FindProvider(const CTSVNPathList &pathList, CBugTraqAssociation *assoc) const\r
+bool CBugTraqAssociations::FindProvider(const CTGitPathList &pathList, CBugTraqAssociation *assoc) const\r
 {\r
        return FindProviderForPathList(pathList, assoc);\r
 }\r
 \r
-bool CBugTraqAssociations::FindProviderForPathList(const CTSVNPathList &pathList, CBugTraqAssociation *assoc) const\r
+bool CBugTraqAssociations::FindProviderForPathList(const CTGitPathList &pathList, CBugTraqAssociation *assoc) const\r
 {\r
        for (int i = 0; i < pathList.GetCount(); ++i)\r
        {\r
-               CTSVNPath path = pathList[i];\r
+               CTGitPath path = pathList[i];\r
                if (FindProviderForPath(path, assoc))\r
                        return true;\r
        }\r
@@ -98,7 +98,7 @@ bool CBugTraqAssociations::FindProviderForPathList(const CTSVNPathList &pathList
        return false;\r
 }\r
 \r
-bool CBugTraqAssociations::FindProviderForPath(CTSVNPath path, CBugTraqAssociation *assoc) const\r
+bool CBugTraqAssociations::FindProviderForPath(CTGitPath path, CBugTraqAssociation *assoc) const\r
 {\r
        do\r
        {\r
@@ -178,7 +178,7 @@ void CBugTraqAssociations::Save() const
        RegCloseKey(hk);\r
 }\r
 \r
-void CBugTraqAssociations::RemoveByPath(const CTSVNPath &path)\r
+void CBugTraqAssociations::RemoveByPath(const CTGitPath &path)\r
 {\r
        inner_t::iterator it = std::find_if(m_inner.begin(), m_inner.end(), FindByPathPred(path));\r
        if (it != m_inner.end())\r
index 859c30b..f307e60 100644 (file)
@@ -36,7 +36,7 @@ bool CHooks::Create()
 {\r
        if (m_pInstance == NULL)\r
                m_pInstance = new CHooks();\r
-       CRegString reghooks = CRegString(_T("Software\\TortoiseSVN\\hooks"));\r
+       CRegString reghooks = CRegString(_T("Software\\TortoiseGit\\hooks"));\r
        CString strhooks = reghooks;\r
        // now fill the map with all the hooks defined in the string\r
        // the string consists of multiple lines, where one hook script is defined\r
@@ -129,7 +129,7 @@ bool CHooks::Save()
                strhooks += (it->second.bShow ? _T("show") : _T("hide"));\r
                strhooks += '\n';\r
        }\r
-       CRegString reghooks = CRegString(_T("Software\\TortoiseSVN\\hooks"));\r
+       CRegString reghooks = CRegString(_T("Software\\TortoiseGit\\hooks"));\r
        reghooks = strhooks;\r
        if (reghooks.LastError)\r
                return false;\r
index e1b3686..44252df 100644 (file)
@@ -123,7 +123,7 @@ void CSciEdit::Init(LONG lLanguage)
        // look for dictionary files and use them if found\r
        long langId = GetUserDefaultLCID();\r
 \r
-       if ((lLanguage != 0)||(((DWORD)CRegStdWORD(_T("Software\\TortoiseSVN\\Spellchecker"), FALSE))==FALSE))\r
+       if ((lLanguage != 0)||(((DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\Spellchecker"), FALSE))==FALSE))\r
        {\r
                if (!((lLanguage)&&(!LoadDictionaries(lLanguage))))\r
                {\r
index 1618b95..07d7a27 100644 (file)
@@ -46,7 +46,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell"\r
+                               AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell"\r
+                               AdditionalIncludeDirectories="../git;../;../ext/scintilla/include;../ext/hunspell;./MiscUi"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
                                RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
                        <File\r
+                               RelativePath=".\BugTraqAssociations.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\CmdLineParser.cpp"\r
                                >\r
                        </File>\r
                                RelativePath=".\TreePropSheet\PropPageFrame.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\TreePropSheet\PropPageFrame.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\TreePropSheet\PropPageFrameDefault.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\TreePropSheet\PropPageFrameDefault.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\TreePropSheet\TreePropSheet.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\TreePropSheet\TreePropSheet.h"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <File\r
                        RelativePath=".\ReadMe.txt"\r