X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FTortoiseProc%2FLogDlg.h;h=f174d35ee547e326080c5ee1dffc9c1060384714;hp=e03bb4ae7fae58b935d5cd21b0d0327454599007;hb=4bf159e98259c2aaed43a5012eb70fb1b8686dcb;hpb=c0e4916c9c73c9dbaa338c4f7c3d179045ac538f

diff --git a/src/TortoiseProc/LogDlg.h b/src/TortoiseProc/LogDlg.h
index e03bb4a..f174d35 100644
--- a/src/TortoiseProc/LogDlg.h
+++ b/src/TortoiseProc/LogDlg.h
@@ -82,15 +82,20 @@ public:
 		FILELIST_PATH
 	};
 
-	void SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit, 
-		BOOL bStrict = CRegDWORD(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE), BOOL bSaveStrict = TRUE);
+	void SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit);
 	void SetIncludeMerge(bool bInclude = true) {m_bIncludeMerges = bInclude;}
 	void SetProjectPropertiesPath(const CTGitPath& path) {m_ProjectProperties.ReadProps(path);}
 	bool IsThreadRunning() {return !!m_LogList.m_bThreadRunning;}
 	void SetDialogTitle(const CString& sTitle) {m_sTitle = sTitle;}
 	void SetSelect(bool bSelect) {m_bSelect = bSelect;}
 	void ContinuousSelection(bool bCont = true) {m_bSelectionMustBeContinuous = bCont;}
+	void SingleSelection(bool bSingle = true) {m_bSelectionMustBeSingle = bSingle;}
 	void SetMergePath(const CTGitPath& mergepath) {m_mergePath = mergepath;}
+	/**
+	 * Provides selected commit hash if available, call after OK return from here
+	 * Empty if none
+	**/
+	CString GetSelectedHash(){ return m_sSelectedHash; }
 
 //	const GitRevRangeArray&	GetSelectedRevRanges() {return m_selectedRevs;}
 
@@ -128,14 +133,15 @@ protected:
 	afx_msg void OnDtnDatetimechangeDatefrom(NMHDR *pNMHDR, LRESULT *pResult);
 	afx_msg void OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult);
 	afx_msg void OnLvnColumnclickChangedFileList(NMHDR *pNMHDR, LRESULT *pResult);
-	afx_msg void OnBnClickedNexthundred();
+	afx_msg void OnBnClickShowWholeProject();
 	afx_msg void OnBnClickedHidepaths();
+	afx_msg void OnBnClickedAllBranch();
 	afx_msg void OnBnClickedCheckStoponcopy();
 	
 	afx_msg void OnDtnDropdownDatefrom(NMHDR *pNMHDR, LRESULT *pResult);
 	afx_msg void OnDtnDropdownDateto(NMHDR *pNMHDR, LRESULT *pResult);
 	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg void OnBnClickedIncludemerge();
+	afx_msg void OnBnClickedFirstParent();
 	afx_msg void OnBnClickedRefresh();
 	afx_msg void OnRefresh();
 	afx_msg void OnFind();
@@ -145,7 +151,7 @@ protected:
 	virtual void OnCancel();
 	virtual void OnOK();
 	virtual BOOL OnInitDialog();
-	//virtual BOOL PreTranslateMessage(MSG* pMsg);
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
 
 	void	FillLogMessageCtrl(bool bShow = true);
 	void	DoDiffFromLog(INT_PTR selIndex, GitRev *rev1, GitRev *rev2, bool blame, bool unified);
@@ -178,7 +184,7 @@ private:
 	void SortByColumn(int nSortColumn, bool bAscending);
 	
 	void EnableOKButton();
-	void GetAll(bool bForceAll = false);
+	void GetAll(bool bIsShowProjectOrBranch = false);
 	void UpdateLogInfoLabel();
 	void SaveSplitterPos();
 	bool ValidateRegexp(LPCTSTR regexp_str, tr1::wregex& pat, bool bMatchCase);
@@ -199,8 +205,6 @@ private:
 	virtual LRESULT DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam);
 	static int __cdecl	SortCompare(const void * pElem1, const void * pElem2);	///< sort callback function
 
-	void ResizeAllListCtrlCols();
-
 	void ShowContextMenuForRevisions(CWnd* pWnd, CPoint point);
 	void ShowContextMenuForChangedpaths(CWnd* pWnd, CPoint point);
 public:
@@ -219,6 +223,7 @@ private:
 	CFilterEdit			m_cFilter;
 	CProgressCtrl		m_LogProgress;
 	CMenuButton			m_btnShow;
+	CMenuButton			m_btnShowWholeProject;
 	CTGitPath			m_path;
 	CTGitPath			m_mergePath;
 	GitRev				m_pegrev;
@@ -228,15 +233,18 @@ private:
 	//GitRev				m_wcRev;
 //	GitRevRangeArray	m_selectedRevs;
 //	GitRevRangeArray	m_selectedRevsOneRange;
+	CString				m_sSelectedHash;	// set to selected commit hash on OK if appropriate
 	bool				m_bSelectionMustBeContinuous;
+	bool				m_bSelectionMustBeSingle;
 	long				m_logcounter;
 	bool				m_bCancelled;
 	
-	BOOL				m_bStrict;
-
 	BOOL				m_bIncludeMerges;
+	BOOL				m_bFirstParent;
+	BOOL				m_bAllBranch;
+	BOOL				m_bWholeProject;
+
 	git_revnum_t		m_lowestRev;
-	BOOL				m_bSaveStrict;
 	CTGitPathList	*   m_currentChangedArray;
 	LogChangedPathArray m_CurrentFilteredChangedArray;
 	CTGitPathList		m_currentChangedPathList;
@@ -265,7 +273,6 @@ private:
 	bool                m_bAscending;
 	static int			m_nSortColumnPathList;
 	static bool			m_bAscendingPathList;
-	CRegDWORD			m_regLastStrict;
 	//CRegDWORD			m_regMaxBugIDColWidth;
 	CButton				m_cHidePaths;
 	bool				m_bShowedAll;