From 698d38efe04e93f392776218796f0a194044c21f Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Sun, 12 Jul 2009 14:53:25 +0800
Subject: [PATCH] Fixed issue #112: (6) Low hanging GUI fruits during Commit
 and Push

Add recent message back to context menu.

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/Resources/TortoiseProcENG.rc     | Bin 438738 -> 438860 bytes
 src/TortoiseProc/CommitDlg.cpp       |  15 +++++++++++++--
 src/TortoiseProc/CommitDlg.h         |   1 +
 src/TortoiseProc/TortoiseProc.vcproj |   8 ++++++++
 src/TortoiseProc/resource.h          | Bin 162688 -> 162780 bytes
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc
index cbdf175645982f8ac554c1318bbdad57eaf72faa..1b5703abd58ad7f3072441fe597dea6c405af35c 100644
GIT binary patch
delta 139
zcmccgSnA9ZsfHHDEle}6P4A0h=9&CtpTzWi*O=rchy6Bb7r4#@#LPg<vR&XhYtY8&
zQhQhhrYCr_h)h2a!pdXs!{E>0&fvk|$q>vC0%Qj<L^3EaC@};uBr+5;lrW?Mc|kxj
h8Hn?Md<6zyAgdS%6B*JOQl}TXvr2C-=wM6I1OQ~VDLDWD

delta 73
zcmX@}MC#IGsfHHDEle}6aRxKwGn6tEF(gm_sKX>Xea|%}IYzU|6K#yA3luT)waZ**
c0%B$$X4x)toz-RI^b>Y0eA{1juq9~%01o&YYybcN

diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 3dc9a52..ebc94a2 100644
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -1273,6 +1273,11 @@ void CCommitDlg::InsertMenuItems(CMenu& mPopup, int& nCmd)
 		sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_PASTELASTMESSAGE);
 		m_nPopupPasteLastMessage = nCmd++;
 		mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupPasteLastMessage, sMenuItemText);
+
+		sMenuItemText.LoadString(IDS_COMMITDLG_POPUP_LOGHISTORY);
+		m_nPopupRecentMessage = nCmd++;
+		mPopup.AppendMenu(MF_STRING | MF_ENABLED, m_nPopupRecentMessage, sMenuItemText);
+
 	}
 	
 }
@@ -1320,6 +1325,12 @@ bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)
 		pSciEdit->InsertText(logmsg);
 		return true;
 	}
+
+	if(cmd == m_nPopupRecentMessage )
+	{
+		OnBnClickedHistory();
+		return true;
+	}
 	return false;
 }
 
@@ -1353,7 +1364,7 @@ void CCommitDlg::OnBnClickedHistory()
 	m_tooltips.Pop();	// hide the tooltips
 	if (m_pathList.GetCount() == 0)
 		return;
-#if 0
+
 	CHistoryDlg historyDlg;
 	historyDlg.SetHistory(m_History);
 	if (historyDlg.DoModal() != IDOK)
@@ -1375,7 +1386,7 @@ void CCommitDlg::OnBnClickedHistory()
 
 	UpdateOKButton();
 	GetDlgItem(IDC_LOGMESSAGE)->SetFocus();
-#endif
+
 }
 
 void CCommitDlg::OnBnClickedBugtraqbutton()
diff --git a/src/TortoiseProc/CommitDlg.h b/src/TortoiseProc/CommitDlg.h
index dc2e339..e2700e5 100644
--- a/src/TortoiseProc/CommitDlg.h
+++ b/src/TortoiseProc/CommitDlg.h
@@ -134,6 +134,7 @@ private:
 	static UINT			WM_AUTOLISTREADY;
 	int					m_nPopupPasteListCmd;
 	int					m_nPopupPasteLastMessage;
+	int					m_nPopupRecentMessage;
 	CRegHistory			m_History;
 	bool				m_bCancelled;
 	CSplitterControl	m_wndSplitter;
diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index bf72a6f..0659734 100644
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -453,6 +453,14 @@
 					RelativePath=".\DeleteConflictDlg.h"
 					>
 				</File>
+				<File
+					RelativePath=".\HistoryDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\HistoryDlg.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="UI"
diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h
index bfff748d6bd100bdbe7b68a2c576057cad18e47d..d8b5b1431f5ef250ac14e4ef7145fc5592cbf6bb 100644
GIT binary patch
delta 52
zcmV-40L%Y?_X*th34nwFv;y*Lmyo&v7zt1SPXJH=RRB<vuhJU>IRG}7(O&@_mmF~d
KBDWN50&EWtQ4x*+

delta 19
ZcmccfowEUmS{S!5eahbMm&4S@4*+0T2!#Lu

-- 
2.11.0