?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Remove the visual style switching stuff - not needed anymore with the native ribbon
[TortoiseGit.git] / src / TortoiseMerge / MainFrm.cpp
blob65fb8a280f12c141cdda0d61f5f3b1f025b190d2
1 // TortoiseGitMerge - a Diff/Patch program
2
3 // Copyright (C) 2008-2017 - TortoiseGit
4 // Copyright (C) 2004-2017 - TortoiseSVN
5 // Copyright (C) 2012-2014 - Sven Strickroth <email@cs-ware.de>
6
7 // This program is free software; you can redistribute it and/or
8 // modify it under the terms of the GNU General Public License
9 // as published by the Free Software Foundation; either version 2
10 // of the License, or (at your option) any later version.
11
12 // This program is distributed in the hope that it will be useful,
13 // but WITHOUT ANY WARRANTY; without even the implied warranty of
14 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 // GNU General Public License for more details.
16
17 // You should have received a copy of the GNU General Public License
18 // along with this program; if not, write to the Free Software Foundation,
19 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20 //
21 #include "stdafx.h"
22 #include "TortoiseMerge.h"
23 #include "OpenDlg.h"
24 #include "SysProgressDlg.h"
25 #include "Settings.h"
26 #include "MessageBox.h"
27 #include "AppUtils.h"
28 #include "PathUtils.h"
29 #include "MainFrm.h"
30 #include "LeftView.h"
31 #include "RightView.h"
32 #include "BottomView.h"
33 #include "DiffColors.h"
34 #include "SelectFileFilter.h"
35 #include "FormatMessageWrapper.h"
36 #include "TaskbarUUID.h"
37 #include "RegexFiltersDlg.h"
38
39 #ifdef _DEBUG
40 #define new DEBUG_NEW
41 #endif
42
43 // CMainFrame
44 #define IDT_RELOADCHECKTIMER 123
45
46 IMPLEMENT_DYNCREATE(CMainFrame, CFrameWndEx)
47
48 BEGIN_MESSAGE_MAP(CMainFrame, CFrameWndEx)
49 ON_WM_CREATE()
50 ON_WM_DESTROY()
51 // Global help commands
52 ON_COMMAND(ID_HELP_FINDER, CFrameWndEx::OnHelpFinder)
53 ON_COMMAND(ID_HELP, CFrameWndEx::OnHelp)
54 ON_COMMAND(ID_CONTEXT_HELP, CFrameWndEx::OnContextHelp)
55 ON_COMMAND(ID_DEFAULT_HELP, CFrameWndEx::OnHelpFinder)
56 ON_COMMAND(ID_FILE_OPEN, OnFileOpen)
57 ON_COMMAND(ID_VIEW_WHITESPACES, OnViewWhitespaces)
58 ON_WM_SIZE()
59 ON_COMMAND(ID_FILE_SAVE, OnFileSave)
60 ON_COMMAND(ID_FILE_SAVE_AS, OnFileSaveAs)
61 ON_UPDATE_COMMAND_UI(ID_FILE_SAVE, OnUpdateFileSave)
62 ON_UPDATE_COMMAND_UI(ID_FILE_SAVE_AS, OnUpdateFileSaveAs)
63 ON_COMMAND(ID_VIEW_ONEWAYDIFF, OnViewOnewaydiff)
64 ON_UPDATE_COMMAND_UI(ID_VIEW_ONEWAYDIFF, OnUpdateViewOnewaydiff)
65 ON_UPDATE_COMMAND_UI(ID_VIEW_WHITESPACES, OnUpdateViewWhitespaces)
66 ON_COMMAND(ID_VIEW_OPTIONS, OnViewOptions)
67 ON_MESSAGE(WM_IDLEUPDATECMDUI, OnIdleUpdateCmdUI)
68 ON_WM_CLOSE()
69 ON_WM_ACTIVATE()
70 ON_COMMAND(ID_FILE_RELOAD, OnFileReload)
71 ON_COMMAND(ID_VIEW_LINEDOWN, OnViewLinedown)
72 ON_COMMAND(ID_VIEW_LINEUP, OnViewLineup)
73 ON_COMMAND(ID_VIEW_MOVEDBLOCKS, OnViewMovedBlocks)
74 ON_UPDATE_COMMAND_UI(ID_VIEW_MOVEDBLOCKS, OnUpdateViewMovedBlocks)
75 ON_UPDATE_COMMAND_UI(ID_EDIT_MARKASRESOLVED, OnUpdateMergeMarkasresolved)
76 ON_COMMAND(ID_EDIT_MARKASRESOLVED, OnMergeMarkasresolved)
77 ON_UPDATE_COMMAND_UI(ID_NAVIGATE_NEXTCONFLICT, OnUpdateMergeNextconflict)
78 ON_UPDATE_COMMAND_UI(ID_NAVIGATE_PREVIOUSCONFLICT, OnUpdateMergePreviousconflict)
79 ON_WM_MOVE()
80 ON_WM_MOVING()
81 ON_UPDATE_COMMAND_UI(ID_EDIT_COPY, OnUpdateEditCopy)
82 ON_COMMAND(ID_VIEW_SWITCHLEFT, OnViewSwitchleft)
83 ON_UPDATE_COMMAND_UI(ID_VIEW_SWITCHLEFT, OnUpdateViewSwitchleft)
84 ON_COMMAND(ID_VIEW_LINELEFT, &CMainFrame::OnViewLineleft)
85 ON_COMMAND(ID_VIEW_LINERIGHT, &CMainFrame::OnViewLineright)
86 ON_UPDATE_COMMAND_UI(ID_VIEW_SHOWFILELIST, &CMainFrame::OnUpdateViewShowfilelist)
87 ON_COMMAND(ID_VIEW_SHOWFILELIST, &CMainFrame::OnViewShowfilelist)
88 ON_COMMAND(ID_EDIT_USETHEIRBLOCK, &CMainFrame::OnEditUseTheirs)
89 ON_COMMAND(ID_EDIT_USEMYBLOCK, &CMainFrame::OnEditUseMine)
90 ON_COMMAND(ID_EDIT_USETHEIRTHENMYBLOCK, &CMainFrame::OnEditUseTheirsThenMine)
91 ON_COMMAND(ID_EDIT_USEMINETHENTHEIRBLOCK, &CMainFrame::OnEditUseMineThenTheirs)
92 ON_COMMAND(ID_EDIT_UNDO, &CMainFrame::OnEditUndo)
93 ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, &CMainFrame::OnUpdateEditUndo)
94 ON_COMMAND(ID_EDIT_REDO, &CMainFrame::OnEditRedo)
95 ON_UPDATE_COMMAND_UI(ID_EDIT_REDO, &CMainFrame::OnUpdateEditRedo)
96 ON_COMMAND(ID_EDIT_ENABLE, &CMainFrame::OnEditEnable)
97 ON_UPDATE_COMMAND_UI(ID_EDIT_ENABLE, &CMainFrame::OnUpdateEditEnable)
98 ON_UPDATE_COMMAND_UI(ID_EDIT_USEMINETHENTHEIRBLOCK, &CMainFrame::OnUpdateEditUseminethentheirblock)
99 ON_UPDATE_COMMAND_UI(ID_EDIT_USEMYBLOCK, &CMainFrame::OnUpdateEditUsemyblock)
100 ON_UPDATE_COMMAND_UI(ID_EDIT_USETHEIRBLOCK, &CMainFrame::OnUpdateEditUsetheirblock)
101 ON_UPDATE_COMMAND_UI(ID_EDIT_USETHEIRTHENMYBLOCK, &CMainFrame::OnUpdateEditUsetheirthenmyblock)
102 ON_COMMAND(ID_VIEW_INLINEDIFFWORD, &CMainFrame::OnViewInlinediffword)
103 ON_UPDATE_COMMAND_UI(ID_VIEW_INLINEDIFFWORD, &CMainFrame::OnUpdateViewInlinediffword)
104 ON_COMMAND(ID_VIEW_INLINEDIFF, &CMainFrame::OnViewInlinediff)
105 ON_UPDATE_COMMAND_UI(ID_VIEW_INLINEDIFF, &CMainFrame::OnUpdateViewInlinediff)
106 ON_UPDATE_COMMAND_UI(ID_EDIT_CREATEUNIFIEDDIFFFILE, &CMainFrame::OnUpdateEditCreateunifieddifffile)
107 ON_COMMAND(ID_EDIT_CREATEUNIFIEDDIFFFILE, &CMainFrame::OnEditCreateunifieddifffile)
108 ON_UPDATE_COMMAND_UI(ID_VIEW_LINEDIFFBAR, &CMainFrame::OnUpdateViewLinediffbar)
109 ON_COMMAND(ID_VIEW_LINEDIFFBAR, &CMainFrame::OnViewLinediffbar)
110 ON_UPDATE_COMMAND_UI(ID_VIEW_BARS, &CMainFrame::OnUpdateViewBars)
111 ON_UPDATE_COMMAND_UI(ID_VIEW_LOCATORBAR, &CMainFrame::OnUpdateViewLocatorbar)
112 ON_COMMAND(ID_VIEW_LOCATORBAR, &CMainFrame::OnViewLocatorbar)
113 ON_COMMAND(ID_EDIT_USELEFTBLOCK, &CMainFrame::OnEditUseleftblock)
114 ON_UPDATE_COMMAND_UI(ID_USEBLOCKS, &CMainFrame::OnUpdateUseBlock)
115 ON_UPDATE_COMMAND_UI(ID_EDIT_USELEFTBLOCK, &CMainFrame::OnUpdateEditUseleftblock)
116 ON_COMMAND(ID_EDIT_USELEFTFILE, &CMainFrame::OnEditUseleftfile)
117 ON_UPDATE_COMMAND_UI(ID_EDIT_USELEFTFILE, &CMainFrame::OnUpdateEditUseleftfile)
118 ON_COMMAND(ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT, &CMainFrame::OnEditUseblockfromleftbeforeright)
119 ON_UPDATE_COMMAND_UI(ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT, &CMainFrame::OnUpdateEditUseblockfromleftbeforeright)
120 ON_COMMAND(ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT, &CMainFrame::OnEditUseblockfromrightbeforeleft)
121 ON_UPDATE_COMMAND_UI(ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT, &CMainFrame::OnUpdateEditUseblockfromrightbeforeleft)
122 ON_UPDATE_COMMAND_UI(ID_NAVIGATE_NEXTDIFFERENCE, &CMainFrame::OnUpdateNavigateNextdifference)
123 ON_UPDATE_COMMAND_UI(ID_NAVIGATE_PREVIOUSDIFFERENCE, &CMainFrame::OnUpdateNavigatePreviousdifference)
124 ON_COMMAND(ID_VIEW_COLLAPSED, &CMainFrame::OnViewCollapsed)
125 ON_UPDATE_COMMAND_UI(ID_VIEW_COLLAPSED, &CMainFrame::OnUpdateViewCollapsed)
126 ON_COMMAND(ID_VIEW_COMPAREWHITESPACES, &CMainFrame::OnViewComparewhitespaces)
127 ON_UPDATE_COMMAND_UI(ID_VIEW_COMPAREWHITESPACES, &CMainFrame::OnUpdateViewComparewhitespaces)
128 ON_COMMAND(ID_VIEW_IGNOREWHITESPACECHANGES, &CMainFrame::OnViewIgnorewhitespacechanges)
129 ON_UPDATE_COMMAND_UI(ID_VIEW_IGNOREWHITESPACECHANGES, &CMainFrame::OnUpdateViewIgnorewhitespacechanges)
130 ON_COMMAND(ID_VIEW_IGNOREALLWHITESPACECHANGES, &CMainFrame::OnViewIgnoreallwhitespacechanges)
131 ON_UPDATE_COMMAND_UI(ID_VIEW_IGNOREALLWHITESPACECHANGES, &CMainFrame::OnUpdateViewIgnoreallwhitespacechanges)
132 ON_UPDATE_COMMAND_UI(ID_NAVIGATE_NEXTINLINEDIFF, &CMainFrame::OnUpdateNavigateNextinlinediff)
133 ON_UPDATE_COMMAND_UI(ID_NAVIGATE_PREVINLINEDIFF, &CMainFrame::OnUpdateNavigatePrevinlinediff)
134 ON_COMMAND(ID_VIEW_WRAPLONGLINES, &CMainFrame::OnViewWraplonglines)
135 ON_UPDATE_COMMAND_UI(ID_VIEW_WRAPLONGLINES, &CMainFrame::OnUpdateViewWraplonglines)
136 ON_REGISTERED_MESSAGE( TaskBarButtonCreated, CMainFrame::OnTaskbarButtonCreated )
137 ON_UPDATE_COMMAND_UI(ID_EDIT_PASTE, &CMainFrame::OnUpdateEditPaste)
138 ON_COMMAND(ID_INDICATOR_LEFTVIEW, &CMainFrame::OnIndicatorLeftview)
139 ON_COMMAND(ID_INDICATOR_RIGHTVIEW, &CMainFrame::OnIndicatorRightview)
140 ON_COMMAND(ID_INDICATOR_BOTTOMVIEW, &CMainFrame::OnIndicatorBottomview)
141 ON_WM_TIMER()
142 ON_COMMAND(ID_VIEW_IGNORECOMMENTS, &CMainFrame::OnViewIgnorecomments)
143 ON_UPDATE_COMMAND_UI(ID_VIEW_IGNORECOMMENTS, &CMainFrame::OnUpdateViewIgnorecomments)
144 ON_COMMAND_RANGE(ID_REGEXFILTER, ID_REGEXFILTER+400, &CMainFrame::OnRegexfilter)
145 ON_UPDATE_COMMAND_UI_RANGE(ID_REGEXFILTER, ID_REGEXFILTER+400, &CMainFrame::OnUpdateViewRegexFilter)
146 ON_COMMAND(ID_REGEX_NO_FILTER, &CMainFrame::OnRegexNoFilter)
147 ON_UPDATE_COMMAND_UI(ID_REGEX_NO_FILTER, &CMainFrame::OnUpdateRegexNoFilter)
148 ON_COMMAND(ID_INDICATOR_LEFTVIEWCOMBOENCODING, &CMainFrame::OnDummyEnabled)
149 ON_COMMAND(ID_INDICATOR_RIGHTVIEWCOMBOENCODING, &CMainFrame::OnDummyEnabled)
150 ON_COMMAND(ID_INDICATOR_BOTTOMVIEWCOMBOENCODING, &CMainFrame::OnDummyEnabled)
151 ON_COMMAND(ID_INDICATOR_LEFTVIEWCOMBOEOL, &CMainFrame::OnDummyEnabled)
152 ON_COMMAND(ID_INDICATOR_RIGHTVIEWCOMBOEOL, &CMainFrame::OnDummyEnabled)
153 ON_COMMAND(ID_INDICATOR_BOTTOMVIEWCOMBOEOL, &CMainFrame::OnDummyEnabled)
154 ON_COMMAND(ID_INDICATOR_LEFTVIEWCOMBOTABMODE, &CMainFrame::OnDummyEnabled)
155 ON_COMMAND(ID_INDICATOR_RIGHTVIEWCOMBOTABMODE, &CMainFrame::OnDummyEnabled)
156 ON_COMMAND(ID_INDICATOR_BOTTOMVIEWCOMBOTABMODE, &CMainFrame::OnDummyEnabled)
157 ON_UPDATE_COMMAND_UI(ID_EDIT_THREEWAY_ACTIONS, &CMainFrame::OnUpdateThreeWayActions)
158 ON_COMMAND_RANGE(ID_INDICATOR_LEFTENCODINGSTART, ID_INDICATOR_LEFTENCODINGSTART+19, &CMainFrame::OnEncodingLeft)
159 ON_COMMAND_RANGE(ID_INDICATOR_RIGHTENCODINGSTART, ID_INDICATOR_RIGHTENCODINGSTART+19, &CMainFrame::OnEncodingRight)
160 ON_COMMAND_RANGE(ID_INDICATOR_BOTTOMENCODINGSTART, ID_INDICATOR_BOTTOMENCODINGSTART+19, &CMainFrame::OnEncodingBottom)
161 ON_COMMAND_RANGE(ID_INDICATOR_LEFTEOLSTART, ID_INDICATOR_LEFTEOLSTART+19, &CMainFrame::OnEOLLeft)
162 ON_COMMAND_RANGE(ID_INDICATOR_RIGHTEOLSTART, ID_INDICATOR_RIGHTEOLSTART+19, &CMainFrame::OnEOLRight)
163 ON_COMMAND_RANGE(ID_INDICATOR_BOTTOMEOLSTART, ID_INDICATOR_BOTTOMEOLSTART+19, &CMainFrame::OnEOLBottom)
164 ON_COMMAND_RANGE(ID_INDICATOR_LEFTTABMODESTART, ID_INDICATOR_LEFTTABMODESTART+19, &CMainFrame::OnTabModeLeft)
165 ON_COMMAND_RANGE(ID_INDICATOR_RIGHTTABMODESTART, ID_INDICATOR_RIGHTTABMODESTART+19, &CMainFrame::OnTabModeRight)
166 ON_COMMAND_RANGE(ID_INDICATOR_BOTTOMTABMODESTART, ID_INDICATOR_BOTTOMTABMODESTART+19, &CMainFrame::OnTabModeBottom)
167 ON_UPDATE_COMMAND_UI_RANGE(ID_INDICATOR_LEFTENCODINGSTART, ID_INDICATOR_LEFTENCODINGSTART+19, &CMainFrame::OnUpdateEncodingLeft)
168 ON_UPDATE_COMMAND_UI_RANGE(ID_INDICATOR_RIGHTENCODINGSTART, ID_INDICATOR_RIGHTENCODINGSTART+19, &CMainFrame::OnUpdateEncodingRight)
169 ON_UPDATE_COMMAND_UI_RANGE(ID_INDICATOR_BOTTOMENCODINGSTART, ID_INDICATOR_BOTTOMENCODINGSTART+19, &CMainFrame::OnUpdateEncodingBottom)
170 ON_UPDATE_COMMAND_UI_RANGE(ID_INDICATOR_LEFTEOLSTART, ID_INDICATOR_LEFTEOLSTART+19, &CMainFrame::OnUpdateEOLLeft)
171 ON_UPDATE_COMMAND_UI_RANGE(ID_INDICATOR_RIGHTEOLSTART, ID_INDICATOR_RIGHTEOLSTART+19, &CMainFrame::OnUpdateEOLRight)
172 ON_UPDATE_COMMAND_UI_RANGE(ID_INDICATOR_BOTTOMEOLSTART, ID_INDICATOR_BOTTOMEOLSTART+19, &CMainFrame::OnUpdateEOLBottom)
173 ON_UPDATE_COMMAND_UI_RANGE(ID_INDICATOR_LEFTTABMODESTART, ID_INDICATOR_LEFTTABMODESTART+19, &CMainFrame::OnUpdateTabModeLeft)
174 ON_UPDATE_COMMAND_UI_RANGE(ID_INDICATOR_RIGHTTABMODESTART, ID_INDICATOR_RIGHTTABMODESTART+19, &CMainFrame::OnUpdateTabModeRight)
175 ON_UPDATE_COMMAND_UI_RANGE(ID_INDICATOR_BOTTOMTABMODESTART, ID_INDICATOR_BOTTOMTABMODESTART+19, &CMainFrame::OnUpdateTabModeBottom)
176 END_MESSAGE_MAP()
177
178 static UINT indicators[] =
179 {
180 ID_SEPARATOR, // status line indicator
181 ID_INDICATOR_LEFTVIEW,
182 ID_INDICATOR_RIGHTVIEW,
183 ID_INDICATOR_BOTTOMVIEW,
184 ID_INDICATOR_CAPS,
185 ID_INDICATOR_NUM,
186 ID_INDICATOR_SCRL
187 };
188
189
190 // CMainFrame construction/destruction
191
192 CMainFrame::CMainFrame()
193 : m_bInitSplitter(FALSE)
194 , m_bReversedPatch(FALSE)
195 , m_bHasConflicts(false)
196 , m_bInlineWordDiff(true)
197 , m_bLineDiff(true)
198 , m_bLocatorBar(true)
199 , m_nMoveMovesToIgnore(0)
200 , m_pwndLeftView(nullptr)
201 , m_pwndRightView(nullptr)
202 , m_pwndBottomView(nullptr)
203 , m_bReadOnly(false)
204 , m_bBlame(false)
205 , m_bCheckReload(false)
206 , m_bSaveRequired(false)
207 , m_bSaveRequiredOnConflicts(false)
208 , m_bDeleteBaseTheirsMineOnClose(false)
209 , resolveMsgWnd(0)
210 , resolveMsgWParam(0)
211 , resolveMsgLParam(0)
212 , m_regWrapLines(L"Software\\TortoiseGitMerge\\WrapLines", 0)
213 , m_regViewModedBlocks(L"Software\\TortoiseGitMerge\\ViewMovedBlocks", TRUE)
214 , m_regOneWay(L"Software\\TortoiseGitMerge\\OnePane")
215 , m_regCollapsed(L"Software\\TortoiseGitMerge\\Collapsed", 0)
216 , m_regInlineDiff(L"Software\\TortoiseGitMerge\\DisplayBinDiff", TRUE)
217 , m_regUseRibbons(L"Software\\TortoiseGitMerge\\UseRibbons", TRUE)
218 , m_regIgnoreComments(L"Software\\TortoiseGitMerge\\IgnoreComments", FALSE)
219 , m_regexIndex(-1)
220 {
221 m_bOneWay = (0 != ((DWORD)m_regOneWay));
222 m_bCollapsed = !!(DWORD)m_regCollapsed;
223 m_bViewMovedBlocks = !!(DWORD)m_regViewModedBlocks;
224 m_bWrapLines = !!(DWORD)m_regWrapLines;
225 m_bInlineDiff = !!m_regInlineDiff;
226 m_bUseRibbons = !!m_regUseRibbons;
227 }
228
229 CMainFrame::~CMainFrame()
230 {
231 }
232
233 LRESULT CMainFrame::OnTaskbarButtonCreated(WPARAM /*wParam*/, LPARAM /*lParam*/)
234 {
235 SetUUIDOverlayIcon(m_hWnd);
236 return 0;
237 }
238
239
240 int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
241 {
242 if (CFrameWndEx::OnCreate(lpCreateStruct) == -1)
243 return -1;
244
245 if (m_bUseRibbons)
246 {
247 HRESULT hr;
248 hr = m_pRibbonFramework.CoCreateInstance(__uuidof(UIRibbonFramework));
249 if (FAILED(hr))
250 {
251 TRACE(L"Failed to create ribbon framework (%08x)\n", hr);
252 return -1; // fail to create
253 }
254
255 m_pRibbonApp.reset(new CNativeRibbonApp(this, m_pRibbonFramework));
256 m_pRibbonApp->SetSettingsFileName(CPathUtils::GetAppDataDirectory() + L"TortoiseGitMerge-RibbonSettings");
257
258 hr = m_pRibbonFramework->Initialize(m_hWnd, m_pRibbonApp.get());
259 if (FAILED(hr))
260 {
261 TRACE(L"Failed to initialize ribbon framework (%08x)\n", hr);
262 return -1; // fail to create
263 }
264
265 hr = m_pRibbonFramework->LoadUI(AfxGetResourceHandle(), L"TORTOISEGITMERGERIBBON_RIBBON");
266 if (FAILED(hr))
267 {
268 TRACE(L"Failed to load ribbon UI (%08x)\n", hr);
269 return -1; // fail to create
270 }
271 BuildRegexSubitems();
272 if (!m_wndRibbonStatusBar.Create(this))
273 {
274 TRACE0("Failed to create ribbon status bar\n");
275 return -1; // fail to create
276 }
277 m_wndRibbonStatusBar.AddElement(new CMFCRibbonStatusBarPane(ID_SEPARATOR, CString(MAKEINTRESOURCE(AFX_IDS_IDLEMESSAGE)), TRUE), L"");
278
279 CString sTooltip(MAKEINTRESOURCE(IDS_ENCODING_COMBO_TOOLTIP));
280 auto apBtnGroupLeft = std::make_unique<CMFCRibbonButtonsGroup>();
281 apBtnGroupLeft->SetID(ID_INDICATOR_LEFTVIEW);
282 apBtnGroupLeft->AddButton(new CMFCRibbonStatusBarPane(ID_SEPARATOR, CString(MAKEINTRESOURCE(IDS_STATUSBAR_LEFTVIEW)), TRUE));
283 CMFCRibbonButton * pButton = new CMFCRibbonButton(ID_INDICATOR_LEFTVIEWCOMBOENCODING, L"");
284 pButton->SetToolTipText(sTooltip);
285 FillEncodingButton(pButton, ID_INDICATOR_LEFTENCODINGSTART);
286 apBtnGroupLeft->AddButton(pButton);
287 pButton = new CMFCRibbonButton(ID_INDICATOR_LEFTVIEWCOMBOEOL, L"");
288 FillEOLButton(pButton, ID_INDICATOR_LEFTEOLSTART);
289 apBtnGroupLeft->AddButton(pButton);
290 pButton = new CMFCRibbonButton(ID_INDICATOR_LEFTVIEWCOMBOTABMODE, L"");
291 FillTabModeButton(pButton, ID_INDICATOR_LEFTTABMODESTART);
292 apBtnGroupLeft->AddButton(pButton);
293 apBtnGroupLeft->AddButton(new CMFCRibbonStatusBarPane(ID_INDICATOR_LEFTVIEW, L"", TRUE));
294 m_wndRibbonStatusBar.AddExtendedElement(apBtnGroupLeft.release(), L"");
295
296 auto apBtnGroupRight = std::make_unique<CMFCRibbonButtonsGroup>();
297 apBtnGroupRight->SetID(ID_INDICATOR_RIGHTVIEW);
298 apBtnGroupRight->AddButton(new CMFCRibbonStatusBarPane(ID_SEPARATOR, CString(MAKEINTRESOURCE(IDS_STATUSBAR_RIGHTVIEW)), TRUE));
299 pButton = new CMFCRibbonButton(ID_INDICATOR_RIGHTVIEWCOMBOENCODING, L"");
300 pButton->SetToolTipText(sTooltip);
301 FillEncodingButton(pButton, ID_INDICATOR_RIGHTENCODINGSTART);
302 apBtnGroupRight->AddButton(pButton);
303 pButton = new CMFCRibbonButton(ID_INDICATOR_RIGHTVIEWCOMBOEOL, L"");
304 FillEOLButton(pButton, ID_INDICATOR_RIGHTEOLSTART);
305 apBtnGroupRight->AddButton(pButton);
306 pButton = new CMFCRibbonButton(ID_INDICATOR_RIGHTVIEWCOMBOTABMODE, L"");
307 FillTabModeButton(pButton, ID_INDICATOR_RIGHTTABMODESTART);
308 apBtnGroupRight->AddButton(pButton);
309 apBtnGroupRight->AddButton(new CMFCRibbonStatusBarPane(ID_INDICATOR_RIGHTVIEW, L"", TRUE));
310 m_wndRibbonStatusBar.AddExtendedElement(apBtnGroupRight.release(), L"");
311 }
312 else
313 {
314 if (!m_wndMenuBar.Create(this))
315 {
316 TRACE0("Failed to create menubar\n");
317 return -1; // fail to create
318 }
319 m_wndMenuBar.SetPaneStyle(m_wndMenuBar.GetPaneStyle() | CBRS_SIZE_DYNAMIC | CBRS_TOOLTIPS | CBRS_FLYBY);
320
321 // prevent the menu bar from taking the focus on activation
322 CMFCPopupMenu::SetForceMenuFocus(FALSE);
323 if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_ALIGN_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY) || !m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
324 {
325 TRACE0("Failed to create toolbar\n");
326 return -1; // fail to create
327 }
328 m_wndToolBar.SetWindowText(L"Main");
329 if (!m_wndStatusBar.Create(this) ||
330 !m_wndStatusBar.SetIndicators(indicators,
331 _countof(indicators)))
332 {
333 TRACE0("Failed to create status bar\n");
334 return -1; // fail to create
335 }
336 m_wndStatusBar.EnablePaneDoubleClick();
337 }
338
339 if (!m_wndLocatorBar.Create(this, IDD_DIFFLOCATOR,
340 CBRS_ALIGN_LEFT | CBRS_SIZE_FIXED, ID_VIEW_LOCATORBAR))
341 {
342 TRACE0("Failed to create dialogbar\n");
343 return -1; // fail to create
344 }
345 if (!m_wndLineDiffBar.Create(this, IDD_LINEDIFF,
346 CBRS_ALIGN_BOTTOM | CBRS_SIZE_FIXED, ID_VIEW_LINEDIFFBAR))
347 {
348 TRACE0("Failed to create dialogbar\n");
349 return -1; // fail to create
350 }
351 m_wndLocatorBar.m_pMainFrm = this;
352 m_wndLineDiffBar.m_pMainFrm = this;
353
354 EnableDocking(CBRS_ALIGN_ANY);
355 if (!m_bUseRibbons)
356 {
357 m_wndMenuBar.EnableDocking(CBRS_ALIGN_TOP);
358 m_wndToolBar.EnableDocking(CBRS_ALIGN_TOP);
359 DockPane(&m_wndMenuBar);
360 DockPane(&m_wndToolBar);
361 }
362 DockPane(&m_wndLocatorBar);
363 DockPane(&m_wndLineDiffBar);
364 ShowPane(&m_wndLocatorBar, true, false, true);
365 ShowPane(&m_wndLineDiffBar, true, false, true);
366
367 m_wndLocatorBar.EnableGripper(FALSE);
368 m_wndLineDiffBar.EnableGripper(FALSE);
369
370 return 0;
371 }
372
373 void CMainFrame::OnDestroy()
374 {
375 if (m_pRibbonFramework)
376 m_pRibbonFramework->Destroy();
377
378 CFrameWndEx::OnDestroy();
379 }
380
381 BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
382 {
383 if( !CFrameWndEx::PreCreateWindow(cs) )
384 return FALSE;
385 return TRUE;
386 }
387
388 // CMainFrame diagnostics
389
390 #ifdef _DEBUG
391 void CMainFrame::AssertValid() const
392 {
393 CFrameWndEx::AssertValid();
394 }
395
396 void CMainFrame::Dump(CDumpContext& dc) const
397 {
398 CFrameWndEx::Dump(dc);
399 }
400
401 #endif //_DEBUG
402
403
404 // CMainFrame message handlers
405
406
407 BOOL CMainFrame::OnCreateClient(LPCREATESTRUCT /*lpcs*/, CCreateContext* pContext)
408 {
409 CRect cr;
410 GetClientRect( &cr);
411
412
413 // split into three panes:
414 // -------------
415 // | | |
416 // | | |
417 // |------------
418 // | |
419 // | |
420 // |------------
421
422 // create a splitter with 2 rows, 1 column
423 if (!m_wndSplitter.CreateStatic(this, 2, 1))
424 {
425 TRACE0("Failed to CreateStaticSplitter\n");
426 return FALSE;
427 }
428
429 // add the second splitter pane - which is a nested splitter with 2 columns
430 if (!m_wndSplitter2.CreateStatic(
431 &m_wndSplitter, // our parent window is the first splitter
432 1, 2, // the new splitter is 1 row, 2 columns
433 WS_CHILD | WS_VISIBLE | WS_BORDER, // style, WS_BORDER is needed
434 m_wndSplitter.IdFromRowCol(0, 0)
435 // new splitter is in the first row, 1st column of first splitter
436 ))
437 {
438 TRACE0("Failed to create nested splitter\n");
439 return FALSE;
440 }
441 // add the first splitter pane - the default view in row 0
442 if (!m_wndSplitter.CreateView(1, 0,
443 RUNTIME_CLASS(CBottomView), CSize(cr.Width(), cr.Height()), pContext))
444 {
445 TRACE0("Failed to create first pane\n");
446 return FALSE;
447 }
448 m_pwndBottomView = static_cast<CBottomView*>(m_wndSplitter.GetPane(1, 0));
449 m_pwndBottomView->m_pwndLocator = &m_wndLocatorBar;
450 m_pwndBottomView->m_pwndLineDiffBar = &m_wndLineDiffBar;
451 if (m_bUseRibbons)
452 m_pwndBottomView->m_pwndRibbonStatusBar = &m_wndRibbonStatusBar;
453 else
454 m_pwndBottomView->m_pwndStatusBar = &m_wndStatusBar;
455 m_pwndBottomView->m_pMainFrame = this;
456
457 // now create the two views inside the nested splitter
458
459 if (!m_wndSplitter2.CreateView(0, 0,
460 RUNTIME_CLASS(CLeftView), CSize(cr.Width()/2, cr.Height()/2), pContext))
461 {
462 TRACE0("Failed to create second pane\n");
463 return FALSE;
464 }
465 m_pwndLeftView = static_cast<CLeftView*>(m_wndSplitter2.GetPane(0, 0));
466 m_pwndLeftView->m_pwndLocator = &m_wndLocatorBar;
467 m_pwndLeftView->m_pwndLineDiffBar = &m_wndLineDiffBar;
468 if (m_bUseRibbons)
469 m_pwndLeftView->m_pwndRibbonStatusBar = &m_wndRibbonStatusBar;
470 else
471 m_pwndLeftView->m_pwndStatusBar = &m_wndStatusBar;
472 m_pwndLeftView->m_pMainFrame = this;
473
474 if (!m_wndSplitter2.CreateView(0, 1,
475 RUNTIME_CLASS(CRightView), CSize(cr.Width()/2, cr.Height()/2), pContext))
476 {
477 TRACE0("Failed to create third pane\n");
478 return FALSE;
479 }
480 m_pwndRightView = static_cast<CRightView*>(m_wndSplitter2.GetPane(0, 1));
481 m_pwndRightView->m_pwndLocator = &m_wndLocatorBar;
482 m_pwndRightView->m_pwndLineDiffBar = &m_wndLineDiffBar;
483 if (m_bUseRibbons)
484 m_pwndRightView->m_pwndRibbonStatusBar = &m_wndRibbonStatusBar;
485 else
486 m_pwndRightView->m_pwndStatusBar = &m_wndStatusBar;
487 m_pwndRightView->m_pMainFrame = this;
488 m_bInitSplitter = TRUE;
489
490 m_dlgFilePatches.Create(IDD_FILEPATCHES, this);
491 UpdateLayout();
492 return TRUE;
493 }
494
495 // Callback function
496 BOOL CMainFrame::PatchFile(CString sFilePath, bool /*bContentMods*/, bool bPropMods, CString sVersion, BOOL bAutoPatch)
497 {
498 //"dry run" was successful, so save the patched file somewhere...
499 CString sTempFile = CTempFiles::Instance().GetTempFilePathString();
500 CString sRejectedFile, sBasePath;
501 if (m_Patch.GetPatchResult(sFilePath, sTempFile, sRejectedFile, sBasePath) < 0)
502 {
503 MessageBox(m_Patch.GetErrorMessage(), nullptr, MB_ICONERROR);
504 return FALSE;
505 }
506 sFilePath = m_Patch.GetTargetPath() + L'\\' + sFilePath;
507 sFilePath.Replace('/', '\\');
508 if (sBasePath.IsEmpty())
509 sBasePath = sFilePath;
510 if (m_bReversedPatch)
511 {
512 m_Data.m_baseFile.SetFileName(sTempFile);
513 CString temp;
514 temp.Format(L"%s %s", (LPCTSTR)CPathUtils::GetFileNameFromPath(sFilePath), (LPCTSTR)m_Data.m_sPatchPatched);
515 m_Data.m_baseFile.SetDescriptiveName(temp);
516 m_Data.m_yourFile.SetFileName(sFilePath);
517 temp.Format(L"%s %s", (LPCTSTR)CPathUtils::GetFileNameFromPath(sFilePath), (LPCTSTR)m_Data.m_sPatchOriginal);
518 m_Data.m_yourFile.SetDescriptiveName(temp);
519 m_Data.m_theirFile.SetOutOfUse();
520 m_Data.m_mergedFile.SetOutOfUse();
521 }
522 else
523 {
524 if ((!PathFileExists(sBasePath))||(PathIsDirectory(sBasePath)))
525 {
526 m_Data.m_baseFile.SetFileName(CTempFiles::Instance().GetTempFilePathString());
527 m_Data.m_baseFile.CreateEmptyFile();
528 }
529 else
530 {
531 m_Data.m_baseFile.SetFileName(sBasePath);
532 }
533 CString sDescription;
534 sDescription.Format(L"%s %s", (LPCTSTR)CPathUtils::GetFileNameFromPath(sBasePath), (LPCTSTR)m_Data.m_sPatchOriginal);
535 m_Data.m_baseFile.SetDescriptiveName(sDescription);
536 if (sBasePath == sFilePath)
537 {
538 m_Data.m_yourFile.SetFileName(sTempFile);
539 CString temp;
540 temp.Format(L"%s %s", (LPCTSTR)CPathUtils::GetFileNameFromPath(sBasePath), (LPCTSTR)m_Data.m_sPatchPatched);
541 m_Data.m_yourFile.SetDescriptiveName(temp);
542 m_Data.m_theirFile.SetOutOfUse();
543 }
544 else
545 {
546 if (!PathFileExists(sFilePath) || PathIsDirectory(sFilePath))
547 {
548 m_Data.m_yourFile.SetFileName(CTempFiles::Instance().GetTempFilePathString());
549 m_Data.m_yourFile.CreateEmptyFile();
550 CString temp;
551 temp.Format(L"%s %s", (LPCTSTR)CPathUtils::GetFileNameFromPath(sFilePath), (LPCTSTR)CString(MAKEINTRESOURCE(IDS_NOTFOUNDVIEWTITLEINDICATOR)));
552 m_Data.m_yourFile.SetDescriptiveName(temp);
553 }
554 else
555 m_Data.m_yourFile.SetFileName(sFilePath);
556 m_Data.m_theirFile.SetFileName(sTempFile);
557 CString temp;
558 temp.Format(L"%s %s", (LPCTSTR)CPathUtils::GetFileNameFromPath(sFilePath), (LPCTSTR)m_Data.m_sPatchPatched);
559 m_Data.m_theirFile.SetDescriptiveName(temp);
560 }
561 m_Data.m_mergedFile.SetFileName(sFilePath);
562 m_Data.m_bPatchRequired = bPropMods;
563 }
564 TRACE(L"comparing %s\nwith the patched result %s\n", (LPCTSTR)sFilePath, (LPCTSTR)sTempFile);
565
566 LoadViews();
567 if (!sRejectedFile.IsEmpty())
568 {
569 #if 0 // TGIT TODO
570 // start TortoiseUDiff with the rejected hunks
571 CString sTitle;
572 sTitle.Format(IDS_TITLE_REJECTEDHUNKS, (LPCTSTR)CPathUtils::GetFileNameFromPath(sFilePath));
573 CAppUtils::StartUnifiedDiffViewer(sRejectedFile, sTitle);
574 #endif
575 }
576 if (bAutoPatch)
577 {
578 if (sBasePath != sFilePath && HasConflictsWontKeep())
579 return FALSE;
580
581 PatchSave();
582 }
583 return TRUE;
584 }
585
586 // Callback function
587 BOOL CMainFrame::DiffFiles(CString sURL1, CString sRev1, CString sURL2, CString sRev2)
588 {
589 CString tempfile1 = CTempFiles::Instance().GetTempFilePathString();
590 CString tempfile2 = CTempFiles::Instance().GetTempFilePathString();
591
592 ASSERT(tempfile1.Compare(tempfile2));
593
594 CString sTemp;
595 CSysProgressDlg progDlg;
596 sTemp.Format(IDS_GETVERSIONOFFILE, (LPCTSTR)sRev1);
597 progDlg.SetLine(1, sTemp, true);
598 progDlg.SetLine(2, sURL1, true);
599 sTemp.LoadString(IDS_GETVERSIONOFFILETITLE);
600 progDlg.SetTitle(sTemp);
601 progDlg.SetShowProgressBar(true);
602 progDlg.SetTime(FALSE);
603 progDlg.SetProgress(1,100);
604 progDlg.ShowModeless(this);
605 if (!CAppUtils::GetVersionedFile(sURL1, sRev1, tempfile1, &progDlg, m_hWnd))
606 {
607 progDlg.Stop();
608 CString sErrMsg;
609 sErrMsg.Format(IDS_ERR_MAINFRAME_FILEVERSIONNOTFOUND, (LPCTSTR)sRev1, (LPCTSTR)sURL1);
610 MessageBox(sErrMsg, nullptr, MB_ICONERROR);
611 return FALSE;
612 }
613 sTemp.Format(IDS_GETVERSIONOFFILE, (LPCTSTR)sRev2);
614 progDlg.SetLine(1, sTemp, true);
615 progDlg.SetLine(2, sURL2, true);
616 progDlg.SetProgress(50, 100);
617 if (!CAppUtils::GetVersionedFile(sURL2, sRev2, tempfile2, &progDlg, m_hWnd))
618 {
619 progDlg.Stop();
620 CString sErrMsg;
621 sErrMsg.Format(IDS_ERR_MAINFRAME_FILEVERSIONNOTFOUND, (LPCTSTR)sRev2, (LPCTSTR)sURL2);
622 MessageBox(sErrMsg, nullptr, MB_ICONERROR);
623 return FALSE;
624 }
625 progDlg.SetProgress(100,100);
626 progDlg.Stop();
627 CString temp;
628 temp.Format(L"%s Revision %s", (LPCTSTR)CPathUtils::GetFileNameFromPath(sURL1), (LPCTSTR)sRev1);
629 m_Data.m_baseFile.SetFileName(tempfile1);
630 m_Data.m_baseFile.SetDescriptiveName(temp);
631 temp.Format(L"%s Revision %s", (LPCTSTR)CPathUtils::GetFileNameFromPath(sURL2), (LPCTSTR)sRev2);
632 m_Data.m_yourFile.SetFileName(tempfile2);
633 m_Data.m_yourFile.SetDescriptiveName(temp);
634
635 LoadViews();
636
637 return TRUE;
638 }
639
640 void CMainFrame::OnFileOpen()
641 {
642 if (CheckForSave(CHFSR_OPEN)==IDCANCEL)
643 return;
644 return OnFileOpen(false);
645 }
646
647 void CMainFrame::OnFileOpen(bool fillyours)
648 {
649 COpenDlg dlg;
650 if (fillyours)
651 dlg.m_sBaseFile = m_Data.m_yourFile.GetFilename();
652 if (dlg.DoModal() != IDOK)
653 {
654 return;
655 }
656 m_dlgFilePatches.ShowWindow(SW_HIDE);
657 m_dlgFilePatches.Init(nullptr, nullptr, CString(), nullptr);
658 TRACE(L"got the files:\n %s\n %s\n %s\n %s\n %s\n", (LPCTSTR)dlg.m_sBaseFile, (LPCTSTR)dlg.m_sTheirFile, (LPCTSTR)dlg.m_sYourFile,
659 (LPCTSTR)dlg.m_sUnifiedDiffFile, (LPCTSTR)dlg.m_sPatchDirectory);
660 m_Data.m_baseFile.SetFileName(dlg.m_sBaseFile);
661 m_Data.m_theirFile.SetFileName(dlg.m_sTheirFile);
662 m_Data.m_yourFile.SetFileName(dlg.m_sYourFile);
663 m_Data.m_sDiffFile = dlg.m_sUnifiedDiffFile;
664 m_Data.m_sPatchPath = dlg.m_sPatchDirectory;
665 m_Data.m_mergedFile.SetOutOfUse();
666 CCrashReport::Instance().AddFile2(dlg.m_sBaseFile, nullptr, L"Basefile", CR_AF_MAKE_FILE_COPY);
667 CCrashReport::Instance().AddFile2(dlg.m_sTheirFile, nullptr, L"Theirfile", CR_AF_MAKE_FILE_COPY);
668 CCrashReport::Instance().AddFile2(dlg.m_sYourFile, nullptr, L"Yourfile", CR_AF_MAKE_FILE_COPY);
669 CCrashReport::Instance().AddFile2(dlg.m_sUnifiedDiffFile, nullptr, L"Difffile", CR_AF_MAKE_FILE_COPY);
670
671 if (!m_Data.IsBaseFileInUse() && m_Data.IsTheirFileInUse() && m_Data.IsYourFileInUse())
672 {
673 // a diff between two files means "Yours" against "Base", not "Theirs" against "Yours"
674 m_Data.m_baseFile.TransferDetailsFrom(m_Data.m_theirFile);
675 }
676 if (m_Data.IsBaseFileInUse() && m_Data.IsTheirFileInUse() && !m_Data.IsYourFileInUse())
677 {
678 // a diff between two files means "Yours" against "Base", not "Theirs" against "Base"
679 m_Data.m_yourFile.TransferDetailsFrom(m_Data.m_theirFile);
680 }
681 m_bSaveRequired = false;
682
683 LoadViews();
684 }
685
686 void CMainFrame::ClearViewNamesAndPaths()
687 {
688 m_pwndLeftView->m_sWindowName.Empty();
689 m_pwndLeftView->m_sFullFilePath.Empty();
690 m_pwndLeftView->m_sReflectedName.Empty();
691 m_pwndRightView->m_sWindowName.Empty();
692 m_pwndRightView->m_sFullFilePath.Empty();
693 m_pwndRightView->m_sReflectedName.Empty();
694 m_pwndBottomView->m_sWindowName.Empty();
695 m_pwndBottomView->m_sFullFilePath.Empty();
696 m_pwndBottomView->m_sReflectedName.Empty();
697 }
698
699 bool CMainFrame::LoadViews(int line)
700 {
701 LoadIgnoreCommentData();
702 m_Data.SetBlame(m_bBlame);
703 m_Data.SetMovedBlocks(m_bViewMovedBlocks);
704 m_bHasConflicts = false;
705 CBaseView* pwndActiveView = m_pwndLeftView;
706 int nOldLine = m_pwndRightView ? m_pwndRightView->m_nTopLine : -1;
707 int nOldLineNumber =
708 m_pwndRightView && m_pwndRightView->m_pViewData ?
709 m_pwndRightView->m_pViewData->GetLineNumber(m_pwndRightView->m_nTopLine) : -1;
710 POINT ptOldCaretPos = {-1, -1};
711 if (m_pwndRightView && m_pwndRightView->IsTarget())
712 ptOldCaretPos = m_pwndRightView->GetCaretPosition();
713 if (m_pwndBottomView && m_pwndBottomView->IsTarget())
714 ptOldCaretPos = m_pwndBottomView->GetCaretPosition();
715 CString sExt = CPathUtils::GetFileExtFromPath(m_Data.m_baseFile.GetFilename()).MakeLower();
716 sExt.TrimLeft(L".");
717 auto sC = m_IgnoreCommentsMap.find(sExt);
718 if (sC == m_IgnoreCommentsMap.end())
719 {
720 sExt = CPathUtils::GetFileExtFromPath(m_Data.m_yourFile.GetFilename()).MakeLower();
721 sC = m_IgnoreCommentsMap.find(sExt);
722 if (sC == m_IgnoreCommentsMap.end())
723 {
724 sExt = CPathUtils::GetFileExtFromPath(m_Data.m_theirFile.GetFilename()).MakeLower();
725 sC = m_IgnoreCommentsMap.find(sExt);
726 }
727 }
728 if (sC != m_IgnoreCommentsMap.end())
729 m_Data.SetCommentTokens(std::get<0>(sC->second), std::get<1>(sC->second), std::get<2>(sC->second));
730 else
731 m_Data.SetCommentTokens(L"", L"", L"");
732 if (!m_Data.Load())
733 {
734 m_pwndLeftView->BuildAllScreen2ViewVector();
735 m_pwndLeftView->DocumentUpdated();
736 m_pwndRightView->DocumentUpdated();
737 m_pwndBottomView->DocumentUpdated();
738 m_wndLocatorBar.DocumentUpdated();
739 m_wndLineDiffBar.DocumentUpdated();
740 ::MessageBox(m_hWnd, m_Data.GetError(), L"TortoiseGitMerge", MB_ICONERROR);
741 m_Data.m_mergedFile.SetOutOfUse();
742 m_bSaveRequired = false;
743 return false;
744 }
745 SetWindowTitle();
746 m_pwndLeftView->BuildAllScreen2ViewVector();
747 m_pwndLeftView->DocumentUpdated();
748 m_pwndRightView->DocumentUpdated();
749 m_pwndBottomView->DocumentUpdated();
750 m_wndLocatorBar.DocumentUpdated();
751 m_wndLineDiffBar.DocumentUpdated();
752
753 m_pwndLeftView->SetWritable(false);
754 m_pwndLeftView->SetWritableIsChangable(false);
755 m_pwndLeftView->SetTarget(false);
756 m_pwndRightView->SetWritable(false);
757 m_pwndRightView->SetWritableIsChangable(false);
758 m_pwndRightView->SetTarget(false);
759 m_pwndBottomView->SetWritable(false);
760 m_pwndBottomView->SetWritableIsChangable(false);
761 m_pwndBottomView->SetTarget(false);
762
763 if (!m_Data.IsBaseFileInUse())
764 {
765 CSysProgressDlg progDlg;
766 if (m_Data.IsYourFileInUse() && m_Data.IsTheirFileInUse())
767 {
768 m_Data.m_baseFile.TransferDetailsFrom(m_Data.m_theirFile);
769 }
770 else if ((!m_Data.m_sDiffFile.IsEmpty())&&(!m_Patch.Init(m_Data.m_sDiffFile, m_Data.m_sPatchPath, &progDlg)))
771 {
772 progDlg.Stop();
773 ClearViewNamesAndPaths();
774 MessageBox(m_Patch.GetErrorMessage(), nullptr, MB_ICONERROR);
775 m_bSaveRequired = false;
776 return false;
777 }
778 progDlg.Stop();
779 if (m_Patch.GetNumberOfFiles() > 0)
780 {
781 CString betterpatchpath = m_Patch.CheckPatchPath(m_Data.m_sPatchPath);
782 if (betterpatchpath.CompareNoCase(m_Data.m_sPatchPath)!=0)
783 {
784 CString msg;
785 msg.Format(IDS_WARNBETTERPATCHPATHFOUND, (LPCTSTR)m_Data.m_sPatchPath, (LPCTSTR)betterpatchpath);
786 CTaskDialog taskdlg(msg,
787 CString(MAKEINTRESOURCE(IDS_WARNBETTERPATCHPATHFOUND_TASK2)),
788 L"TortoiseGitMerge",
789 0,
790 TDF_ENABLE_HYPERLINKS | TDF_USE_COMMAND_LINKS | TDF_ALLOW_DIALOG_CANCELLATION | TDF_POSITION_RELATIVE_TO_WINDOW);
791 CString task3;
792 WCHAR t3[MAX_PATH] = { 0 };
793 CString cp = betterpatchpath.Left(MAX_PATH - 1);
794 PathCompactPathEx(t3, cp, 50, 0);
795 task3.Format(IDS_WARNBETTERPATCHPATHFOUND_TASK3, t3);
796 taskdlg.AddCommandControl(1, task3);
797 CString task4;
798 WCHAR t4[MAX_PATH] = { 0 };
799 cp = m_Data.m_sPatchPath.Left(MAX_PATH - 1);
800 PathCompactPathEx(t4, cp, 50, 0);
801 task4.Format(IDS_WARNBETTERPATCHPATHFOUND_TASK4, t4);
802 taskdlg.AddCommandControl(2, task4);
803 taskdlg.SetDefaultCommandControl(1);
804 taskdlg.SetMainIcon(TD_INFORMATION_ICON);
805 taskdlg.SetCommonButtons(TDCBF_CANCEL_BUTTON);
806 if (taskdlg.DoModal(m_hWnd) == 1)
807 {
808 m_Data.m_sPatchPath = betterpatchpath;
809 m_Patch.Init(m_Data.m_sDiffFile, m_Data.m_sPatchPath, &progDlg);
810 }
811 }
812 m_dlgFilePatches.Init(&m_Patch, this, m_Data.m_sPatchPath, this);
813 m_dlgFilePatches.ShowWindow(SW_SHOW);
814 ClearViewNamesAndPaths();
815 if (!m_wndSplitter.IsRowHidden(1))
816 m_wndSplitter.HideRow(1);
817 m_pwndLeftView->SetHidden(FALSE);
818 m_pwndRightView->SetHidden(FALSE);
819 m_pwndBottomView->SetHidden(TRUE);
820 }
821 }
822 if (m_Data.IsBaseFileInUse() && !m_Data.IsYourFileInUse() && m_Data.IsTheirFileInUse())
823 {
824 m_Data.m_yourFile.TransferDetailsFrom(m_Data.m_theirFile);
825 }
826 if (m_Data.IsBaseFileInUse() && m_Data.IsYourFileInUse() && !m_Data.IsTheirFileInUse())
827 {
828 //diff between YOUR and BASE
829 if (m_bOneWay)
830 {
831 pwndActiveView = m_pwndLeftView;
832 if (!m_wndSplitter2.IsColumnHidden(1))
833 m_wndSplitter2.HideColumn(1);
834
835 m_pwndLeftView->m_pViewData = &m_Data.m_YourBaseBoth;
836 m_pwndLeftView->SetTextType(m_Data.m_arYourFile.GetUnicodeType());
837 m_pwndLeftView->SetLineEndingStyle(m_Data.m_arYourFile.GetLineEndings());
838 m_pwndLeftView->m_sWindowName = m_Data.m_baseFile.GetWindowName() + L" - " + m_Data.m_yourFile.GetWindowName();
839 m_pwndLeftView->m_sFullFilePath = m_Data.m_baseFile.GetFilename() + L" - " + m_Data.m_yourFile.GetFilename();
840 m_pwndLeftView->m_sReflectedName = m_Data.m_yourFile.GetReflectedName();
841 m_pwndLeftView->m_pWorkingFile = &m_Data.m_yourFile;
842 m_pwndLeftView->SetTarget();
843 m_pwndLeftView->SetWritableIsChangable(true);
844
845 m_pwndRightView->m_pViewData = nullptr;
846 m_pwndRightView->m_pWorkingFile = nullptr;
847 m_pwndBottomView->m_pViewData = nullptr;
848 m_pwndBottomView->m_pWorkingFile = nullptr;
849
850 if (!m_wndSplitter.IsRowHidden(1))
851 m_wndSplitter.HideRow(1);
852 m_pwndLeftView->SetHidden(FALSE);
853 m_pwndRightView->SetHidden(TRUE);
854 m_pwndBottomView->SetHidden(TRUE);
855 ::SetWindowPos(m_pwndLeftView->m_hWnd, nullptr, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
856 }
857 else
858 {
859 pwndActiveView = m_pwndRightView;
860 if (m_wndSplitter2.IsColumnHidden(1))
861 m_wndSplitter2.ShowColumn();
862
863 m_pwndLeftView->m_pViewData = &m_Data.m_YourBaseLeft;
864 m_pwndLeftView->SetTextType(m_Data.m_arBaseFile.GetUnicodeType());
865 m_pwndLeftView->SetLineEndingStyle(m_Data.m_arBaseFile.GetLineEndings());
866 m_pwndLeftView->m_sWindowName = m_Data.m_baseFile.GetWindowName();
867 m_pwndLeftView->m_sFullFilePath = m_Data.m_baseFile.GetFilename();
868 m_pwndLeftView->m_sConvertedFilePath = m_Data.m_baseFile.GetConvertedFileName();
869 m_pwndLeftView->m_sReflectedName = m_Data.m_baseFile.GetReflectedName();
870 m_pwndLeftView->m_pWorkingFile = &m_Data.m_baseFile;
871 m_pwndLeftView->SetWritableIsChangable(true);
872
873 m_pwndRightView->m_pViewData = &m_Data.m_YourBaseRight;
874 m_pwndRightView->SetTextType(m_Data.m_arYourFile.GetUnicodeType());
875 m_pwndRightView->SetLineEndingStyle(m_Data.m_arYourFile.GetLineEndings());
876 m_pwndRightView->m_sWindowName = m_Data.m_yourFile.GetWindowName();
877 m_pwndRightView->m_sFullFilePath = m_Data.m_yourFile.GetFilename();
878 m_pwndRightView->m_sConvertedFilePath = m_Data.m_yourFile.GetConvertedFileName();
879 m_pwndRightView->m_sReflectedName = m_Data.m_yourFile.GetReflectedName();
880 m_pwndRightView->m_pWorkingFile = &m_Data.m_yourFile;
881 m_pwndRightView->SetWritable();
882 m_pwndRightView->SetTarget();
883
884 m_pwndBottomView->m_pViewData = nullptr;
885 m_pwndBottomView->m_pWorkingFile = nullptr;
886
887 if (!m_wndSplitter.IsRowHidden(1))
888 m_wndSplitter.HideRow(1);
889 m_pwndLeftView->SetHidden(FALSE);
890 m_pwndRightView->SetHidden(FALSE);
891 m_pwndBottomView->SetHidden(TRUE);
892 }
893 bool hasMods, hasConflicts, hasWhitespaceMods, hasFilteredMods;
894 pwndActiveView->CheckModifications(hasMods, hasConflicts, hasWhitespaceMods, hasFilteredMods);
895 if (!hasMods && !hasConflicts)
896 {
897 // files appear identical, show a dialog informing the user that there are or might
898 // be other differences
899 bool hasEncodingDiff = m_Data.m_arBaseFile.GetUnicodeType() != m_Data.m_arYourFile.GetUnicodeType();
900 bool hasEOLDiff = m_Data.m_arBaseFile.GetLineEndings() != m_Data.m_arYourFile.GetLineEndings();
901 if (hasWhitespaceMods || hasEncodingDiff || hasEOLDiff)
902 {
903 // text is identical, but the files do not match
904 CString sWarning(MAKEINTRESOURCE(IDS_TEXTIDENTICAL_MAIN));
905 CString sWhitespace(MAKEINTRESOURCE(IDS_TEXTIDENTICAL_WHITESPACE));
906 CString sEncoding(MAKEINTRESOURCE(IDS_TEXTIDENTICAL_ENCODING));
907 CString sEOL(MAKEINTRESOURCE(IDS_TEXTIDENTICAL_EOL));
908 if (hasWhitespaceMods)
909 {
910 sWarning += L"\r\n";
911 sWarning += sWhitespace;
912 }
913 if (hasEncodingDiff)
914 {
915 sWarning += L"\r\n";
916 sWarning += sEncoding;
917 sWarning += L" (";
918 sWarning += m_Data.m_arBaseFile.GetEncodingName(m_Data.m_arBaseFile.GetUnicodeType());
919 sWarning += L", ";
920 sWarning += m_Data.m_arYourFile.GetEncodingName(m_Data.m_arYourFile.GetUnicodeType());
921 sWarning += L")";
922 }
923 if (hasEOLDiff)
924 {
925 sWarning += L"\r\n";
926 sWarning += sEOL;
927 }
928 AfxMessageBox(sWarning, MB_ICONINFORMATION);
929 }
930 }
931 }
932 else if (m_Data.IsBaseFileInUse() && m_Data.IsYourFileInUse() && m_Data.IsTheirFileInUse())
933 {
934 //diff between THEIR, YOUR and BASE
935 m_pwndBottomView->SetWritable();
936 m_pwndBottomView->SetTarget();
937 pwndActiveView = m_pwndBottomView;
938
939 m_pwndLeftView->m_pViewData = &m_Data.m_TheirBaseBoth;
940 m_pwndLeftView->SetTextType(m_Data.m_arTheirFile.GetUnicodeType());
941 m_pwndLeftView->SetLineEndingStyle(m_Data.m_arTheirFile.GetLineEndings());
942 m_pwndLeftView->m_sWindowName = m_Data.m_theirFile.GetWindowName(IDS_VIEWTITLE_THEIRS);
943 m_pwndLeftView->m_sFullFilePath = m_Data.m_theirFile.GetFilename();
944 m_pwndLeftView->m_sConvertedFilePath = m_Data.m_theirFile.GetConvertedFileName();
945 m_pwndLeftView->m_sReflectedName = m_Data.m_theirFile.GetReflectedName();
946 m_pwndLeftView->m_pWorkingFile = &m_Data.m_theirFile;
947
948 m_pwndRightView->m_pViewData = &m_Data.m_YourBaseBoth;
949 m_pwndRightView->SetTextType(m_Data.m_arYourFile.GetUnicodeType());
950 m_pwndRightView->SetLineEndingStyle(m_Data.m_arYourFile.GetLineEndings());
951 m_pwndRightView->m_sWindowName = m_Data.m_yourFile.GetWindowName(IDS_VIEWTITLE_MINE);
952 m_pwndRightView->m_sFullFilePath = m_Data.m_yourFile.GetFilename();
953 m_pwndRightView->m_sConvertedFilePath = m_Data.m_yourFile.GetConvertedFileName();
954 m_pwndRightView->m_sReflectedName = m_Data.m_yourFile.GetReflectedName();
955 m_pwndRightView->m_pWorkingFile = &m_Data.m_yourFile;
956
957 m_pwndBottomView->m_pViewData = &m_Data.m_Diff3;
958 m_pwndBottomView->SetTextType(m_Data.m_arTheirFile.GetUnicodeType());
959 m_pwndBottomView->SetLineEndingStyle(m_Data.m_arTheirFile.GetLineEndings());
960 m_pwndBottomView->m_sWindowName.LoadString(IDS_VIEWTITLE_MERGED);
961 m_pwndBottomView->m_sWindowName += L" - " + m_Data.m_mergedFile.GetWindowName();
962 m_pwndBottomView->m_sFullFilePath = m_Data.m_mergedFile.GetFilename();
963 m_pwndBottomView->m_sConvertedFilePath = m_Data.m_mergedFile.GetConvertedFileName();
964 m_pwndBottomView->m_sReflectedName = m_Data.m_mergedFile.GetReflectedName();
965 m_pwndBottomView->m_pWorkingFile = &m_Data.m_mergedFile;
966
967 if (m_wndSplitter2.IsColumnHidden(1))
968 m_wndSplitter2.ShowColumn();
969 if (m_wndSplitter.IsRowHidden(1))
970 m_wndSplitter.ShowRow();
971 m_pwndLeftView->SetHidden(FALSE);
972 m_pwndRightView->SetHidden(FALSE);
973 m_pwndBottomView->SetHidden(FALSE);
974 // in three pane view, hide the line diff bar
975 m_wndLineDiffBar.ShowPane(false, false, true);
976 m_wndLineDiffBar.DocumentUpdated();
977 }
978 if (!m_Data.m_mergedFile.InUse())
979 {
980 m_Data.m_mergedFile.SetFileName(m_Data.m_yourFile.GetFilename());
981 }
982 m_pwndLeftView->BuildAllScreen2ViewVector();
983 m_pwndLeftView->DocumentUpdated();
984 m_pwndRightView->DocumentUpdated();
985 m_pwndBottomView->DocumentUpdated();
986 m_wndLocatorBar.DocumentUpdated();
987 m_wndLineDiffBar.DocumentUpdated();
988 UpdateLayout();
989 SetActiveView(pwndActiveView);
990
991 if ((line >= -1) && m_pwndRightView->m_pViewData)
992 {
993 int n = line == -1 ? min( nOldLineNumber, nOldLine ) : line;
994 if (n >= 0)
995 {
996 n = m_pwndRightView->m_pViewData->FindLineNumber(n);
997 if (m_bCollapsed)
998 {
999 // adjust the goto-line position if we're collapsed
1000 int step = m_pwndRightView->m_nTopLine > n ? -1 : 1;
1001 int skip = 0;
1002 for (int i = m_pwndRightView->m_nTopLine; i != n; i += step)
1003 {
1004 if (m_pwndRightView->m_pViewData->GetHideState(i) == HIDESTATE_HIDDEN)
1005 ++skip;
1006 }
1007 if (m_pwndRightView->m_pViewData->GetHideState(n) == HIDESTATE_HIDDEN)
1008 OnViewTextFoldUnfold();
1009 else
1010 n = n + (skip * step * -1);
1011 }
1012 }
1013 if (n < 0)
1014 n = nOldLine;
1015
1016 m_pwndRightView->ScrollAllToLine(n);
1017 POINT p;
1018 p.x = 0;
1019 p.y = n;
1020 if ((ptOldCaretPos.x >= 0) || (ptOldCaretPos.y >= 0))
1021 p = ptOldCaretPos;
1022 m_pwndLeftView->SetCaretPosition(p);
1023 m_pwndRightView->SetCaretPosition(p);
1024 m_pwndBottomView->SetCaretPosition(p);
1025 m_pwndBottomView->ScrollToChar(0);
1026 m_pwndLeftView->ScrollToChar(0);
1027 m_pwndRightView->ScrollToChar(0);
1028 }
1029 else
1030 {
1031 CRegDWORD regFirstDiff = CRegDWORD(L"Software\\TortoiseGitMerge\\FirstDiffOnLoad", TRUE);
1032 CRegDWORD regFirstConflict = CRegDWORD(L"Software\\TortoiseGitMerge\\FirstConflictOnLoad", TRUE);
1033 bool bGoFirstDiff = (0 != (DWORD)regFirstDiff);
1034 bool bGoFirstConflict = (0 != (DWORD)regFirstConflict);
1035 if (bGoFirstConflict && (CheckResolved()>=0))
1036 {
1037 pwndActiveView->GoToFirstConflict();
1038 // Ignore the first few Mouse Move messages, so that the line diff stays on
1039 // the first diff line until the user actually moves the mouse
1040 m_nMoveMovesToIgnore = MOVESTOIGNORE;
1041 }
1042 else if (bGoFirstDiff)
1043 {
1044 pwndActiveView->GoToFirstDifference();
1045 // Ignore the first few Mouse Move messages, so that the line diff stays on
1046 // the first diff line until the user actually moves the mouse
1047 m_nMoveMovesToIgnore = MOVESTOIGNORE;
1048 }
1049 else
1050 {
1051 // Avoid incorrect rendering of active pane.
1052 m_pwndBottomView->ScrollToChar(0);
1053 m_pwndLeftView->ScrollToChar(0);
1054 m_pwndRightView->ScrollToChar(0);
1055 }
1056 }
1057 CheckResolved();
1058 if (m_bHasConflicts && !m_bSaveRequiredOnConflicts)
1059 m_bSaveRequired = false;
1060 CUndo::GetInstance().Clear();
1061 return true;
1062 }
1063
1064 void CMainFrame::UpdateLayout()
1065 {
1066 if (m_bInitSplitter)
1067 {
1068 m_wndSplitter.CenterSplitter();
1069 m_wndSplitter2.CenterSplitter();
1070 }
1071 }
1072
1073 void CMainFrame::RecalcLayout(BOOL bNotify)
1074 {
1075 GetClientRect(&m_dockManager.m_rectInPlace);
1076 if (m_pRibbonApp)
1077 m_dockManager.m_rectInPlace.top += m_pRibbonApp->GetRibbonHeight();
1078 CFrameWndEx::RecalcLayout(bNotify);
1079 }
1080
1081 void CMainFrame::OnSize(UINT nType, int cx, int cy)
1082 {
1083 CFrameWndEx::OnSize(nType, cx, cy);
1084 if (m_bInitSplitter && nType != SIZE_MINIMIZED)
1085 {
1086 if (m_wndSplitter.GetSafeHwnd())
1087 {
1088 if (m_wndSplitter.HasOldRowSize() && (m_wndSplitter.GetOldRowCount() == 2))
1089 {
1090 int oldTotal = m_wndSplitter.GetOldRowSize(0) + m_wndSplitter.GetOldRowSize(1);
1091 if (oldTotal)
1092 {
1093 int cxCur0, cxCur1, cxMin0, cxMin1;
1094 m_wndSplitter.GetRowInfo(0, cxCur0, cxMin0);
1095 m_wndSplitter.GetRowInfo(1, cxCur1, cxMin1);
1096 cxCur0 = m_wndSplitter.GetOldRowSize(0) * (cxCur0 + cxCur1) / oldTotal;
1097 cxCur1 = m_wndSplitter.GetOldRowSize(1) * (cxCur0 + cxCur1) / oldTotal;
1098 m_wndSplitter.SetRowInfo(0, cxCur0, 0);
1099 m_wndSplitter.SetRowInfo(1, cxCur1, 0);
1100 m_wndSplitter.RecalcLayout();
1101 }
1102 }
1103
1104 if (m_wndSplitter2.HasOldColSize() && (m_wndSplitter2.GetOldColCount() == 2))
1105 {
1106 int oldTotal = m_wndSplitter2.GetOldColSize(0) + m_wndSplitter2.GetOldColSize(1);
1107 if (oldTotal)
1108 {
1109 int cyCur0, cyCur1, cyMin0, cyMin1;
1110 m_wndSplitter2.GetColumnInfo(0, cyCur0, cyMin0);
1111 m_wndSplitter2.GetColumnInfo(1, cyCur1, cyMin1);
1112 cyCur0 = m_wndSplitter2.GetOldColSize(0) * (cyCur0 + cyCur1) / oldTotal;
1113 cyCur1 = m_wndSplitter2.GetOldColSize(1) * (cyCur0 + cyCur1) / oldTotal;
1114 m_wndSplitter2.SetColumnInfo(0, cyCur0, 0);
1115 m_wndSplitter2.SetColumnInfo(1, cyCur1, 0);
1116 m_wndSplitter2.RecalcLayout();
1117 }
1118 }
1119 }
1120 }
1121 if ((nType == SIZE_RESTORED)&&m_bCheckReload)
1122 {
1123 m_bCheckReload = false;
1124 CheckForReload();
1125 }
1126 }
1127
1128 void CMainFrame::OnViewWhitespaces()
1129 {
1130 CRegDWORD regViewWhitespaces = CRegDWORD(L"Software\\TortoiseGitMerge\\ViewWhitespaces", 1);
1131 BOOL bViewWhitespaces = regViewWhitespaces;
1132 if (m_pwndLeftView)
1133 bViewWhitespaces = m_pwndLeftView->m_bViewWhitespace;
1134
1135 bViewWhitespaces = !bViewWhitespaces;
1136 regViewWhitespaces = bViewWhitespaces;
1137 if (m_pwndLeftView)
1138 {
1139 m_pwndLeftView->m_bViewWhitespace = bViewWhitespaces;
1140 m_pwndLeftView->Invalidate();
1141 }
1142 if (m_pwndRightView)
1143 {
1144 m_pwndRightView->m_bViewWhitespace = bViewWhitespaces;
1145 m_pwndRightView->Invalidate();
1146 }
1147 if (m_pwndBottomView)
1148 {
1149 m_pwndBottomView->m_bViewWhitespace = bViewWhitespaces;
1150 m_pwndBottomView->Invalidate();
1151 }
1152 }
1153
1154 void CMainFrame::OnUpdateViewWhitespaces(CCmdUI *pCmdUI)
1155 {
1156 if (m_pwndLeftView)
1157 pCmdUI->SetCheck(m_pwndLeftView->m_bViewWhitespace);
1158 }
1159
1160 void CMainFrame::OnViewCollapsed()
1161 {
1162 m_regCollapsed = !(DWORD)m_regCollapsed;
1163 m_bCollapsed = !!(DWORD)m_regCollapsed;
1164
1165 OnViewTextFoldUnfold();
1166 m_wndLocatorBar.Invalidate();
1167 }
1168
1169 void CMainFrame::OnUpdateViewCollapsed(CCmdUI *pCmdUI)
1170 {
1171 pCmdUI->SetCheck(m_bCollapsed);
1172 }
1173
1174 void CMainFrame::OnViewWraplonglines()
1175 {
1176 m_bWrapLines = !(DWORD)m_regWrapLines;
1177 m_regWrapLines = m_bWrapLines;
1178
1179 if (m_pwndLeftView) m_pwndLeftView ->WrapChanged();
1180 if (m_pwndRightView) m_pwndRightView ->WrapChanged();
1181 if (m_pwndBottomView) m_pwndBottomView->WrapChanged();
1182 OnViewTextFoldUnfold();
1183 m_wndLocatorBar.DocumentUpdated();
1184 }
1185
1186 void CMainFrame::OnViewTextFoldUnfold()
1187 {
1188 OnViewTextFoldUnfold(m_pwndLeftView);
1189 OnViewTextFoldUnfold(m_pwndRightView);
1190 OnViewTextFoldUnfold(m_pwndBottomView);
1191 }
1192
1193 void CMainFrame::OnViewTextFoldUnfold(CBaseView* view)
1194 {
1195 if (view == 0)
1196 return;
1197 view->BuildAllScreen2ViewVector();
1198 view->UpdateCaret();
1199 view->Invalidate();
1200 view->EnsureCaretVisible();
1201 }
1202
1203 void CMainFrame::OnUpdateViewWraplonglines(CCmdUI *pCmdUI)
1204 {
1205 pCmdUI->SetCheck(m_bWrapLines);
1206 }
1207
1208 void CMainFrame::OnViewOnewaydiff()
1209 {
1210 if (CheckForSave(CHFSR_RELOAD)==IDCANCEL)
1211 return;
1212 m_bOneWay = !m_bOneWay;
1213 ShowDiffBar(!m_bOneWay);
1214 LoadViews(-1);
1215 }
1216
1217 void CMainFrame::DiffLeftToBase()
1218 {
1219 DiffTwo(m_Data.m_baseFile, m_Data.m_theirFile);
1220 }
1221
1222 void CMainFrame::DiffRightToBase()
1223 {
1224 DiffTwo(m_Data.m_baseFile, m_Data.m_yourFile);
1225 }
1226
1227 void CMainFrame::DiffTwo(const CWorkingFile& file1, const CWorkingFile& file2)
1228 {
1229 wchar_t ownpath[MAX_PATH] = { 0 };
1230 GetModuleFileName(nullptr, ownpath, MAX_PATH);
1231 CString sCmd;
1232 sCmd.Format(L"\"%s\"", ownpath);
1233 sCmd += L" /base:\"";
1234 sCmd += file1.GetFilename();
1235 sCmd += L"\" /mine:\"";
1236 sCmd += file2.GetFilename();
1237 sCmd += L'"';
1238 if (!file1.GetWindowName().IsEmpty())
1239 sCmd += L" /basename:\"" + file1.GetWindowName() + L"\"";
1240 if (!file2.GetWindowName().IsEmpty())
1241 sCmd += L" /yourname:\"" + file2.GetWindowName() + L"\"";
1242
1243 CAppUtils::LaunchApplication(sCmd, 0, false);
1244 }
1245
1246 void CMainFrame::ShowDiffBar(bool bShow)
1247 {
1248 if (bShow)
1249 {
1250 // restore the line diff bar
1251 m_wndLineDiffBar.ShowPane(m_bLineDiff, false, true);
1252 m_wndLineDiffBar.DocumentUpdated();
1253 m_wndLocatorBar.ShowPane(m_bLocatorBar, false, true);
1254 m_wndLocatorBar.DocumentUpdated();
1255 }
1256 else
1257 {
1258 // in one way view, hide the line diff bar
1259 m_wndLineDiffBar.ShowPane(false, false, true);
1260 m_wndLineDiffBar.DocumentUpdated();
1261 }
1262 }
1263
1264 int CMainFrame::CheckResolved()
1265 {
1266 //only in three way diffs can be conflicts!
1267 m_bHasConflicts = true;
1268 if (IsViewGood(m_pwndBottomView))
1269 {
1270 CViewData* viewdata = m_pwndBottomView->m_pViewData;
1271 if (viewdata)
1272 {
1273 for (int i=0; i<viewdata->GetCount(); i++)
1274 {
1275 const DiffStates state = viewdata->GetState(i);
1276 if ((DIFFSTATE_CONFLICTED == state)||(DIFFSTATE_CONFLICTED_IGNORED == state))
1277 return i;
1278 }
1279 }
1280 }
1281 m_bHasConflicts = false;
1282 return -1;
1283 }
1284
1285 int CMainFrame::SaveFile(const CString& sFilePath)
1286 {
1287 CBaseView* pView = nullptr;
1288 CViewData* pViewData = nullptr;
1289 CFileTextLines * pOriginFile = &m_Data.m_arBaseFile;
1290 if (IsViewGood(m_pwndBottomView))
1291 {
1292 pView = m_pwndBottomView;
1293 pViewData = m_pwndBottomView->m_pViewData;
1294 }
1295 else if (IsViewGood(m_pwndRightView))
1296 {
1297 pView = m_pwndRightView;
1298 pViewData = m_pwndRightView->m_pViewData;
1299 if (m_Data.IsYourFileInUse())
1300 pOriginFile = &m_Data.m_arYourFile;
1301 else if (m_Data.IsTheirFileInUse())
1302 pOriginFile = &m_Data.m_arTheirFile;
1303 }
1304 else
1305 {
1306 // nothing to save!
1307 return 1;
1308 }
1309 Invalidate();
1310 if ((pViewData)&&(pOriginFile))
1311 {
1312 CFileTextLines file;
1313 pOriginFile->CopySettings(&file);
1314 CFileTextLines::SaveParams saveParams;
1315 saveParams.m_LineEndings = pView->GetLineEndings();
1316 saveParams.m_UnicodeType = pView->GetTextType();
1317 file.SetSaveParams(saveParams);
1318 for (int i=0; i<pViewData->GetCount(); i++)
1319 {
1320 //only copy non-removed lines
1321 DiffStates state = pViewData->GetState(i);
1322 switch (state)
1323 {
1324 case DIFFSTATE_CONFLICTED:
1325 case DIFFSTATE_CONFLICTED_IGNORED:
1326 {
1327 int first = i;
1328 int last = i;
1329 do
1330 {
1331 last++;
1332 } while((last<pViewData->GetCount()) && ((pViewData->GetState(last)==DIFFSTATE_CONFLICTED)||(pViewData->GetState(last)==DIFFSTATE_CONFLICTED_IGNORED)));
1333 // TortoiseGitMerge changes here
1334 file.Add(L"<<<<<<< .mine", m_pwndRightView->GetLineEndings());
1335 for (int j=first; j<last; j++)
1336 {
1337 EOL lineending = m_pwndRightView->m_pViewData->GetLineEnding(j);
1338 if (lineending == EOL_NOENDING)
1339 lineending = m_pwndRightView->GetLineEndings();
1340 file.Add(m_pwndRightView->m_pViewData->GetLine(j), lineending);
1341 }
1342 file.Add(L"=======", m_pwndRightView->GetLineEndings());
1343 for (int j=first; j<last; j++)
1344 {
1345 EOL lineending = m_pwndLeftView->m_pViewData->GetLineEnding(j);
1346 if (lineending == EOL_NOENDING)
1347 lineending = m_pwndLeftView->GetLineEndings();
1348 file.Add(m_pwndLeftView->m_pViewData->GetLine(j), lineending);
1349 }
1350 file.Add(L">>>>>>> .theirs", m_pwndRightView->GetLineEndings());
1351 i = last-1;
1352 }
1353 break;
1354 case DIFFSTATE_EMPTY:
1355 case DIFFSTATE_CONFLICTEMPTY:
1356 case DIFFSTATE_IDENTICALREMOVED:
1357 case DIFFSTATE_REMOVED:
1358 case DIFFSTATE_THEIRSREMOVED:
1359 case DIFFSTATE_YOURSREMOVED:
1360 case DIFFSTATE_CONFLICTRESOLVEDEMPTY:
1361 // do not save removed lines
1362 break;
1363 default:
1364 file.Add(pViewData->GetLine(i), pViewData->GetLineEnding(i));
1365 break;
1366 }
1367 }
1368 if (!file.Save(sFilePath, false, false))
1369 {
1370 CMessageBox::Show(m_hWnd, file.GetErrorString(), L"TortoiseGitMerge", MB_ICONERROR);
1371 return -1;
1372 }
1373 if (sFilePath == m_Data.m_baseFile.GetFilename())
1374 {
1375 m_Data.m_baseFile.StoreFileAttributes();
1376 }
1377 if (sFilePath == m_Data.m_theirFile.GetFilename())
1378 {
1379 m_Data.m_theirFile.StoreFileAttributes();
1380 }
1381 if (sFilePath == m_Data.m_yourFile.GetFilename())
1382 {
1383 m_Data.m_yourFile.StoreFileAttributes();
1384 }
1385 /*if (sFilePath == m_Data.m_mergedFile.GetFilename())
1386 {
1387 m_Data.m_mergedFile.StoreFileAttributes();
1388 }//*/
1389 m_dlgFilePatches.SetFileStatusAsPatched(sFilePath);
1390 if (IsViewGood(m_pwndBottomView))
1391 m_pwndBottomView->SetModified(FALSE);
1392 else if (IsViewGood(m_pwndRightView))
1393 m_pwndRightView->SetModified(FALSE);
1394 CUndo::GetInstance().MarkAsOriginalState(
1395 false,
1396 IsViewGood(m_pwndRightView) && (pViewData == m_pwndRightView->m_pViewData),
1397 IsViewGood(m_pwndBottomView) && (pViewData == m_pwndBottomView->m_pViewData));
1398 if (file.GetCount() == 1 && file.GetAt(0).IsEmpty() && file.GetLineEnding(0) == EOL_NOENDING)
1399 return 0;
1400 return file.GetCount();
1401 }
1402 return 1;
1403 }
1404
1405 void CMainFrame::OnFileSave()
1406 {
1407 // when multiple files are set as writable we have to ask what file to save
1408 int nEditableViewCount =
1409 (CBaseView::IsViewGood(m_pwndLeftView) && m_pwndLeftView->IsWritable() ? 1 : 0)
1410 + (CBaseView::IsViewGood(m_pwndRightView) && m_pwndRightView->IsWritable() ? 1 : 0)
1411 + (CBaseView::IsViewGood(m_pwndBottomView) && m_pwndBottomView->IsWritable() ? 1 : 0);
1412 bool bLeftIsModified = CBaseView::IsViewGood(m_pwndLeftView) && m_pwndLeftView->IsModified();
1413 bool bRightIsModified = CBaseView::IsViewGood(m_pwndRightView) && m_pwndRightView->IsModified();
1414 bool bBottomIsModified = CBaseView::IsViewGood(m_pwndBottomView) && m_pwndBottomView->IsModified();
1415 int nModifiedViewCount =
1416 (bLeftIsModified ? 1 : 0)
1417 + (bRightIsModified ? 1 : 0)
1418 + (bBottomIsModified ? 1 : 0);
1419 if (nEditableViewCount>1)
1420 {
1421 if (nModifiedViewCount == 1)
1422 {
1423 if (bLeftIsModified)
1424 m_pwndLeftView->SaveFile(SAVE_REMOVEDLINES);
1425 else
1426 FileSave();
1427 }
1428 else if (nModifiedViewCount>0)
1429 {
1430 // both views
1431 CTaskDialog taskdlg(CString(MAKEINTRESOURCE(IDS_SAVE_MORE)),
1432 CString(MAKEINTRESOURCE(IDS_SAVE)),
1433 CString(MAKEINTRESOURCE(IDS_APPNAME)),
1434 0,
1435 TDF_ENABLE_HYPERLINKS | TDF_USE_COMMAND_LINKS | TDF_ALLOW_DIALOG_CANCELLATION | TDF_POSITION_RELATIVE_TO_WINDOW);
1436 CString sTaskTemp;
1437 if (m_pwndLeftView->m_pWorkingFile->InUse() && !m_pwndLeftView->m_pWorkingFile->IsReadonly())
1438 sTaskTemp.Format(IDS_ASKFORSAVE_SAVELEFT, (LPCTSTR)m_pwndLeftView->m_pWorkingFile->GetFilename());
1439 else
1440 sTaskTemp = CString(MAKEINTRESOURCE(IDS_ASKFORSAVE_SAVELEFTAS));
1441 taskdlg.AddCommandControl(201, sTaskTemp, bLeftIsModified);// left
1442 if (bLeftIsModified)
1443 taskdlg.SetDefaultCommandControl(201);
1444 if (m_pwndRightView->m_pWorkingFile->InUse() && !m_pwndRightView->m_pWorkingFile->IsReadonly())
1445 sTaskTemp.Format(IDS_ASKFORSAVE_SAVERIGHT, (LPCTSTR)m_pwndRightView->m_pWorkingFile->GetFilename());
1446 else
1447 sTaskTemp = CString(MAKEINTRESOURCE(IDS_ASKFORSAVE_SAVERIGHTAS));
1448 taskdlg.AddCommandControl(202, sTaskTemp, bRightIsModified); // right
1449 if (bRightIsModified)
1450 taskdlg.SetDefaultCommandControl(202);
1451 taskdlg.AddCommandControl(203, CString(MAKEINTRESOURCE(IDS_ASKFORSAVE_SAVEALL2)), nModifiedViewCount>1); // both
1452 if (nModifiedViewCount > 1)
1453 taskdlg.SetDefaultCommandControl(203);
1454 taskdlg.SetCommonButtons(TDCBF_CANCEL_BUTTON);
1455 taskdlg.SetMainIcon(TD_WARNING_ICON);
1456 UINT ret = (UINT)taskdlg.DoModal(m_hWnd);
1457 switch (ret)
1458 {
1459 case 201: // left
1460 m_pwndLeftView->SaveFile(SAVE_REMOVEDLINES);
1461 break;
1462 case 203: // both
1463 m_pwndLeftView->SaveFile(SAVE_REMOVEDLINES);
1464 case 202: // right
1465 m_pwndRightView->SaveFile();
1466 break;
1467 }
1468 }
1469 }
1470 else
1471 {
1472 // only target view was modified
1473 FileSave();
1474 }
1475 }
1476
1477 void CMainFrame::PatchSave()
1478 {
1479 bool bDoesNotExist = !PathFileExists(m_Data.m_mergedFile.GetFilename());
1480 if (m_Data.m_bPatchRequired)
1481 {
1482 m_Patch.PatchPath(m_Data.m_mergedFile.GetFilename());
1483 }
1484 if (!PathIsDirectory(m_Data.m_mergedFile.GetFilename()))
1485 {
1486 int saveret = SaveFile(m_Data.m_mergedFile.GetFilename());
1487 if (saveret==0)
1488 {
1489 // file was saved with 0 lines, remove it.
1490 m_Patch.RemoveFile(m_Data.m_mergedFile.GetFilename());
1491 // just in case
1492 DeleteFile(m_Data.m_mergedFile.GetFilename());
1493 }
1494 m_Data.m_mergedFile.StoreFileAttributes();
1495 if (m_Data.m_mergedFile.GetFilename() == m_Data.m_yourFile.GetFilename())
1496 m_Data.m_yourFile.StoreFileAttributes();
1497 if (bDoesNotExist && (DWORD(CRegDWORD(L"Software\\TortoiseGitMerge\\AutoAdd", TRUE))))
1498 {
1499 // call TortoiseProc to add the new file to version control
1500 CString cmd = L"/command:add /noui /path:\"";
1501 cmd += m_Data.m_mergedFile.GetFilename() + L'"';
1502 CAppUtils::RunTortoiseGitProc(cmd);
1503 }
1504 }
1505 }
1506
1507 bool CMainFrame::FileSave(bool bCheckResolved /*=true*/)
1508 {
1509 if (HasMarkedBlocks())
1510 {
1511 CString sTitle(MAKEINTRESOURCE(IDS_WARNMARKEDBLOCKS));
1512 CString sSubTitle(MAKEINTRESOURCE(IDS_ASKFORSAVE_MARKEDBLOCKS));
1513 CString sAppName(MAKEINTRESOURCE(IDS_APPNAME));
1514 CTaskDialog taskdlg(sTitle,
1515 sSubTitle,
1516 sAppName,
1517 0,
1518 TDF_ENABLE_HYPERLINKS | TDF_USE_COMMAND_LINKS | TDF_ALLOW_DIALOG_CANCELLATION | TDF_POSITION_RELATIVE_TO_WINDOW);
1519 taskdlg.AddCommandControl(10, CString(MAKEINTRESOURCE(IDS_MARKEDBLOCKSSAVEINCLUDE)));
1520 taskdlg.AddCommandControl(11, CString(MAKEINTRESOURCE(IDS_MARKEDBLOCKSSAVEEXCLUDE)));
1521 taskdlg.AddCommandControl(12, CString(MAKEINTRESOURCE(IDS_MARKEDBLCOKSSAVEIGNORE)));
1522 taskdlg.AddCommandControl(IDCANCEL, CString(MAKEINTRESOURCE(IDS_ASKFORSAVE_CANCEL_OPEN)));
1523 taskdlg.SetCommonButtons(TDCBF_CANCEL_BUTTON);
1524 taskdlg.SetDefaultCommandControl(10);
1525 taskdlg.SetMainIcon(TD_WARNING_ICON);
1526 UINT ret = (UINT)taskdlg.DoModal(m_hWnd);
1527 if (ret == 10)
1528 m_pwndRightView->LeaveOnlyMarkedBlocks();
1529 else if (ret == 11)
1530 m_pwndRightView->UseViewFileOfMarked();
1531 else if (ret == 12)
1532 m_pwndRightView->UseViewFileExceptEdited();
1533 else
1534 return false;
1535 }
1536
1537 if (!m_Data.m_mergedFile.InUse())
1538 return FileSaveAs(bCheckResolved);
1539 // check if the file has the readonly attribute set
1540 bool bDoesNotExist = false;
1541 DWORD fAttribs = GetFileAttributes(m_Data.m_mergedFile.GetFilename());
1542 if ((fAttribs != INVALID_FILE_ATTRIBUTES)&&(fAttribs & FILE_ATTRIBUTE_READONLY))
1543 return FileSaveAs(bCheckResolved);
1544 if (fAttribs == INVALID_FILE_ATTRIBUTES)
1545 {
1546 bDoesNotExist = (GetLastError() == ERROR_FILE_NOT_FOUND);
1547 }
1548 if (bCheckResolved && HasConflictsWontKeep())
1549 return false;
1550
1551 if (((DWORD)CRegDWORD(L"Software\\TortoiseGitMerge\\Backup")) != 0)
1552 {
1553 MoveFileEx(m_Data.m_mergedFile.GetFilename(), m_Data.m_mergedFile.GetFilename() + L".bak", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH);
1554 }
1555 if (m_Data.m_bPatchRequired)
1556 {
1557 m_Patch.PatchPath(m_Data.m_mergedFile.GetFilename());
1558 }
1559 int saveret = SaveFile(m_Data.m_mergedFile.GetFilename());
1560 if (saveret==0)
1561 {
1562 // file was saved with 0 lines!
1563 // ask the user if the file should be deleted
1564 CString msg;
1565 msg.Format(IDS_DELETEWHENEMPTY, (LPCTSTR)CPathUtils::GetFileNameFromPath(m_Data.m_mergedFile.GetFilename()));
1566 CTaskDialog taskdlg(msg,
1567 CString(MAKEINTRESOURCE(IDS_DELETEWHENEMPTY_TASK2)),
1568 CString(MAKEINTRESOURCE(IDS_APPNAME)),
1569 0,
1570 TDF_ENABLE_HYPERLINKS | TDF_USE_COMMAND_LINKS | TDF_ALLOW_DIALOG_CANCELLATION | TDF_POSITION_RELATIVE_TO_WINDOW);
1571 taskdlg.AddCommandControl(1, CString(MAKEINTRESOURCE(IDS_DELETEWHENEMPTY_TASK3)));
1572 taskdlg.AddCommandControl(2, CString(MAKEINTRESOURCE(IDS_DELETEWHENEMPTY_TASK4)));
1573 taskdlg.SetCommonButtons(TDCBF_CANCEL_BUTTON);
1574 taskdlg.SetDefaultCommandControl(1);
1575 taskdlg.SetMainIcon(TD_WARNING_ICON);
1576 if (taskdlg.DoModal(m_hWnd) == 1)
1577 {
1578 m_Patch.RemoveFile(m_Data.m_mergedFile.GetFilename());
1579 DeleteFile(m_Data.m_mergedFile.GetFilename());
1580 }
1581 }
1582 else if (saveret < 0)
1583 {
1584 // error while saving the file
1585 return false;
1586 }
1587
1588 // if we're in conflict resolve mode (three pane view), check if there are no more conflicts
1589 // and if there aren't, ask to mark the file as resolved
1590 if (IsViewGood(m_pwndBottomView) && !m_bHasConflicts && bCheckResolved)
1591 {
1592 CString projectRoot;
1593 if (GitAdminDir::HasAdminDir(m_Data.m_mergedFile.GetFilename(), false, &projectRoot))
1594 {
1595 CString subpath = m_Data.m_mergedFile.GetFilename();
1596 subpath.Replace(L'\\', L'/');
1597 if (subpath.GetLength() >= projectRoot.GetLength())
1598 {
1599 if (subpath[projectRoot.GetLength()] == L'/')
1600 subpath = subpath.Right(subpath.GetLength() - projectRoot.GetLength() - 1);
1601 else
1602 subpath = subpath.Right(subpath.GetLength() - projectRoot.GetLength());
1603 }
1604
1605 CAutoRepository repository(projectRoot);
1606 bool hasConflictInIndex = false;
1607 do
1608 {
1609 if (!repository)
1610 break;
1611
1612 CAutoIndex index;
1613 if (git_repository_index(index.GetPointer(), repository))
1614 break;
1615
1616 CStringA path = CUnicodeUtils::GetMulti(subpath, CP_UTF8);
1617 hasConflictInIndex = git_index_get_bypath(index, path, 1) || git_index_get_bypath(index, path, 2);
1618 } while(0);
1619
1620 if (hasConflictInIndex)
1621 {
1622 CString msg;
1623 msg.Format(IDS_MARKASRESOLVED, (LPCTSTR)CPathUtils::GetFileNameFromPath(m_Data.m_mergedFile.GetFilename()));
1624 CTaskDialog taskdlg(msg,
1625 CString(MAKEINTRESOURCE(IDS_MARKASRESOLVED_TASK2)),
1626 CString(MAKEINTRESOURCE(IDS_APPNAME)),
1627 0,
1628 TDF_ENABLE_HYPERLINKS | TDF_USE_COMMAND_LINKS | TDF_ALLOW_DIALOG_CANCELLATION | TDF_POSITION_RELATIVE_TO_WINDOW);
1629 taskdlg.AddCommandControl(1, CString(MAKEINTRESOURCE(IDS_MARKASRESOLVED_TASK3)));
1630 taskdlg.AddCommandControl(2, CString(MAKEINTRESOURCE(IDS_MARKASRESOLVED_TASK4)));
1631 taskdlg.SetCommonButtons(TDCBF_CANCEL_BUTTON);
1632 taskdlg.SetDefaultCommandControl(1);
1633 taskdlg.SetMainIcon(TD_WARNING_ICON);
1634 if (taskdlg.DoModal(m_hWnd) == 1)
1635 MarkAsResolved();
1636 }
1637 }
1638 }
1639
1640 m_bSaveRequired = false;
1641 m_Data.m_mergedFile.StoreFileAttributes();
1642
1643 if (bDoesNotExist && (DWORD(CRegDWORD(L"Software\\TortoiseGitMerge\\AutoAdd", TRUE))))
1644 {
1645 // call TortoiseProc to add the new file to version control
1646 CString cmd = L"/command:add /noui /path:\"";
1647 cmd += m_Data.m_mergedFile.GetFilename() + L'"';
1648 if(!CAppUtils::RunTortoiseGitProc(cmd))
1649 return false;
1650 }
1651 return true;
1652 }
1653
1654 void CMainFrame::OnFileSaveAs()
1655 {
1656 // ask what file to save as
1657 bool bHaveConflict = (CheckResolved() >= 0);
1658 CTaskDialog taskdlg(
1659 CString(MAKEINTRESOURCE(bHaveConflict ? IDS_ASKFORSAVEAS_MORECONFLICT : IDS_ASKFORSAVEAS_MORE)),
1660 CString(MAKEINTRESOURCE(IDS_ASKFORSAVEAS)),
1661 CString(MAKEINTRESOURCE(IDS_APPNAME)),
1662 0,
1663 TDF_ENABLE_HYPERLINKS | TDF_USE_COMMAND_LINKS | TDF_ALLOW_DIALOG_CANCELLATION | TDF_POSITION_RELATIVE_TO_WINDOW);
1664 // default can be last view (target) as was in 1.7 or actual (where is cursor) as is in most text editor
1665 if (IsViewGood(m_pwndLeftView))
1666 {
1667 taskdlg.AddCommandControl(201, CString(MAKEINTRESOURCE(IDS_ASKFORSAVE_SAVELEFTAS))); // left
1668 taskdlg.SetDefaultCommandControl(201);
1669 }
1670 if (IsViewGood(m_pwndRightView))
1671 {
1672 taskdlg.AddCommandControl(202, CString(MAKEINTRESOURCE(IDS_ASKFORSAVE_SAVERIGHTAS))); // right
1673 taskdlg.SetDefaultCommandControl(202);
1674 }
1675 if (IsViewGood(m_pwndBottomView))
1676 {
1677 taskdlg.AddCommandControl(203, CString(MAKEINTRESOURCE(IDS_ASKFORSAVE_SAVEBOTTOMAS))); // bottom
1678 taskdlg.SetDefaultCommandControl(203);
1679 }
1680 if (bHaveConflict)
1681 {
1682 taskdlg.AddCommandControl(204, CString(MAKEINTRESOURCE(IDS_ASKFORSAVE_NEEDRESOLVE))); // resolve
1683 taskdlg.SetDefaultCommandControl(204);
1684 }
1685 taskdlg.SetCommonButtons(TDCBF_CANCEL_BUTTON);
1686 taskdlg.SetMainIcon(bHaveConflict ? TD_WARNING_ICON : TD_INFORMATION_ICON);
1687 int nCommand = (int)taskdlg.DoModal(m_hWnd);
1688 CString sFileName;
1689 switch (nCommand)
1690 {
1691 case 201: // left
1692 if (TryGetFileName(sFileName))
1693 {
1694 // in 2, 3 view display we want to keep removed lines
1695 m_pwndLeftView->SaveFileTo(sFileName, IsViewGood(m_pwndRightView) ? SAVE_REMOVEDLINES : 0);
1696 }
1697 break;
1698 case 202: // right
1699 if (TryGetFileName(sFileName))
1700 {
1701 m_pwndRightView->SaveFileTo(sFileName);
1702 }
1703 break;
1704 case 203: // bottom
1705 FileSaveAs();
1706 break;
1707 case 204: // continue resolving
1708 if (IsViewGood(m_pwndBottomView))
1709 {
1710 m_pwndBottomView->GoToLine(CheckResolved());
1711 }
1712 break;
1713 }
1714 }
1715
1716 bool CMainFrame::FileSaveAs(bool bCheckResolved /*=true*/)
1717 {
1718 if (bCheckResolved && HasConflictsWontKeep())
1719 return false;
1720
1721 CString fileName;
1722 if(!TryGetFileName(fileName))
1723 return false;
1724
1725 SaveFile(fileName);
1726 return true;
1727 }
1728
1729 void CMainFrame::OnUpdateFileSave(CCmdUI *pCmdUI)
1730 {
1731 BOOL bEnable = FALSE;
1732 if (m_Data.m_mergedFile.InUse())
1733 {
1734 if (IsViewGood(m_pwndBottomView)&&(m_pwndBottomView->m_pViewData))
1735 bEnable = TRUE;
1736 else if ( (IsViewGood(m_pwndRightView)&&(m_pwndRightView->m_pViewData)) &&
1737 (m_pwndRightView->IsModified() || (m_Data.m_yourFile.GetWindowName().Right(9).Compare(L": patched") == 0)))
1738 bEnable = TRUE;
1739 else if (IsViewGood(m_pwndLeftView)
1740 && (m_pwndLeftView->m_pViewData)
1741 && (m_pwndLeftView->IsModified()))
1742 bEnable = TRUE;
1743 }
1744 pCmdUI->Enable(bEnable);
1745 }
1746
1747 void CMainFrame::OnUpdateFileSaveAs(CCmdUI *pCmdUI)
1748 {
1749 // any file is open we can save it as
1750 BOOL bEnable = FALSE;
1751 if (IsViewGood(m_pwndBottomView)&&(m_pwndBottomView->m_pViewData))
1752 bEnable = TRUE;
1753 else if (IsViewGood(m_pwndRightView)&&(m_pwndRightView->m_pViewData))
1754 bEnable = TRUE;
1755 else if (IsViewGood(m_pwndLeftView)&&(m_pwndLeftView->m_pViewData))
1756 bEnable = TRUE;
1757 pCmdUI->Enable(bEnable);
1758 }
1759
1760 void CMainFrame::OnUpdateViewOnewaydiff(CCmdUI *pCmdUI)
1761 {
1762 pCmdUI->SetCheck(!m_bOneWay);
1763 BOOL bEnable = TRUE;
1764 if (IsViewGood(m_pwndBottomView))
1765 {
1766 bEnable = FALSE;
1767 }
1768 pCmdUI->Enable(bEnable);
1769 }
1770
1771 void CMainFrame::OnViewOptions()
1772 {
1773 CString sTemp;
1774 sTemp.LoadString(IDS_SETTINGSTITLE);
1775 CSettings dlg(sTemp);
1776 dlg.DoModal();
1777 if (dlg.IsReloadNeeded())
1778 {
1779 if (CheckForSave(CHFSR_OPTIONS)==IDCANCEL)
1780 return;
1781 CDiffColors::GetInstance().LoadRegistry();
1782 LoadViews();
1783 return;
1784 }
1785 CDiffColors::GetInstance().LoadRegistry();
1786 if (m_pwndBottomView)
1787 m_pwndBottomView->Invalidate();
1788 if (m_pwndLeftView)
1789 m_pwndLeftView->Invalidate();
1790 if (m_pwndRightView)
1791 m_pwndRightView->Invalidate();
1792 }
1793
1794 void CMainFrame::OnClose()
1795 {
1796 if (!IsWindowEnabled())
1797 return; // just in case someone sends a WM_CLOSE to the main window while another window (dialog,...) is open
1798 if (CheckForSave(CHFSR_CLOSE)!=IDCANCEL)
1799 {
1800 WINDOWPLACEMENT wp;
1801
1802 // before it is destroyed, save the position of the window
1803 wp.length = sizeof wp;
1804
1805 if (GetWindowPlacement(&wp))
1806 {
1807
1808 if (IsIconic())
1809 // never restore to Iconic state
1810 wp.showCmd = SW_SHOW ;
1811
1812 if ((wp.flags & WPF_RESTORETOMAXIMIZED) != 0)
1813 // if maximized and maybe iconic restore maximized state
1814 wp.showCmd = SW_SHOWMAXIMIZED ;
1815
1816 // and write it
1817 WriteWindowPlacement(&wp);
1818 }
1819 __super::OnClose();
1820 }
1821 }
1822
1823 void CMainFrame::OnActivate(UINT nValue, CWnd* /*pwnd*/, BOOL /*bActivated?*/)
1824 {
1825 if (nValue != 0) // activated
1826 {
1827 if (IsIconic())
1828 {
1829 m_bCheckReload = TRUE;
1830 }
1831 else
1832 {
1833 // use a timer to give other messages time to get processed
1834 // first, like e.g. the WM_CLOSE message in case the user
1835 // clicked the close button and that brought the window
1836 // to the front - in that case checking for reload wouldn't
1837 // do any good.
1838 SetTimer(IDT_RELOADCHECKTIMER, 300, nullptr);
1839 }
1840 }
1841 }
1842
1843 void CMainFrame::OnViewLinedown()
1844 {
1845 OnViewLineUpDown(1);
1846 }
1847
1848 void CMainFrame::OnViewLineup()
1849 {
1850 OnViewLineUpDown(-1);
1851 }
1852
1853 void CMainFrame::OnViewLineUpDown(int direction)
1854 {
1855 if (m_pwndLeftView)
1856 m_pwndLeftView->ScrollToLine(m_pwndLeftView->m_nTopLine+direction);
1857 if (m_pwndRightView)
1858 m_pwndRightView->ScrollToLine(m_pwndRightView->m_nTopLine+direction);
1859 if (m_pwndBottomView)
1860 m_pwndBottomView->ScrollToLine(m_pwndBottomView->m_nTopLine+direction);
1861 m_wndLocatorBar.Invalidate();
1862 m_nMoveMovesToIgnore = MOVESTOIGNORE;
1863 }
1864
1865 void CMainFrame::OnViewLineleft()
1866 {
1867 OnViewLineLeftRight(-1);
1868 }
1869
1870 void CMainFrame::OnViewLineright()
1871 {
1872 OnViewLineLeftRight(1);
1873 }
1874
1875 void CMainFrame::OnViewLineLeftRight(int direction)
1876 {
1877 if (m_pwndLeftView)
1878 m_pwndLeftView->ScrollSide(direction);
1879 if (m_pwndRightView)
1880 m_pwndRightView->ScrollSide(direction);
1881 if (m_pwndBottomView)
1882 m_pwndBottomView->ScrollSide(direction);
1883 }
1884
1885 void CMainFrame::OnEditUseTheirs()
1886 {
1887 if (m_pwndBottomView)
1888 m_pwndBottomView->UseTheirTextBlock();
1889 }
1890 void CMainFrame::OnUpdateEditUsetheirblock(CCmdUI *pCmdUI)
1891 {
1892 pCmdUI->Enable(m_pwndBottomView && m_pwndBottomView->HasSelection());
1893 }
1894
1895 void CMainFrame::OnEditUseMine()
1896 {
1897 if (m_pwndBottomView)
1898 m_pwndBottomView->UseMyTextBlock();
1899 }
1900 void CMainFrame::OnUpdateEditUsemyblock(CCmdUI *pCmdUI)
1901 {
1902 OnUpdateEditUsetheirblock(pCmdUI);
1903 }
1904
1905 void CMainFrame::OnEditUseTheirsThenMine()
1906 {
1907 if (m_pwndBottomView)
1908 m_pwndBottomView->UseTheirAndYourBlock();
1909 }
1910
1911 void CMainFrame::OnUpdateEditUsetheirthenmyblock(CCmdUI *pCmdUI)
1912 {
1913 OnUpdateEditUsetheirblock(pCmdUI);
1914 }
1915
1916 void CMainFrame::OnEditUseMineThenTheirs()
1917 {
1918 if (m_pwndBottomView)
1919 m_pwndBottomView->UseYourAndTheirBlock();
1920 }
1921
1922 void CMainFrame::OnUpdateEditUseminethentheirblock(CCmdUI *pCmdUI)
1923 {
1924 OnUpdateEditUsetheirblock(pCmdUI);
1925 }
1926
1927 void CMainFrame::OnEditUseleftblock()
1928 {
1929 if (m_pwndBottomView->IsWindowVisible())
1930 m_pwndBottomView->UseRightBlock();
1931 else
1932 m_pwndRightView->UseLeftBlock();
1933 }
1934
1935 void CMainFrame::OnUpdateEditUseleftblock(CCmdUI *pCmdUI)
1936 {
1937 pCmdUI->Enable(IsViewGood(m_pwndRightView) && m_pwndRightView->IsTarget() && m_pwndRightView->HasSelection());
1938 }
1939
1940 void CMainFrame::OnUpdateUseBlock(CCmdUI *pCmdUI)
1941 {
1942 pCmdUI->Enable(TRUE);
1943 }
1944
1945 void CMainFrame::OnEditUseleftfile()
1946 {
1947 if (m_pwndBottomView->IsWindowVisible())
1948 m_pwndBottomView->UseRightFile();
1949 else
1950 m_pwndRightView->UseLeftFile();
1951 }
1952
1953 void CMainFrame::OnUpdateEditUseleftfile(CCmdUI *pCmdUI)
1954 {
1955 pCmdUI->Enable(IsViewGood(m_pwndRightView) && m_pwndRightView->IsTarget());
1956 }
1957
1958 void CMainFrame::OnEditUseblockfromleftbeforeright()
1959 {
1960 if (m_pwndRightView)
1961 m_pwndRightView->UseBothLeftFirst();
1962 }
1963
1964 void CMainFrame::OnUpdateEditUseblockfromleftbeforeright(CCmdUI *pCmdUI)
1965 {
1966 OnUpdateEditUseleftblock(pCmdUI);
1967 }
1968
1969 void CMainFrame::OnEditUseblockfromrightbeforeleft()
1970 {
1971 if (m_pwndRightView)
1972 m_pwndRightView->UseBothRightFirst();
1973 }
1974
1975 void CMainFrame::OnUpdateEditUseblockfromrightbeforeleft(CCmdUI *pCmdUI)
1976 {
1977 OnUpdateEditUseleftblock(pCmdUI);
1978 }
1979
1980 void CMainFrame::OnFileReload()
1981 {
1982 if (CheckForSave(CHFSR_RELOAD)==IDCANCEL)
1983 return;
1984 CDiffColors::GetInstance().LoadRegistry();
1985 LoadViews(-1);
1986 }
1987
1988 void CMainFrame::ActivateFrame(int nCmdShow)
1989 {
1990 // nCmdShow is the normal show mode this frame should be in
1991 // translate default nCmdShow (-1)
1992 if (nCmdShow == -1)
1993 {
1994 if (!IsWindowVisible())
1995 nCmdShow = SW_SHOWNORMAL;
1996 else if (IsIconic())
1997 nCmdShow = SW_RESTORE;
1998 }
1999
2000 // bring to top before showing
2001 BringToTop(nCmdShow);
2002
2003 if (nCmdShow != -1)
2004 {
2005 // show the window as specified
2006 WINDOWPLACEMENT wp;
2007
2008 if ( !ReadWindowPlacement(&wp) )
2009 {
2010 ShowWindow(nCmdShow);
2011 }
2012 else
2013 {
2014 if ( nCmdShow != SW_SHOWNORMAL )
2015 wp.showCmd = nCmdShow;
2016
2017 SetWindowPlacement(&wp);
2018 }
2019
2020 // and finally, bring to top after showing
2021 BringToTop(nCmdShow);
2022 }
2023 }
2024
2025 BOOL CMainFrame::ReadWindowPlacement(WINDOWPLACEMENT * pwp)
2026 {
2027 CRegString placement = CRegString(L"Software\\TortoiseGitMerge\\WindowPos");
2028 CString sPlacement = placement;
2029 if (sPlacement.IsEmpty())
2030 return FALSE;
2031 int nRead = swscanf_s(sPlacement, L"%u,%u,%d,%d,%d,%d,%d,%d,%d,%d",
2032 &pwp->flags, &pwp->showCmd,
2033 &pwp->ptMinPosition.x, &pwp->ptMinPosition.y,
2034 &pwp->ptMaxPosition.x, &pwp->ptMaxPosition.y,
2035 &pwp->rcNormalPosition.left, &pwp->rcNormalPosition.top,
2036 &pwp->rcNormalPosition.right, &pwp->rcNormalPosition.bottom);
2037 if ( nRead != 10 )
2038 return FALSE;
2039 pwp->length = sizeof(WINDOWPLACEMENT);
2040
2041 return TRUE;
2042 }
2043
2044 void CMainFrame::WriteWindowPlacement(WINDOWPLACEMENT * pwp)
2045 {
2046 CRegString placement(L"Software\\TortoiseGitMerge\\WindowPos");
2047 TCHAR szBuffer[_countof("-32767")*8 + sizeof("65535")*2];
2048
2049 swprintf_s(szBuffer, L"%u,%u,%d,%d,%d,%d,%d,%d,%d,%d",
2050 pwp->flags, pwp->showCmd,
2051 pwp->ptMinPosition.x, pwp->ptMinPosition.y,
2052 pwp->ptMaxPosition.x, pwp->ptMaxPosition.y,
2053 pwp->rcNormalPosition.left, pwp->rcNormalPosition.top,
2054 pwp->rcNormalPosition.right, pwp->rcNormalPosition.bottom);
2055 placement = szBuffer;
2056 }
2057
2058 void CMainFrame::OnUpdateMergeMarkasresolved(CCmdUI *pCmdUI)
2059 {
2060 if (!pCmdUI)
2061 return;
2062 BOOL bEnable = FALSE;
2063 if ((!m_bReadOnly)&&(m_Data.m_mergedFile.InUse()))
2064 {
2065 if (IsViewGood(m_pwndBottomView)&&(m_pwndBottomView->m_pViewData))
2066 {
2067 bEnable = TRUE;
2068 }
2069 }
2070 pCmdUI->Enable(bEnable);
2071 }
2072
2073 void CMainFrame::OnMergeMarkasresolved()
2074 {
2075 if(HasConflictsWontKeep())
2076 return;
2077
2078 // now check if the file has already been saved and if not, save it.
2079 if (m_Data.m_mergedFile.InUse())
2080 {
2081 if (IsViewGood(m_pwndBottomView)&&(m_pwndBottomView->m_pViewData))
2082 {
2083 if (!FileSave(false))
2084 return;
2085 m_bSaveRequired = false;
2086 }
2087 }
2088 MarkAsResolved();
2089 }
2090
2091 BOOL CMainFrame::MarkAsResolved()
2092 {
2093 if (m_bReadOnly)
2094 return FALSE;
2095 if (!IsViewGood(m_pwndBottomView))
2096 return FALSE;
2097
2098 CString cmd = L"/command:resolve /path:\"";
2099 cmd += m_Data.m_mergedFile.GetFilename();
2100 cmd += L"\" /closeonend:1 /noquestion /skipcheck /silent";
2101 if (resolveMsgWnd)
2102 {
2103 CString s;
2104 s.Format(L" /resolvemsghwnd:%I64d /resolvemsgwparam:%I64d /resolvemsglparam:%I64d", (__int64)resolveMsgWnd, (__int64)resolveMsgWParam, (__int64)resolveMsgLParam);
2105 cmd += s;
2106 }
2107 if(!CAppUtils::RunTortoiseGitProc(cmd))
2108 return FALSE;
2109 m_bSaveRequired = false;
2110 return TRUE;
2111 }
2112
2113 void CMainFrame::OnUpdateMergeNextconflict(CCmdUI *pCmdUI)
2114 {
2115 BOOL bShow = FALSE;
2116 if (HasNextConflict(m_pwndBottomView))
2117 bShow = TRUE;
2118 else if (HasNextConflict(m_pwndRightView))
2119 bShow = TRUE;
2120 else if (HasNextConflict(m_pwndLeftView))
2121 bShow = TRUE;
2122 pCmdUI->Enable(bShow);
2123 }
2124
2125 bool CMainFrame::HasNextConflict(CBaseView* view)
2126 {
2127 if (view == 0)
2128 return false;
2129 if (!view->IsTarget())
2130 return false;
2131 return view->HasNextConflict();
2132 }
2133
2134 void CMainFrame::OnUpdateMergePreviousconflict(CCmdUI *pCmdUI)
2135 {
2136 BOOL bShow = FALSE;
2137 if (HasPrevConflict(m_pwndBottomView))
2138 bShow = TRUE;
2139 else if (HasPrevConflict(m_pwndRightView))
2140 bShow = TRUE;
2141 else if (HasPrevConflict(m_pwndLeftView))
2142 bShow = TRUE;
2143 pCmdUI->Enable(bShow);
2144 }
2145
2146 bool CMainFrame::HasPrevConflict(CBaseView* view)
2147 {
2148 if (view == 0)
2149 return false;
2150 if (!view->IsTarget())
2151 return false;
2152 return view->HasPrevConflict();
2153 }
2154
2155 void CMainFrame::OnUpdateNavigateNextdifference(CCmdUI *pCmdUI)
2156 {
2157 CBaseView* baseView = GetActiveBaseView();
2158 BOOL bShow = FALSE;
2159 if (baseView != 0)
2160 bShow = baseView->HasNextDiff();
2161 pCmdUI->Enable(bShow);
2162 }
2163
2164 void CMainFrame::OnUpdateNavigatePreviousdifference(CCmdUI *pCmdUI)
2165 {
2166 CBaseView* baseView = GetActiveBaseView();
2167 BOOL bShow = FALSE;
2168 if (baseView != 0)
2169 bShow = baseView->HasPrevDiff();
2170 pCmdUI->Enable(bShow);
2171 }
2172
2173 void CMainFrame::OnUpdateNavigateNextinlinediff(CCmdUI *pCmdUI)
2174 {
2175 BOOL bShow = FALSE;
2176 if (HasNextInlineDiff(m_pwndBottomView))
2177 bShow = TRUE;
2178 else if (HasNextInlineDiff(m_pwndRightView))
2179 bShow = TRUE;
2180 else if (HasNextInlineDiff(m_pwndLeftView))
2181 bShow = TRUE;
2182 pCmdUI->Enable(bShow);
2183 }
2184
2185 bool CMainFrame::HasNextInlineDiff(CBaseView* view)
2186 {
2187 if (view == 0)
2188 return false;
2189 if (!view->IsTarget())
2190 return false;
2191 return view->HasNextInlineDiff();
2192 }
2193
2194 void CMainFrame::OnUpdateNavigatePrevinlinediff(CCmdUI *pCmdUI)
2195 {
2196 BOOL bShow = FALSE;
2197 if (HasPrevInlineDiff(m_pwndBottomView))
2198 bShow = TRUE;
2199 else if (HasPrevInlineDiff(m_pwndRightView))
2200 bShow = TRUE;
2201 else if (HasPrevInlineDiff(m_pwndLeftView))
2202 bShow = TRUE;
2203 pCmdUI->Enable(bShow);
2204 }
2205
2206 bool CMainFrame::HasPrevInlineDiff(CBaseView* view)
2207 {
2208 if (view == 0)
2209 return false;
2210 if (!view->IsTarget())
2211 return false;
2212 return view->HasPrevInlineDiff();
2213 }
2214
2215 void CMainFrame::OnMoving(UINT fwSide, LPRECT pRect)
2216 {
2217 // if the pathfilelist dialog is attached to the mainframe,
2218 // move it along with the mainframe
2219 if (::IsWindow(m_dlgFilePatches.m_hWnd))
2220 {
2221 RECT patchrect;
2222 m_dlgFilePatches.GetWindowRect(&patchrect);
2223 if (::IsWindow(m_hWnd))
2224 {
2225 RECT thisrect;
2226 GetWindowRect(&thisrect);
2227 if (patchrect.right == thisrect.left)
2228 {
2229 m_dlgFilePatches.SetWindowPos(nullptr, patchrect.left - (thisrect.left - pRect->left), patchrect.top - (thisrect.top - pRect->top),
2230 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
2231 }
2232 }
2233 }
2234 __super::OnMoving(fwSide, pRect);
2235 }
2236
2237 void CMainFrame::OnUpdateEditCopy(CCmdUI *pCmdUI)
2238 {
2239 BOOL bShow = FALSE;
2240 if ((m_pwndBottomView)&&(m_pwndBottomView->HasSelection()))
2241 bShow = TRUE;
2242 else if ((m_pwndRightView)&&(m_pwndRightView->HasSelection()))
2243 bShow = TRUE;
2244 else if ((m_pwndLeftView)&&(m_pwndLeftView->HasSelection()))
2245 bShow = TRUE;
2246 pCmdUI->Enable(bShow);
2247 }
2248
2249 void CMainFrame::OnUpdateEditPaste(CCmdUI *pCmdUI)
2250 {
2251 BOOL bWritable = FALSE;
2252 if ((m_pwndBottomView)&&(m_pwndBottomView->IsWritable()))
2253 bWritable = TRUE;
2254 else if ((m_pwndRightView)&&(m_pwndRightView->IsWritable()))
2255 bWritable = TRUE;
2256 else if ((m_pwndLeftView)&&(m_pwndLeftView->IsWritable()))
2257 bWritable = TRUE;
2258 pCmdUI->Enable(bWritable && ::IsClipboardFormatAvailable(CF_TEXT));
2259 }
2260
2261 void CMainFrame::OnViewSwitchleft()
2262 {
2263 if (CheckForSave(CHFSR_SWITCH)!=IDCANCEL)
2264 {
2265 CWorkingFile file = m_Data.m_baseFile;
2266 m_Data.m_baseFile = m_Data.m_yourFile;
2267 m_Data.m_yourFile = file;
2268 if (m_Data.m_mergedFile.GetFilename().CompareNoCase(m_Data.m_yourFile.GetFilename())==0)
2269 {
2270 m_Data.m_mergedFile = m_Data.m_baseFile;
2271 }
2272 else if (m_Data.m_mergedFile.GetFilename().CompareNoCase(m_Data.m_baseFile.GetFilename())==0)
2273 {
2274 m_Data.m_mergedFile = m_Data.m_yourFile;
2275 }
2276 LoadViews();
2277 }
2278 }
2279
2280 void CMainFrame::OnUpdateViewSwitchleft(CCmdUI *pCmdUI)
2281 {
2282 BOOL bEnable = !IsViewGood(m_pwndBottomView);
2283 pCmdUI->Enable(bEnable);
2284 }
2285
2286 void CMainFrame::OnUpdateViewShowfilelist(CCmdUI *pCmdUI)
2287 {
2288 BOOL bEnable = m_dlgFilePatches.HasFiles();
2289 pCmdUI->Enable(bEnable);
2290 pCmdUI->SetCheck(m_dlgFilePatches.IsWindowVisible());
2291 }
2292
2293 void CMainFrame::OnViewShowfilelist()
2294 {
2295 m_dlgFilePatches.ShowWindow(m_dlgFilePatches.IsWindowVisible() ? SW_HIDE : SW_SHOW);
2296 }
2297
2298 void CMainFrame::OnEditUndo()
2299 {
2300 if (CUndo::GetInstance().CanUndo())
2301 {
2302 CUndo::GetInstance().Undo(m_pwndLeftView, m_pwndRightView, m_pwndBottomView);
2303 }
2304 }
2305
2306 void CMainFrame::OnUpdateEditUndo(CCmdUI *pCmdUI)
2307 {
2308 pCmdUI->Enable(CUndo::GetInstance().CanUndo());
2309 }
2310
2311 void CMainFrame::OnEditRedo()
2312 {
2313 if (CUndo::GetInstance().CanRedo())
2314 {
2315 CUndo::GetInstance().Redo(m_pwndLeftView, m_pwndRightView, m_pwndBottomView);
2316 }
2317 }
2318
2319 void CMainFrame::OnUpdateEditRedo(CCmdUI *pCmdUI)
2320 {
2321 pCmdUI->Enable(CUndo::GetInstance().CanRedo());
2322 }
2323
2324 void CMainFrame::OnEditEnable()
2325 {
2326 CBaseView * pView = GetActiveBaseView();
2327 if (pView && pView->IsReadonlyChangable())
2328 {
2329 bool isReadOnly = pView->IsReadonly();
2330 pView->SetReadonly(!isReadOnly);
2331 }
2332 }
2333
2334 void CMainFrame::OnUpdateEditEnable(CCmdUI *pCmdUI)
2335 {
2336 CBaseView * pView = GetActiveBaseView();
2337 if (pView)
2338 {
2339 pCmdUI->Enable(pView->IsReadonlyChangable() || !pView->IsReadonly());
2340 pCmdUI->SetCheck(!pView->IsReadonly());
2341 }
2342 else
2343 {
2344 pCmdUI->Enable(FALSE);
2345 }
2346 }
2347
2348 void CMainFrame::OnIndicatorLeftview()
2349 {
2350 if (m_bUseRibbons)
2351 return;
2352 if (IsViewGood(m_pwndLeftView))
2353 {
2354 m_pwndLeftView->AskUserForNewLineEndingsAndTextType(IDS_STATUSBAR_LEFTVIEW);
2355 }
2356 }
2357
2358 void CMainFrame::OnIndicatorRightview()
2359 {
2360 if (m_bUseRibbons)
2361 return;
2362 if (IsViewGood(m_pwndRightView))
2363 {
2364 m_pwndRightView->AskUserForNewLineEndingsAndTextType(IDS_STATUSBAR_RIGHTVIEW);
2365 }
2366 }
2367
2368 void CMainFrame::OnIndicatorBottomview()
2369 {
2370 if (m_bUseRibbons)
2371 return;
2372 if (IsViewGood(m_pwndBottomView))
2373 {
2374 m_pwndBottomView->AskUserForNewLineEndingsAndTextType(IDS_STATUSBAR_BOTTOMVIEW);
2375 }
2376 }
2377
2378 int CMainFrame::CheckForReload()
2379 {
2380 static bool bLock = false; //we don't want to check when activated after MessageBox we just created ... this is simple, but we don't need multithread lock
2381 if (bLock)
2382 {
2383 return IDNO;
2384 }
2385 bLock = true;
2386 bool bSourceChanged =
2387 m_Data.m_baseFile.HasSourceFileChanged()
2388 || m_Data.m_yourFile.HasSourceFileChanged()
2389 || m_Data.m_theirFile.HasSourceFileChanged()
2390 /*|| m_Data.m_mergedFile.HasSourceFileChanged()*/;
2391 if (!bSourceChanged)
2392 {
2393 bLock = false;
2394 return IDNO;
2395 }
2396
2397 CString msg = HasUnsavedEdits() ? CString(MAKEINTRESOURCE(IDS_WARNMODIFIEDOUTSIDELOOSECHANGES)) : CString(MAKEINTRESOURCE(IDS_WARNMODIFIEDOUTSIDE));
2398 CTaskDialog taskdlg(msg,
2399 CString(MAKEINTRESOURCE(IDS_WARNMODIFIEDOUTSIDE_TASK2)),
2400 L"TortoiseGitMerge",
2401 0,
2402 TDF_ENABLE_HYPERLINKS | TDF_USE_COMMAND_LINKS | TDF_ALLOW_DIALOG_CANCELLATION | TDF_POSITION_RELATIVE_TO_WINDOW);
2403 CString sTask3;
2404 if (HasUnsavedEdits())
2405 sTask3.LoadString(IDS_WARNMODIFIEDOUTSIDE_TASK3);
2406 else
2407 sTask3.LoadString(IDS_WARNMODIFIEDOUTSIDE_TASK4);
2408 taskdlg.AddCommandControl(IDYES, sTask3);
2409 taskdlg.AddCommandControl(IDNO, CString(MAKEINTRESOURCE(IDS_WARNMODIFIEDOUTSIDE_TASK5)));
2410 taskdlg.SetCommonButtons(TDCBF_CANCEL_BUTTON);
2411 taskdlg.SetDefaultCommandControl(IDYES);
2412 taskdlg.SetMainIcon(TD_WARNING_ICON);
2413 UINT ret = (UINT)taskdlg.DoModal(m_hWnd);
2414 if (ret == IDYES)
2415 {
2416 CDiffColors::GetInstance().LoadRegistry();
2417 LoadViews(-1);
2418 }
2419 else
2420 {
2421 if (IsViewGood(m_pwndBottomView)) // three pane view
2422 {
2423 /*if (m_Data.m_sourceFile.HasSourceFileChanged())
2424 m_pwndBottomView->SetModified();
2425 if (m_Data.m_mergedFile.HasSourceFileChanged())
2426 m_pwndBottomView->SetModified();//*/
2427 if (m_Data.m_yourFile.HasSourceFileChanged())
2428 m_pwndRightView->SetModified();
2429 if (m_Data.m_theirFile.HasSourceFileChanged())
2430 m_pwndLeftView->SetModified();
2431 }
2432 else if (IsViewGood(m_pwndRightView)) // two pane view
2433 {
2434 if (m_Data.m_baseFile.HasSourceFileChanged())
2435 m_pwndLeftView->SetModified();
2436 if (m_Data.m_yourFile.HasSourceFileChanged())
2437 m_pwndRightView->SetModified();
2438 }
2439 else
2440 {
2441 if (m_Data.m_yourFile.HasSourceFileChanged())
2442 m_pwndLeftView->SetModified();
2443 }
2444
2445 // no reload just store updated file time
2446 m_Data.m_baseFile.StoreFileAttributes();
2447 m_Data.m_theirFile.StoreFileAttributes();
2448 m_Data.m_yourFile.StoreFileAttributes();
2449 //m_Data.m_mergedFile.StoreFileAttributes();
2450 }
2451 bLock = false;
2452 return ret;
2453 }
2454
2455 int CMainFrame::CheckForSave(ECheckForSaveReason eReason)
2456 {
2457 int idTitle = IDS_WARNMODIFIEDLOOSECHANGES;
2458 int idNoSave = IDS_ASKFORSAVE_TASK7;
2459 int idCancelAction = IDS_ASKFORSAVE_CANCEL_OPEN;
2460 switch (eReason)
2461 {
2462 case CHFSR_CLOSE:
2463 //idTitle = IDS_WARNMODIFIEDLOOSECHANGES;
2464 idNoSave = IDS_ASKFORSAVE_TASK4;
2465 idCancelAction = IDS_ASKFORSAVE_TASK5;
2466 break;
2467 case CHFSR_SWITCH:
2468 //idTitle = IDS_WARNMODIFIEDLOOSECHANGES;
2469 //idNoSave = IDS_ASKFORSAVE_TASK7;
2470 idCancelAction = IDS_ASKFORSAVE_TASK8;
2471 break;
2472 case CHFSR_RELOAD:
2473 //idTitle = IDS_WARNMODIFIEDLOOSECHANGES;
2474 //idNoSave = IDS_ASKFORSAVE_TASK7;
2475 idCancelAction = IDS_ASKFORSAVE_CANCEL_OPEN;
2476 break;
2477 case CHFSR_OPTIONS:
2478 idTitle = IDS_WARNMODIFIEDLOOSECHANGESOPTIONS;
2479 //idNoSave = IDS_ASKFORSAVE_TASK7;
2480 idCancelAction = IDS_ASKFORSAVE_CANCEL_OPTIONS;
2481 break;
2482 case CHFSR_OPEN:
2483 //idTitle = IDS_WARNMODIFIEDLOOSECHANGES;
2484 idNoSave = IDS_ASKFORSAVE_NOSAVE_OPEN;
2485 idCancelAction = IDS_ASKFORSAVE_CANCEL_OPEN;
2486 break;
2487 }
2488
2489 CString sTitle(MAKEINTRESOURCE(idTitle));
2490 CString sSubTitle(MAKEINTRESOURCE(IDS_ASKFORSAVE_TASK2));
2491 CString sNoSave(MAKEINTRESOURCE(idNoSave));
2492 CString sCancelAction(MAKEINTRESOURCE(idCancelAction));
2493 CString sAppName(MAKEINTRESOURCE(IDS_APPNAME));
2494
2495 // TODO simplify logic, reduce code duplication
2496 if (CBaseView::IsViewGood(m_pwndBottomView))
2497 {
2498 // three-way diff - by design only bottom can be changed
2499 // use 1.7 way to do that
2500 }
2501 else if (CBaseView::IsViewGood(m_pwndRightView))
2502 {
2503 // two-way diff -
2504 // in 1.7 version only right was saved, now left and/or right can be save, so we need to indicate what we are asking to save
2505 if (HasUnsavedEdits(m_pwndLeftView))
2506 {
2507 // both views
2508 CTaskDialog taskdlg(sTitle,
2509 sSubTitle,
2510 sAppName,
2511 0,
2512 TDF_ENABLE_HYPERLINKS | TDF_USE_COMMAND_LINKS | TDF_ALLOW_DIALOG_CANCELLATION | TDF_POSITION_RELATIVE_TO_WINDOW);
2513 CString sTaskTemp;
2514 if (m_pwndLeftView->m_pWorkingFile->InUse() && !m_pwndLeftView->m_pWorkingFile->IsReadonly())
2515 sTaskTemp.Format(IDS_ASKFORSAVE_SAVELEFT, (LPCTSTR)m_pwndLeftView->m_pWorkingFile->GetFilename());
2516 else
2517 sTaskTemp = CString(MAKEINTRESOURCE(IDS_ASKFORSAVE_SAVELEFTAS));
2518 taskdlg.AddCommandControl(201, sTaskTemp); // left
2519 taskdlg.SetDefaultCommandControl(201);
2520 if (HasUnsavedEdits(m_pwndRightView))
2521 {
2522 if (m_pwndRightView->m_pWorkingFile->InUse() && !m_pwndRightView->m_pWorkingFile->IsReadonly())
2523 sTaskTemp.Format(IDS_ASKFORSAVE_SAVERIGHT, (LPCTSTR)m_pwndRightView->m_pWorkingFile->GetFilename());
2524 else
2525 sTaskTemp = CString(MAKEINTRESOURCE(IDS_ASKFORSAVE_SAVERIGHTAS));
2526 taskdlg.AddCommandControl(202, sTaskTemp); // right
2527 taskdlg.AddCommandControl(203, CString(MAKEINTRESOURCE(IDS_ASKFORSAVE_SAVEALL2))); // both
2528 taskdlg.SetDefaultCommandControl(203);
2529 }
2530 taskdlg.AddCommandControl(IDNO, sNoSave); // none
2531 taskdlg.AddCommandControl(IDCANCEL, sCancelAction); // cancel
2532 taskdlg.SetCommonButtons(TDCBF_CANCEL_BUTTON);
2533 taskdlg.SetMainIcon(TD_WARNING_ICON);
2534 UINT ret = (UINT)taskdlg.DoModal(m_hWnd);
2535 switch (ret)
2536 {
2537 case 201: // left
2538 m_pwndLeftView->SaveFile(SAVE_REMOVEDLINES);
2539 break;
2540 case 203: // both
2541 m_pwndLeftView->SaveFile(SAVE_REMOVEDLINES);
2542 case 202: // right
2543 m_pwndRightView->SaveFile();
2544 break;
2545 }
2546 if (ret != IDCANCEL && (eReason == CHFSR_CLOSE || eReason == CHFSR_OPEN))
2547 DeleteBaseTheirsMineOnClose();
2548 return ret;
2549 }
2550 else
2551 {
2552 // only secondary (left) view
2553 }
2554 // only right view - 1.7 implementation is used
2555 }
2556 else if (CBaseView::IsViewGood(m_pwndLeftView))
2557 {
2558 // only one view - only one to save
2559 // 1.7 FileSave don't support this mode
2560 if (HasUnsavedEdits(m_pwndLeftView))
2561 {
2562 CTaskDialog taskdlg(sTitle,
2563 sSubTitle,
2564 sAppName,
2565 0,
2566 TDF_ENABLE_HYPERLINKS | TDF_USE_COMMAND_LINKS | TDF_ALLOW_DIALOG_CANCELLATION | TDF_POSITION_RELATIVE_TO_WINDOW);
2567 CString sTask3;
2568 if (m_Data.m_mergedFile.InUse())
2569 sTask3.Format(IDS_ASKFORSAVE_TASK3, (LPCTSTR)m_Data.m_mergedFile.GetFilename());
2570 else
2571 sTask3.LoadString(IDS_ASKFORSAVE_TASK6);
2572 taskdlg.AddCommandControl(IDYES, sTask3);
2573 taskdlg.AddCommandControl(IDNO, sNoSave);
2574 taskdlg.AddCommandControl(IDCANCEL, sCancelAction);
2575 taskdlg.SetCommonButtons(TDCBF_CANCEL_BUTTON);
2576 taskdlg.SetDefaultCommandControl(IDYES);
2577 taskdlg.SetMainIcon(TD_WARNING_ICON);
2578 if ((UINT)taskdlg.DoModal(m_hWnd) == IDYES)
2579 {
2580 if (m_pwndLeftView->SaveFile()<0)
2581 return IDCANCEL;
2582 }
2583 }
2584 if (eReason == CHFSR_CLOSE || eReason == CHFSR_OPEN)
2585 DeleteBaseTheirsMineOnClose();
2586 return IDNO;
2587 }
2588 else
2589 {
2590 if (eReason == CHFSR_CLOSE || eReason == CHFSR_OPEN)
2591 DeleteBaseTheirsMineOnClose();
2592 return IDNO; // nothing to save
2593 }
2594
2595 // 1.7 implementation
2596 UINT ret = IDNO;
2597 if (HasUnsavedEdits())
2598 {
2599 CTaskDialog taskdlg(sTitle,
2600 sSubTitle,
2601 sAppName,
2602 0,
2603 TDF_ENABLE_HYPERLINKS | TDF_USE_COMMAND_LINKS | TDF_ALLOW_DIALOG_CANCELLATION | TDF_POSITION_RELATIVE_TO_WINDOW);
2604 CString sTask3;
2605 if (m_Data.m_mergedFile.InUse())
2606 sTask3.Format(IDS_ASKFORSAVE_TASK3, (LPCTSTR)m_Data.m_mergedFile.GetFilename());
2607 else
2608 sTask3.LoadString(IDS_ASKFORSAVE_TASK6);
2609 taskdlg.AddCommandControl(IDYES, sTask3);
2610 taskdlg.AddCommandControl(IDNO, sNoSave);
2611 taskdlg.AddCommandControl(IDCANCEL, sCancelAction);
2612 taskdlg.SetCommonButtons(TDCBF_CANCEL_BUTTON);
2613 taskdlg.SetDefaultCommandControl(IDYES);
2614 taskdlg.SetMainIcon(TD_WARNING_ICON);
2615 ret = (UINT)taskdlg.DoModal(m_hWnd);
2616
2617 if (ret == IDYES)
2618 {
2619 if (!FileSave())
2620 ret = IDCANCEL;
2621 }
2622 }
2623
2624 if (ret != IDCANCEL && (eReason == CHFSR_CLOSE || eReason == CHFSR_OPEN))
2625 DeleteBaseTheirsMineOnClose();
2626
2627 return ret;
2628 }
2629
2630 void CMainFrame::DeleteBaseTheirsMineOnClose()
2631 {
2632 if (!m_bDeleteBaseTheirsMineOnClose)
2633 return;
2634
2635 m_bDeleteBaseTheirsMineOnClose = false;
2636
2637 DeleteFile(m_Data.m_baseFile.GetFilename());
2638 DeleteFile(m_Data.m_theirFile.GetFilename());
2639 DeleteFile(m_Data.m_yourFile.GetFilename());
2640 }
2641
2642 bool CMainFrame::HasUnsavedEdits() const
2643 {
2644 return HasUnsavedEdits(m_pwndBottomView) || HasUnsavedEdits(m_pwndRightView) || m_bSaveRequired;
2645 }
2646
2647 bool CMainFrame::HasUnsavedEdits(const CBaseView* view)
2648 {
2649 if (!CBaseView::IsViewGood(view))
2650 return false;
2651 return view->IsModified();
2652 }
2653
2654 bool CMainFrame::HasMarkedBlocks() const
2655 {
2656 return CBaseView::IsViewGood(m_pwndRightView) && m_pwndRightView->HasMarkedBlocks();
2657 }
2658
2659 bool CMainFrame::IsViewGood(const CBaseView* view)
2660 {
2661 return CBaseView::IsViewGood(view);
2662 }
2663
2664 void CMainFrame::OnViewInlinediffword()
2665 {
2666 m_bInlineWordDiff = !m_bInlineWordDiff;
2667 if (m_pwndLeftView)
2668 {
2669 m_pwndLeftView->SetInlineWordDiff(m_bInlineWordDiff);
2670 m_pwndLeftView->BuildAllScreen2ViewVector();
2671 m_pwndLeftView->DocumentUpdated();
2672 }
2673 if (m_pwndRightView)
2674 {
2675 m_pwndRightView->SetInlineWordDiff(m_bInlineWordDiff);
2676 m_pwndRightView->BuildAllScreen2ViewVector();
2677 m_pwndRightView->DocumentUpdated();
2678 }
2679 if (m_pwndBottomView)
2680 {
2681 m_pwndBottomView->SetInlineWordDiff(m_bInlineWordDiff);
2682 m_pwndBottomView->BuildAllScreen2ViewVector();
2683 m_pwndBottomView->DocumentUpdated();
2684 }
2685 m_wndLineDiffBar.DocumentUpdated();
2686 }
2687
2688 void CMainFrame::OnUpdateViewInlinediffword(CCmdUI *pCmdUI)
2689 {
2690 pCmdUI->Enable(m_bInlineDiff && IsViewGood(m_pwndLeftView) && IsViewGood(m_pwndRightView));
2691 pCmdUI->SetCheck(m_bInlineWordDiff);
2692 }
2693
2694 void CMainFrame::OnViewInlinediff()
2695 {
2696 m_bInlineDiff = !m_bInlineDiff;
2697 if (m_pwndLeftView)
2698 {
2699 m_pwndLeftView->SetInlineDiff(m_bInlineDiff);
2700 m_pwndLeftView->BuildAllScreen2ViewVector();
2701 m_pwndLeftView->DocumentUpdated();
2702 }
2703 if (m_pwndRightView)
2704 {
2705 m_pwndRightView->SetInlineDiff(m_bInlineDiff);
2706 m_pwndRightView->BuildAllScreen2ViewVector();
2707 m_pwndRightView->DocumentUpdated();
2708 }
2709 if (m_pwndBottomView)
2710 {
2711 m_pwndBottomView->SetInlineDiff(m_bInlineDiff);
2712 m_pwndBottomView->BuildAllScreen2ViewVector();
2713 m_pwndBottomView->DocumentUpdated();
2714 }
2715 m_wndLineDiffBar.DocumentUpdated();
2716 }
2717
2718 void CMainFrame::OnUpdateViewInlinediff(CCmdUI *pCmdUI)
2719 {
2720 pCmdUI->Enable(IsViewGood(m_pwndLeftView) && IsViewGood(m_pwndRightView));
2721 pCmdUI->SetCheck(m_bInlineDiff);
2722 }
2723
2724 void CMainFrame::OnUpdateEditCreateunifieddifffile(CCmdUI *pCmdUI)
2725 {
2726 // "create unified diff file" is only available if two files
2727 // are diffed, not three.
2728 bool bEnabled = true;
2729 if (!IsViewGood(m_pwndLeftView))
2730 bEnabled = false;
2731 else if (!IsViewGood(m_pwndRightView))
2732 bEnabled = false;
2733 else if (IsViewGood(m_pwndBottomView)) //no negation here
2734 bEnabled = false;
2735 pCmdUI->Enable(bEnabled);
2736 }
2737
2738 void CMainFrame::OnEditCreateunifieddifffile()
2739 {
2740 CString origFile, modifiedFile;
2741 // the original file is the one on the left
2742 if (m_pwndLeftView)
2743 origFile = m_pwndLeftView->m_sFullFilePath;
2744 if (m_pwndRightView)
2745 modifiedFile = m_pwndRightView->m_sFullFilePath;
2746 if (origFile.IsEmpty() || modifiedFile.IsEmpty())
2747 return;
2748
2749 CString outputFile;
2750 if(!TryGetFileName(outputFile))
2751 return;
2752
2753 CRegStdDWORD regContextLines(L"Software\\TortoiseGitMerge\\ContextLines", (DWORD)-1);
2754 CAppUtils::CreateUnifiedDiff(origFile, modifiedFile, outputFile, regContextLines, true);
2755 }
2756
2757 void CMainFrame::OnUpdateViewLinediffbar(CCmdUI *pCmdUI)
2758 {
2759 pCmdUI->SetCheck(m_bLineDiff);
2760 pCmdUI->Enable();
2761 }
2762
2763 void CMainFrame::OnViewLinediffbar()
2764 {
2765 m_bLineDiff = !m_bLineDiff;
2766 m_wndLineDiffBar.ShowPane(m_bLineDiff, false, true);
2767 m_wndLineDiffBar.DocumentUpdated();
2768 m_wndLocatorBar.ShowPane(m_bLocatorBar, false, true);
2769 m_wndLocatorBar.DocumentUpdated();
2770 }
2771
2772 void CMainFrame::OnUpdateViewLocatorbar(CCmdUI *pCmdUI)
2773 {
2774 pCmdUI->SetCheck(m_bLocatorBar);
2775 pCmdUI->Enable();
2776 }
2777
2778 void CMainFrame::OnUpdateViewBars(CCmdUI * pCmdUI)
2779 {
2780 pCmdUI->Enable();
2781 }
2782
2783 void CMainFrame::OnViewLocatorbar()
2784 {
2785 m_bLocatorBar = !m_bLocatorBar;
2786 m_wndLocatorBar.ShowPane(m_bLocatorBar, false, true);
2787 m_wndLocatorBar.DocumentUpdated();
2788 m_wndLineDiffBar.ShowPane(m_bLineDiff, false, true);
2789 m_wndLineDiffBar.DocumentUpdated();
2790 }
2791
2792 void CMainFrame::OnViewComparewhitespaces()
2793 {
2794 if (CheckForSave(CHFSR_OPTIONS)==IDCANCEL)
2795 return;
2796 CRegDWORD regIgnoreWS(L"Software\\TortoiseGitMerge\\IgnoreWS");
2797 regIgnoreWS = 0;
2798 LoadViews(-1);
2799 }
2800
2801 void CMainFrame::OnUpdateViewComparewhitespaces(CCmdUI *pCmdUI)
2802 {
2803 CRegDWORD regIgnoreWS(L"Software\\TortoiseGitMerge\\IgnoreWS");
2804 DWORD dwIgnoreWS = regIgnoreWS;
2805 pCmdUI->SetCheck(dwIgnoreWS == 0);
2806 }
2807
2808 void CMainFrame::OnViewIgnorewhitespacechanges()
2809 {
2810 if (CheckForSave(CHFSR_OPTIONS)==IDCANCEL)
2811 return;
2812 CRegDWORD regIgnoreWS(L"Software\\TortoiseGitMerge\\IgnoreWS");
2813 regIgnoreWS = 2;
2814 LoadViews(-1);
2815 }
2816
2817 void CMainFrame::OnUpdateViewIgnorewhitespacechanges(CCmdUI *pCmdUI)
2818 {
2819 CRegDWORD regIgnoreWS(L"Software\\TortoiseGitMerge\\IgnoreWS");
2820 DWORD dwIgnoreWS = regIgnoreWS;
2821 pCmdUI->SetCheck(dwIgnoreWS == 2);
2822 }
2823
2824 void CMainFrame::OnViewIgnoreallwhitespacechanges()
2825 {
2826 if (CheckForSave(CHFSR_OPTIONS)==IDCANCEL)
2827 return;
2828 CRegDWORD regIgnoreWS(L"Software\\TortoiseGitMerge\\IgnoreWS");
2829 regIgnoreWS = 1;
2830 LoadViews(-1);
2831 }
2832
2833 void CMainFrame::OnUpdateViewIgnoreallwhitespacechanges(CCmdUI *pCmdUI)
2834 {
2835 CRegDWORD regIgnoreWS(L"Software\\TortoiseGitMerge\\IgnoreWS");
2836 DWORD dwIgnoreWS = regIgnoreWS;
2837 pCmdUI->SetCheck(dwIgnoreWS == 1);
2838 }
2839
2840 void CMainFrame::OnViewMovedBlocks()
2841 {
2842 m_bViewMovedBlocks = !(DWORD)m_regViewModedBlocks;
2843 m_regViewModedBlocks = m_bViewMovedBlocks;
2844 LoadViews(-1);
2845 }
2846
2847 void CMainFrame::OnUpdateViewMovedBlocks(CCmdUI *pCmdUI)
2848 {
2849 pCmdUI->SetCheck(m_bViewMovedBlocks);
2850 BOOL bEnable = TRUE;
2851 if (IsViewGood(m_pwndBottomView))
2852 {
2853 bEnable = FALSE;
2854 }
2855 pCmdUI->Enable(bEnable);
2856 }
2857
2858 bool CMainFrame::HasConflictsWontKeep()
2859 {
2860 const int nConflictLine = CheckResolved();
2861 if (nConflictLine < 0)
2862 return false;
2863 if (!m_pwndBottomView)
2864 return false;
2865
2866 CString sTemp;
2867 sTemp.Format(IDS_ERR_MAINFRAME_FILEHASCONFLICTS, m_pwndBottomView->m_pViewData->GetLineNumber(nConflictLine)+1);
2868 CTaskDialog taskdlg(sTemp,
2869 CString(MAKEINTRESOURCE(IDS_ERR_MAINFRAME_FILEHASCONFLICTS_TASK2)),
2870 L"TortoiseGitMerge",
2871 0,
2872 TDF_ENABLE_HYPERLINKS | TDF_USE_COMMAND_LINKS | TDF_ALLOW_DIALOG_CANCELLATION | TDF_POSITION_RELATIVE_TO_WINDOW);
2873 taskdlg.AddCommandControl(1, CString(MAKEINTRESOURCE(IDS_ERR_MAINFRAME_FILEHASCONFLICTS_TASK3)));
2874 taskdlg.AddCommandControl(2, CString(MAKEINTRESOURCE(IDS_ERR_MAINFRAME_FILEHASCONFLICTS_TASK4)));
2875 taskdlg.SetCommonButtons(TDCBF_CANCEL_BUTTON);
2876 taskdlg.SetDefaultCommandControl(2);
2877 taskdlg.SetMainIcon(TD_ERROR_ICON);
2878 if (taskdlg.DoModal(m_hWnd) == 1)
2879 return false;
2880
2881 m_pwndBottomView->GoToLine(nConflictLine);
2882 return true;
2883 }
2884
2885 bool CMainFrame::TryGetFileName(CString& result)
2886 {
2887 return CCommonAppUtils::FileOpenSave(result, nullptr, IDS_SAVEASTITLE, IDS_COMMONFILEFILTER, false, m_hWnd);
2888 }
2889
2890 CBaseView* CMainFrame::GetActiveBaseView() const
2891 {
2892 CView* activeView = GetActiveView();
2893 CBaseView* activeBase = dynamic_cast<CBaseView*>( activeView );
2894 return activeBase;
2895 }
2896
2897 void CMainFrame::SetWindowTitle()
2898 {
2899 // try to find a suitable window title
2900 CString sYour = m_Data.m_yourFile.GetDescriptiveName();
2901 if (sYour.Find(L" - ") >= 0)
2902 sYour = sYour.Left(sYour.Find(L" - "));
2903 if (sYour.Find(L" : ") >= 0)
2904 sYour = sYour.Left(sYour.Find(L" : "));
2905 CString sTheir = m_Data.m_theirFile.GetDescriptiveName();
2906 if (sTheir.IsEmpty())
2907 sTheir = m_Data.m_baseFile.GetDescriptiveName();
2908 if (sTheir.Find(L" - ") >= 0)
2909 sTheir = sTheir.Left(sTheir.Find(L" - "));
2910 if (sTheir.Find(L" : ") >= 0)
2911 sTheir = sTheir.Left(sTheir.Find(L" : "));
2912
2913 if (!sYour.IsEmpty() && !sTheir.IsEmpty())
2914 {
2915 if (sYour.CompareNoCase(sTheir)==0)
2916 SetWindowText(sYour + L" - TortoiseGitMerge");
2917 else if ((sYour.GetLength() < 10) &&
2918 (sTheir.GetLength() < 10))
2919 SetWindowText(sYour + L" - " + sTheir + L" - TortoiseGitMerge");
2920 else
2921 {
2922 // we have two very long descriptive texts here, which
2923 // means we have to find a way to use them as a window
2924 // title in a shorter way.
2925 // for simplicity, we just use the one from "yourfile"
2926 SetWindowText(sYour + L" - TortoiseGitMerge");
2927 }
2928 }
2929 else if (!sYour.IsEmpty())
2930 SetWindowText(sYour + L" - TortoiseGitMerge");
2931 else if (!sTheir.IsEmpty())
2932 SetWindowText(sTheir + L" - TortoiseGitMerge");
2933 else
2934 SetWindowText(L"TortoiseGitMerge");
2935 }
2936
2937 void CMainFrame::OnTimer(UINT_PTR nIDEvent)
2938 {
2939 switch (nIDEvent)
2940 {
2941 case IDT_RELOADCHECKTIMER:
2942 KillTimer(nIDEvent);
2943 CheckForReload();
2944 break;
2945 }
2946
2947 __super::OnTimer(nIDEvent);
2948 }
2949
2950 void CMainFrame::LoadIgnoreCommentData()
2951 {
2952 static bool bLoaded = false;
2953 if (bLoaded)
2954 return;
2955 CString sPath = CPathUtils::GetAppDataDirectory() + L"ignorecomments.txt";
2956 if (!PathFileExists(sPath))
2957 {
2958 // ignore comments file does not exist (yet), so create a default one
2959 HRSRC hRes = FindResource(nullptr, MAKEINTRESOURCE(IDR_IGNORECOMMENTSTXT), L"config");
2960 if (hRes)
2961 {
2962 HGLOBAL hResourceLoaded = LoadResource(nullptr, hRes);
2963 if (hResourceLoaded)
2964 {
2965 char * lpResLock = (char *) LockResource(hResourceLoaded);
2966 DWORD dwSizeRes = SizeofResource(nullptr, hRes);
2967 if (lpResLock)
2968 {
2969 HANDLE hFile = CreateFile(sPath, GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
2970 if (hFile != INVALID_HANDLE_VALUE)
2971 {
2972 DWORD dwWritten = 0;
2973 WriteFile(hFile, lpResLock, dwSizeRes, &dwWritten, nullptr);
2974 CloseHandle(hFile);
2975 }
2976 }
2977 }
2978 }
2979 }
2980
2981 try
2982 {
2983 CStdioFile file;
2984 if (file.Open(sPath, CFile::modeRead))
2985 {
2986 CString sLine;
2987 while (file.ReadString(sLine))
2988 {
2989 int eqpos = sLine.Find('=');
2990 if (eqpos >= 0)
2991 {
2992 CString sExts = sLine.Left(eqpos);
2993 CString sComments = sLine.Mid(eqpos+1);
2994
2995 int pos = sComments.Find(',');
2996 CString sLineStart = sComments.Left(pos);
2997 pos = sComments.Find(',', pos);
2998 int pos2 = sComments.Find(',', pos+1);
2999 CString sBlockStart = sComments.Mid(pos+1, pos2-pos-1);
3000 CString sBlockEnd = sComments.Mid(pos2+1);
3001
3002 auto commentTuple = std::make_tuple(sLineStart, sBlockStart, sBlockEnd);
3003
3004 pos = 0;
3005 CString temp;
3006 for (;;)
3007 {
3008 temp = sExts.Tokenize(L",", pos);
3009 if (temp.IsEmpty())
3010 {
3011 break;
3012 }
3013 ASSERT(m_IgnoreCommentsMap.find(temp) == m_IgnoreCommentsMap.end());
3014 m_IgnoreCommentsMap[temp] = commentTuple;
3015 }
3016 }
3017 }
3018 }
3019 }
3020 catch (CFileException* e)
3021 {
3022 e->Delete();
3023 }
3024 bLoaded = true;
3025 }
3026
3027 void CMainFrame::OnViewIgnorecomments()
3028 {
3029 if (CheckForSave(CHFSR_OPTIONS)==IDCANCEL)
3030 return;
3031 m_regIgnoreComments = !DWORD(m_regIgnoreComments);
3032 LoadViews(-1);
3033 }
3034
3035 void CMainFrame::OnUpdateViewIgnorecomments(CCmdUI *pCmdUI)
3036 {
3037 // only enable if we have comments defined for this file extension
3038 CString sExt = CPathUtils::GetFileExtFromPath(m_Data.m_baseFile.GetFilename()).MakeLower();
3039 sExt.TrimLeft(L".");
3040 auto sC = m_IgnoreCommentsMap.find(sExt);
3041 if (sC == m_IgnoreCommentsMap.end())
3042 {
3043 sExt = CPathUtils::GetFileExtFromPath(m_Data.m_yourFile.GetFilename()).MakeLower();
3044 sExt.TrimLeft(L".");
3045 sC = m_IgnoreCommentsMap.find(sExt);
3046 if (sC == m_IgnoreCommentsMap.end())
3047 {
3048 sExt = CPathUtils::GetFileExtFromPath(m_Data.m_theirFile.GetFilename()).MakeLower();
3049 sExt.TrimLeft(L".");
3050 sC = m_IgnoreCommentsMap.find(sExt);
3051 }
3052 }
3053 pCmdUI->Enable(sC != m_IgnoreCommentsMap.end());
3054
3055 pCmdUI->SetCheck(DWORD(m_regIgnoreComments) != 0);
3056 }
3057
3058
3059 void CMainFrame::OnRegexfilter(UINT cmd)
3060 {
3061 if ((cmd == ID_REGEXFILTER)||(cmd == (ID_REGEXFILTER+1)))
3062 {
3063 CRegexFiltersDlg dlg(this);
3064 dlg.SetIniFile(&m_regexIni);
3065 if (dlg.DoModal() == IDOK)
3066 {
3067 FILE* pFile = nullptr;
3068 _wfopen_s(&pFile, CPathUtils::GetAppDataDirectory() + L"regexfilters.ini", L"wb");
3069 m_regexIni.SaveFile(pFile);
3070 fclose(pFile);
3071 }
3072 BuildRegexSubitems();
3073 }
3074 else
3075 {
3076 if (cmd == (UINT)m_regexIndex && !m_bUseRibbons)
3077 {
3078 if (CheckForSave(CHFSR_OPTIONS)==IDCANCEL)
3079 return;
3080 m_Data.SetRegexTokens(std::wregex(), L"");
3081 m_regexIndex = -1;
3082 LoadViews(-1);
3083 }
3084 else if (cmd != (UINT)m_regexIndex)
3085 {
3086 CSimpleIni::TNamesDepend sections;
3087 m_regexIni.GetAllSections(sections);
3088 int index = ID_REGEXFILTER + 2;
3089 m_regexIndex = -1;
3090 for (const auto& section : sections)
3091 {
3092 if (cmd == (UINT)index)
3093 {
3094 if (CheckForSave(CHFSR_OPTIONS)==IDCANCEL)
3095 break;
3096 try
3097 {
3098 std::wregex rx(m_regexIni.GetValue(section.pItem, L"regex", L""));
3099 m_Data.SetRegexTokens(rx, m_regexIni.GetValue(section.pItem, L"replace", L""));
3100 }
3101 catch (std::exception &ex)
3102 {
3103 MessageBox(L"Regex is invalid!\r\n" + CString(ex.what()));
3104 }
3105 m_regexIndex = index;
3106 try
3107 {
3108 LoadViews(-1);
3109 }
3110 catch (const std::regex_error& ex)
3111 {
3112 MessageBox(L"Regexp error caught:\r\n" + CString(ex.what()) + L"\r\nTrying to recover by unsetting it again.");
3113 m_Data.SetRegexTokens(std::wregex(), L"");
3114 m_regexIndex = -1;
3115 LoadViews(-1);
3116 }
3117 break;
3118 }
3119 ++index;
3120 }
3121 }
3122 }
3123 }
3124
3125 void CMainFrame::OnUpdateViewRegexFilter( CCmdUI *pCmdUI )
3126 {
3127 pCmdUI->Enable();
3128 pCmdUI->SetCheck(pCmdUI->m_nID == (UINT)m_regexIndex);
3129 }
3130
3131 void CMainFrame::BuildRegexSubitems(CMFCPopupMenu* pMenuPopup)
3132 {
3133 CString sIniPath = CPathUtils::GetAppDataDirectory() + L"regexfilters.ini";
3134 if (!PathFileExists(sIniPath))
3135 {
3136 // ini file does not exist (yet), so create a default one
3137 HRSRC hRes = FindResource(nullptr, MAKEINTRESOURCE(IDR_REGEXFILTERINI), L"config");
3138 if (hRes)
3139 {
3140 HGLOBAL hResourceLoaded = LoadResource(nullptr, hRes);
3141 if (hResourceLoaded)
3142 {
3143 char * lpResLock = (char *)LockResource(hResourceLoaded);
3144 DWORD dwSizeRes = SizeofResource(nullptr, hRes);
3145 if (lpResLock)
3146 {
3147 HANDLE hFile = CreateFile(sIniPath, GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
3148 if (hFile != INVALID_HANDLE_VALUE)
3149 {
3150 DWORD dwWritten = 0;
3151 WriteFile(hFile, lpResLock, dwSizeRes, &dwWritten, nullptr);
3152 CloseHandle(hFile);
3153 }
3154 }
3155 }
3156 }
3157 }
3158
3159 m_regexIni.LoadFile(sIniPath);
3160 CSimpleIni::TNamesDepend sections;
3161 m_regexIni.GetAllSections(sections);
3162
3163 if (m_bUseRibbons)
3164 {
3165 std::list<CNativeRibbonDynamicItemInfo> items;
3166 int cmdIndex = 2;
3167 items.push_back(CNativeRibbonDynamicItemInfo(ID_REGEX_NO_FILTER, CString(MAKEINTRESOURCE(ID_REGEX_NO_FILTER)), IDB_REGEX_FILTER));
3168 for (const auto& section : sections)
3169 {
3170 items.emplace_back(ID_REGEXFILTER + cmdIndex, section.pItem, IDB_REGEX_FILTER);
3171 cmdIndex++;
3172 }
3173
3174 m_pRibbonApp->SetItems(ID_REGEXFILTER, items);
3175 }
3176 else if (pMenuPopup)
3177 {
3178 int iIndex = -1;
3179 if (!CMFCToolBar::IsCustomizeMode() &&
3180 (iIndex = pMenuPopup->GetMenuBar()->CommandToIndex(ID_REGEXFILTER)) >= 0)
3181 {
3182 if (!sections.empty())
3183 pMenuPopup->InsertSeparator(iIndex + 1); // insert the separator at the end
3184 int cmdIndex = 2;
3185 for (const auto& section : sections)
3186 {
3187 pMenuPopup->InsertItem(CMFCToolBarMenuButton(ID_REGEXFILTER + cmdIndex, nullptr, -1, (LPCWSTR)section.pItem), iIndex + cmdIndex);
3188 cmdIndex++;
3189 }
3190 }
3191 }
3192 }
3193
3194 void CMainFrame::FillEncodingButton( CMFCRibbonButton * pButton, int start )
3195 {
3196 pButton->SetDefaultCommand(FALSE);
3197 pButton->AddSubItem(new CMFCRibbonButton(start + CFileTextLines::UnicodeType::ASCII, L"ASCII" ));
3198 pButton->AddSubItem(new CMFCRibbonButton(start + CFileTextLines::UnicodeType::BINARY, L"BINARY" ));
3199 pButton->AddSubItem(new CMFCRibbonButton(start + CFileTextLines::UnicodeType::UTF16_LE, L"UTF-16LE" ));
3200 pButton->AddSubItem(new CMFCRibbonButton(start + CFileTextLines::UnicodeType::UTF16_LEBOM, L"UTF-16LE BOM"));
3201 pButton->AddSubItem(new CMFCRibbonButton(start + CFileTextLines::UnicodeType::UTF16_BE, L"UTF-16BE" ));
3202 pButton->AddSubItem(new CMFCRibbonButton(start + CFileTextLines::UnicodeType::UTF16_BEBOM, L"UTF-16BE BOM"));
3203 pButton->AddSubItem(new CMFCRibbonButton(start + CFileTextLines::UnicodeType::UTF32_LE, L"UTF-32LE" ));
3204 pButton->AddSubItem(new CMFCRibbonButton(start + CFileTextLines::UnicodeType::UTF32_BE, L"UTF-32BE" ));
3205 pButton->AddSubItem(new CMFCRibbonButton(start + CFileTextLines::UnicodeType::UTF8, L"UTF-8" ));
3206 pButton->AddSubItem(new CMFCRibbonButton(start + CFileTextLines::UnicodeType::UTF8BOM, L"UTF-8 BOM" ));
3207 }
3208
3209 void CMainFrame::FillEOLButton( CMFCRibbonButton * pButton, int start )
3210 {
3211 pButton->SetDefaultCommand(FALSE);
3212 pButton->AddSubItem(new CMFCRibbonButton(start + EOL::EOL_LF , L"LF" ));
3213 pButton->AddSubItem(new CMFCRibbonButton(start + EOL::EOL_CRLF, L"CRLF"));
3214 pButton->AddSubItem(new CMFCRibbonButton(start + EOL::EOL_LFCR, L"LRCR"));
3215 pButton->AddSubItem(new CMFCRibbonButton(start + EOL::EOL_CR , L"CR" ));
3216 pButton->AddSubItem(new CMFCRibbonButton(start + EOL::EOL_VT , L"VT" ));
3217 pButton->AddSubItem(new CMFCRibbonButton(start + EOL::EOL_FF , L"FF" ));
3218 pButton->AddSubItem(new CMFCRibbonButton(start + EOL::EOL_NEL , L"NEL" ));
3219 pButton->AddSubItem(new CMFCRibbonButton(start + EOL::EOL_LS , L"LS" ));
3220 pButton->AddSubItem(new CMFCRibbonButton(start + EOL::EOL_PS , L"PS" ));
3221 }
3222
3223 void CMainFrame::FillTabModeButton(CMFCRibbonButton * pButton, int start)
3224 {
3225 pButton->SetDefaultCommand(FALSE);
3226 pButton->AddSubItem(new CMFCRibbonButton(start + TABMODE_NONE , L"Tab"));
3227 pButton->AddSubItem(new CMFCRibbonButton(start + TABMODE_USESPACES , L"Space"));
3228 pButton->AddSubItem(new CMFCRibbonSeparator(TRUE));
3229 pButton->AddSubItem(new CMFCRibbonButton(start + TABMODE_SMARTINDENT , L"Smart tab char"));
3230 pButton->AddSubItem(new CMFCRibbonSeparator(TRUE));
3231 pButton->AddSubItem(new CMFCRibbonButton(start + TABSIZEBUTTON1, L"1"));
3232 pButton->AddSubItem(new CMFCRibbonButton(start + TABSIZEBUTTON2, L"2"));
3233 pButton->AddSubItem(new CMFCRibbonButton(start + TABSIZEBUTTON4, L"4"));
3234 pButton->AddSubItem(new CMFCRibbonButton(start + TABSIZEBUTTON8, L"8"));
3235 pButton->AddSubItem(new CMFCRibbonSeparator(TRUE));
3236 pButton->AddSubItem(new CMFCRibbonButton(start + ENABLEEDITORCONFIG, L"EditorConfig"));
3237 }
3238
3239 bool CMainFrame::AdjustUnicodeTypeForLoad(CFileTextLines::UnicodeType& type)
3240 {
3241 switch (type)
3242 {
3243 case CFileTextLines::UnicodeType::AUTOTYPE:
3244 case CFileTextLines::UnicodeType::BINARY:
3245 return false;
3246
3247 case CFileTextLines::UnicodeType::ASCII:
3248 case CFileTextLines::UnicodeType::UTF16_LE:
3249 case CFileTextLines::UnicodeType::UTF16_BE:
3250 case CFileTextLines::UnicodeType::UTF32_LE:
3251 case CFileTextLines::UnicodeType::UTF32_BE:
3252 case CFileTextLines::UnicodeType::UTF8:
3253 return true;
3254
3255 case CFileTextLines::UnicodeType::UTF16_LEBOM:
3256 type = CFileTextLines::UnicodeType::UTF16_LE;
3257 return true;
3258
3259 case CFileTextLines::UnicodeType::UTF16_BEBOM:
3260 type = CFileTextLines::UnicodeType::UTF16_BE;
3261 return true;
3262
3263 case CFileTextLines::UnicodeType::UTF8BOM:
3264 type = CFileTextLines::UnicodeType::UTF8;
3265 return true;
3266 }
3267 return false;
3268 }
3269
3270 void CMainFrame::OnEncodingLeft( UINT cmd )
3271 {
3272 if (m_pwndLeftView)
3273 {
3274 if (GetKeyState(VK_CONTROL) & 0x8000)
3275 {
3276 // reload with selected encoding
3277 auto saveparams = m_Data.m_arBaseFile.GetSaveParams();
3278 saveparams.m_UnicodeType = CFileTextLines::UnicodeType(cmd - ID_INDICATOR_LEFTENCODINGSTART);
3279 if (AdjustUnicodeTypeForLoad(saveparams.m_UnicodeType))
3280 {
3281 m_Data.m_arBaseFile.SetSaveParams(saveparams);
3282 m_Data.m_arBaseFile.KeepEncoding();
3283 LoadViews();
3284 }
3285 }
3286 else
3287 {
3288 m_pwndLeftView->SetTextType(CFileTextLines::UnicodeType(cmd - ID_INDICATOR_LEFTENCODINGSTART));
3289 m_pwndLeftView->RefreshViews();
3290 }
3291 }
3292 }
3293
3294 void CMainFrame::OnEncodingRight( UINT cmd )
3295 {
3296 if (m_pwndRightView)
3297 {
3298 if (GetKeyState(VK_CONTROL) & 0x8000)
3299 {
3300 // reload with selected encoding
3301 auto saveparams = m_Data.m_arYourFile.GetSaveParams();
3302 saveparams.m_UnicodeType = CFileTextLines::UnicodeType(cmd - ID_INDICATOR_RIGHTENCODINGSTART);
3303 if (AdjustUnicodeTypeForLoad(saveparams.m_UnicodeType))
3304 {
3305 m_Data.m_arYourFile.SetSaveParams(saveparams);
3306 m_Data.m_arYourFile.KeepEncoding();
3307 LoadViews();
3308 }
3309 }
3310 else
3311 {
3312 m_pwndRightView->SetTextType(CFileTextLines::UnicodeType(cmd - ID_INDICATOR_RIGHTENCODINGSTART));
3313 m_pwndRightView->RefreshViews();
3314 }
3315 }
3316 }
3317
3318 void CMainFrame::OnEncodingBottom( UINT cmd )
3319 {
3320 if (m_pwndBottomView)
3321 {
3322 if (GetKeyState(VK_CONTROL) & 0x8000)
3323 {
3324 // reload with selected encoding
3325 auto saveparams = m_Data.m_arTheirFile.GetSaveParams();
3326 saveparams.m_UnicodeType = CFileTextLines::UnicodeType(cmd - ID_INDICATOR_BOTTOMENCODINGSTART);
3327 if (AdjustUnicodeTypeForLoad(saveparams.m_UnicodeType))
3328 {
3329 m_Data.m_arTheirFile.SetSaveParams(saveparams);
3330 m_Data.m_arTheirFile.KeepEncoding();
3331 LoadViews();
3332 }
3333 }
3334 else
3335 {
3336 m_pwndBottomView->SetTextType(CFileTextLines::UnicodeType(cmd - ID_INDICATOR_BOTTOMENCODINGSTART));
3337 m_pwndBottomView->RefreshViews();
3338 }
3339 }
3340 }
3341
3342 void CMainFrame::OnEOLLeft( UINT cmd )
3343 {
3344 if (m_pwndLeftView)
3345 {
3346 m_pwndLeftView->ReplaceLineEndings(EOL(cmd-ID_INDICATOR_LEFTEOLSTART));
3347 m_pwndLeftView->RefreshViews();
3348 }
3349 }
3350
3351 void CMainFrame::OnEOLRight( UINT cmd )
3352 {
3353 if (m_pwndRightView)
3354 {
3355 m_pwndRightView->ReplaceLineEndings(EOL(cmd-ID_INDICATOR_RIGHTEOLSTART));
3356 m_pwndRightView->RefreshViews();
3357 }
3358 }
3359
3360 void CMainFrame::OnEOLBottom( UINT cmd )
3361 {
3362 if (m_pwndBottomView)
3363 {
3364 m_pwndBottomView->ReplaceLineEndings(EOL(cmd-ID_INDICATOR_BOTTOMEOLSTART));
3365 m_pwndBottomView->RefreshViews();
3366 }
3367 }
3368
3369 void CMainFrame::OnTabModeLeft( UINT cmd )
3370 {
3371 OnTabMode(m_pwndLeftView, (int)cmd - ID_INDICATOR_LEFTTABMODESTART);
3372 }
3373
3374 void CMainFrame::OnTabModeRight( UINT cmd )
3375 {
3376 OnTabMode(m_pwndRightView, (int)cmd - ID_INDICATOR_RIGHTTABMODESTART);
3377 }
3378
3379 void CMainFrame::OnTabModeBottom( UINT cmd )
3380 {
3381 OnTabMode(m_pwndBottomView, (int)cmd - ID_INDICATOR_BOTTOMTABMODESTART);
3382 }
3383
3384 void CMainFrame::OnTabMode(CBaseView *view, int cmd)
3385 {
3386 if (!view)
3387 return;
3388 int nTabMode = view->GetTabMode();
3389 if (cmd == TABMODE_NONE || cmd == TABMODE_USESPACES)
3390 view->SetTabMode((nTabMode & (~TABMODE_USESPACES)) | (cmd & TABMODE_USESPACES));
3391 else if (cmd == TABMODE_SMARTINDENT) // Toggle
3392 view->SetTabMode((nTabMode & (~TABMODE_SMARTINDENT)) | ((nTabMode & TABMODE_SMARTINDENT) ? 0 : TABMODE_SMARTINDENT));
3393 else if (cmd == TABSIZEBUTTON1)
3394 view->SetTabSize(1);
3395 else if (cmd == TABSIZEBUTTON2)
3396 view->SetTabSize(2);
3397 else if (cmd == TABSIZEBUTTON4)
3398 view->SetTabSize(4);
3399 else if (cmd == TABSIZEBUTTON8)
3400 view->SetTabSize(8);
3401 else if (cmd == ENABLEEDITORCONFIG)
3402 view->SetEditorConfigEnabled(!view->GetEditorConfigEnabled());
3403 view->RefreshViews();
3404 }
3405
3406 void CMainFrame::OnUpdateEncodingLeft( CCmdUI *pCmdUI )
3407 {
3408 if (m_pwndLeftView)
3409 {
3410 pCmdUI->SetCheck(CFileTextLines::UnicodeType(pCmdUI->m_nID - ID_INDICATOR_LEFTENCODINGSTART) == m_pwndLeftView->GetTextType());
3411 pCmdUI->Enable(m_pwndLeftView->IsWritable() || (GetKeyState(VK_CONTROL)&0x8000));
3412 }
3413 else
3414 pCmdUI->Enable(FALSE);
3415 }
3416
3417 void CMainFrame::OnUpdateEncodingRight( CCmdUI *pCmdUI )
3418 {
3419 if (m_pwndRightView)
3420 {
3421 pCmdUI->SetCheck(CFileTextLines::UnicodeType(pCmdUI->m_nID - ID_INDICATOR_RIGHTENCODINGSTART) == m_pwndRightView->GetTextType());
3422 pCmdUI->Enable(m_pwndRightView->IsWritable() || (GetKeyState(VK_CONTROL) & 0x8000));
3423 }
3424 else
3425 pCmdUI->Enable(FALSE);
3426 }
3427
3428 void CMainFrame::OnUpdateEncodingBottom( CCmdUI *pCmdUI )
3429 {
3430 if (m_pwndBottomView)
3431 {
3432 pCmdUI->SetCheck(CFileTextLines::UnicodeType(pCmdUI->m_nID - ID_INDICATOR_BOTTOMENCODINGSTART) == m_pwndBottomView->GetTextType());
3433 pCmdUI->Enable(m_pwndBottomView->IsWritable() || (GetKeyState(VK_CONTROL) & 0x8000));
3434 }
3435 else
3436 pCmdUI->Enable(FALSE);
3437 }
3438
3439 void CMainFrame::OnUpdateEOLLeft( CCmdUI *pCmdUI )
3440 {
3441 if (m_pwndLeftView)
3442 {
3443 pCmdUI->SetCheck(EOL(pCmdUI->m_nID - ID_INDICATOR_LEFTEOLSTART) == m_pwndLeftView->GetLineEndings());
3444 pCmdUI->Enable(m_pwndLeftView->IsWritable());
3445 }
3446 else
3447 pCmdUI->Enable(FALSE);
3448 }
3449
3450 void CMainFrame::OnUpdateEOLRight( CCmdUI *pCmdUI )
3451 {
3452 if (m_pwndRightView)
3453 {
3454 pCmdUI->SetCheck(EOL(pCmdUI->m_nID - ID_INDICATOR_RIGHTEOLSTART) == m_pwndRightView->GetLineEndings());
3455 pCmdUI->Enable(m_pwndRightView->IsWritable());
3456 }
3457 else
3458 pCmdUI->Enable(FALSE);
3459 }
3460
3461 void CMainFrame::OnUpdateEOLBottom( CCmdUI *pCmdUI )
3462 {
3463 if (m_pwndBottomView)
3464 {
3465 pCmdUI->SetCheck(EOL(pCmdUI->m_nID - ID_INDICATOR_BOTTOMEOLSTART) == m_pwndBottomView->GetLineEndings());
3466 pCmdUI->Enable(m_pwndBottomView->IsWritable());
3467 }
3468 else
3469 pCmdUI->Enable(FALSE);
3470 }
3471
3472 void CMainFrame::OnUpdateTabModeLeft(CCmdUI *pCmdUI)
3473 {
3474 OnUpdateTabMode(m_pwndLeftView, pCmdUI, ID_INDICATOR_LEFTTABMODESTART);
3475 }
3476
3477 void CMainFrame::OnUpdateTabModeRight(CCmdUI *pCmdUI)
3478 {
3479 OnUpdateTabMode(m_pwndRightView, pCmdUI, ID_INDICATOR_RIGHTTABMODESTART);
3480 }
3481
3482 void CMainFrame::OnUpdateTabModeBottom(CCmdUI *pCmdUI)
3483 {
3484 OnUpdateTabMode(m_pwndBottomView, pCmdUI, ID_INDICATOR_BOTTOMTABMODESTART);
3485 }
3486
3487 void CMainFrame::OnUpdateTabMode(CBaseView *view, CCmdUI *pCmdUI, int startid)
3488 {
3489 if (view)
3490 {
3491 int cmd = (int)pCmdUI->m_nID - startid;
3492 if (cmd == TABMODE_NONE)
3493 pCmdUI->SetCheck((view->GetTabMode() & TABMODE_USESPACES) == TABMODE_NONE);
3494 else if (cmd == TABMODE_USESPACES)
3495 pCmdUI->SetCheck(view->GetTabMode() & TABMODE_USESPACES);
3496 else if (cmd == TABMODE_SMARTINDENT)
3497 pCmdUI->SetCheck(view->GetTabMode() & TABMODE_SMARTINDENT);
3498 else if (cmd == TABSIZEBUTTON1)
3499 pCmdUI->SetCheck(view->GetTabSize() == 1);
3500 else if (cmd == TABSIZEBUTTON2)
3501 pCmdUI->SetCheck(view->GetTabSize() == 2);
3502 else if (cmd == TABSIZEBUTTON4)
3503 pCmdUI->SetCheck(view->GetTabSize() == 4);
3504 else if (cmd == TABSIZEBUTTON8)
3505 pCmdUI->SetCheck(view->GetTabSize() == 8);
3506 else if (cmd == ENABLEEDITORCONFIG)
3507 pCmdUI->SetCheck(view->GetEditorConfigEnabled());
3508 pCmdUI->Enable(view->IsWritable());
3509 if (cmd == ENABLEEDITORCONFIG)
3510 pCmdUI->Enable(view->IsWritable() && view->GetEditorConfigLoaded());
3511 }
3512 else
3513 pCmdUI->Enable(FALSE);
3514 }
3515
3516 BOOL CMainFrame::OnShowPopupMenu(CMFCPopupMenu* pMenuPopup)
3517 {
3518 __super::OnShowPopupMenu(pMenuPopup);
3519
3520 if (!pMenuPopup)
3521 return TRUE;
3522
3523 int iIndex = -1;
3524 if (!CMFCToolBar::IsCustomizeMode() &&
3525 (iIndex = pMenuPopup->GetMenuBar()->CommandToIndex(ID_REGEXFILTER)) >= 0)
3526 {
3527 BuildRegexSubitems(pMenuPopup);
3528 }
3529
3530 return TRUE;
3531 }
3532
3533 LRESULT CMainFrame::OnIdleUpdateCmdUI(WPARAM wParam, LPARAM lParam)
3534 {
3535 __super::OnIdleUpdateCmdUI(wParam, lParam);
3536
3537 if (m_pRibbonApp)
3538 {
3539 BOOL bDisableIfNoHandler = (BOOL)wParam;
3540 m_pRibbonApp->UpdateCmdUI(bDisableIfNoHandler);
3541 }
3542 return 0;
3543 }
3544
3545 void CMainFrame::OnUpdateThreeWayActions(CCmdUI * pCmdUI)
3546 {
3547 pCmdUI->Enable();
3548 }
3549
3550 void CMainFrame::OnRegexNoFilter()
3551 {
3552 if (CheckForSave(CHFSR_OPTIONS) == IDCANCEL)
3553 return;
3554 m_Data.SetRegexTokens(std::wregex(), L"");
3555 m_regexIndex = -1;
3556 LoadViews(-1);
3557 }
3558
3559 void CMainFrame::OnUpdateRegexNoFilter(CCmdUI * pCmdUI)
3560 {
3561 pCmdUI->SetCheck(m_regexIndex < 0);
3562 }
Windows Explorer Extension to Operate Git