From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Mon, 15 Apr 2013 15:43:23 +0000 (+0800)
Subject: Show selected revision count as well as selected file count
X-Git-Tag: REL_1.8.3.0_EXTERNAL~52
X-Git-Url: https://repo.or.cz/w/TortoiseGit.git/commitdiff_plain/3a5194c4ed9e6e35992d1bc72e0467919546c312

Show selected revision count as well as selected file count

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---

diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot
index b81fdbd06..81d5df268 100644
--- a/Languages/Tortoise.pot
+++ b/Languages/Tortoise.pot
@@ -7556,7 +7556,7 @@ msgstr ""
 
 #. Resource IDs: (76)
 #, c-format
-msgid "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) selected\r\n"
+msgid "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) selected, %ld file(s) selected\r\n"
 msgstr ""
 
 #. Resource IDs: (24)
diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index 29833d9dd..0194bdeae 100644
--- a/src/Resources/TortoiseProcENG.rc
+++ b/src/Resources/TortoiseProcENG.rc
@@ -2796,7 +2796,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_PROC_LOG_STATS      "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) selected\r\n"
+    IDS_PROC_LOG_STATS      "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) selected, %ld file(s) selected\r\n"
     IDS_PROC_LOG_ALLBRANCHES "<All Branches>"
     IDS_PROC_LOG_NOBRANCH   "<No branch>"
     IDS_SETTINGS_CREATELIB_TT 
diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp
index c18f0cf68..7a974e475 100644
--- a/src/TortoiseProc/LogDlg.cpp
+++ b/src/TortoiseProc/LogDlg.cpp
@@ -131,6 +131,7 @@ BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)
 	ON_WM_SETCURSOR()
 	ON_BN_CLICKED(IDHELP, OnBnClickedHelp)
 	ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGLIST, OnLvnItemchangedLoglist)
+	ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGMSG, OnLvnItemchangedLogmsg)
 	ON_NOTIFY(EN_LINK, IDC_MSGVIEW, OnEnLinkMsgview)
 	ON_BN_CLICKED(IDC_STATBUTTON, OnBnClickedStatbutton)
 
@@ -1182,6 +1183,11 @@ void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
 	UpdateLogInfoLabel();
 }
 
+void CLogDlg::OnLvnItemchangedLogmsg(NMHDR *pNMHDR, LRESULT *pResult)
+{
+	UpdateLogInfoLabel();
+}
+
 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
 {
 	ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);
@@ -1962,6 +1968,7 @@ void CLogDlg::UpdateLogInfoLabel()
 	CGitHash rev1 ;
 	CGitHash rev2 ;
 	long selectedrevs = 0;
+	long selectedfiles = 0;
 	int count = (int)m_LogList.m_arShownList.GetCount();
 	int start = 0;
 	if (count)
@@ -1973,11 +1980,13 @@ void CLogDlg::UpdateLogInfoLabel()
 		//pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_arShownList.GetCount()-1));
 		rev2 =  (reinterpret_cast<GitRev*>(m_LogList.m_arShownList.SafeGetAt(count-1)))->m_CommitHash;
 		selectedrevs = m_LogList.GetSelectedCount();
+		if (selectedrevs)
+			selectedfiles = m_ChangedFileListCtrl.GetSelectedCount();
 	}
 	CString sTemp;
 	sTemp.Format(IDS_PROC_LOG_STATS,
 		count - start,
-		rev2.ToString().Left(g_Git.GetShortHASHLength()), rev1.ToString().Left(g_Git.GetShortHASHLength()), selectedrevs);
+		rev2.ToString().Left(g_Git.GetShortHASHLength()), rev1.ToString().Left(g_Git.GetShortHASHLength()), selectedrevs, selectedfiles);
 
 	if(selectedrevs == 1)
 	{
diff --git a/src/TortoiseProc/LogDlg.h b/src/TortoiseProc/LogDlg.h
index 3803e9f74..356c89325 100644
--- a/src/TortoiseProc/LogDlg.h
+++ b/src/TortoiseProc/LogDlg.h
@@ -106,6 +106,7 @@ protected:
 	afx_msg void OnContextMenu(CWnd* pWnd, CPoint point);
 	afx_msg void OnNMDblclkLoglist(NMHDR *pNMHDR, LRESULT *pResult);
 	afx_msg void OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult);
+	afx_msg void OnLvnItemchangedLogmsg(NMHDR *pNMHDR, LRESULT *pResult);
 	afx_msg void OnBnClickedHelp();
 	afx_msg void OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult);
 	afx_msg void OnBnClickedStatbutton();