From 5cd706c3ad8fe6c3252be0ac0f90994f615b9bf5 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 4 Mar 2013 05:10:31 +0100 Subject: [PATCH] GitProgressDlg: Make sure full path gets into title Signed-off-by: Sven Strickroth --- src/TortoiseProc/GitProgressList.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/TortoiseProc/GitProgressList.cpp b/src/TortoiseProc/GitProgressList.cpp index 4e102417c..f74e35419 100644 --- a/src/TortoiseProc/GitProgressList.cpp +++ b/src/TortoiseProc/GitProgressList.cpp @@ -1734,7 +1734,7 @@ void CGitProgressList::OnSize(UINT nType, int cx, int cy) bool CGitProgressList::CmdAdd(CString& sWindowTitle, bool& localoperation) { localoperation = true; - SetWindowTitle(IDS_PROGRS_TITLE_ADD, m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle); + SetWindowTitle(IDS_PROGRS_TITLE_ADD, g_Git.m_CurrentDir + _T("\\") + m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle); SetBackgroundImage(IDI_ADD_BKG); ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_ADD))); @@ -1964,7 +1964,7 @@ bool CGitProgressList::CmdResolve(CString& sWindowTitle, bool& localoperation) localoperation = true; ASSERT(m_targetPathList.GetCount() == 1); - SetWindowTitle(IDS_PROGRS_TITLE_RESOLVE, m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle); + SetWindowTitle(IDS_PROGRS_TITLE_RESOLVE, g_Git.m_CurrentDir + _T("\\") + m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle); SetBackgroundImage(IDI_RESOLVE_BKG); // check if the file may still have conflict markers in it. //BOOL bMarkers = FALSE; @@ -2042,7 +2042,7 @@ bool CGitProgressList::CmdRevert(CString& sWindowTitle, bool& localoperation) { localoperation = true; - SetWindowTitle(IDS_PROGRS_TITLE_REVERT, m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle); + SetWindowTitle(IDS_PROGRS_TITLE_REVERT, g_Git.m_CurrentDir + _T("\\") + m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle); SetBackgroundImage(IDI_REVERT_BKG); CTGitPathList delList; @@ -2195,7 +2195,7 @@ bool CGitProgressList::CmdClone(CString& sWindowTitle, bool& /*localoperation*/) } bool CGitProgressList::CmdSendMail(CString& sWindowTitle, bool& /*localoperation*/) { - SetWindowTitle(IDS_PROGRS_TITLE_SENDMAIL, m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle); + SetWindowTitle(IDS_PROGRS_TITLE_SENDMAIL, g_Git.m_CurrentDir + _T("\\") + m_targetPathList.GetCommonRoot().GetUIPathString(), sWindowTitle); //SetBackgroundImage(IDI_ADD_BKG); ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_SENDMAIL))); bool ret=true; -- 2.11.4.GIT