OSDN Git Service

Merge X64 Build
[tortoisegit/TortoiseGitJp.git] / src / TortoiseBlame / TortoiseBlame.cpp
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