TGitPath Add Rename handle

[tortoisegit/TortoiseGitJp.git] / src / Git / GitStatusListCtrl.cpp

diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp
index 9b46458..a2c7e45 100644 (file)
--- a/src/Git/GitStatusListCtrl.cpp
+++ b/src/Git/GitStatusListCtrl.cpp
@@ -52,6 +52,7 @@
 //#include "EditPropertiesDlg.h"\r
 //#include "CreateChangelistDlg.h"\r
 #include "XPTheme.h"\r
+#include "CommonResource.h"\r
 \r
 const UINT CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED\r
                                        = ::RegisterWindowMessage(_T("GITSLNM_ITEMCOUNTCHANGED"));\r
@@ -1055,7 +1056,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 +1283,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
@@ -1441,6 +1442,11 @@ void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD langID, int listInde
                icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);\r
        }\r
        // relative path\r
+       CString rename;\r
+       rename.Format(_T("(from %s)"),GitPath->GetGitOldPathString());\r
+       if(GitPath->m_Action & CTGitPath::LOGACTIONS_REPLACED)\r
+               entryname+=rename;\r
+       \r
        InsertItem(index, entryname, icon_idx);\r
 \r
        this->SetItemData(index, (DWORD_PTR)GitPath);\r
@@ -2800,7 +2806,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