Use correct length for buffer
[TortoiseGit.git] / src / TortoiseProc / LogDlg.cpp
blob68b23fd446807c747f51d139ab1f48f1f1aae746
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2003-2009, 2015 - TortoiseSVN
4 // Copyright (C) 2008-2016 - TortoiseGit
6 // This program is free software; you can redistribute it and/or
7 // modify it under the terms of the GNU General Public License
8 // as published by the Free Software Foundation; either version 2
9 // of the License, or (at your option) any later version.
11 // This program is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
16 // You should have received a copy of the GNU General Public License
17 // along with this program; if not, write to the Free Software Foundation,
18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20 #include "stdafx.h"
21 #include "TortoiseProc.h"
22 #include "cursor.h"
23 #include "StatGraphDlg.h"
24 #include "LogDlg.h"
25 #include "MessageBox.h"
26 #include "registry.h"
27 #include "AppUtils.h"
28 #include "StringUtils.h"
29 #include "UnicodeUtils.h"
30 #include "TempFile.h"
31 #include "IconMenu.h"
32 #include "BrowseRefsDlg.h"
33 #include "SmartHandle.h"
34 #include "LogOrdering.h"
35 #include "ClipboardHelper.h"
37 #define WM_TGIT_REFRESH_SELECTION (WM_APP + 1)
39 IMPLEMENT_DYNAMIC(CLogDlg, CResizableStandAloneDialog)
40 CLogDlg::CLogDlg(CWnd* pParent /*=nullptr*/)
41 : CResizableStandAloneDialog(CLogDlg::IDD, pParent)
42 , m_wParam(0)
43 , m_nSortColumn(0)
44 , m_bFollowRenames(false)
45 , m_bSelect(false)
46 , m_bSelectionMustBeSingle(true)
47 , m_bShowTags(true)
48 , m_bShowLocalBranches(true)
49 , m_bShowRemoteBranches(true)
50 , m_bNoMerges(false)
51 , m_iHidePaths(0)
52 , m_bWalkBehavior(FALSE)
53 , m_bFirstParent(false)
54 , m_bWholeProject(FALSE)
55 , m_iCompressedGraph(0)
56 , m_bShowWC(true)
58 , m_bSelectionMustBeContinuous(false)
60 , m_bCancelled(FALSE)
61 , m_pNotifyWindow(nullptr)
63 , m_bAscending(FALSE)
64 , m_hAccel(nullptr)
65 , m_bNavigatingWithSelect(false)
67 m_bFilterWithRegex = !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), FALSE);
68 m_bFilterCaseSensitively = !!CRegDWORD(L"Software\\TortoiseGit\\FilterCaseSensitively", FALSE);
69 m_bAsteriskLogPrefix = !!CRegDWORD(L"Software\\TortoiseGit\\AsteriskLogPrefix", TRUE);
70 m_LogList.m_SelectedFilters = CRegDWORD(_T("Software\\TortoiseGit\\SelectedLogFilters"), LOGFILTER_ALL);
72 CString str;
73 str=g_Git.m_CurrentDir;
74 str.Replace(_T(":"),_T("_"));
75 str=CString(_T("Software\\TortoiseGit\\LogDialog\\AllBranch\\"))+str;
77 m_regbAllBranch=CRegDWORD(str,FALSE);
79 m_AllBranchType = (AllBranchType)(DWORD)m_regbAllBranch;
80 switch (m_AllBranchType)
82 case AllBranchType::None:
83 m_bAllBranch = FALSE;
84 break;
85 case AllBranchType::AllBranches:
86 m_bAllBranch = TRUE;
87 break;
88 default:
89 m_bAllBranch = BST_INDETERMINATE;
92 str = g_Git.m_CurrentDir;
93 str.Replace(_T(":"),_T("_"));
94 m_regShowWholeProject = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ShowWholeProject\\") + str, FALSE);
95 m_bWholeProject = m_regShowWholeProject;
96 m_regbShowTags = CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowTags\\") + str, TRUE);
97 m_bShowTags = !!m_regbShowTags;
98 m_regbShowLocalBranches = CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowLocalBranches\\") + str, TRUE);
99 m_bShowLocalBranches = !!m_regbShowLocalBranches;
100 m_regbShowRemoteBranches = CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowRemoteBranches\\") + str, TRUE);
101 m_bShowRemoteBranches = !!m_regbShowRemoteBranches;
103 m_bShowUnversioned = CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE);
105 m_bShowGravatar = !!CRegDWORD(_T("Software\\TortoiseGit\\EnableGravatar"), FALSE);
106 m_regbShowGravatar = CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\ShowGravatar\\") + str, m_bShowGravatar);
107 m_bShowGravatar = !!m_regbShowGravatar;
108 m_bShowDescribe = !!CRegDWORD(_T("Software\\TortoiseGit\\ShowDescribe"));
109 m_bShowBranchRevNo = !!CRegDWORD(_T("Software\\TortoiseGit\\ShowBranchRevisionNumber"), FALSE);
112 CLogDlg::~CLogDlg()
114 m_regbAllBranch = (DWORD)m_AllBranchType;
115 m_regbShowTags = m_bShowTags;
116 m_regbShowLocalBranches = m_bShowLocalBranches;
117 m_regbShowRemoteBranches = m_bShowRemoteBranches;
118 m_regbShowGravatar = m_bShowGravatar;
121 void CLogDlg::DoDataExchange(CDataExchange* pDX)
123 CResizableStandAloneDialog::DoDataExchange(pDX);
124 DDX_Control(pDX, IDC_LOGLIST, m_LogList);
125 DDX_Control(pDX, IDC_LOGMSG, m_ChangedFileListCtrl);
126 DDX_Control(pDX, IDC_PROGRESS, m_LogProgress);
127 DDX_Control(pDX, IDC_SPLITTERTOP, m_wndSplitter1);
128 DDX_Control(pDX, IDC_SPLITTERBOTTOM, m_wndSplitter2);
129 DDX_Text(pDX, IDC_SEARCHEDIT, m_LogList.m_sFilterText);
130 DDX_Control(pDX, IDC_DATEFROM, m_DateFrom);
131 DDX_Control(pDX, IDC_DATETO, m_DateTo);
132 DDX_Control(pDX, IDC_LOG_JUMPTYPE, m_JumpType);
133 DDX_Control(pDX, IDC_LOG_JUMPUP, m_JumpUp);
134 DDX_Control(pDX, IDC_LOG_JUMPDOWN, m_JumpDown);
135 DDX_Text(pDX, IDC_LOGINFO, m_sLogInfo);
136 DDX_Check(pDX, IDC_LOG_ALLBRANCH,m_bAllBranch);
137 DDX_Check(pDX, IDC_WHOLE_PROJECT, m_bWholeProject);
138 DDX_Check(pDX, IDC_WALKBEHAVIOUR, m_bWalkBehavior);
139 DDX_Control(pDX, IDC_SEARCHEDIT, m_cFilter);
140 DDX_Control(pDX, IDC_STATIC_REF, m_staticRef);
141 DDX_Control(pDX, IDC_PIC_AUTHOR, m_gravatar);
142 DDX_Control(pDX, IDC_FILTER, m_cFileFilter);
145 BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)
146 ON_WM_CONTEXTMENU()
147 ON_WM_SETCURSOR()
148 ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGLIST, OnLvnItemchangedLoglist)
149 ON_NOTIFY(LVN_ITEMCHANGED, IDC_LOGMSG, OnLvnItemchangedLogmsg)
150 ON_NOTIFY(EN_LINK, IDC_MSGVIEW, OnEnLinkMsgview)
151 ON_EN_VSCROLL(IDC_MSGVIEW, OnEnscrollMsgview)
152 ON_EN_HSCROLL(IDC_MSGVIEW, OnEnscrollMsgview)
153 ON_BN_CLICKED(IDC_STATBUTTON, OnBnClickedStatbutton)
155 ON_MESSAGE(WM_TGIT_REFRESH_SELECTION, OnRefreshSelection)
156 ON_MESSAGE(WM_FILTEREDIT_INFOCLICKED, OnClickedInfoIcon)
157 ON_MESSAGE(WM_FILTEREDIT_CANCELCLICKED, OnClickedCancelFilter)
159 ON_MESSAGE(MSG_LOAD_PERCENTAGE,OnLogListLoading)
161 ON_EN_CHANGE(IDC_SEARCHEDIT, OnEnChangeSearchedit)
162 ON_WM_TIMER()
163 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATETO, OnDtnDatetimechangeDateto)
164 ON_NOTIFY(DTN_DATETIMECHANGE, IDC_DATEFROM, OnDtnDatetimechangeDatefrom)
165 ON_CBN_SELCHANGE(IDC_LOG_JUMPTYPE, &CLogDlg::OnCbnSelchangeJumpType)
166 ON_COMMAND(IDC_LOG_JUMPUP, &CLogDlg::OnBnClickedJumpUp)
167 ON_COMMAND(IDC_LOG_JUMPDOWN, &CLogDlg::OnBnClickedJumpDown)
168 ON_COMMAND(ID_GO_UP, &CLogDlg::OnBnClickedJumpUp)
169 ON_COMMAND(ID_GO_DOWN, &CLogDlg::OnBnClickedJumpDown)
170 ON_COMMAND(ID_EXITCLEARFILTER, OnExitClearFilter)
171 ON_BN_CLICKED(IDC_WALKBEHAVIOUR, OnBnClickedWalkBehaviour)
172 ON_BN_CLICKED(IDC_VIEW, OnBnClickedView)
173 ON_BN_CLICKED(IDC_WHOLE_PROJECT, OnBnClickShowWholeProject)
174 ON_NOTIFY(LVN_COLUMNCLICK,IDC_LOGLIST, OnLvnColumnclick)
175 ON_COMMAND(MSG_FETCHED_DIFF, OnBnClickedHidepaths)
176 ON_BN_CLICKED(IDC_LOG_ALLBRANCH, OnBnClickedAllBranch)
177 ON_EN_CHANGE(IDC_FILTER, OnEnChangeFileFilter)
179 ON_NOTIFY(DTN_DROPDOWN, IDC_DATEFROM, &CLogDlg::OnDtnDropdownDatefrom)
180 ON_WM_SIZE()
181 ON_BN_CLICKED(IDC_REFRESH, &CLogDlg::OnBnClickedRefresh)
182 ON_STN_CLICKED(IDC_STATIC_REF, &CLogDlg::OnBnClickedBrowseRef)
183 ON_COMMAND(ID_LOGDLG_REFRESH, &CLogDlg::OnBnClickedRefresh)
184 ON_COMMAND(ID_GO_BACKWARD_SELECT, &CLogDlg::GoBackAndSelect)
185 ON_COMMAND(ID_GO_FORWARD_SELECT, &CLogDlg::GoForwardAndSelect)
186 ON_COMMAND(ID_GO_BACKWARD, &CLogDlg::GoBack)
187 ON_COMMAND(ID_GO_FORWARD, &CLogDlg::GoForward)
188 ON_COMMAND(ID_SELECT_SEARCHFIELD, &CLogDlg::OnSelectSearchField)
189 ON_COMMAND(ID_LOGDLG_FIND, &CLogDlg::OnFind)
190 ON_COMMAND(ID_LOGDLG_FOCUSFILTER, &CLogDlg::OnFocusFilter)
191 ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)
192 ON_MESSAGE(MSG_REFLOG_CHANGED, OnRefLogChanged)
193 ON_REGISTERED_MESSAGE(WM_TASKBARBTNCREATED, OnTaskbarBtnCreated)
195 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ITEMCHANGED, &CLogDlg::OnFileListCtrlItemChanged)
196 ON_WM_MOVE()
197 ON_WM_MOVING()
198 ON_WM_SIZING()
199 ON_WM_CTLCOLOR()
200 ON_WM_PAINT()
201 END_MESSAGE_MAP()
203 enum JumpType
205 JumpType_AuthorEmail,
206 JumpType_CommitterEmail,
207 JumpType_MergePoint,
208 JumpType_Parent1,
209 JumpType_Parent2,
210 JumpType_Tag,
211 JumpType_TagFF,
212 JumpType_Branch,
213 JumpType_BranchFF,
214 JumpType_History,
217 void CLogDlg::SetParams(const CTGitPath& orgPath, const CTGitPath& path, CString hightlightRevision, CString range, DWORD limit, int limitScale/*=-1*/)
219 m_orgPath = orgPath;
220 m_path = path;
221 m_hightlightRevision = hightlightRevision;
223 if (range == GIT_REV_ZERO)
224 range = _T("HEAD");
226 if (!(range.IsEmpty() || range == _T("HEAD")))
228 m_bAllBranch = BST_UNCHECKED;
229 m_AllBranchType = AllBranchType::None;
232 SetRange(range);
234 if (limitScale == CFilterData::SHOW_NO_LIMIT || (!range.IsEmpty() && m_LogList.m_Filter.m_NumberOfLogsScale != CFilterData::SHOW_LAST_N_COMMITS))
235 m_LogList.m_Filter.m_NumberOfLogsScale = CFilterData::SHOW_NO_LIMIT;
236 if (limitScale >= CFilterData::SHOW_LAST_N_COMMITS && limit > 0)
238 // limitation from command line argument, so override the filter.
239 m_LogList.m_Filter.m_NumberOfLogs = limit;
240 m_LogList.m_Filter.m_NumberOfLogsScale = limitScale;
243 if (::IsWindow(m_hWnd))
244 UpdateData(FALSE);
247 void CLogDlg::SetFilter(const CString& findstr, LONG findtype, bool findregex)
249 m_LogList.m_sFilterText = findstr;
250 if (findtype)
251 m_LogList.m_SelectedFilters = findtype;
252 m_LogList.m_bFilterWithRegex = m_bFilterWithRegex = findregex;
255 BOOL CLogDlg::OnInitDialog()
257 CString temp;
258 CResizableStandAloneDialog::OnInitDialog();
259 CAppUtils::MarkWindowAsUnpinnable(m_hWnd);
261 // Let the TaskbarButtonCreated message through the UIPI filter. If we don't
262 // do this, Explorer would be unable to send that message to our window if we
263 // were running elevated. It's OK to make the call all the time, since if we're
264 // not elevated, this is a no-op.
265 CHANGEFILTERSTRUCT cfs = { sizeof(CHANGEFILTERSTRUCT) };
266 typedef BOOL STDAPICALLTYPE ChangeWindowMessageFilterExDFN(HWND hWnd, UINT message, DWORD action, PCHANGEFILTERSTRUCT pChangeFilterStruct);
267 CAutoLibrary hUser = AtlLoadSystemLibraryUsingFullPath(_T("user32.dll"));
268 if (hUser)
270 ChangeWindowMessageFilterExDFN *pfnChangeWindowMessageFilterEx = (ChangeWindowMessageFilterExDFN*)GetProcAddress(hUser, "ChangeWindowMessageFilterEx");
271 if (pfnChangeWindowMessageFilterEx)
273 pfnChangeWindowMessageFilterEx(m_hWnd, WM_TASKBARBTNCREATED, MSGFLT_ALLOW, &cfs);
276 m_pTaskbarList.Release();
277 if (FAILED(m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList)))
278 m_pTaskbarList = nullptr;
280 m_hAccel = LoadAccelerators(AfxGetResourceHandle(),MAKEINTRESOURCE(IDR_ACC_LOGDLG));
282 // use the state of the "stop on copy/rename" option from the last time
283 UpdateData(FALSE);
285 // set the font to use in the log message view, configured in the settings dialog
286 CAppUtils::CreateFontForLogs(m_logFont);
287 GetDlgItem(IDC_MSGVIEW)->SetFont(&m_logFont);
288 // make the log message rich edit control send a message when the mouse pointer is over a link
289 GetDlgItem(IDC_MSGVIEW)->SendMessage(EM_SETEVENTMASK, NULL, ENM_LINK | ENM_SCROLL);
291 // "unrelated paths" should be in gray color
292 m_iHidePaths = 2;
294 // set up the columns
295 m_LogList.DeleteAllItems();
297 m_LogList.m_Path=m_path;
298 m_LogList.m_hasWC = !GitAdminDir::IsBareRepo(g_Git.m_CurrentDir);
299 m_LogList.m_bShowWC = m_LogList.m_hasWC && m_bShowWC;
300 m_LogList.InsertGitColumn();
302 if (m_bWholeProject)
303 m_LogList.m_Path.Reset();
305 m_ChangedFileListCtrl.Init(GITSLC_COLEXT | GITSLC_COLSTATUS |GITSLC_COLADD|GITSLC_COLDEL, _T("LogDlg"), (GITSLC_POPALL ^ (GITSLC_POPIGNORE|GITSLC_POPRESTORE)), false, m_LogList.m_hasWC, GITSLC_COLEXT | GITSLC_COLSTATUS | GITSLC_COLADD| GITSLC_COLDEL);
307 GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);
309 SetDlgTitle();
311 CheckRegexpTooltip();
313 SetSplitterRange();
315 // the filter control has a 'cancel' button (the red 'X'), we need to load its bitmap
316 m_cFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
317 m_cFilter.SetInfoIcon(IDI_LOGFILTER);
318 m_cFilter.SetValidator(this);
320 AdjustControlSize(IDC_LOG_ALLBRANCH);
321 AdjustControlSize(IDC_WHOLE_PROJECT);
323 GetClientRect(m_DlgOrigRect);
324 m_LogList.GetClientRect(m_LogListOrigRect);
325 GetDlgItem(IDC_MSGVIEW)->GetClientRect(m_MsgViewOrigRect);
326 m_ChangedFileListCtrl.GetClientRect(m_ChgOrigRect);
328 m_Brush.CreateSolidBrush(RGB(174, 200, 255));
330 m_DateFrom.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS|MCS_NOTODAY|MCS_NOTRAILINGDATES|MCS_NOSELCHANGEONNAV);
331 m_DateTo.SendMessage(DTM_SETMCSTYLE, 0, MCS_WEEKNUMBERS | MCS_NOTRAILINGDATES | MCS_NOSELCHANGEONNAV);
333 m_staticRef.SetURL(CString());
335 AddMainAnchors();
336 SetFilterCueText();
338 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_LOCAL_BRANCHES;
339 if (m_AllBranchType == AllBranchType::AllBranches)
340 m_LogList.m_ShowMask|=CGit::LOG_INFO_ALL_BRANCH;
341 else if (m_AllBranchType == AllBranchType::AllLocalBranches)
342 m_LogList.m_ShowMask |= CGit::LOG_INFO_LOCAL_BRANCHES;
343 else if (m_AllBranchType == AllBranchType::AllBasicRefs)
344 m_LogList.m_ShowMask |= CGit::LOG_INFO_BASIC_REFS;
345 else
346 m_LogList.m_ShowMask&=~CGit::LOG_INFO_ALL_BRANCH;
348 HandleShowLabels(m_bShowTags, LOGLIST_SHOWTAGS);
349 HandleShowLabels(m_bShowLocalBranches, LOGLIST_SHOWLOCALBRANCHES);
350 HandleShowLabels(m_bShowRemoteBranches, LOGLIST_SHOWREMOTEBRANCHES);
352 // SetPromptParentWindow(m_hWnd);
353 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_AUTHOREMAIL)));
354 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_COMMITTEREMAIL)));
355 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_MERGEPOINT)));
356 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT1)));
357 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_PARENT2)));
358 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG)));
359 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_TAG_FF)));
360 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH)));
361 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_BRANCH_FF)));
362 m_JumpType.AddString(CString(MAKEINTRESOURCE(IDS_PROC_SELECTION_HISTORY)));
363 m_JumpType.SetCurSel(0);
364 m_JumpUp.SetIcon((HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPUP), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR));
365 m_JumpDown.SetIcon((HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_JUMPDOWN), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR));
367 if (hWndExplorer)
368 CenterWindow(CWnd::FromHandle(hWndExplorer));
369 EnableSaveRestore(_T("LogDlg"));
371 DWORD yPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
372 DWORD yPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
373 RECT rcDlg, rcLogList, rcChgMsg;
374 GetClientRect(&rcDlg);
375 m_LogList.GetWindowRect(&rcLogList);
376 ScreenToClient(&rcLogList);
377 m_ChangedFileListCtrl.GetWindowRect(&rcChgMsg);
378 ScreenToClient(&rcChgMsg);
379 if (yPos1 && ((LONG)yPos1 < rcDlg.bottom - 185))
381 RECT rectSplitter;
382 m_wndSplitter1.GetWindowRect(&rectSplitter);
383 ScreenToClient(&rectSplitter);
384 int delta = yPos1 - rectSplitter.top;
386 if ((rcLogList.bottom + delta > rcLogList.top)&&(rcLogList.bottom + delta < rcChgMsg.bottom - 30))
388 m_wndSplitter1.SetWindowPos(nullptr, rectSplitter.left, yPos1, 0, 0, SWP_NOSIZE);
389 DoSizeV1(delta);
392 if (yPos2 && ((LONG)yPos2 < rcDlg.bottom - 153))
394 RECT rectSplitter;
395 m_wndSplitter2.GetWindowRect(&rectSplitter);
396 ScreenToClient(&rectSplitter);
397 int delta = yPos2 - rectSplitter.top;
399 if ((rcChgMsg.top + delta < rcChgMsg.bottom)&&(rcChgMsg.top + delta > rcLogList.top + 30))
401 m_wndSplitter2.SetWindowPos(nullptr, rectSplitter.left, yPos2, 0, 0, SWP_NOSIZE);
402 DoSizeV2(delta);
406 SetSplitterRange();
408 if (m_bSelect)
410 // the dialog is used to select revisions
411 // enable the OK button if appropriate
412 EnableOKButton();
414 else
416 // the dialog is used to just view log messages
417 // hide the OK button and set text on Cancel button to OK
418 GetDlgItemText(IDOK, temp);
419 SetDlgItemText(IDCANCEL, temp);
420 GetDlgItem(IDOK)->ShowWindow(SW_HIDE);
423 // first start a thread to obtain the log messages without
424 // blocking the dialog
425 //m_tTo = 0;
426 //m_tFrom = (DWORD)-1;
428 // scroll to user selected or current revision
429 if (m_hightlightRevision.IsEmpty() || g_Git.GetHash(m_LogList.m_lastSelectedHash, m_hightlightRevision))
431 if (g_Git.GetHash(m_LogList.m_lastSelectedHash, _T("HEAD")))
432 MessageBox(g_Git.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR);
435 if (g_Git.GetConfigValueBool(_T("tgit.logshowpatch")))
436 TogglePatchView();
438 m_LogList.FetchLogAsync(this);
439 ShowGravatar();
440 m_gravatar.Init();
442 m_cFileFilter.SetCancelBitmaps(IDI_CANCELNORMAL, IDI_CANCELPRESSED);
443 m_cFileFilter.SetInfoIcon(IDI_FILTEREDIT);
444 temp.LoadString(IDS_FILEDIFF_FILTERCUE);
445 temp = _T(" ") + temp;
446 m_cFileFilter.SetCueBanner(temp);
448 GetDlgItem(IDC_LOGLIST)->SetFocus();
450 m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxRefHistoryItems"), 5));
451 CString reg;
452 reg.Format(_T("Software\\TortoiseGit\\History\\log-refs\\%s"), (LPCTSTR)g_Git.m_CurrentDir);
453 reg.Replace(_T(':'),_T('_'));
454 m_History.Load(reg, _T("ref"));
456 reg.Format(_T("Software\\TortoiseGit\\History\\LogDlg_Limits\\%s\\FromDate"), (LPCTSTR)g_Git.m_CurrentDir);
457 reg.Replace(_T(':'), _T('_'));
458 m_regLastSelectedFromDate = CRegString(reg);
460 ShowStartRef();
461 return FALSE;
464 HBRUSH CLogDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
466 HBRUSH hbr = __super::OnCtlColor(pDC, pWnd, nCtlColor);
468 if ((m_LogList.m_Filter.m_NumberOfLogsScale >= CFilterData::SHOW_LAST_N_COMMITS || m_LogList.m_Filter.m_NumberOfLogsScale == CFilterData::SHOW_LAST_SEL_DATE && m_LogList.m_Filter.m_From != -1) && pWnd->GetDlgCtrlID() == IDC_FROMLABEL)
470 pDC->SetBkMode(TRANSPARENT);
471 return m_Brush;
474 return hbr;
477 void CLogDlg::OnPaint()
479 CPaintDC dc(this);
481 if (!(m_LogList.m_Filter.m_NumberOfLogsScale >= CFilterData::SHOW_LAST_N_COMMITS || m_LogList.m_Filter.m_NumberOfLogsScale == CFilterData::SHOW_LAST_SEL_DATE && m_LogList.m_Filter.m_From != -1))
482 return;
484 CWnd* pWnd = GetDlgItem(IDC_FROMLABEL);
485 if (!pWnd)
486 return;
488 CRect rect;
489 pWnd->GetWindowRect(&rect);
490 ScreenToClient(rect);
491 rect.left -= 5;
492 rect.top -= 3;
493 rect.bottom += 3;
495 dc.FillRect(rect, &m_Brush);
498 LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM /*lParam*/)
500 int cur=(int)wParam;
502 if( cur == GITLOG_START )
504 CString temp;
505 temp.LoadString(IDS_PROGRESSWAIT);
507 this->m_LogList.ShowText(temp, true);
509 // We use a progress bar while getting the logs
510 m_LogProgress.SetRange32(0, 100);
511 m_LogProgress.SetPos(0);
512 if (m_pTaskbarList)
514 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
515 m_pTaskbarList->SetProgressValue(m_hWnd, 0, 100);
518 GetDlgItem(IDC_WALKBEHAVIOUR)->ShowWindow(SW_HIDE);
519 GetDlgItem(IDC_VIEW)->ShowWindow(SW_HIDE);
520 GetDlgItem(IDC_STATBUTTON)->ShowWindow(SW_HIDE);
521 GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);
523 DialogEnableWindow(IDC_WALKBEHAVIOUR, FALSE);
524 DialogEnableWindow(IDC_STATBUTTON, FALSE);
525 //DialogEnableWindow(IDC_REFRESH, FALSE);
526 DialogEnableWindow(IDC_VIEW, FALSE);
529 else if( cur == GITLOG_END)
531 if(this->m_LogList.HasText())
533 this->m_LogList.ClearText();
535 UpdateLogInfoLabel();
537 if (m_pTaskbarList)
538 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NOPROGRESS);
540 DialogEnableWindow(IDC_WHOLE_PROJECT, !m_bFollowRenames && !m_path.IsEmpty());
542 DialogEnableWindow(IDC_STATBUTTON, !(m_LogList.m_arShownList.empty() || m_LogList.m_arShownList.size() == 1 && m_LogList.m_bShowWC));
543 DialogEnableWindow(IDC_REFRESH, TRUE);
544 DialogEnableWindow(IDC_VIEW, TRUE);
545 DialogEnableWindow(IDC_WALKBEHAVIOUR, TRUE);
546 // PostMessage(WM_TIMER, LOGFILTER_TIMER);
547 GetDlgItem(IDC_WALKBEHAVIOUR)->ShowWindow(SW_SHOW);
548 GetDlgItem(IDC_VIEW)->ShowWindow(SW_SHOW);
549 GetDlgItem(IDC_STATBUTTON)->ShowWindow(SW_SHOW);
550 GetDlgItem(IDC_PROGRESS)->ShowWindow(FALSE);
551 //CTime time=m_LogList.GetOldestTime();
552 CTime begin,end;
553 m_LogList.GetTimeRange(begin,end);
555 if (m_LogList.m_Filter.m_From > 0 && m_LogList.m_Filter.m_NumberOfLogsScale >= CFilterData::SHOW_LAST_SEL_DATE)
556 begin = m_LogList.m_Filter.m_From;
557 m_DateFrom.SetTime(&begin);
558 if (m_LogList.m_Filter.m_To != -1)
559 end = m_LogList.m_Filter.m_To;
560 m_DateTo.SetTime(&end);
561 Invalidate();
563 else
565 if(this->m_LogList.HasText())
567 this->m_LogList.ClearText();
568 this->m_LogList.Invalidate();
570 UpdateLogInfoLabel();
571 m_LogProgress.SetPos(cur);
572 if (m_pTaskbarList)
574 m_pTaskbarList->SetProgressState(m_hWnd, TBPF_NORMAL);
575 m_pTaskbarList->SetProgressValue(m_hWnd, cur, 100);
578 return 0;
580 void CLogDlg::SetDlgTitle()
582 if (m_sTitle.IsEmpty())
583 GetWindowText(m_sTitle);
585 if (m_LogList.m_Path.IsEmpty() || m_orgPath.GetWinPathString().IsEmpty())
586 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, m_sTitle);
587 else
588 CAppUtils::SetWindowTitle(m_hWnd, m_orgPath.GetWinPathString(), m_sTitle);
591 void CLogDlg::CheckRegexpTooltip()
593 CWnd *pWnd = GetDlgItem(IDC_SEARCHEDIT);
594 // Since tooltip describes regexp features, show it only if regexps are enabled.
595 if (m_bFilterWithRegex)
596 m_tooltips.AddTool(pWnd, IDS_LOG_FILTER_REGEX_TT);
597 else
598 m_tooltips.DelTool(pWnd);
601 void CLogDlg::EnableOKButton()
603 if (m_bSelect)
605 // the dialog is used to select revisions
606 if (m_bSelectionMustBeSingle)
608 // enable OK button if only a single revision is selected
609 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()==1));
611 else if (m_bSelectionMustBeContinuous)
612 DialogEnableWindow(IDOK, (m_LogList.GetSelectedCount()!=0)&&(m_LogList.IsSelectionContinuous()));
613 else
614 DialogEnableWindow(IDOK, m_LogList.GetSelectedCount()!=0);
616 else
617 DialogEnableWindow(IDOK, TRUE);
620 bool LookLikeGitHash(const CString& msg, int &pos)
622 int c = 0;
623 for (; pos < msg.GetLength(); ++pos)
625 if (msg[pos] >= '0' && msg[pos] <= '9' || msg[pos] >= 'a' && msg[pos] <= 'f')
626 c++;
627 else
628 return c >= g_Git.GetShortHASHLength() && c <= GIT_HASH_SIZE * 2 && msg[pos] != '@';
630 return c >= g_Git.GetShortHASHLength() && c <= GIT_HASH_SIZE * 2;
633 std::vector<CHARRANGE> FindGitHashPositions(const CString& msg, int offset)
635 std::vector<CHARRANGE> result;
636 offset = offset < 0 ? 0 : offset;
637 int old = offset;
638 while (offset < msg.GetLength())
640 old = offset;
641 TCHAR e = msg[offset];
642 if (e == '\n')
644 ++offset;
645 if (msg.Mid(offset, 11) == _T("git-svn-id:")
646 || msg.Mid(offset, 14) == _T("Signed-off-by:")
647 || msg.Mid(offset, 10) == _T("Change-Id:")
650 offset += 10;
651 while (offset < msg.GetLength())
653 if (msg[++offset] == '\n')
654 break;
656 continue;
659 else if (e >= 'A' && e <= 'Z' || e >= 'h' && e <= 'z')
663 e = msg[++offset];
664 } while (offset < msg.GetLength() && (e >= 'A' && e <= 'Z' || e >= 'a' && e <= 'z' || e >= '0' && e <= '9'));
666 else if (e >= 'a' && e <= 'g' || e >= '0' && e <= '9')
668 if (e == 'g')
670 ++old;
671 ++offset;
673 if (LookLikeGitHash(msg, offset))
675 TCHAR d = offset < msg.GetLength() ? msg[offset] : '\0';
676 if (!((d >= 'A' && d <= 'Z') || (d >= 'a' && d <= 'z') || (d >= '0' && d <= '9')))
678 CHARRANGE range = { old, offset };
679 result.push_back(range);
682 ++offset;
684 else
685 ++offset;
688 return result;
691 BOOL FindGitHash(const CString& msg, int offset, CWnd *pWnd)
693 std::vector<CHARRANGE> positions = FindGitHashPositions(msg, offset);
694 CAppUtils::SetCharFormat(pWnd, CFM_LINK, CFE_LINK, positions);
696 return positions.empty() ? FALSE : TRUE;
699 static int DescribeCommit(CGitHash& hash, CString& result)
701 CAutoRepository repo(g_Git.GetGitRepository());
702 if (!repo)
703 return -1;
704 CAutoObject commit;
705 if (git_object_lookup(commit.GetPointer(), repo, (const git_oid *)hash.m_hash, GIT_OBJ_COMMIT))
706 return -1;
708 CAutoDescribeResult describe;
709 git_describe_options describe_options = GIT_DESCRIBE_OPTIONS_INIT;
710 describe_options.describe_strategy = CRegDWORD(_T("Software\\TortoiseGit\\DescribeStrategy"), GIT_DESCRIBE_DEFAULT);
711 if (git_describe_commit(describe.GetPointer(), (git_object *)commit, &describe_options))
712 return -1;
714 CAutoBuf describe_buf;
715 git_describe_format_options format_options = GIT_DESCRIBE_FORMAT_OPTIONS_INIT;
716 format_options.abbreviated_size = CRegDWORD(_T("Software\\TortoiseGit\\DescribeAbbreviatedSize"), GIT_DESCRIBE_DEFAULT_ABBREVIATED_SIZE);
717 format_options.always_use_long_format = CRegDWORD(_T("Software\\TortoiseGit\\DescribeAlwaysLong"));
718 if (git_describe_format(describe_buf, describe, &format_options))
719 return -1;
721 result = CUnicodeUtils::GetUnicode(describe_buf->ptr);
722 return 0;
725 void CLogDlg::FillLogMessageCtrl(bool bShow /* = true*/)
727 // we fill here the log message rich edit control,
728 // and also populate the changed files list control
729 // according to the selected revision(s).
731 CRichEditCtrl * pMsgView = (CRichEditCtrl*)GetDlgItem(IDC_MSGVIEW);
732 // empty the log message view
733 pMsgView->SetWindowText(_T(" "));
734 FillPatchView(true);
735 // empty the changed files list
736 m_ChangedFileListCtrl.SetRedraw(FALSE);
737 // InterlockedExchange(&m_bNoDispUpdates, TRUE);
738 m_ChangedFileListCtrl.DeleteAllItems();
740 // if we're not here to really show a selected revision, just
741 // get out of here after clearing the views, which is what is intended
742 // if that flag is not set.
743 if (!bShow)
745 // force a redraw
746 m_ChangedFileListCtrl.Invalidate();
747 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
748 m_ChangedFileListCtrl.SetRedraw(TRUE);
749 m_gravatar.LoadGravatar();
750 return;
753 // depending on how many revisions are selected, we have to do different
754 // tasks.
755 int selCount = m_LogList.GetSelectedCount();
756 if (selCount == 0)
758 // if nothing is selected, we have nothing more to do
759 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
760 m_ChangedFileListCtrl.SetRedraw(TRUE);
761 m_gravatar.LoadGravatar();
762 return;
764 else if (selCount == 1)
766 // if one revision is selected, we have to fill the log message view
767 // with the corresponding log message, and also fill the changed files
768 // list fully.
769 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
770 size_t selIndex = m_LogList.GetNextSelectedItem(pos);
771 if (selIndex >= m_LogList.m_arShownList.size())
773 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
774 m_ChangedFileListCtrl.SetRedraw(TRUE);
775 return;
777 GitRevLoglist* pLogEntry = m_LogList.m_arShownList.SafeGetAt(selIndex);
780 m_gravatar.LoadGravatar(pLogEntry->GetAuthorEmail());
782 CString out_describe;
783 if (m_bShowDescribe)
785 CString result;
786 if (!DescribeCommit(pLogEntry->m_CommitHash, result))
787 out_describe = _T("Describe: ") + result + _T("\r\n");
790 CString out_counter;
791 if (m_bShowBranchRevNo && !pLogEntry->m_CommitHash.IsEmpty())
793 bool isFirstParentCommit = !pLogEntry->m_Lanes.empty() && Lanes::isActive(pLogEntry->m_Lanes[0]);
795 if (isFirstParentCommit)
797 CString rev_counter, rev_err;
798 if (g_Git.Run(_T("git.exe rev-list --count --first-parent " + pLogEntry->m_CommitHash.ToString()), &rev_counter, &rev_err, CP_UTF8))
799 CMessageBox::Show(GetSafeHwnd(), L"Could not get rev count\n" + rev_counter + L"\n" + rev_err, _T("TortoiseGit"), MB_ICONERROR);
800 else
801 out_counter = _T(", ") + CString(MAKEINTRESOURCE(IDS_REV_COUNTER)) + _T(": ") + rev_counter.Trim();
805 // set the log message text
806 pMsgView->SetWindowText(CString(MAKEINTRESOURCE(IDS_HASH)) + _T(": ") + pLogEntry->m_CommitHash.ToString() + out_counter + _T("\r\n") + out_describe + _T("\r\n"));
807 // turn bug ID's into links if the bugtraq: properties have been set
808 // and we can find a match of those in the log message
810 pMsgView->SetSel(-1,-1);
811 CAppUtils::SetCharFormat(pMsgView, CFM_BOLD, CFE_BOLD);
813 CString msg = m_bAsteriskLogPrefix ? _T("* ") : _T("");
814 msg+=pLogEntry->GetSubject();
815 pMsgView->ReplaceSel(msg);
817 pMsgView->SetSel(-1,-1);
818 CAppUtils::SetCharFormat(pMsgView, CFM_BOLD, 0);
820 msg=_T("\n");
821 msg+=pLogEntry->GetBody();
823 if(!pLogEntry->m_Notes.IsEmpty())
825 msg+= _T("\n*") + CString(MAKEINTRESOURCE(IDS_NOTES)) + _T("* ");
826 msg+= pLogEntry->m_Notes;
827 msg+= _T("\n\n");
830 CString tagInfo = m_LogList.GetTagInfo(pLogEntry);
831 if(!tagInfo.IsEmpty())
832 tagInfo = _T("\n*") + CString(MAKEINTRESOURCE(IDS_PROC_LOG_TAGINFO)) + _T("*\n\n") + tagInfo;
833 msg += tagInfo;
835 HCURSOR old = GetCursor(); // hack to fix issue #2792
836 pMsgView->ReplaceSel(msg);
837 SetCursor(old);
839 CString text;
840 pMsgView->GetWindowText(text);
841 // the rich edit control doesn't count the CR char!
842 // to be exact: CRLF is treated as one char.
843 text.Remove('\r');
845 int findHashStart = text.Find('\n');
846 if (!out_describe.IsEmpty())
847 findHashStart = text.Find('\n', findHashStart + 1);
848 FindGitHash(text, findHashStart, pMsgView);
849 m_LogList.m_ProjectProperties.FindBugID(text, pMsgView);
850 CAppUtils::StyleURLs(text, pMsgView);
851 if (((DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\StyleCommitMessages"), TRUE)) == TRUE)
852 CAppUtils::FormatTextInRichEditControl(pMsgView);
854 CHARRANGE range;
855 range.cpMin = 0;
856 range.cpMax = 0;
857 pMsgView->SendMessage(EM_EXSETSEL, NULL, (LPARAM)&range);
859 if (!pLogEntry->m_IsDiffFiles)
861 m_ChangedFileListCtrl.SetBusyString(CString(MAKEINTRESOURCE(IDS_PROC_LOG_FETCHINGFILES)));
862 m_ChangedFileListCtrl.SetBusy(TRUE);
863 m_ChangedFileListCtrl.SetRedraw(TRUE);
864 return;
867 CString matchpath=this->m_path.GetGitPathString();
869 CTGitPathList& files = pLogEntry->GetFiles(&m_LogList);
870 int count = files.GetCount();
871 if (!m_bWholeProject && !matchpath.IsEmpty() && m_iHidePaths)
873 int matchPathLen = matchpath.GetLength();
874 bool somethingHidden = false;
875 for (int i = 0; i < count; ++i)
877 ((CTGitPath&)files[i]).m_Action &= ~(CTGitPath::LOGACTIONS_HIDE | CTGitPath::LOGACTIONS_GRAY);
879 if (files[i].GetGitPathString().Left(matchPathLen) != matchpath && ((files[i].m_Action & (CTGitPath::LOGACTIONS_REPLACED | CTGitPath::LOGACTIONS_COPY)) == 0 || files[i].GetGitOldPathString().Left(matchPathLen) != matchpath))
881 somethingHidden = true;
882 if (m_iHidePaths == 1)
883 ((CTGitPath&)files[i]).m_Action |= CTGitPath::LOGACTIONS_HIDE;
884 else if (m_iHidePaths == 2)
885 ((CTGitPath&)files[i]).m_Action |= CTGitPath::LOGACTIONS_GRAY;
888 if (somethingHidden)
889 pLogEntry->GetAction(&m_LogList) |= CTGitPath::LOGACTIONS_HIDE;
890 else
891 pLogEntry->GetAction(&m_LogList) &= ~CTGitPath::LOGACTIONS_HIDE;
893 else if (pLogEntry->GetAction(&m_LogList) & CTGitPath::LOGACTIONS_HIDE)
895 pLogEntry->GetAction(&m_LogList) &= ~CTGitPath::LOGACTIONS_HIDE;
896 for (int i = 0 ; i < count; ++i)
897 ((CTGitPath&)files[i]).m_Action &= ~(CTGitPath::LOGACTIONS_HIDE | CTGitPath::LOGACTIONS_GRAY);
900 CString fileFilter;
901 m_cFileFilter.GetWindowText(fileFilter);
902 if (!fileFilter.IsEmpty())
904 fileFilter.MakeLower();
905 bool somethingHidden = false;
906 for (int i = 0; i < count; ++i)
908 CString sPath(files[i].GetGitPathString());
909 sPath.MakeLower();
910 if (sPath.Find(fileFilter) < 0)
912 ((CTGitPath&)files[i]).m_Action |= CTGitPath::LOGACTIONS_HIDE;
913 somethingHidden = true;
916 if (somethingHidden)
917 pLogEntry->GetAction(&m_LogList) |= CTGitPath::LOGACTIONS_HIDE;
920 m_ChangedFileListCtrl.UpdateWithGitPathList(files);
921 m_ChangedFileListCtrl.m_CurrentVersion=pLogEntry->m_CommitHash;
922 if (pLogEntry->m_CommitHash.IsEmpty() && m_bShowUnversioned)
924 m_ChangedFileListCtrl.UpdateUnRevFileList(pLogEntry->GetUnRevFiles());
925 m_ChangedFileListCtrl.Show(GITSLC_SHOWVERSIONED | GITSLC_SHOWUNVERSIONED);
927 else
928 m_ChangedFileListCtrl.Show(GITSLC_SHOWVERSIONED);
930 m_ChangedFileListCtrl.SetBusy(FALSE);
932 m_ChangedFileListCtrl.SetRedraw(TRUE);
933 return;
937 else
939 // more than one revision is selected:
940 // the log message view must be emptied
941 // the changed files list contains all the changed paths from all
942 // selected revisions, with 'doubles' removed
943 m_gravatar.LoadGravatar();
946 // redraw the views
947 // InterlockedExchange(&m_bNoDispUpdates, FALSE);
949 // sort according to the settings
950 if (m_nSortColumnPathList > 0)
951 SetSortArrow(&m_ChangedFileListCtrl, m_nSortColumnPathList, m_bAscendingPathList);
952 else
953 SetSortArrow(&m_ChangedFileListCtrl, -1, false);
954 m_ChangedFileListCtrl.SetRedraw(TRUE);
957 void CLogDlg::FillPatchView(bool onlySetTimer)
959 if (!::IsWindow(this->m_patchViewdlg.m_hWnd))
960 return;
962 KillTimer(LOG_FILLPATCHVTIMER);
963 if (onlySetTimer)
965 SetTimer(LOG_FILLPATCHVTIMER, 100, nullptr);
966 return;
969 POSITION posLogList = m_LogList.GetFirstSelectedItemPosition();
970 if (posLogList == nullptr)
972 m_patchViewdlg.ClearView();
973 return; // nothing is selected, get out of here
976 GitRev* pLogEntry = m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(posLogList));
977 if (pLogEntry == nullptr || m_LogList.GetNextSelectedItem(posLogList) != -1)
979 m_patchViewdlg.ClearView();
980 return;
983 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
984 CString out;
986 if (pos == nullptr)
988 int diffContext = g_Git.GetConfigValueInt32(_T("diff.context"), -1);
989 CStringA outA;
990 CString rev1 = pLogEntry->m_CommitHash.IsEmpty() ? _T("HEAD") : (pLogEntry->m_CommitHash.ToString() + _T("~1"));
991 CString rev2 = pLogEntry->m_CommitHash.IsEmpty() ? GIT_REV_ZERO : pLogEntry->m_CommitHash.ToString();
992 g_Git.GetUnifiedDiff(CTGitPath(), rev1, rev2, &outA, false, false, diffContext);
993 out = CUnicodeUtils::GetUnicode(outA);
995 else
997 while (pos)
999 int nSelect = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
1000 CTGitPath * p = (CTGitPath*)m_ChangedFileListCtrl.GetItemData(nSelect);
1001 if (p && !(p->m_Action&CTGitPath::LOGACTIONS_UNVER))
1003 CString cmd;
1004 if (pLogEntry->m_CommitHash.IsEmpty())
1005 cmd.Format(_T("git.exe diff HEAD -- \"%s\""), (LPCTSTR)p->GetGitPathString());
1006 else
1007 cmd.Format(_T("git.exe diff %s^%d..%s -- \"%s\""), (LPCTSTR)pLogEntry->m_CommitHash.ToString(), p->m_ParentNo + 1, (LPCTSTR)pLogEntry->m_CommitHash.ToString(), (LPCTSTR)p->GetGitPathString());
1008 g_Git.Run(cmd, &out, CP_UTF8);
1013 m_patchViewdlg.SetText(out);
1016 void CLogDlg::TogglePatchView()
1018 m_patchViewdlg.m_ParentDlg = this;
1019 if (!IsWindow(m_patchViewdlg.m_hWnd))
1021 BOOL viewPatchEnabled = FALSE;
1022 viewPatchEnabled = g_Git.GetConfigValueBool(_T("tgit.logshowpatch"));
1023 if (viewPatchEnabled == FALSE)
1024 g_Git.SetConfigValue(_T("tgit.logshowpatch"), _T("true"));
1025 m_patchViewdlg.Create(IDD_PATCH_VIEW, this);
1026 m_patchViewdlg.m_ctrlPatchView.Call(SCI_SETSCROLLWIDTHTRACKING, TRUE);
1027 CRect rect;
1028 this->GetWindowRect(&rect);
1030 m_patchViewdlg.ShowWindow(SW_SHOW);
1031 m_patchViewdlg.SetWindowPos(nullptr, rect.right, rect.top, rect.Width(), rect.Height(), SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOZORDER);
1033 FillPatchView();
1035 else
1037 g_Git.SetConfigValue(_T("tgit.logshowpatch"), _T("false"));
1038 m_patchViewdlg.ShowWindow(SW_HIDE);
1039 m_patchViewdlg.DestroyWindow();
1043 LRESULT CLogDlg::OnFileListCtrlItemChanged(WPARAM /*wparam*/, LPARAM /*lparam*/)
1045 FillPatchView(true);
1046 return 0;
1049 void CLogDlg::OnMoving(UINT fwSide, LPRECT pRect)
1051 __super::OnMoving(fwSide, pRect);
1053 if (!::IsWindow(m_patchViewdlg.m_hWnd))
1054 return;
1056 RECT patchrect;
1057 m_patchViewdlg.GetWindowRect(&patchrect);
1058 if (!::IsWindow(m_hWnd))
1059 return;
1061 RECT thisrect;
1062 GetWindowRect(&thisrect);
1063 if (patchrect.left == thisrect.right)
1065 m_patchViewdlg.SetWindowPos(nullptr, patchrect.left - (thisrect.left - pRect->left), patchrect.top - (thisrect.top - pRect->top), 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
1069 void CLogDlg::OnSizing(UINT fwSide, LPRECT pRect)
1071 __super::OnSizing(fwSide, pRect);
1073 if (!::IsWindow(this->m_patchViewdlg.m_hWnd))
1074 return;
1076 CRect thisrect, patchrect;
1077 this->GetWindowRect(thisrect);
1078 this->m_patchViewdlg.GetWindowRect(patchrect);
1079 if (thisrect.right != patchrect.left)
1080 return;
1082 patchrect.left -= (thisrect.right - pRect->right);
1083 patchrect.right -= (thisrect.right - pRect->right);
1085 if (patchrect.bottom == thisrect.bottom)
1086 patchrect.bottom -= (thisrect.bottom - pRect->bottom);
1087 if (patchrect.top == thisrect.top)
1088 patchrect.top -= thisrect.top - pRect->top;
1089 m_patchViewdlg.MoveWindow(patchrect);
1092 void CLogDlg::OnSelectSearchField()
1094 m_cFilter.SetSel(0, -1, FALSE);
1095 m_cFilter.SetFocus();
1098 void CLogDlg::GoBack()
1100 GoBackForward(false, false);
1103 void CLogDlg::GoForward()
1105 GoBackForward(false, true);
1108 void CLogDlg::GoBackAndSelect()
1110 GoBackForward(true, false);
1113 void CLogDlg::GoForwardAndSelect()
1115 GoBackForward(true, true);
1118 void CLogDlg::GoBackForward(bool select, bool bForward)
1120 m_LogList.m_highlight.Empty();
1121 CGitHash gotoHash;
1122 if (bForward ? m_LogList.m_selectionHistory.GoForward(gotoHash) : m_LogList.m_selectionHistory.GoBack(gotoHash))
1124 int i;
1125 for (i = 0; i < (int)m_LogList.m_arShownList.size(); ++i)
1127 GitRev* rev = m_LogList.m_arShownList.SafeGetAt(i);
1128 if (!rev) continue;
1129 if (rev->m_CommitHash == gotoHash)
1131 m_LogList.EnsureVisible(i, FALSE);
1132 if (select)
1134 m_LogList.m_highlight.Empty();
1135 m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED | LVIS_FOCUSED);
1136 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1137 while (pos)
1139 int index = m_LogList.GetNextSelectedItem(pos);
1140 if (index >= 0)
1141 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
1143 m_bNavigatingWithSelect = true;
1144 m_LogList.SetItemState(i, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
1145 m_LogList.SetSelectionMark(i);
1146 m_bNavigatingWithSelect = false;
1148 else
1149 m_LogList.m_highlight = gotoHash;
1150 m_LogList.Invalidate();
1151 return;
1154 if (i == (int)m_LogList.m_arShownList.size())
1156 CString msg;
1157 msg.Format(IDS_LOG_NOT_VISIBLE, (LPCTSTR)gotoHash.ToString());
1158 MessageBox(msg, _T("TortoiseGit"), MB_OK | MB_ICONINFORMATION);
1159 return;
1162 PlaySound((LPCTSTR)SND_ALIAS_SYSTEMASTERISK, nullptr, SND_ASYNC | SND_ALIAS_ID);
1165 void CLogDlg::OnBnClickedRefresh()
1167 Refresh (true);
1170 void CLogDlg::Refresh (bool clearfilter /*autoGoOnline*/)
1172 if (m_bSelect)
1173 DialogEnableWindow(IDOK, FALSE);
1174 m_LogList.Refresh(clearfilter);
1175 EnableOKButton();
1176 ShowStartRef();
1177 FillLogMessageCtrl(false);
1182 BOOL CLogDlg::Cancel()
1184 return m_bCancelled;
1187 void CLogDlg::SaveSplitterPos()
1189 if (!IsIconic())
1191 CRegDWORD regPos1(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));
1192 CRegDWORD regPos2(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));
1193 RECT rectSplitter;
1194 m_wndSplitter1.GetWindowRect(&rectSplitter);
1195 ScreenToClient(&rectSplitter);
1196 regPos1 = rectSplitter.top;
1197 m_wndSplitter2.GetWindowRect(&rectSplitter);
1198 ScreenToClient(&rectSplitter);
1199 regPos2 = rectSplitter.top;
1203 void CLogDlg::OnCancel()
1205 this->ShowWindow(SW_HIDE);
1207 // canceling means stopping the working thread if it's still running.
1208 m_LogList.SafeTerminateAsyncDiffThread();
1209 if (this->IsThreadRunning())
1211 m_LogList.SafeTerminateThread();
1213 UpdateData();
1215 SaveSplitterPos();
1216 __super::OnCancel();
1219 void CLogDlg::CopyChangedSelectionToClipBoard()
1221 POSITION posLogList = m_LogList.GetFirstSelectedItemPosition();
1222 if (posLogList == nullptr)
1223 return; // nothing is selected, get out of here
1225 CString sPaths;
1227 // CGitRev* pLogEntry = reinterpret_cast<CGitRev* >(m_LogList.m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1228 // if (posLogList)
1230 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
1231 while (pos)
1233 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
1234 CTGitPath *path = (CTGitPath*)m_ChangedFileListCtrl.GetItemData(nItem);
1235 if(path)
1236 sPaths += path->GetGitPathString();
1237 sPaths += _T("\r\n");
1240 #if 0
1241 else
1243 // only one revision is selected in the log dialog top pane
1244 // but multiple items could be selected in the changed items list
1245 POSITION pos = m_ChangedFileListCtrl.GetFirstSelectedItemPosition();
1246 while (pos)
1248 int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);
1249 LogChangedPath * changedlogpath = pLogEntry->pArChangedPaths->SafeGetAt(nItem);
1251 if ((m_cHidePaths.GetState() & 0x0003)==BST_CHECKED)
1253 // some items are hidden! So find out which item the user really selected
1254 INT_PTR selRealIndex = -1;
1255 for (INT_PTR hiddenindex=0; hiddenindex<pLogEntry->pArChangedPaths->GetCount(); ++hiddenindex)
1257 if (pLogEntry->pArChangedPaths->SafeGetAt(hiddenindex)->sPath.Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)==0)
1258 ++selRealIndex;
1259 if (selRealIndex == nItem)
1261 changedlogpath = pLogEntry->pArChangedPaths->SafeGetAt(hiddenindex);
1262 break;
1266 if (changedlogpath)
1268 sPaths += changedlogpath->sPath;
1269 sPaths += _T("\r\n");
1273 #endif
1274 sPaths.Trim();
1275 CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());
1278 void CLogDlg::OnContextMenu(CWnd* pWnd, CPoint point)
1280 // we have 4 separate context menus:
1281 // one for the branch label in the upper left
1282 // one for FROM date control
1283 // one shown on the log message list control,
1284 // one shown in the changed-files list control
1285 if (pWnd == GetDlgItem(IDC_STATIC_REF))
1287 CIconMenu popup;
1288 if (!popup.CreatePopupMenu())
1289 return;
1291 int cnt = 0;
1292 popup.AppendMenuIcon(++cnt, IDS_MENUREFBROWSE);
1293 popup.SetDefaultItem(cnt);
1294 popup.AppendMenuIcon(++cnt, _T("HEAD"));
1295 CGitHash fetchHead;
1296 g_Git.GetHash(fetchHead, g_Git.FixBranchName(_T("FETCH_HEAD")));
1297 popup.AppendMenuIcon(++cnt, _T("FETCH_HEAD"));
1298 popup.EnableMenuItem(cnt, fetchHead.IsEmpty());
1299 popup.AppendMenuIcon(++cnt, IDS_ALL);
1300 popup.EnableMenuItem(cnt, m_bFollowRenames);
1301 popup.AppendMenuIcon(++cnt, IDS_PROC_LOG_SELECT_BASIC_REFS);
1302 popup.EnableMenuItem(cnt, m_bFollowRenames);
1303 popup.AppendMenuIcon(++cnt, IDS_PROC_LOG_SELECT_LOCAL_BRANCHES);
1304 popup.EnableMenuItem(cnt, m_bFollowRenames);
1305 int offset = ++cnt;
1306 if (m_History.GetCount() > 0)
1308 popup.AppendMenu(MF_SEPARATOR, 0);
1309 for (size_t i = 0; i < m_History.GetCount(); ++i)
1311 CString entry = m_History.GetEntry(i);
1312 if (entry.GetLength() > 150)
1313 entry = entry.Left(150) + _T("...");
1314 popup.AppendMenuIcon(cnt++, entry);
1318 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1319 if (cmd == 0)
1320 return;
1321 else if (cmd == 1)
1323 OnBnClickedBrowseRef();
1324 return;
1327 m_LogList.m_ShowMask &= ~(CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_BASIC_REFS | CGit::LOG_INFO_LOCAL_BRANCHES);
1328 m_bAllBranch = BST_UNCHECKED;
1329 m_AllBranchType = AllBranchType::None;
1330 if (cmd == 2)
1332 SetRange(g_Git.GetCurrentBranch(true));
1334 else if (cmd == 3)
1336 SetRange(fetchHead.ToString());
1338 else if (cmd == 4)
1340 m_bAllBranch = BST_CHECKED;
1341 m_AllBranchType = AllBranchType::AllBranches;
1342 m_LogList.m_ShowMask |= CGit::LOG_INFO_ALL_BRANCH;
1344 else if (cmd == 5)
1346 m_bAllBranch = BST_INDETERMINATE;
1347 m_AllBranchType = AllBranchType::AllBasicRefs;
1348 m_LogList.m_ShowMask |= CGit::LOG_INFO_BASIC_REFS;
1350 else if (cmd == 6)
1352 m_bAllBranch = BST_INDETERMINATE;
1353 m_AllBranchType = AllBranchType::AllLocalBranches;
1354 m_LogList.m_ShowMask |= CGit::LOG_INFO_LOCAL_BRANCHES;
1356 else if (cmd >= offset)
1358 SetRange(m_History.GetEntry(cmd - offset));
1359 m_History.AddEntry(m_LogList.m_sRange);
1360 m_History.Save();
1363 UpdateData(FALSE);
1365 OnRefresh();
1366 FillLogMessageCtrl(false);
1368 return;
1371 if (pWnd == GetDlgItem(IDC_DATEFROM))
1373 CIconMenu popup;
1374 if (!popup.CreatePopupMenu())
1375 return;
1377 int cnt = 0;
1379 popup.AppendMenuIcon(++cnt, IDS_NO_LIMIT);
1381 DWORD scale = (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\NumberOfLogsScale"), CFilterData::SHOW_NO_LIMIT);
1382 CString strScale;
1383 switch (scale)
1385 case CFilterData::SHOW_LAST_N_COMMITS:
1386 strScale.LoadString(IDS_LAST_N_COMMITS);
1387 break;
1388 case CFilterData::SHOW_LAST_N_YEARS:
1389 strScale.LoadString(IDS_LAST_N_YEARS);
1390 break;
1391 case CFilterData::SHOW_LAST_N_MONTHS:
1392 strScale.LoadString(IDS_LAST_N_MONTHS);
1393 break;
1394 case CFilterData::SHOW_LAST_N_WEEKS:
1395 strScale.LoadString(IDS_LAST_N_WEEKS);
1396 break;
1398 if (!strScale.IsEmpty() && m_LogList.m_Filter.m_NumberOfLogs > 0)
1400 popup.AppendMenu(MF_SEPARATOR, 0);
1401 CString number;
1402 number.Format(L"%ld", m_LogList.m_Filter.m_NumberOfLogs);
1403 CString item;
1404 item.Format(strScale, (LPCTSTR)number);
1405 popup.AppendMenuIcon(++cnt, item);
1408 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1409 if (cmd <= 0)
1410 return;
1411 else if (cmd == 1)
1413 m_LogList.m_Filter.m_NumberOfLogsScale = CFilterData::SHOW_NO_LIMIT;
1414 // reset last selected date
1415 m_regLastSelectedFromDate.removeValue();
1417 else if (cmd == 2)
1418 m_LogList.m_Filter.m_NumberOfLogsScale = scale;
1420 UpdateData(FALSE);
1421 OnRefresh();
1422 FillLogMessageCtrl(false);
1424 return;
1427 int selCount = m_LogList.GetSelectedCount();
1428 if ((selCount == 1)&&(pWnd == GetDlgItem(IDC_MSGVIEW)))
1430 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1431 int selIndex = -1;
1432 if (pos)
1433 selIndex = m_LogList.GetNextSelectedItem(pos);
1435 GitRevLoglist* pRev = nullptr;
1436 if (selIndex >= 0)
1437 pRev = m_LogList.m_arShownList.SafeGetAt(selIndex);
1439 if ((point.x == -1) && (point.y == -1))
1441 CRect rect;
1442 GetDlgItem(IDC_MSGVIEW)->GetClientRect(&rect);
1443 ClientToScreen(&rect);
1444 point = rect.CenterPoint();
1446 CString sMenuItemText;
1447 CIconMenu popup;
1448 if (popup.CreatePopupMenu())
1450 long start = -1, end = -1;
1451 auto pEdit = (CRichEditCtrl *)GetDlgItem(IDC_MSGVIEW);
1452 pEdit->GetSel(start, end);
1453 // add the 'default' entries
1454 popup.AppendMenuIcon(WM_COPY, IDS_SCIEDIT_COPY, IDI_COPYCLIP);
1455 if (start >= end)
1456 popup.EnableMenuItem(WM_COPY, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
1457 popup.AppendMenu(MF_SEPARATOR);
1458 sMenuItemText.LoadString(IDS_STATUSLIST_CONTEXT_COPYEXT);
1459 popup.AppendMenuIcon(EM_SETSEL, sMenuItemText, IDI_COPYCLIP);
1460 if (pRev && !pRev->m_CommitHash.IsEmpty())
1462 popup.AppendMenu(MF_SEPARATOR, NULL);
1463 sMenuItemText.LoadString(IDS_EDIT_NOTES);
1464 popup.AppendMenuIcon(CGitLogList::ID_EDITNOTE, sMenuItemText, IDI_EDIT);
1467 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1468 switch (cmd)
1470 case 0:
1471 break; // no command selected
1472 case EM_SETSEL:
1474 pEdit->SetRedraw(FALSE);
1475 int oldLine = pEdit->GetFirstVisibleLine();
1476 pEdit->SetSel(0, -1);
1477 pEdit->Copy();
1478 pEdit->SetSel(start, end);
1479 int newLine = pEdit->GetFirstVisibleLine();
1480 pEdit->LineScroll(oldLine - newLine);
1481 pEdit->SetRedraw(TRUE);
1482 pEdit->RedrawWindow();
1484 break;
1485 case WM_COPY:
1486 ::SendMessage(GetDlgItem(IDC_MSGVIEW)->GetSafeHwnd(), cmd, 0, -1);
1487 break;
1488 case CGitLogList::ID_EDITNOTE:
1489 CAppUtils::EditNote(pRev);
1490 this->FillLogMessageCtrl(true);
1491 break;
1497 void CLogDlg::OnOK()
1499 // since the log dialog is also used to select revisions for other
1500 // dialogs, we have to do some work before closing this dialog
1501 if (GetFocus() != GetDlgItem(IDOK))
1502 return; // if the "OK" button doesn't have the focus, do nothing: this prevents closing the dialog when pressing enter
1504 m_LogList.SafeTerminateAsyncDiffThread();
1505 if (this->IsThreadRunning())
1507 m_LogList.SafeTerminateThread();
1509 UpdateData();
1510 // get the selected row(s)
1511 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1512 while (pos)
1514 int selIndex = m_LogList.GetNextSelectedItem(pos);
1515 GitRev* pLogEntry = m_LogList.m_arShownList.SafeGetAt(selIndex);
1516 if (!pLogEntry)
1517 continue;
1518 m_sSelectedHash.push_back(pLogEntry->m_CommitHash);
1520 UpdateData(FALSE);
1521 SaveSplitterPos();
1522 __super::OnOK();
1524 #if 0
1525 if (!GetDlgItem(IDOK)->IsWindowVisible() && GetFocus() != GetDlgItem(IDCANCEL))
1526 return; // the Cancel button works as the OK button. But if the cancel button has not the focus, do nothing.
1528 CString temp;
1529 CString buttontext;
1530 GetDlgItemText(IDOK, buttontext);
1531 temp.LoadString(IDS_MSGBOX_CANCEL);
1532 if (temp.Compare(buttontext) != 0)
1533 __super::OnOK(); // only exit if the button text matches, and that will match only if the thread isn't running anymore
1534 m_bCancelled = TRUE;
1535 m_selectedRevs.Clear();
1536 m_selectedRevsOneRange.Clear();
1537 if (m_pNotifyWindow)
1539 int selIndex = m_LogList.GetSelectionMark();
1540 if (selIndex >= 0)
1542 PLOGENTRYDATA pLogEntry = nullptr;
1543 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1544 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1545 m_selectedRevs.AddRevision(pLogEntry->Rev);
1546 git_revnum_t lowerRev = pLogEntry->Rev;
1547 git_revnum_t higherRev = lowerRev;
1548 while (pos)
1550 pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_LogList.GetNextSelectedItem(pos)));
1551 git_revnum_t rev = pLogEntry->Rev;
1552 m_selectedRevs.AddRevision(pLogEntry->Rev);
1553 if (lowerRev > rev)
1554 lowerRev = rev;
1555 if (higherRev < rev)
1556 higherRev = rev;
1558 if (m_sFilterText.IsEmpty() && m_nSortColumn == 0 && IsSelectionContinuous())
1560 m_selectedRevsOneRange.AddRevRange(lowerRev, higherRev);
1562 BOOL bSentMessage = FALSE;
1563 if (m_LogList.GetSelectedCount() == 1)
1565 // if only one revision is selected, check if the path/url with which the dialog was started
1566 // was directly affected in that revision. If it was, then check if our path was copied from somewhere.
1567 // if it was copied, use the copy from revision as lowerRev
1568 if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))
1570 CString sUrl = m_path.GetGitPathString();
1571 if (!m_path.IsUrl())
1573 sUrl = GetURLFromPath(m_path);
1575 sUrl = sUrl.Mid(m_sRepositoryRoot.GetLength());
1576 for (int cp = 0; cp < pLogEntry->pArChangedPaths->GetCount(); ++cp)
1578 LogChangedPath * pData = pLogEntry->pArChangedPaths->SafeGetAt(cp);
1579 if (pData)
1581 if (sUrl.Compare(pData->sPath) == 0)
1583 if (!pData->sCopyFromPath.IsEmpty())
1585 lowerRev = pData->lCopyFromRev;
1586 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART), lowerRev);
1587 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND), higherRev);
1588 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
1589 bSentMessage = TRUE;
1596 if ( !bSentMessage )
1598 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTSTART | MERGE_REVSELECTMINUSONE), lowerRev);
1599 m_pNotifyWindow->SendMessage(WM_REVSELECTED, m_wParam & (MERGE_REVSELECTEND | MERGE_REVSELECTMINUSONE), higherRev);
1600 m_pNotifyWindow->SendMessage(WM_REVLIST, m_selectedRevs.GetCount(), (LPARAM)&m_selectedRevs);
1601 if (m_selectedRevsOneRange.GetCount())
1602 m_pNotifyWindow->SendMessage(WM_REVLISTONERANGE, 0, (LPARAM)&m_selectedRevsOneRange);
1606 UpdateData();
1607 CRegDWORD reg(_T("Software\\TortoiseGit\\ShowAllEntry"));
1608 SaveSplitterPos();
1609 #endif
1612 void CLogDlg::OnPasteGitHash()
1614 if (!IsClipboardFormatAvailable(CF_TEXT))
1615 return;
1617 CClipboardHelper clipboardHelper;
1618 if (!clipboardHelper.Open(GetSafeHwnd()))
1619 return;
1621 HGLOBAL hClipboardData = GetClipboardData(CF_TEXT);
1622 if (!hClipboardData)
1623 return;
1625 char* pStr = (char*)GlobalLock(hClipboardData);
1626 CString str(pStr);
1627 GlobalUnlock(hClipboardData);
1628 if (str.IsEmpty())
1629 return;
1631 int pos = 0;
1632 if (LookLikeGitHash(str, pos))
1633 JumpToGitHash(str);
1636 void CLogDlg::JumpToGitHash(CString& hash)
1638 for (int i = 0; i < (int)m_LogList.m_arShownList.size(); ++i)
1640 GitRev* rev = m_LogList.m_arShownList.SafeGetAt(i);
1641 if (!rev) continue;
1642 if (rev->m_CommitHash.ToString().Left(hash.GetLength()) != hash)
1643 continue;
1645 m_LogList.SetItemState(m_LogList.GetSelectionMark(), 0, LVIS_SELECTED | LVIS_FOCUSED);
1646 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
1647 while (pos)
1649 int index = m_LogList.GetNextSelectedItem(pos);
1650 if (index >= 0)
1651 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
1653 m_LogList.EnsureVisible(i, FALSE);
1654 m_LogList.SetSelectionMark(i);
1655 m_LogList.SetItemState(i, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);
1656 // refresh of selection needs to be queued instead of done immediately, to ensure hyperlinks in target selection are created
1657 PostMessage(WM_TGIT_REFRESH_SELECTION, 0, 0);
1658 return;
1661 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND, IDS_APPNAME, 1, IDI_INFORMATION, IDS_OKBUTTON, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN);
1664 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
1666 // Skip Ctrl-C when copying text out of the log message or search filter
1667 bool bSkipAccelerator = (pMsg->message == WM_KEYDOWN && (pMsg->wParam == 'C' || pMsg->wParam == VK_INSERT) && (GetFocus() == GetDlgItem(IDC_MSGVIEW) || GetFocus() == GetDlgItem(IDC_SEARCHEDIT) || GetFocus() == GetDlgItem(IDC_FILTER)) && GetKeyState(VK_CONTROL) & 0x8000);
1668 if (pMsg->message == WM_KEYDOWN && pMsg->wParam=='\r')
1670 if (GetFocus()==GetDlgItem(IDC_LOGLIST))
1672 if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))
1674 m_LogList.DiffSelectedRevWithPrevious();
1675 return TRUE;
1678 if (GetFocus() == GetDlgItem(IDC_SEARCHEDIT))
1680 KillTimer(LOGFILTER_TIMER);
1681 Refresh(false);
1683 if (GetFocus() == GetDlgItem(IDC_FILTER))
1685 KillTimer(FILEFILTER_TIMER);
1686 FillLogMessageCtrl();
1687 return TRUE;
1690 else if (pMsg->message == WM_KEYDOWN && ((pMsg->wParam == 'V' && GetKeyState(VK_CONTROL) < 0) || (pMsg->wParam == VK_INSERT && GetKeyState(VK_SHIFT) < 0 && GetKeyState(VK_CONTROL) >= 0)) && GetKeyState(VK_MENU) >= 0)
1692 if (GetFocus() != GetDlgItem(IDC_SEARCHEDIT) && GetFocus() != GetDlgItem(IDC_FILTER))
1694 OnPasteGitHash();
1695 return TRUE;
1698 else if (pMsg->message == WM_XBUTTONUP)
1700 bool select = (pMsg->wParam & MK_SHIFT) == 0;
1701 if (HIWORD(pMsg->wParam) & XBUTTON1)
1702 GoBackForward(select, false);
1703 if (HIWORD(pMsg->wParam) & XBUTTON2)
1704 GoBackForward(select, true);
1705 if (HIWORD(pMsg->wParam) & (XBUTTON1 | XBUTTON2))
1706 return TRUE;
1708 if (m_hAccel && !bSkipAccelerator)
1710 int ret = TranslateAccelerator(m_hWnd, m_hAccel, pMsg);
1711 if (ret)
1712 return TRUE;
1715 return __super::PreTranslateMessage(pMsg);
1719 BOOL CLogDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
1721 //if (this->IsThreadRunning())
1722 if(m_LogList.m_bNoDispUpdates)
1724 // only show the wait cursor over the list control
1725 if ((pWnd)&&
1726 ((pWnd == GetDlgItem(IDC_LOGLIST))||
1727 (pWnd == GetDlgItem(IDC_MSGVIEW))||
1728 (pWnd == GetDlgItem(IDC_LOGMSG))))
1730 HCURSOR hCur = LoadCursor(nullptr, IDC_WAIT);
1731 SetCursor(hCur);
1732 return TRUE;
1735 if ((pWnd) && (pWnd == GetDlgItem(IDC_MSGVIEW)))
1736 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
1738 HCURSOR hCur = LoadCursor(nullptr, IDC_ARROW);
1739 SetCursor(hCur);
1740 return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);
1743 void CLogDlg::OnLvnItemchangedLoglist(NMHDR *pNMHDR, LRESULT *pResult)
1745 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1746 *pResult = 0;
1747 //if (this->IsThreadRunning())
1748 if(m_LogList.m_bNoDispUpdates)
1749 return;
1750 if (pNMLV->iItem >= 0)
1752 if (!m_LogList.m_highlight.IsEmpty())
1754 m_LogList.m_highlight.Empty();
1755 m_LogList.Invalidate();
1757 this->m_LogList.m_nSearchIndex = pNMLV->iItem;
1758 GitRev* pLogEntry = m_LogList.m_arShownList.SafeGetAt(pNMLV->iItem);
1759 if (pLogEntry == nullptr)
1760 return;
1761 m_LogList.m_lastSelectedHash = pLogEntry->m_CommitHash;
1762 if (pNMLV->iSubItem != 0)
1763 return;
1764 if (pNMLV->iItem == (int)m_LogList.m_arShownList.size())
1766 // remove the selected state
1767 if (pNMLV->uChanged & LVIF_STATE)
1769 m_LogList.SetItemState(pNMLV->iItem, 0, LVIS_SELECTED);
1770 FillLogMessageCtrl();
1771 UpdateData(FALSE);
1772 UpdateLogInfoLabel();
1774 return;
1776 if (pNMLV->uChanged & LVIF_STATE)
1778 if ((pNMLV->uNewState & LVIS_SELECTED) && !m_bNavigatingWithSelect)
1780 m_LogList.m_selectionHistory.Add(m_LogList.m_lastSelectedHash);
1781 m_LogList.m_lastSelectedHash = pLogEntry->m_CommitHash;
1783 FillLogMessageCtrl();
1784 UpdateData(FALSE);
1787 else
1789 m_LogList.m_lastSelectedHash.Empty();
1790 FillLogMessageCtrl();
1791 UpdateData(FALSE);
1793 EnableOKButton();
1794 if (pNMLV->iItem < 0)
1795 return;
1796 UpdateLogInfoLabel();
1799 void CLogDlg::OnLvnItemchangedLogmsg(NMHDR * /*pNMHDR*/, LRESULT * /*pResult*/)
1801 if (m_ChangedFileListCtrl.IsBusy())
1802 return;
1803 UpdateLogInfoLabel();
1806 void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
1808 ENLINK *pEnLink = reinterpret_cast<ENLINK *>(pNMHDR);
1809 if ((pEnLink->msg == WM_LBUTTONUP) || (pEnLink->msg == WM_SETCURSOR))
1811 CString url, msg;
1812 GetDlgItemText(IDC_MSGVIEW, msg);
1813 msg.Replace(_T("\r\n"), _T("\n"));
1814 url = msg.Mid(pEnLink->chrg.cpMin, pEnLink->chrg.cpMax-pEnLink->chrg.cpMin);
1815 auto findResult = m_LogList.m_ProjectProperties.FindBugIDPositions(msg);
1816 if (std::find_if(findResult.cbegin(), findResult.cend(),
1817 [=] (const CHARRANGE &cr) -> bool { return cr.cpMin == pEnLink->chrg.cpMin && cr.cpMax == pEnLink->chrg.cpMax; }
1818 ) != findResult.cend())
1820 url = m_LogList.m_ProjectProperties.GetBugIDUrl(url);
1821 url = GetAbsoluteUrlFromRelativeUrl(url);
1823 if (::PathIsURL(url))
1825 if (pEnLink->msg == WM_LBUTTONUP)
1826 ShellExecute(this->m_hWnd, _T("open"), url, nullptr, nullptr, SW_SHOWDEFAULT);
1827 else
1829 static RECT prevRect = { 0 };
1830 CWnd * pMsgView = GetDlgItem(IDC_MSGVIEW);
1831 if (pMsgView)
1833 RECT rc;
1834 POINTL pt;
1835 pMsgView->SendMessage(EM_POSFROMCHAR, (WPARAM)&pt, pEnLink->chrg.cpMin);
1836 rc.left = pt.x;
1837 rc.top = pt.y;
1838 pMsgView->SendMessage(EM_POSFROMCHAR, (WPARAM)&pt, pEnLink->chrg.cpMax);
1839 rc.right = pt.x;
1840 rc.bottom = pt.y + 12;
1841 if ((prevRect.left != rc.left) || (prevRect.top != rc.top))
1843 m_tooltips.DelTool(pMsgView, 1);
1844 m_tooltips.AddTool(pMsgView, url, &rc, 1);
1845 prevRect = rc;
1850 else if(pEnLink->msg == WM_LBUTTONUP)
1852 int pos = 0;
1853 if (LookLikeGitHash(url, pos))
1854 JumpToGitHash(url);
1857 *pResult = 0;
1860 void CLogDlg::OnBnClickedStatbutton()
1862 if (this->IsThreadRunning())
1863 return;
1864 if (m_LogList.m_arShownList.empty() || m_LogList.m_arShownList.size() == 1 && m_LogList.m_bShowWC)
1865 return; // nothing or just the working copy changes are shown, so no statistics.
1866 // the statistics dialog expects the log entries to be sorted by date
1867 SortByColumn(3, false);
1869 CStatGraphDlg dlg;
1870 m_LogList.RecalculateShownList(&dlg.m_ShowList);
1872 dlg.m_path = m_orgPath;
1873 dlg.DoModal();
1874 // restore the previous sorting
1875 SortByColumn(m_nSortColumn, m_bAscending);
1876 OnTimer(LOGFILTER_TIMER);
1879 void CLogDlg::MoveToSameTop(CWnd *pWndRef, CWnd *pWndTarget)
1881 CRect rcWndPicAuthor, rcWndMsgView;
1882 pWndRef->GetWindowRect(rcWndMsgView);
1883 ScreenToClient(rcWndMsgView);
1884 pWndTarget->GetWindowRect(rcWndPicAuthor);
1885 ScreenToClient(rcWndPicAuthor);
1886 int diff = rcWndMsgView.top - rcWndPicAuthor.top;
1887 rcWndPicAuthor.top += diff;
1888 rcWndPicAuthor.bottom += diff;
1889 pWndTarget->MoveWindow(rcWndPicAuthor);
1892 void CLogDlg::DoSizeV1(int delta)
1894 RemoveMainAnchors();
1896 // first, reduce the middle section to a minimum.
1897 // if that is not sufficient, minimize the lower section
1899 CRect changeListViewRect;
1900 m_ChangedFileListCtrl.GetClientRect(changeListViewRect);
1901 CRect messageViewRect;
1902 GetDlgItem(IDC_MSGVIEW)->GetClientRect(messageViewRect);
1904 int messageViewDelta = max(-delta, 20 - messageViewRect.Height());
1905 int changeFileListDelta = -delta - messageViewDelta;
1907 // set new sizes & positions
1908 CSplitterControl::ChangeHeight(&m_LogList, delta, CW_TOPALIGN);
1909 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), messageViewDelta, CW_TOPALIGN);
1910 CSplitterControl::ChangePos(GetDlgItem(IDC_MSGVIEW), 0, delta);
1911 MoveToSameTop(GetDlgItem(IDC_MSGVIEW), GetDlgItem(IDC_PIC_AUTHOR));
1912 CSplitterControl::ChangePos(GetDlgItem(IDC_SPLITTERBOTTOM), 0, -changeFileListDelta);
1913 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl, changeFileListDelta, CW_BOTTOMALIGN);
1915 AddMainAnchors();
1916 ArrangeLayout();
1917 AdjustMinSize();
1918 SetSplitterRange();
1919 m_LogList.Invalidate();
1920 m_ChangedFileListCtrl.Invalidate();
1921 GetDlgItem(IDC_MSGVIEW)->Invalidate();
1922 m_gravatar.Invalidate();
1925 void CLogDlg::DoSizeV2(int delta)
1927 RemoveMainAnchors();
1929 // first, reduce the middle section to a minimum.
1930 // if that is not sufficient, minimize the top section
1932 CRect logViewRect;
1933 m_LogList.GetClientRect(logViewRect);
1934 CRect messageViewRect;
1935 GetDlgItem(IDC_MSGVIEW)->GetClientRect(messageViewRect);
1937 int messageViewDelta = max(delta, 20 - messageViewRect.Height());
1938 int logListDelta = delta - messageViewDelta;
1940 // set new sizes & positions
1941 CSplitterControl::ChangeHeight(&m_LogList, logListDelta, CW_TOPALIGN);
1942 CSplitterControl::ChangePos(GetDlgItem(IDC_SPLITTERTOP), 0, logListDelta);
1944 CSplitterControl::ChangeHeight(GetDlgItem(IDC_MSGVIEW), messageViewDelta, CW_TOPALIGN);
1945 CSplitterControl::ChangePos(GetDlgItem(IDC_MSGVIEW), 0, logListDelta);
1946 MoveToSameTop(GetDlgItem(IDC_MSGVIEW), GetDlgItem(IDC_PIC_AUTHOR));
1948 CSplitterControl::ChangeHeight(&m_ChangedFileListCtrl, -delta, CW_BOTTOMALIGN);
1950 AddMainAnchors();
1951 ArrangeLayout();
1952 AdjustMinSize();
1953 SetSplitterRange();
1954 GetDlgItem(IDC_MSGVIEW)->Invalidate();
1955 m_ChangedFileListCtrl.Invalidate();
1956 m_gravatar.Invalidate();
1959 void CLogDlg::AddMainAnchors()
1961 AddAnchor(IDC_STATIC_REF, TOP_LEFT);
1962 AddAnchor(IDC_FROMLABEL, TOP_LEFT);
1963 AddAnchor(IDC_DATEFROM, TOP_LEFT);
1964 AddAnchor(IDC_TOLABEL, TOP_LEFT);
1965 AddAnchor(IDC_DATETO, TOP_LEFT);
1967 AddAnchor(IDC_SEARCHEDIT, TOP_LEFT, TOP_RIGHT);
1968 AddAnchor(IDC_LOG_JUMPTYPE, TOP_RIGHT);
1969 AddAnchor(IDC_LOG_JUMPUP, TOP_RIGHT);
1970 AddAnchor(IDC_LOG_JUMPDOWN, TOP_RIGHT);
1972 AddAnchor(IDC_LOGLIST, TOP_LEFT, MIDDLE_RIGHT);
1973 AddAnchor(IDC_SPLITTERTOP, MIDDLE_LEFT, MIDDLE_RIGHT);
1974 AddAnchor(IDC_MSGVIEW, MIDDLE_LEFT, MIDDLE_RIGHT); // keep in sync with ShowGravatar()
1975 AddAnchor(IDC_PIC_AUTHOR, MIDDLE_RIGHT);
1976 AddAnchor(IDC_SPLITTERBOTTOM, MIDDLE_LEFT, MIDDLE_RIGHT);
1977 AddAnchor(IDC_LOGMSG, MIDDLE_LEFT, BOTTOM_RIGHT);
1979 AddAnchor(IDC_LOGINFO, BOTTOM_LEFT, BOTTOM_RIGHT);
1980 AddAnchor(IDC_WALKBEHAVIOUR, BOTTOM_LEFT);
1981 AddAnchor(IDC_VIEW, BOTTOM_LEFT);
1982 AddAnchor(IDC_LOG_ALLBRANCH, BOTTOM_LEFT);
1983 AddAnchor(IDC_FILTER, BOTTOM_LEFT, BOTTOM_RIGHT);
1984 AddAnchor(IDC_WHOLE_PROJECT, BOTTOM_LEFT);
1985 AddAnchor(IDC_REFRESH, BOTTOM_LEFT);
1986 AddAnchor(IDC_STATBUTTON, BOTTOM_LEFT);
1987 AddAnchor(IDC_PROGRESS, BOTTOM_LEFT, BOTTOM_RIGHT);
1988 AddAnchor(IDOK, BOTTOM_RIGHT);
1989 AddAnchor(IDCANCEL, BOTTOM_RIGHT);
1990 AddAnchor(IDHELP, BOTTOM_RIGHT);
1993 void CLogDlg::RemoveMainAnchors()
1995 RemoveAnchor(IDC_STATIC_REF);
1996 RemoveAnchor(IDC_FROMLABEL);
1997 RemoveAnchor(IDC_DATEFROM);
1998 RemoveAnchor(IDC_TOLABEL);
1999 RemoveAnchor(IDC_DATETO);
2001 RemoveAnchor(IDC_SEARCHEDIT);
2002 RemoveAnchor(IDC_LOG_JUMPTYPE);
2003 RemoveAnchor(IDC_LOG_JUMPUP);
2004 RemoveAnchor(IDC_LOG_JUMPDOWN);
2006 RemoveAnchor(IDC_LOGLIST);
2007 RemoveAnchor(IDC_SPLITTERTOP);
2008 RemoveAnchor(IDC_MSGVIEW);
2009 RemoveAnchor(IDC_PIC_AUTHOR);
2010 RemoveAnchor(IDC_SPLITTERBOTTOM);
2011 RemoveAnchor(IDC_LOGMSG);
2013 RemoveAnchor(IDC_LOGINFO);
2014 RemoveAnchor(IDC_WALKBEHAVIOUR);
2015 RemoveAnchor(IDC_VIEW);
2016 RemoveAnchor(IDC_LOG_ALLBRANCH);
2017 RemoveAnchor(IDC_FILTER);
2018 RemoveAnchor(IDC_WHOLE_PROJECT);
2019 RemoveAnchor(IDC_REFRESH);
2020 RemoveAnchor(IDC_STATBUTTON);
2021 RemoveAnchor(IDC_PROGRESS);
2022 RemoveAnchor(IDOK);
2023 RemoveAnchor(IDCANCEL);
2024 RemoveAnchor(IDHELP);
2027 void CLogDlg::AdjustMinSize()
2029 // adjust the minimum size of the dialog to prevent the resizing from
2030 // moving the list control too far down.
2031 CRect rcChgListView;
2032 m_ChangedFileListCtrl.GetClientRect(rcChgListView);
2033 CRect rcLogList;
2034 m_LogList.GetClientRect(rcLogList);
2035 CRect rcLogMsg;
2036 GetDlgItem(IDC_MSGVIEW)->GetClientRect(rcLogMsg);
2038 SetMinTrackSize(CSize(m_DlgOrigRect.Width(),
2039 m_DlgOrigRect.Height()-m_ChgOrigRect.Height()-m_LogListOrigRect.Height()-m_MsgViewOrigRect.Height()
2040 + rcLogMsg.Height() + abs(rcChgListView.Height() - rcLogList.Height()) + 60));
2043 LRESULT CLogDlg::DefWindowProc(UINT message, WPARAM wParam, LPARAM lParam)
2045 switch (message) {
2046 case WM_NOTIFY:
2047 if (wParam == IDC_SPLITTERTOP)
2049 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
2050 DoSizeV1(pHdr->delta);
2052 else if (wParam == IDC_SPLITTERBOTTOM)
2054 SPC_NMHDR* pHdr = (SPC_NMHDR*) lParam;
2055 DoSizeV2(pHdr->delta);
2057 break;
2060 return CResizableDialog::DefWindowProc(message, wParam, lParam);
2063 void CLogDlg::SetSplitterRange()
2065 if ((m_LogList)&&(m_ChangedFileListCtrl))
2067 CRect rcTop;
2068 m_LogList.GetWindowRect(rcTop);
2069 ScreenToClient(rcTop);
2070 CRect rcBottom;
2071 m_ChangedFileListCtrl.GetWindowRect(rcBottom);
2072 ScreenToClient(rcBottom);
2073 m_wndSplitter1.SetRange(rcTop.top + 20, rcBottom.bottom - 50);
2074 m_wndSplitter2.SetRange(rcTop.top + 50, rcBottom.bottom - 20);
2078 void CLogDlg::OnEnscrollMsgview()
2080 m_tooltips.DelTool(GetDlgItem(IDC_MSGVIEW), 1);
2083 LRESULT CLogDlg::OnClickedInfoIcon(WPARAM wParam, LPARAM lParam)
2085 if ((HWND)wParam == m_cFileFilter.GetSafeHwnd())
2086 return 0;
2088 // FIXME: x64 version would get this function called with unexpected parameters.
2089 if (!lParam)
2090 return 0;
2092 RECT * rect = (LPRECT)lParam;
2093 CPoint point;
2094 CString temp;
2095 point = CPoint(rect->left, rect->bottom);
2096 #define LOGMENUFLAGS(x) (MF_STRING | MF_ENABLED | ((m_LogList.m_SelectedFilters & x) ? MF_CHECKED : MF_UNCHECKED))
2097 CMenu popup;
2098 if (popup.CreatePopupMenu())
2100 temp.LoadString(IDS_LOG_FILTER_SUBJECT);
2101 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_SUBJECT), LOGFILTER_SUBJECT, temp);
2103 temp.LoadString(IDS_LOG_FILTER_MESSAGES);
2104 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_MESSAGES), LOGFILTER_MESSAGES, temp);
2106 temp.LoadString(IDS_LOG_FILTER_PATHS);
2107 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_PATHS), LOGFILTER_PATHS, temp);
2109 temp.LoadString(IDS_LOG_FILTER_AUTHORS);
2110 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_AUTHORS), LOGFILTER_AUTHORS, temp);
2112 temp.LoadString(IDS_LOG_FILTER_EMAILS);
2113 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_EMAILS), LOGFILTER_EMAILS, temp);
2115 temp.LoadString(IDS_LOG_FILTER_REVS);
2116 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REVS), LOGFILTER_REVS, temp);
2118 temp.LoadString(IDS_LOG_FILTER_REFNAME);
2119 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_REFNAME), LOGFILTER_REFNAME, temp);
2121 temp.LoadString(IDS_PROC_LOG_TAGINFO);
2122 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_ANNOTATEDTAG), LOGFILTER_ANNOTATEDTAG, temp);
2124 temp.LoadString(IDS_NOTES);
2125 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_NOTES), LOGFILTER_NOTES, temp);
2127 if (m_LogList.m_bShowBugtraqColumn == TRUE) {
2128 temp.LoadString(IDS_LOG_FILTER_BUGIDS);
2129 popup.AppendMenu(LOGMENUFLAGS(LOGFILTER_BUGID), LOGFILTER_BUGID, temp);
2132 popup.AppendMenu(MF_SEPARATOR, NULL);
2134 temp.LoadString(IDS_LOG_FILTER_TOGGLE);
2135 popup.AppendMenu(MF_STRING | MF_ENABLED, LOGFILTER_TOGGLE, temp);
2137 temp.LoadString(IDS_ALL);
2138 popup.AppendMenu(MF_STRING | MF_ENABLED, LOGFILTER_ALL, temp);
2140 popup.AppendMenu(MF_SEPARATOR, NULL);
2142 temp.LoadString(IDS_LOG_FILTER_REGEX);
2143 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterWithRegex ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_REGEX, temp);
2145 temp.LoadString(IDS_LOG_FILTER_CASESENSITIVE);
2146 popup.AppendMenu(MF_STRING | MF_ENABLED | (m_bFilterCaseSensitively ? MF_CHECKED : MF_UNCHECKED), LOGFILTER_CASE, temp);
2148 m_tooltips.Pop();
2149 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
2150 if (selection != 0)
2152 if (selection == LOGFILTER_REGEX)
2154 m_bFilterWithRegex = !m_bFilterWithRegex;
2155 CRegDWORD b(_T("Software\\TortoiseGit\\UseRegexFilter"), FALSE);
2156 b = m_bFilterWithRegex;
2157 m_LogList.m_bFilterWithRegex = m_bFilterWithRegex;
2158 SetFilterCueText();
2159 CheckRegexpTooltip();
2160 m_cFilter.ValidateAndRedraw();
2162 else if (selection == LOGFILTER_CASE)
2164 m_bFilterCaseSensitively = !m_bFilterCaseSensitively;
2165 CRegDWORD b(_T("Software\\TortoiseGit\\FilterCaseSensitively"), FALSE);
2166 b = m_bFilterCaseSensitively;
2167 m_LogList.m_bFilterCaseSensitively = m_bFilterCaseSensitively;
2169 else if (selection == LOGFILTER_TOGGLE)
2171 m_LogList.m_SelectedFilters = (~m_LogList.m_SelectedFilters) & LOGFILTER_ALL;
2172 SetFilterCueText();
2174 else if (selection == LOGFILTER_ALL)
2176 m_LogList.m_SelectedFilters = selection;
2177 SetFilterCueText();
2179 else
2181 m_LogList.m_SelectedFilters ^= selection;
2182 SetFilterCueText();
2184 CRegDWORD(_T("Software\\TortoiseGit\\SelectedLogFilters")) = m_LogList.m_SelectedFilters;
2185 // Reload only if a search text is entered
2186 if (m_LogList.HasFilterText())
2187 SetTimer(LOGFILTER_TIMER, 1000, nullptr);
2190 return 0L;
2193 LRESULT CLogDlg::OnClickedCancelFilter(WPARAM wParam, LPARAM /*lParam*/)
2195 if ((HWND)wParam == m_cFileFilter.GetSafeHwnd())
2197 KillTimer(FILEFILTER_TIMER);
2199 FillLogMessageCtrl();
2200 return 0L;
2203 KillTimer(LOGFILTER_TIMER);
2205 m_LogList.m_sFilterText.Empty();
2206 UpdateData(FALSE);
2207 theApp.DoWaitCursor(1);
2208 FillLogMessageCtrl(false);
2210 m_LogList.RemoveFilter();
2212 Refresh();
2214 theApp.DoWaitCursor(-1);
2215 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
2216 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
2217 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2218 UpdateLogInfoLabel();
2220 return 0L;
2224 void CLogDlg::SetFilterCueText()
2226 CString temp(MAKEINTRESOURCE(IDS_LOG_FILTER_BY));
2227 temp += _T(" ");
2229 if (m_LogList.m_SelectedFilters & LOGFILTER_SUBJECT)
2231 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_SUBJECT));
2234 if (m_LogList.m_SelectedFilters & LOGFILTER_MESSAGES)
2236 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2237 temp += _T(", ");
2238 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_MESSAGES));
2241 if (m_LogList.m_SelectedFilters & LOGFILTER_PATHS)
2243 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2244 temp += _T(", ");
2245 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_PATHS));
2248 if (m_LogList.m_SelectedFilters & LOGFILTER_AUTHORS)
2250 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2251 temp += _T(", ");
2252 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_AUTHORS));
2255 if (m_LogList.m_SelectedFilters & LOGFILTER_EMAILS)
2257 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2258 temp += _T(", ");
2259 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_EMAILS));
2262 if (m_LogList.m_SelectedFilters & LOGFILTER_REVS)
2264 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2265 temp += _T(", ");
2266 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REVS));
2269 if (m_LogList.m_SelectedFilters & LOGFILTER_REFNAME)
2271 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2272 temp += _T(", ");
2273 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_REFNAME));
2276 if (m_LogList.m_SelectedFilters & LOGFILTER_NOTES)
2278 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2279 temp += _T(", ");
2280 temp += CString(MAKEINTRESOURCE(IDS_NOTES));
2283 if (m_LogList.m_bShowBugtraqColumn && m_LogList.m_SelectedFilters & LOGFILTER_BUGID)
2285 if (temp.ReverseFind(_T(' ')) != temp.GetLength() - 1)
2286 temp += _T(", ");
2287 temp += CString(MAKEINTRESOURCE(IDS_LOG_FILTER_BUGIDS));
2290 // to make the cue banner text appear more to the right of the edit control
2291 temp = _T(" ")+temp;
2292 m_cFilter.SetCueBanner(temp.TrimRight());
2295 bool CLogDlg::Validate(LPCTSTR string)
2297 if (!m_bFilterWithRegex)
2298 return true;
2299 std::tr1::wregex pat;
2300 return m_LogList.ValidateRegexp(string, pat, false);
2303 void CLogDlg::OnEnChangeFileFilter()
2305 SetTimer(FILEFILTER_TIMER, 1000, nullptr);
2308 void CLogDlg::OnTimer(UINT_PTR nIDEvent)
2310 if (nIDEvent == LOGFTIME_TIMER)
2312 KillTimer(LOGFTIME_TIMER);
2313 Refresh(false);
2315 else if (nIDEvent == LOG_FILLPATCHVTIMER)
2316 FillPatchView();
2317 else if (nIDEvent == LOGFILTER_TIMER)
2319 KillTimer(LOGFILTER_TIMER);
2320 Refresh(false);
2322 #if 0
2323 /* we will use git built-in grep to filter log */
2324 if (this->IsThreadRunning())
2326 // thread still running! So just restart the timer.
2327 SetTimer(LOGFILTER_TIMER, 1000, nullptr);
2328 return;
2330 CWnd * focusWnd = GetFocus();
2331 bool bSetFocusToFilterControl = ((focusWnd != GetDlgItem(IDC_DATEFROM))&&(focusWnd != GetDlgItem(IDC_DATETO))
2332 && (focusWnd != GetDlgItem(IDC_LOGLIST)));
2333 if (m_LogList.m_sFilterText.IsEmpty())
2335 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.IsEmpty()))));
2336 // do not return here!
2337 // we also need to run the filter if the filter text is empty:
2338 // 1. to clear an existing filter
2339 // 2. to rebuild the m_arShownList after sorting
2341 theApp.DoWaitCursor(1);
2342 CStoreSelection storeselection(this);
2343 KillTimer(LOGFILTER_TIMER);
2344 FillLogMessageCtrl(false);
2346 // now start filter the log list
2347 m_LogList.StartFilter();
2349 if ( m_LogList.GetItemCount()==1 )
2351 m_LogList.SetSelectionMark(0);
2352 m_LogList.SetItemState(0, LVIS_SELECTED, LVIS_SELECTED);
2354 theApp.DoWaitCursor(-1);
2355 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
2356 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
2357 if (bSetFocusToFilterControl)
2358 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2359 UpdateLogInfoLabel();
2360 #endif
2361 } // if (nIDEvent == LOGFILTER_TIMER)
2362 else if (nIDEvent == LOG_HEADER_ORDER_TIMER)
2364 KillTimer(LOG_HEADER_ORDER_TIMER);
2365 CLogOrdering orderDlg;
2366 if (orderDlg.DoModal() == IDOK)
2367 Refresh();
2369 else if (nIDEvent == FILEFILTER_TIMER)
2371 KillTimer(FILEFILTER_TIMER);
2372 FillLogMessageCtrl();
2374 DialogEnableWindow(IDC_STATBUTTON, !(((this->IsThreadRunning())||(m_LogList.m_arShownList.empty() || m_LogList.m_arShownList.size() == 1 && m_LogList.m_bShowWC))));
2375 __super::OnTimer(nIDEvent);
2378 void CLogDlg::OnDtnDatetimechangeDateto(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2382 CTime _time;
2383 m_DateTo.GetTime(_time);
2385 CTime fromTime;
2386 m_DateFrom.GetTime(fromTime);
2387 if (_time < fromTime)
2389 _time = fromTime;
2390 m_DateTo.SetTime(&_time);
2393 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 23, 59, 59);
2394 if (time.GetTime() != m_LogList.m_Filter.m_To)
2396 m_LogList.m_Filter.m_To = (DWORD)time.GetTime();
2397 SetTimer(LOGFTIME_TIMER, 10, nullptr);
2400 catch (...)
2402 CMessageBox::Show(GetSafeHwnd(), _T("Invalidate Parameter"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
2405 *pResult = 0;
2408 void CLogDlg::OnDtnDatetimechangeDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2412 CTime _time;
2413 m_DateFrom.GetTime(_time);
2415 CTime toTime;
2416 m_DateTo.GetTime(toTime);
2417 if (_time > toTime)
2419 _time = toTime;
2420 m_DateFrom.SetTime(&_time);
2423 CTime time(_time.GetYear(), _time.GetMonth(), _time.GetDay(), 0, 0, 0);
2424 if (time.GetTime() != m_LogList.m_Filter.m_From)
2426 m_LogList.m_Filter.m_From = (DWORD)time.GetTime();
2427 m_LogList.m_Filter.m_NumberOfLogsScale = CFilterData::SHOW_LAST_SEL_DATE;
2429 if (CFilterData::SHOW_LAST_SEL_DATE == (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogDialog\\NumberOfLogsScale"), CFilterData::SHOW_NO_LIMIT))
2430 m_regLastSelectedFromDate = time.Format(L"%Y-%m-%d");
2432 SetTimer(LOGFTIME_TIMER, 10, nullptr);
2435 catch (...)
2437 CMessageBox::Show(GetSafeHwnd(), _T("Invalidate Parameter"), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
2440 *pResult = 0;
2443 void CLogDlg::OnCbnSelchangeJumpType()
2445 // reserved for future use
2448 void CLogDlg::OnBnClickedJumpUp()
2450 int sel = m_JumpType.GetCurSel();
2451 if (sel < 0) return;
2452 JumpType jumpType = (JumpType)sel;
2454 if (jumpType == JumpType_History)
2456 GoBack();
2457 return;
2460 CString strValue;
2461 CGitHash hashValue;
2462 int index = -1;
2463 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2464 if (pos)
2466 index = m_LogList.GetNextSelectedItem(pos);
2467 if (index == 0) return;
2469 GitRev* data = m_LogList.m_arShownList.SafeGetAt(index);
2470 if (jumpType == JumpType_AuthorEmail)
2471 strValue = data->GetAuthorEmail();
2472 else if (jumpType == JumpType_CommitterEmail)
2473 strValue = data->GetCommitterEmail();
2474 else if (jumpType == JumpType_Parent1)
2475 hashValue = data->m_CommitHash;
2476 else if (jumpType == JumpType_Parent2)
2477 hashValue = data->m_CommitHash;
2478 else if (jumpType == JumpType_TagFF)
2479 hashValue = data->m_CommitHash;
2480 else if (jumpType == JumpType_BranchFF)
2481 hashValue = data->m_CommitHash;
2483 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2485 else
2486 return;
2488 while (pos)
2490 index = m_LogList.GetNextSelectedItem(pos);
2491 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2493 m_LogList.SetSelectionMark(-1);
2495 for (int i = index - 1; i >= 0; i--)
2497 bool found = false;
2498 GitRev* data = m_LogList.m_arShownList.SafeGetAt(i);
2499 if (jumpType == JumpType_AuthorEmail)
2500 found = strValue == data->GetAuthorEmail();
2501 else if (jumpType == JumpType_CommitterEmail)
2502 found = strValue == data->GetCommitterEmail();
2503 else if (jumpType == JumpType_MergePoint)
2504 found = data->ParentsCount() > 1;
2505 else if (jumpType == JumpType_Parent1)
2507 if (!data->m_ParentHash.empty())
2508 found = data->m_ParentHash[0] == hashValue;
2510 else if (jumpType == JumpType_Parent2)
2512 if (data->m_ParentHash.size() > 1)
2513 found = data->m_ParentHash[1] == hashValue;
2515 else if (jumpType == JumpType_Tag || jumpType == JumpType_TagFF)
2517 STRING_VECTOR refList = m_LogList.m_HashMap[data->m_CommitHash];
2518 for (size_t j = 0; j < refList.size(); ++j)
2520 if (refList[j].Left(10) == _T("refs/tags/"))
2522 found = true;
2523 break;
2527 if (found && jumpType == JumpType_TagFF)
2528 found = g_Git.IsFastForward(hashValue, data->m_CommitHash);
2530 else if (jumpType == JumpType_Branch || jumpType == JumpType_BranchFF)
2532 STRING_VECTOR refList = m_LogList.m_HashMap[data->m_CommitHash];
2533 for (size_t j = 0; j < refList.size(); ++j)
2535 if (refList[j].Left(11) == _T("refs/heads/") || refList[j].Left(13) == _T("refs/remotes/"))
2537 found = true;
2538 break;
2542 if (found && jumpType == JumpType_BranchFF)
2543 found = g_Git.IsFastForward(hashValue, data->m_CommitHash);
2546 if (found)
2548 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
2549 m_LogList.EnsureVisible(i, FALSE);
2550 m_LogList.SetSelectionMark(i);
2551 return;
2555 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND, IDS_APPNAME, 1, IDI_INFORMATION, IDS_OKBUTTON, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN);
2558 void CLogDlg::OnBnClickedJumpDown()
2560 int jumpType = m_JumpType.GetCurSel();
2561 if (jumpType < 0) return;
2563 if (jumpType == JumpType_History)
2565 GoForward();
2566 return;
2569 CString strValue;
2570 CGitHash hashValue;
2571 int index = -1;
2572 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2573 if (pos)
2575 index = m_LogList.GetNextSelectedItem(pos);
2576 if (index == 0) return;
2578 GitRev* data = m_LogList.m_arShownList.SafeGetAt(index);
2579 if (jumpType == JumpType_AuthorEmail)
2580 strValue = data->GetAuthorEmail();
2581 else if (jumpType == JumpType_CommitterEmail)
2582 strValue = data->GetCommitterEmail();
2583 else if (jumpType == JumpType_Parent1)
2585 if (!data->m_ParentHash.empty())
2586 hashValue = data->m_ParentHash.at(0);
2587 else
2588 return;
2590 else if (jumpType == JumpType_Parent2)
2592 if (data->m_ParentHash.size() > 1)
2593 hashValue = data->m_ParentHash.at(1);
2594 else
2595 return;
2597 else if (jumpType == JumpType_TagFF)
2598 hashValue = data->m_CommitHash;
2599 else if (jumpType == JumpType_BranchFF)
2600 hashValue = data->m_CommitHash;
2602 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2604 else
2605 return;
2607 while (pos)
2609 index = m_LogList.GetNextSelectedItem(pos);
2610 m_LogList.SetItemState(index, 0, LVIS_SELECTED);
2612 m_LogList.SetSelectionMark(-1);
2614 for (int i = index + 1; i < m_LogList.GetItemCount(); ++i)
2616 bool found = false;
2617 GitRev* data = m_LogList.m_arShownList.SafeGetAt(i);
2618 if (jumpType == JumpType_AuthorEmail)
2619 found = strValue == data->GetAuthorEmail();
2620 else if (jumpType == JumpType_CommitterEmail)
2621 found = strValue == data->GetCommitterEmail();
2622 else if (jumpType == JumpType_MergePoint)
2623 found = data->ParentsCount() > 1;
2624 else if (jumpType == JumpType_Parent1)
2625 found = data->m_CommitHash == hashValue;
2626 else if (jumpType == JumpType_Parent2)
2627 found = data->m_CommitHash == hashValue;
2628 else if (jumpType == JumpType_Tag || jumpType == JumpType_TagFF)
2630 STRING_VECTOR refList = m_LogList.m_HashMap[data->m_CommitHash];
2631 for (size_t j = 0; j < refList.size(); ++j)
2633 if (refList[j].Left(10) == _T("refs/tags/"))
2635 found = true;
2636 break;
2640 if (found && jumpType == JumpType_TagFF)
2641 found = g_Git.IsFastForward(data->m_CommitHash, hashValue);
2643 else if (jumpType == JumpType_Branch || jumpType == JumpType_BranchFF)
2645 STRING_VECTOR refList = m_LogList.m_HashMap[data->m_CommitHash];
2646 for (size_t j = 0; j < refList.size(); ++j)
2648 if (refList[j].Left(11) == _T("refs/heads/") || refList[j].Left(13) == _T("refs/remotes/"))
2650 found = true;
2651 break;
2655 if (found && jumpType == JumpType_BranchFF)
2656 found = g_Git.IsFastForward(data->m_CommitHash, hashValue);
2659 if (found)
2661 m_LogList.SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
2662 m_LogList.EnsureVisible(i, FALSE);
2663 m_LogList.SetSelectionMark(i);
2664 return;
2668 CMessageBox::ShowCheck(GetSafeHwnd(), IDS_PROC_LOG_JUMPNOTFOUND, IDS_APPNAME, 1, IDI_INFORMATION, IDS_OKBUTTON, 0, 0, _T("NoJumpNotFoundWarning"), IDS_MSGBOX_DONOTSHOWAGAIN);
2671 void CLogDlg::SortByColumn(int /*nSortColumn*/, bool /*bAscending*/)
2673 #if 0
2674 switch(nSortColumn)
2676 case 0: // Revision
2678 if(bAscending)
2679 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscRevSort());
2680 else
2681 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescRevSort());
2683 break;
2684 case 1: // action
2686 if(bAscending)
2687 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscActionSort());
2688 else
2689 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescActionSort());
2691 break;
2692 case 2: // Author
2694 if(bAscending)
2695 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscAuthorSort());
2696 else
2697 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescAuthorSort());
2699 break;
2700 case 3: // Date
2702 if(bAscending)
2703 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscDateSort());
2704 else
2705 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescDateSort());
2707 break;
2708 case 4: // Message or bug id
2709 if (m_bShowBugtraqColumn)
2711 if(bAscending)
2712 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscBugIDSort());
2713 else
2714 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescBugIDSort());
2715 break;
2717 // fall through here
2718 case 5: // Message
2720 if(bAscending)
2721 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::AscMessageSort());
2722 else
2723 std::sort(m_logEntries.begin(), m_logEntries.end(), CLogDataVector::DescMessageSort());
2725 break;
2726 default:
2727 ATLASSERT(0);
2728 break;
2730 #endif
2733 void CLogDlg::OnLvnColumnclick(NMHDR *pNMHDR, LRESULT *pResult)
2735 if (this->IsThreadRunning())
2736 return; //no sorting while the arrays are filled
2737 #if 0
2738 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
2739 const int nColumn = pNMLV->iSubItem;
2740 m_bAscending = nColumn == m_nSortColumn ? !m_bAscending : TRUE;
2741 m_nSortColumn = nColumn;
2742 SortByColumn(m_nSortColumn, m_bAscending);
2743 SetSortArrow(&m_LogList, m_nSortColumn, !!m_bAscending);
2744 SortShownListArray();
2745 m_LogList.Invalidate();
2746 UpdateLogInfoLabel();
2747 #else
2748 UNREFERENCED_PARAMETER(pNMHDR);
2749 #endif
2750 *pResult = 0;
2752 SetTimer(LOG_HEADER_ORDER_TIMER, 10, nullptr);
2755 void CLogDlg::SortShownListArray()
2757 // make sure the shown list still matches the filter after sorting.
2758 OnTimer(LOGFILTER_TIMER);
2759 // clear the selection states
2760 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
2761 while (pos)
2763 m_LogList.SetItemState(m_LogList.GetNextSelectedItem(pos), 0, LVIS_SELECTED);
2765 m_LogList.SetSelectionMark(-1);
2768 void CLogDlg::SetSortArrow(CListCtrl * control, int nColumn, bool bAscending)
2770 if (!control)
2771 return;
2772 // set the sort arrow
2773 CHeaderCtrl * pHeader = control->GetHeaderCtrl();
2774 HDITEM HeaderItem = {0};
2775 HeaderItem.mask = HDI_FORMAT;
2776 for (int i=0; i<pHeader->GetItemCount(); ++i)
2778 pHeader->GetItem(i, &HeaderItem);
2779 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
2780 pHeader->SetItem(i, &HeaderItem);
2782 if (nColumn >= 0)
2784 pHeader->GetItem(nColumn, &HeaderItem);
2785 HeaderItem.fmt |= (bAscending ? HDF_SORTUP : HDF_SORTDOWN);
2786 pHeader->SetItem(nColumn, &HeaderItem);
2790 int CLogDlg::m_nSortColumnPathList = 0;
2791 bool CLogDlg::m_bAscendingPathList = false;
2793 void CLogDlg::OnBnClickedHidepaths()
2795 FillLogMessageCtrl();
2796 m_ChangedFileListCtrl.Invalidate();
2799 void CLogDlg::UpdateLogInfoLabel()
2801 CGitHash rev1 ;
2802 CGitHash rev2 ;
2803 long selectedrevs = 0;
2804 long selectedfiles = 0;
2805 int count = (int)m_LogList.m_arShownList.size();
2806 int start = 0;
2807 if (count)
2809 rev1 = m_LogList.m_arShownList.SafeGetAt(0)->m_CommitHash;
2810 if(this->m_LogList.m_bShowWC && rev1.IsEmpty()&&(count>1))
2811 start = 1;
2812 rev1 = m_LogList.m_arShownList.SafeGetAt(start)->m_CommitHash;
2813 //pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.SafeGetAt(m_arShownList.GetCount()-1));
2814 rev2 = m_LogList.m_arShownList.SafeGetAt(count - 1)->m_CommitHash;
2815 selectedrevs = m_LogList.GetSelectedCount();
2816 if (selectedrevs)
2817 selectedfiles = m_ChangedFileListCtrl.GetSelectedCount();
2819 CString sTemp;
2820 sTemp.Format(IDS_PROC_LOG_STATS,
2821 count - start,
2822 (LPCTSTR)rev2.ToString().Left(g_Git.GetShortHASHLength()), (LPCTSTR)rev1.ToString().Left(g_Git.GetShortHASHLength()), selectedrevs, selectedfiles);
2824 if(selectedrevs == 1)
2826 CString str=m_ChangedFileListCtrl.GetStatisticsString(true);
2827 str.Replace(_T('\n'), _T(' '));
2828 sTemp += _T("\r\n") + str;
2830 m_sLogInfo = sTemp;
2832 UpdateData(FALSE);
2835 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)
2837 // the date control should not show the "today" button
2838 CMonthCalCtrl * pCtrl = m_DateFrom.GetMonthCalCtrl();
2839 if (pCtrl)
2840 pCtrl->ModifyStyle(0, MCS_NOTODAY);
2841 *pResult = 0;
2844 void CLogDlg::OnSize(UINT nType, int cx, int cy)
2846 __super::OnSize(nType, cx, cy);
2847 //set range
2848 SetSplitterRange();
2851 void CLogDlg::OnRefresh()
2854 this->m_LogProgress.SetPos(0);
2856 Refresh (false);
2860 void CLogDlg::OnFocusFilter()
2862 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2865 void CLogDlg::OnEditCopy()
2867 if (GetFocus() == &m_ChangedFileListCtrl)
2868 CopyChangedSelectionToClipBoard();
2869 else
2870 m_LogList.CopySelectionToClipBoard();
2873 CString CLogDlg::GetAbsoluteUrlFromRelativeUrl(const CString& url)
2875 // is the URL a relative one?
2876 if (url.Left(2).Compare(_T("^/")) == 0)
2878 // URL is relative to the repository root
2879 CString url1 = m_sRepositoryRoot + url.Mid(1);
2880 TCHAR buf[INTERNET_MAX_URL_LENGTH] = { 0 };
2881 DWORD len = url.GetLength();
2882 if (UrlCanonicalize((LPCTSTR)url1, buf, &len, 0) == S_OK)
2883 return CString(buf, len);
2884 return url1;
2886 else if (url[0] == '/')
2888 // URL is relative to the server's hostname
2889 CString sHost;
2890 // find the server's hostname
2891 int schemepos = m_sRepositoryRoot.Find(_T("//"));
2892 if (schemepos >= 0)
2894 sHost = m_sRepositoryRoot.Left(m_sRepositoryRoot.Find('/', schemepos+3));
2895 CString url1 = sHost + url;
2896 TCHAR buf[INTERNET_MAX_URL_LENGTH] = { 0 };
2897 DWORD len = url.GetLength();
2898 if (UrlCanonicalize((LPCTSTR)url, buf, &len, 0) == S_OK)
2899 return CString(buf, len);
2900 return url1;
2903 return url;
2906 void CLogDlg::ShowGravatar()
2908 m_gravatar.EnableGravatar(m_bShowGravatar);
2909 RemoveAnchor(IDC_MSGVIEW);
2910 if (m_gravatar.IsGravatarEnabled())
2912 RECT rect, rect2;
2913 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(&rect);
2914 ScreenToClient(&rect);
2915 m_gravatar.GetWindowRect(&rect2);
2916 ScreenToClient(&rect2);
2917 rect.right = rect2.left;
2918 GetDlgItem(IDC_MSGVIEW)->MoveWindow(&rect);
2919 m_gravatar.ShowWindow(SW_SHOW);
2921 else
2923 RECT rect, rect2;
2924 GetDlgItem(IDC_MSGVIEW)->GetWindowRect(&rect);
2925 ScreenToClient(&rect);
2926 m_gravatar.GetWindowRect(&rect2);
2927 ScreenToClient(&rect2);
2928 rect.right = rect2.right;
2929 GetDlgItem(IDC_MSGVIEW)->MoveWindow(&rect);
2930 m_gravatar.ShowWindow(SW_HIDE);
2932 AddAnchor(IDC_MSGVIEW, MIDDLE_LEFT, MIDDLE_RIGHT); // keep in sync with AddMainAnchors
2936 void CLogDlg::OnEnChangeSearchedit()
2938 UpdateData();
2939 if (!m_LogList.HasFilterText())
2941 // clear the filter, i.e. make all entries appear
2942 theApp.DoWaitCursor(1);
2943 KillTimer(LOGFILTER_TIMER);
2944 FillLogMessageCtrl(false);
2946 Refresh();
2947 //m_LogList.StartFilter();
2948 #if 0
2949 InterlockedExchange(&m_bNoDispUpdates, TRUE);
2950 m_arShownList.RemoveAll();
2951 for (DWORD i=0; i<m_logEntries.size(); ++i)
2953 if (IsEntryInDateRange(i))
2954 m_arShownList.Add(m_logEntries[i]);
2956 InterlockedExchange(&m_bNoDispUpdates, FALSE);
2957 m_LogList.DeleteAllItems();
2958 m_LogList.SetItemCountEx(ShownCountWithStopped());
2959 m_LogList.RedrawItems(0, ShownCountWithStopped());
2960 m_LogList.SetRedraw(false);
2961 m_LogList.SetRedraw(true);
2962 #endif
2963 theApp.DoWaitCursor(-1);
2964 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_HIDE);
2965 GetDlgItem(IDC_SEARCHEDIT)->ShowWindow(SW_SHOW);
2966 GetDlgItem(IDC_SEARCHEDIT)->SetFocus();
2967 DialogEnableWindow(IDC_STATBUTTON, !(this->IsThreadRunning() || m_LogList.m_arShownList.empty()));
2968 return;
2970 if (Validate(m_LogList.m_sFilterText))
2971 SetTimer(LOGFILTER_TIMER, 1000, nullptr);
2972 else
2973 KillTimer(LOGFILTER_TIMER);
2976 void CLogDlg::OnBnClickedAllBranch()
2978 // m_bAllBranch is not auto-toggled by MFC, we have to handle it manually (in order to prevent the indeterminate state)
2980 m_LogList.m_ShowMask &=~ (CGit::LOG_INFO_LOCAL_BRANCHES | CGit::LOG_INFO_BASIC_REFS | CGit::LOG_INFO_ALL_BRANCH);
2982 if (m_bAllBranch)
2984 m_bAllBranch = BST_UNCHECKED;
2985 m_AllBranchType = AllBranchType::None;
2986 m_ChangedFileListCtrl.m_sDisplayedBranch = m_LogList.GetRange();
2988 else
2990 m_bAllBranch = BST_CHECKED;
2991 m_AllBranchType = AllBranchType::AllBranches;
2992 m_LogList.m_ShowMask|=CGit::LOG_INFO_ALL_BRANCH;
2993 m_ChangedFileListCtrl.m_sDisplayedBranch.Empty();
2996 // need to save value here, so that log dialogs started from now on also have AllBranch activated
2997 m_regbAllBranch = (DWORD)m_AllBranchType;
2999 UpdateData(FALSE);
3001 OnRefresh();
3003 FillLogMessageCtrl(false);
3006 void CLogDlg::OnBnClickedFollowRenames()
3008 if(m_bFollowRenames)
3010 m_LogList.m_ShowMask |= CGit::LOG_INFO_FOLLOW;
3011 m_LogList.m_ShowMask &=~ CGit::LOG_INFO_LOCAL_BRANCHES;
3012 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_BASIC_REFS;
3013 if (m_bAllBranch)
3015 m_bAllBranch = FALSE;
3016 m_AllBranchType = AllBranchType::None;
3017 m_LogList.m_ShowMask &=~ CGit::LOG_INFO_ALL_BRANCH;
3020 else
3021 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_FOLLOW;
3023 DialogEnableWindow(IDC_LOG_ALLBRANCH, !m_bFollowRenames);
3024 DialogEnableWindow(IDC_WHOLE_PROJECT, !m_bFollowRenames && !m_path.IsEmpty());
3026 OnRefresh();
3028 FillLogMessageCtrl(false);
3031 void CLogDlg::HandleShowLabels(bool var, int flag)
3033 if (var)
3034 m_LogList.m_ShowRefMask |= flag;
3035 else
3036 m_LogList.m_ShowRefMask &= ~flag;
3038 if ((m_LogList.m_ShowFilter & CGitLogListBase::FILTERSHOW_REFS) && !(m_LogList.m_ShowFilter & CGitLogListBase::FILTERSHOW_ANYCOMMIT))
3040 // Remove commits where labels are not shown.
3041 OnRefresh();
3042 FillLogMessageCtrl(false);
3044 else
3046 // Just redraw
3047 m_LogList.Invalidate();
3051 void CLogDlg::OnBnClickedCompressedGraph()
3053 UpdateData();
3055 if (m_iCompressedGraph == 2)
3056 m_LogList.m_ShowFilter = CGitLogListBase::FILTERSHOW_REFS;
3057 else if (m_iCompressedGraph == 1)
3058 m_LogList.m_ShowFilter = static_cast<CGitLogListBase::FilterShow>(CGitLogListBase::FILTERSHOW_REFS | CGitLogListBase::FILTERSHOW_MERGEPOINTS);
3059 else
3060 m_LogList.m_ShowFilter = CGitLogListBase::FILTERSHOW_ALL;
3062 OnRefresh();
3063 FillLogMessageCtrl(false);
3066 void CLogDlg::OnBnClickedBrowseRef()
3068 CString newRef = CBrowseRefsDlg::PickRef(false, m_LogList.GetRange(), gPickRef_All, true);
3069 if(newRef.IsEmpty())
3070 return;
3072 m_History.AddEntry(newRef);
3073 m_History.Save();
3075 SetRange(newRef);
3077 m_LogList.m_ShowMask &= ~(CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_BASIC_REFS | CGit::LOG_INFO_LOCAL_BRANCHES);
3078 m_bAllBranch = BST_UNCHECKED;
3079 m_AllBranchType = AllBranchType::None;
3080 UpdateData(FALSE);
3082 OnRefresh();
3083 FillLogMessageCtrl(false);
3086 void CLogDlg::ShowStartRef()
3088 //Show ref name on top
3089 if(!::IsWindow(m_hWnd))
3090 return;
3091 if (m_LogList.m_ShowMask & (CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_BASIC_REFS | CGit::LOG_INFO_LOCAL_BRANCHES))
3093 switch (m_LogList.m_ShowMask & (CGit::LOG_INFO_ALL_BRANCH | CGit::LOG_INFO_BASIC_REFS | CGit::LOG_INFO_LOCAL_BRANCHES))
3095 case CGit::LOG_INFO_ALL_BRANCH:
3096 m_staticRef.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_ALLBRANCHES)));
3097 break;
3099 case CGit::LOG_INFO_BASIC_REFS:
3100 m_staticRef.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_BASIC_REFS)));
3101 break;
3103 case CGit::LOG_INFO_LOCAL_BRANCHES:
3104 m_staticRef.SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_LOG_LOCAL_BRANCHES)));
3105 break;
3108 m_staticRef.Invalidate(TRUE);
3109 m_tooltips.DelTool(GetDlgItem(IDC_STATIC_REF));
3110 return;
3113 CString showStartRef = m_LogList.GetRange();
3114 if (showStartRef.IsEmpty() || showStartRef == _T("HEAD"))
3116 showStartRef.Empty();
3117 //Ref name is HEAD
3118 if (g_Git.Run(L"git.exe symbolic-ref HEAD", &showStartRef, nullptr, CP_UTF8))
3119 showStartRef.LoadString(IDS_PROC_LOG_NOBRANCH);
3120 showStartRef.Trim(L"\r\n\t ");
3124 showStartRef = g_Git.StripRefName(showStartRef);
3126 m_staticRef.SetWindowText(showStartRef);
3127 CWnd *pWnd = GetDlgItem(IDC_STATIC_REF);
3128 m_tooltips.AddTool(pWnd, showStartRef);
3129 m_staticRef.Invalidate(TRUE);
3132 void CLogDlg::SetRange(const CString& range)
3134 m_LogList.SetRange(range);
3135 m_ChangedFileListCtrl.m_sDisplayedBranch = range;
3137 ShowStartRef();
3140 static void AppendMenuChecked(CMenu &menu, UINT nTextID, UINT_PTR nItemID, BOOL checked = FALSE, BOOL enabled = TRUE)
3142 CString text;
3143 text.LoadString(nTextID);
3144 menu.AppendMenu(MF_STRING | (enabled ? MF_ENABLED : MF_DISABLED) | (checked ? MF_CHECKED : MF_UNCHECKED), nItemID, text);
3147 #define WALKBEHAVIOUR_FIRSTPARENT 1
3148 #define WALKBEHAVIOUR_FOLLOWRENAMES 2
3149 #define WALKBEHAVIOUR_COMPRESSEDGRAPH 3
3150 #define WALKBEHAVIOUR_LABELEDCOMMITS 4
3151 #define WALKBEHAVIOUR_NOMERGES 5
3153 void CLogDlg::OnBnClickedWalkBehaviour()
3155 CMenu popup;
3156 if (popup.CreatePopupMenu())
3158 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_FIRSTPARENT, WALKBEHAVIOUR_FIRSTPARENT, m_bFirstParent);
3159 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_NOMERGES, WALKBEHAVIOUR_NOMERGES, m_bNoMerges);
3160 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_FOLLOWRENAMES, WALKBEHAVIOUR_FOLLOWRENAMES, m_bFollowRenames, !(m_path.IsEmpty() || m_path.IsDirectory()));
3161 popup.AppendMenu(MF_SEPARATOR, NULL);
3162 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_COMPRESSED, WALKBEHAVIOUR_COMPRESSEDGRAPH, m_iCompressedGraph == 1);
3163 AppendMenuChecked(popup, IDS_WALKBEHAVIOUR_LABELEDCOMMITS, WALKBEHAVIOUR_LABELEDCOMMITS, m_iCompressedGraph == 2);
3165 m_tooltips.Pop();
3166 RECT rect;
3167 GetDlgItem(IDC_WALKBEHAVIOUR)->GetWindowRect(&rect);
3168 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, rect.left, rect.top, this, 0);
3169 switch (selection)
3171 case WALKBEHAVIOUR_FIRSTPARENT:
3172 m_bFirstParent = !m_bFirstParent;
3173 OnBnClickedFirstParent();
3174 break;
3175 case WALKBEHAVIOUR_NOMERGES:
3176 m_bNoMerges = !m_bNoMerges;
3177 OnBnClickedFirstParent(); // OnBnClickedFirstParent handles both cases: m_bFirstParent and m_bNoMerges
3178 break;
3179 case WALKBEHAVIOUR_FOLLOWRENAMES:
3180 m_bFollowRenames = !m_bFollowRenames;
3181 OnBnClickedFollowRenames();
3182 break;
3183 case WALKBEHAVIOUR_COMPRESSEDGRAPH:
3184 m_iCompressedGraph = (m_iCompressedGraph == 1 ? 0 : 1);
3185 OnBnClickedCompressedGraph();
3186 break;
3187 case WALKBEHAVIOUR_LABELEDCOMMITS:
3188 m_iCompressedGraph = (m_iCompressedGraph == 2 ? 0 : 2);
3189 OnBnClickedCompressedGraph();
3190 break;
3191 default:
3192 break;
3194 m_bWalkBehavior = (m_bFirstParent || m_bNoMerges || m_bFollowRenames || m_iCompressedGraph);
3195 UpdateData(FALSE);
3199 #define VIEW_HIDEPATHS 1
3200 #define VIEW_GRAYPATHS 2
3201 #define VIEW_SHOWTAGS 3
3202 #define VIEW_SHOWLOCALBRANCHES 4
3203 #define VIEW_SHOWREMOTEBRANCHES 5
3204 #define VIEW_SHOWGRAVATAR 6
3205 #define VIEW_SHOWPATCH 7
3207 void CLogDlg::OnBnClickedView()
3209 CMenu popup;
3210 if (popup.CreatePopupMenu())
3212 AppendMenuChecked(popup, IDS_SHOWFILES_HIDEPATHS, VIEW_HIDEPATHS, m_iHidePaths == 1);
3213 AppendMenuChecked(popup, IDS_SHOWFILES_GRAYPATHS, VIEW_GRAYPATHS, m_iHidePaths == 2);
3214 popup.AppendMenu(MF_SEPARATOR, NULL);
3215 CMenu showLabelsMenu;
3216 if (showLabelsMenu.CreatePopupMenu())
3218 AppendMenuChecked(showLabelsMenu, IDS_VIEW_SHOWTAGLABELS, VIEW_SHOWTAGS, m_bShowTags);
3219 AppendMenuChecked(showLabelsMenu, IDS_VIEW_SHOWLOCALBRANCHLABELS, VIEW_SHOWLOCALBRANCHES, m_bShowLocalBranches);
3220 AppendMenuChecked(showLabelsMenu, IDS_VIEW_SHOWREMOTEBRANCHLABELS, VIEW_SHOWREMOTEBRANCHES, m_bShowRemoteBranches);
3221 popup.AppendMenu(MF_STRING | MF_POPUP, (UINT_PTR)showLabelsMenu.m_hMenu, (CString)MAKEINTRESOURCE(IDS_VIEW_LABELS));
3223 popup.AppendMenu(MF_SEPARATOR, NULL);
3224 AppendMenuChecked(popup, IDS_VIEW_SHOWGRAVATAR, VIEW_SHOWGRAVATAR, m_bShowGravatar);
3225 AppendMenuChecked(popup, IDS_MENU_VIEWPATCH, VIEW_SHOWPATCH, IsWindow(this->m_patchViewdlg.m_hWnd));
3227 m_tooltips.Pop();
3228 RECT rect;
3229 GetDlgItem(IDC_VIEW)->GetWindowRect(&rect);
3230 int selection = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, rect.left, rect.top, this, 0);
3231 switch (selection)
3233 case VIEW_HIDEPATHS:
3234 if (m_iHidePaths == 1)
3235 m_iHidePaths = 0;
3236 else
3237 m_iHidePaths = 1;
3238 OnBnClickedHidepaths();
3239 break;
3240 case VIEW_GRAYPATHS:
3241 if (m_iHidePaths == 2)
3242 m_iHidePaths = 0;
3243 else
3244 m_iHidePaths = 2;
3245 OnBnClickedHidepaths();
3246 break;
3247 case VIEW_SHOWTAGS:
3248 m_bShowTags = !m_bShowTags;
3249 HandleShowLabels(m_bShowTags, LOGLIST_SHOWTAGS);
3250 break;
3251 case VIEW_SHOWLOCALBRANCHES:
3252 m_bShowLocalBranches = !m_bShowLocalBranches;
3253 HandleShowLabels(m_bShowLocalBranches, LOGLIST_SHOWLOCALBRANCHES);
3254 break;
3255 case VIEW_SHOWREMOTEBRANCHES:
3256 m_bShowRemoteBranches = !m_bShowRemoteBranches;
3257 HandleShowLabels(m_bShowRemoteBranches, LOGLIST_SHOWREMOTEBRANCHES);
3258 break;
3259 case VIEW_SHOWGRAVATAR:
3261 m_bShowGravatar = !m_bShowGravatar;
3262 ShowGravatar();
3263 m_gravatar.Init();
3264 CString email;
3265 POSITION pos = m_LogList.GetFirstSelectedItemPosition();
3266 if (pos)
3268 int selIndex = m_LogList.GetNextSelectedItem(pos);
3269 int moreSel = m_LogList.GetNextSelectedItem(pos);
3270 if (moreSel < 0)
3272 GitRev* pLogEntry = m_LogList.m_arShownList.SafeGetAt(selIndex);
3273 if (pLogEntry)
3274 email = pLogEntry->GetAuthorEmail();
3277 m_gravatar.LoadGravatar(email);
3278 break;
3280 case VIEW_SHOWPATCH:
3281 TogglePatchView();
3282 break;
3283 default:
3284 break;
3289 void CLogDlg::OnBnClickedFirstParent()
3291 if(this->m_bFirstParent)
3292 m_LogList.m_ShowMask|=CGit::LOG_INFO_FIRST_PARENT;
3293 else
3294 m_LogList.m_ShowMask&=~CGit::LOG_INFO_FIRST_PARENT;
3296 if (m_bNoMerges)
3297 m_LogList.m_ShowMask |= CGit::LOG_INFO_NO_MERGE;
3298 else
3299 m_LogList.m_ShowMask &= ~CGit::LOG_INFO_NO_MERGE;
3301 OnRefresh();
3303 FillLogMessageCtrl(false);
3306 void CLogDlg::OnBnClickShowWholeProject()
3308 this->UpdateData();
3310 if(this->m_bWholeProject)
3312 m_LogList.m_Path.Reset();
3313 SetDlgTitle();
3315 else
3316 m_LogList.m_Path=m_path;
3318 m_regShowWholeProject = m_bWholeProject;
3320 SetDlgTitle();
3322 OnRefresh();
3324 FillLogMessageCtrl(false);
3327 LRESULT CLogDlg::OnRefLogChanged(WPARAM /*wParam*/, LPARAM /*lParam*/)
3329 ShowStartRef();
3330 return 0;
3333 LRESULT CLogDlg::OnTaskbarBtnCreated(WPARAM /*wParam*/, LPARAM /*lParam*/)
3335 m_pTaskbarList.Release();
3336 m_pTaskbarList.CoCreateInstance(CLSID_TaskbarList);
3337 SetUUIDOverlayIcon(m_hWnd);
3338 return 0;
3341 LRESULT CLogDlg::OnRefreshSelection(WPARAM /*wParam*/, LPARAM /*lParam*/)
3343 // it's enough to deselect, then select again one item of the whole selection
3344 int selMark = m_LogList.GetSelectionMark();
3345 if (selMark >= 0)
3347 m_LogList.SetSelectionMark(selMark);
3348 m_LogList.SetItemState(selMark, 0, LVIS_SELECTED);
3349 m_LogList.SetItemState(selMark, LVIS_SELECTED, LVIS_SELECTED);
3351 return 0;
3354 void CLogDlg::OnExitClearFilter()
3356 if (!m_LogList.m_sFilterText.IsEmpty())
3358 OnClickedCancelFilter(NULL, NULL);
3359 return;
3361 SendMessage(WM_CLOSE);