From 26a13aad3b4ddb2c59cc75b7578e68708a6139f0 Mon Sep 17 00:00:00 2001 From: Frank Li Date: Mon, 19 Apr 2010 21:39:41 +0800 Subject: [PATCH] Tip show "new file" "delete file" "rename file" status at tortoisemerge Signed-off-by: Frank Li --- src/TortoiseMerge/FilePatchesDlg.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/TortoiseMerge/FilePatchesDlg.cpp b/src/TortoiseMerge/FilePatchesDlg.cpp index 2369f109e..86639e294 100644 --- a/src/TortoiseMerge/FilePatchesDlg.cpp +++ b/src/TortoiseMerge/FilePatchesDlg.cpp @@ -231,7 +231,19 @@ void CFilePatchesDlg::OnLvnGetInfoTipFilelist(NMHDR *pNMHDR, LRESULT *pResult) LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast(pNMHDR); CString temp = GetFullPath(pGetInfoTip->iItem); - _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, temp, pGetInfoTip->cchTextMax); + CString temp2 = GetFullPath(pGetInfoTip->iItem, 1); + + if(temp != temp2) + { + if(temp == _T("NUL")) + _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, CString(_T("New File:"))+temp2, pGetInfoTip->cchTextMax); + else if(temp2 == _T("NUL")) + _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, CString(_T("Del File:"))+temp, pGetInfoTip->cchTextMax); + else + _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, CString(_T("Rename File:"))+temp+ _T(" > ")+temp2, pGetInfoTip->cchTextMax); + + }else + _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, temp, pGetInfoTip->cchTextMax); *pResult = 0; } -- 2.11.4.GIT