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