Add Setting Dialog

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / SVNProgressDlg.cpp

diff --git a/src/TortoiseProc/SVNProgressDlg.cpp b/src/TortoiseProc/SVNProgressDlg.cpp
index 4bfe9b0..95497b0 100644 (file)
--- a/src/TortoiseProc/SVNProgressDlg.cpp
+++ b/src/TortoiseProc/SVNProgressDlg.cpp
@@ -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