?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Success build TortoiseMerge.
[TortoiseGit.git] / src / TortoiseMerge / MainFrm.cpp
blob0f95fb22d55beaab46de27ad4be96b1ac0a10bef
1 // TortoiseMerge - a Diff/Patch program
2
3 // Copyright (C) 2004-2009 - TortoiseSVN
4
5 // This program is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU General Public License
7 // as published by the Free Software Foundation; either version 2
8 // of the License, or (at your option) any later version.
9
10 // This program is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 // GNU General Public License for more details.
14
15 // You should have received a copy of the GNU General Public License
16 // along with this program; if not, write to the Free Software Foundation,
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
18 //
19 #include "stdafx.h"
20 #include "TortoiseMerge.h"
21 #include "OpenDlg.h"
22 #include "Patch.h"
23 #include "SysProgressDlg.h"
24 #include "Settings.h"
25 #include "MessageBox.h"
26 #include "AppUtils.h"
27 #include "PathUtils.h"
28 #include "MainFrm.h"
29 #include "LeftView.h"
30 #include "RightView.h"
31 #include "BottomView.h"
32 #include "DiffColors.h"
33 #include ".\mainfrm.h"
34
35 #ifdef _DEBUG
36 #define new DEBUG_NEW
37 #endif
38
39
40 // CMainFrame
41 const UINT CMainFrame::m_FindDialogMessage = RegisterWindowMessage(FINDMSGSTRING);
42
43 IMPLEMENT_DYNCREATE(CMainFrame, CFrameWndEx)
44
45 BEGIN_MESSAGE_MAP(CMainFrame, CFrameWndEx)
46 ON_WM_CREATE()
47 ON_COMMAND_RANGE(ID_VIEW_APPLOOK_WIN_2000, ID_VIEW_APPLOOK_OFF_2007_AQUA, &CMainFrame::OnApplicationLook)
48 ON_UPDATE_COMMAND_UI_RANGE(ID_VIEW_APPLOOK_WIN_2000, ID_VIEW_APPLOOK_OFF_2007_AQUA, &CMainFrame::OnUpdateApplicationLook)
49 // Global help commands
50 ON_COMMAND(ID_HELP_FINDER, CFrameWndEx::OnHelpFinder)
51 ON_COMMAND(ID_HELP, CFrameWndEx::OnHelp)
52 ON_COMMAND(ID_CONTEXT_HELP, CFrameWndEx::OnContextHelp)
53 ON_COMMAND(ID_DEFAULT_HELP, CFrameWndEx::OnHelpFinder)
54 ON_COMMAND(ID_FILE_OPEN, OnFileOpen)
55 ON_COMMAND(ID_VIEW_WHITESPACES, OnViewWhitespaces)
56 ON_WM_SIZE()
57 ON_COMMAND(ID_FILE_SAVE, OnFileSave)
58 ON_COMMAND(ID_FILE_SAVE_AS, OnFileSaveAs)
59 ON_UPDATE_COMMAND_UI(ID_FILE_SAVE, OnUpdateFileSave)
60 ON_UPDATE_COMMAND_UI(ID_FILE_SAVE_AS, OnUpdateFileSaveAs)
61 ON_COMMAND(ID_VIEW_ONEWAYDIFF, OnViewOnewaydiff)
62 ON_UPDATE_COMMAND_UI(ID_VIEW_ONEWAYDIFF, OnUpdateViewOnewaydiff)
63 ON_UPDATE_COMMAND_UI(ID_VIEW_WHITESPACES, OnUpdateViewWhitespaces)
64 ON_COMMAND(ID_VIEW_OPTIONS, OnViewOptions)
65 ON_WM_CLOSE()
66 ON_COMMAND(ID_EDIT_FIND, OnEditFind)
67 ON_REGISTERED_MESSAGE(m_FindDialogMessage, OnFindDialogMessage)
68 ON_COMMAND(ID_EDIT_FINDNEXT, OnEditFindnext)
69 ON_COMMAND(ID_EDIT_FINDPREV, OnEditFindprev)
70 ON_COMMAND(ID_FILE_RELOAD, OnFileReload)
71 ON_COMMAND(ID_VIEW_LINEDOWN, OnViewLinedown)
72 ON_COMMAND(ID_VIEW_LINEUP, OnViewLineup)
73 ON_UPDATE_COMMAND_UI(ID_EDIT_MARKASRESOLVED, OnUpdateMergeMarkasresolved)
74 ON_COMMAND(ID_EDIT_MARKASRESOLVED, OnMergeMarkasresolved)
75 ON_UPDATE_COMMAND_UI(ID_NAVIGATE_NEXTCONFLICT, OnUpdateMergeNextconflict)
76 ON_UPDATE_COMMAND_UI(ID_NAVIGATE_PREVIOUSCONFLICT, OnUpdateMergePreviousconflict)
77 ON_WM_MOVE()
78 ON_WM_MOVING()
79 ON_UPDATE_COMMAND_UI(ID_EDIT_COPY, OnUpdateEditCopy)
80 ON_COMMAND(ID_VIEW_SWITCHLEFT, OnViewSwitchleft)
81 ON_UPDATE_COMMAND_UI(ID_VIEW_SWITCHLEFT, OnUpdateViewSwitchleft)
82 ON_COMMAND(ID_VIEW_LINELEFT, &CMainFrame::OnViewLineleft)
83 ON_COMMAND(ID_VIEW_LINERIGHT, &CMainFrame::OnViewLineright)
84 ON_UPDATE_COMMAND_UI(ID_VIEW_SHOWFILELIST, &CMainFrame::OnUpdateViewShowfilelist)
85 ON_COMMAND(ID_VIEW_SHOWFILELIST, &CMainFrame::OnViewShowfilelist)
86 ON_COMMAND(ID_EDIT_USETHEIRBLOCK, &CMainFrame::OnEditUseTheirs)
87 ON_COMMAND(ID_EDIT_USEMYBLOCK, &CMainFrame::OnEditUseMine)
88 ON_COMMAND(ID_EDIT_USETHEIRTHENMYBLOCK, &CMainFrame::OnEditUseTheirsThenMine)
89 ON_COMMAND(ID_EDIT_USEMINETHENTHEIRBLOCK, &CMainFrame::OnEditUseMineThenTheirs)
90 ON_COMMAND(ID_EDIT_UNDO, &CMainFrame::OnEditUndo)
91 ON_UPDATE_COMMAND_UI(ID_EDIT_UNDO, &CMainFrame::OnUpdateEditUndo)
92 ON_UPDATE_COMMAND_UI(ID_EDIT_USEMINETHENTHEIRBLOCK, &CMainFrame::OnUpdateEditUseminethentheirblock)
93 ON_UPDATE_COMMAND_UI(ID_EDIT_USEMYBLOCK, &CMainFrame::OnUpdateEditUsemyblock)
94 ON_UPDATE_COMMAND_UI(ID_EDIT_USETHEIRBLOCK, &CMainFrame::OnUpdateEditUsetheirblock)
95 ON_UPDATE_COMMAND_UI(ID_EDIT_USETHEIRTHENMYBLOCK, &CMainFrame::OnUpdateEditUsetheirthenmyblock)
96 ON_COMMAND(ID_VIEW_INLINEDIFFWORD, &CMainFrame::OnViewInlinediffword)
97 ON_UPDATE_COMMAND_UI(ID_VIEW_INLINEDIFFWORD, &CMainFrame::OnUpdateViewInlinediffword)
98 ON_UPDATE_COMMAND_UI(ID_EDIT_CREATEUNIFIEDDIFFFILE, &CMainFrame::OnUpdateEditCreateunifieddifffile)
99 ON_COMMAND(ID_EDIT_CREATEUNIFIEDDIFFFILE, &CMainFrame::OnEditCreateunifieddifffile)
100 ON_UPDATE_COMMAND_UI(ID_VIEW_LINEDIFFBAR, &CMainFrame::OnUpdateViewLinediffbar)
101 ON_COMMAND(ID_VIEW_LINEDIFFBAR, &CMainFrame::OnViewLinediffbar)
102 ON_UPDATE_COMMAND_UI(ID_VIEW_LOCATORBAR, &CMainFrame::OnUpdateViewLocatorbar)
103 ON_COMMAND(ID_VIEW_LOCATORBAR, &CMainFrame::OnViewLocatorbar)
104 ON_COMMAND(ID_EDIT_USELEFTBLOCK, &CMainFrame::OnEditUseleftblock)
105 ON_UPDATE_COMMAND_UI(ID_EDIT_USELEFTBLOCK, &CMainFrame::OnUpdateEditUseleftblock)
106 ON_COMMAND(ID_EDIT_USELEFTFILE, &CMainFrame::OnEditUseleftfile)
107 ON_UPDATE_COMMAND_UI(ID_EDIT_USELEFTFILE, &CMainFrame::OnUpdateEditUseleftfile)
108 ON_COMMAND(ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT, &CMainFrame::OnEditUseblockfromleftbeforeright)
109 ON_UPDATE_COMMAND_UI(ID_EDIT_USEBLOCKFROMLEFTBEFORERIGHT, &CMainFrame::OnUpdateEditUseblockfromleftbeforeright)
110 ON_COMMAND(ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT, &CMainFrame::OnEditUseblockfromrightbeforeleft)
111 ON_UPDATE_COMMAND_UI(ID_EDIT_USEBLOCKFROMRIGHTBEFORELEFT, &CMainFrame::OnUpdateEditUseblockfromrightbeforeleft)
112 END_MESSAGE_MAP()
113
114 static UINT indicators[] =
115 {
116 ID_SEPARATOR, // status line indicator
117 ID_INDICATOR_LEFTVIEW,
118 ID_INDICATOR_RIGHTVIEW,
119 ID_INDICATOR_BOTTOMVIEW,
120 ID_INDICATOR_CAPS,
121 ID_INDICATOR_NUM,
122 ID_INDICATOR_SCRL
123 };
124
125
126 // CMainFrame construction/destruction
127
128 CMainFrame::CMainFrame()
129 {
130 m_pFindDialog = NULL;
131 m_nSearchIndex = 0;
132 m_bInitSplitter = FALSE;
133 m_bOneWay = (0 != ((DWORD)CRegDWORD(_T("Software\\TortoiseMerge\\OnePane"))));
134 m_bReversedPatch = FALSE;
135 m_bHasConflicts = false;
136 m_bInlineWordDiff = true;
137 m_bLineDiff = true;
138 m_bLocatorBar = true;
139 m_nMoveMovesToIgnore = 0;
140 theApp.m_nAppLook = theApp.GetInt(_T("ApplicationLook"), ID_VIEW_APPLOOK_VS_2005);
141 }
142
143 CMainFrame::~CMainFrame()
144 {
145 }
146
147 int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
148 {
149 if (CFrameWndEx::OnCreate(lpCreateStruct) == -1)
150 return -1;
151
152 OnApplicationLook(theApp.m_nAppLook);
153
154 if (!m_wndMenuBar.Create(this))
155 {
156 TRACE0("Failed to create menubar\n");
157 return -1; // fail to create
158 }
159
160 m_wndMenuBar.SetPaneStyle(m_wndMenuBar.GetPaneStyle() | CBRS_SIZE_DYNAMIC | CBRS_TOOLTIPS | CBRS_FLYBY);
161
162 // prevent the menu bar from taking the focus on activation
163 CMFCPopupMenu::SetForceMenuFocus(FALSE);
164
165 if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_ALIGN_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY) ||
166 !m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
167 {
168 TRACE0("Failed to create toolbar\n");
169 return -1; // fail to create
170 }
171 m_wndToolBar.SetWindowText(_T("Main"));
172
173 if (!m_wndStatusBar.Create(this) ||
174 !m_wndStatusBar.SetIndicators(indicators,
175 sizeof(indicators)/sizeof(UINT)))
176 {
177 TRACE0("Failed to create status bar\n");
178 return -1; // fail to create
179 }
180
181 if (!m_wndLocatorBar.Create(this, IDD_DIFFLOCATOR,
182 CBRS_ALIGN_LEFT | CBRS_SIZE_FIXED, ID_VIEW_LOCATORBAR))
183 {
184 TRACE0("Failed to create dialogbar\n");
185 return -1; // fail to create
186 }
187 if (!m_wndLineDiffBar.Create(this, IDD_LINEDIFF,
188 CBRS_ALIGN_BOTTOM | CBRS_SIZE_FIXED, ID_VIEW_LINEDIFFBAR))
189 {
190 TRACE0("Failed to create dialogbar\n");
191 return -1; // fail to create
192 }
193 m_wndLocatorBar.m_pMainFrm = this;
194 m_wndLineDiffBar.m_pMainFrm = this;
195
196 EnableDocking(CBRS_ALIGN_ANY);
197 m_wndMenuBar.EnableDocking(CBRS_ALIGN_TOP);
198 m_wndToolBar.EnableDocking(CBRS_ALIGN_TOP);
199 DockPane(&m_wndMenuBar);
200 DockPane(&m_wndToolBar);
201 DockPane(&m_wndLocatorBar);
202 DockPane(&m_wndLineDiffBar);
203 ShowPane(&m_wndLocatorBar, true, false, true);
204 ShowPane(&m_wndLineDiffBar, true, false, true);
205
206 m_wndLocatorBar.EnableGripper(FALSE);
207 m_wndLineDiffBar.EnableGripper(FALSE);
208
209 return 0;
210 }
211
212 BOOL CMainFrame::PreCreateWindow(CREATESTRUCT& cs)
213 {
214 if( !CFrameWndEx::PreCreateWindow(cs) )
215 return FALSE;
216 return TRUE;
217 }
218
219 void CMainFrame::OnApplicationLook(UINT id)
220 {
221 CWaitCursor wait;
222
223 theApp.m_nAppLook = id;
224
225 switch (theApp.m_nAppLook)
226 {
227 case ID_VIEW_APPLOOK_WIN_2000:
228 CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManager));
229 break;
230
231 case ID_VIEW_APPLOOK_OFF_XP:
232 CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerOfficeXP));
233 break;
234
235 case ID_VIEW_APPLOOK_WIN_XP:
236 CMFCVisualManagerWindows::m_b3DTabsXPTheme = TRUE;
237 CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows));
238 break;
239
240 case ID_VIEW_APPLOOK_OFF_2003:
241 CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerOffice2003));
242 CDockingManager::SetDockingMode(DT_SMART);
243 break;
244
245 case ID_VIEW_APPLOOK_VS_2005:
246 CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerVS2005));
247 CDockingManager::SetDockingMode(DT_SMART);
248 break;
249
250 default:
251 switch (theApp.m_nAppLook)
252 {
253 case ID_VIEW_APPLOOK_OFF_2007_BLUE:
254 CMFCVisualManagerOffice2007::SetStyle(CMFCVisualManagerOffice2007::Office2007_LunaBlue);
255 break;
256
257 case ID_VIEW_APPLOOK_OFF_2007_BLACK:
258 CMFCVisualManagerOffice2007::SetStyle(CMFCVisualManagerOffice2007::Office2007_ObsidianBlack);
259 break;
260
261 case ID_VIEW_APPLOOK_OFF_2007_SILVER:
262 CMFCVisualManagerOffice2007::SetStyle(CMFCVisualManagerOffice2007::Office2007_Silver);
263 break;
264
265 case ID_VIEW_APPLOOK_OFF_2007_AQUA:
266 CMFCVisualManagerOffice2007::SetStyle(CMFCVisualManagerOffice2007::Office2007_Aqua);
267 break;
268 }
269
270 CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerOffice2007));
271 CDockingManager::SetDockingMode(DT_SMART);
272 }
273
274 RedrawWindow(NULL, NULL, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_UPDATENOW | RDW_FRAME | RDW_ERASE);
275
276 theApp.WriteInt(_T("ApplicationLook"), theApp.m_nAppLook);
277 }
278
279 void CMainFrame::OnUpdateApplicationLook(CCmdUI* pCmdUI)
280 {
281 pCmdUI->SetRadio(theApp.m_nAppLook == pCmdUI->m_nID);
282 }
283
284
285 // CMainFrame diagnostics
286
287 #ifdef _DEBUG
288 void CMainFrame::AssertValid() const
289 {
290 CFrameWndEx::AssertValid();
291 }
292
293 void CMainFrame::Dump(CDumpContext& dc) const
294 {
295 CFrameWndEx::Dump(dc);
296 }
297
298 #endif //_DEBUG
299
300
301 // CMainFrame message handlers
302
303
304 BOOL CMainFrame::OnCreateClient(LPCREATESTRUCT /*lpcs*/, CCreateContext* pContext)
305 {
306 CRect cr;
307 GetClientRect( &cr);
308
309
310 // split into three panes:
311 // -------------
312 // | | |
313 // | | |
314 // |------------
315 // | |
316 // | |
317 // |------------
318
319 // create a splitter with 2 rows, 1 column
320 if (!m_wndSplitter.CreateStatic(this, 2, 1))
321 {
322 TRACE0("Failed to CreateStaticSplitter\n");
323 return FALSE;
324 }
325
326 // add the second splitter pane - which is a nested splitter with 2 columns
327 if (!m_wndSplitter2.CreateStatic(
328 &m_wndSplitter, // our parent window is the first splitter
329 1, 2, // the new splitter is 1 row, 2 columns
330 WS_CHILD | WS_VISIBLE | WS_BORDER, // style, WS_BORDER is needed
331 m_wndSplitter.IdFromRowCol(0, 0)
332 // new splitter is in the first row, 1st column of first splitter
333 ))
334 {
335 TRACE0("Failed to create nested splitter\n");
336 return FALSE;
337 }
338 // add the first splitter pane - the default view in row 0
339 if (!m_wndSplitter.CreateView(1, 0,
340 RUNTIME_CLASS(CBottomView), CSize(cr.Width(), cr.Height()), pContext))
341 {
342 TRACE0("Failed to create first pane\n");
343 return FALSE;
344 }
345 m_pwndBottomView = (CBottomView *)m_wndSplitter.GetPane(1,0);
346 m_pwndBottomView->m_pwndLocator = &m_wndLocatorBar;
347 m_pwndBottomView->m_pwndLineDiffBar = &m_wndLineDiffBar;
348 m_pwndBottomView->m_pwndStatusBar = &m_wndStatusBar;
349 m_pwndBottomView->m_pMainFrame = this;
350
351 // now create the two views inside the nested splitter
352
353 if (!m_wndSplitter2.CreateView(0, 0,
354 RUNTIME_CLASS(CLeftView), CSize(cr.Width()/2, cr.Height()/2), pContext))
355 {
356 TRACE0("Failed to create second pane\n");
357 return FALSE;
358 }
359 m_pwndLeftView = (CLeftView *)m_wndSplitter2.GetPane(0,0);
360 m_pwndLeftView->m_pwndLocator = &m_wndLocatorBar;
361 m_pwndLeftView->m_pwndLineDiffBar = &m_wndLineDiffBar;
362 m_pwndLeftView->m_pwndStatusBar = &m_wndStatusBar;
363 m_pwndLeftView->m_pMainFrame = this;
364
365 if (!m_wndSplitter2.CreateView(0, 1,
366 RUNTIME_CLASS(CRightView), CSize(cr.Width()/2, cr.Height()/2), pContext))
367 {
368 TRACE0("Failed to create third pane\n");
369 return FALSE;
370 }
371 m_pwndRightView = (CRightView *)m_wndSplitter2.GetPane(0,1);
372 m_pwndRightView->m_pwndLocator = &m_wndLocatorBar;
373 m_pwndRightView->m_pwndLineDiffBar = &m_wndLineDiffBar;
374 m_pwndRightView->m_pwndStatusBar = &m_wndStatusBar;
375 m_pwndRightView->m_pMainFrame = this;
376 m_bInitSplitter = TRUE;
377
378 m_dlgFilePatches.Create(IDD_FILEPATCHES, this);
379 UpdateLayout();
380 return TRUE;
381 }
382
383 // Callback function
384 BOOL CMainFrame::PatchFile(CString sFilePath, CString sVersion, BOOL bAutoPatch)
385 {
386 //first, do a "dry run" of patching...
387 if (!m_Patch.PatchFile(sFilePath))
388 {
389 //patching not successful, so retrieve the
390 //base file from version control and try
391 //again...
392 CString sTemp;
393 CSysProgressDlg progDlg;
394 sTemp.Format(IDS_GETVERSIONOFFILE, (LPCTSTR)sVersion);
395 progDlg.SetLine(1, sTemp, true);
396 progDlg.SetLine(2, sFilePath, true);
397 sTemp.LoadString(IDS_GETVERSIONOFFILETITLE);
398 progDlg.SetTitle(sTemp);
399 progDlg.SetShowProgressBar(false);
400 progDlg.SetAnimation(IDR_DOWNLOAD);
401 progDlg.SetTime(FALSE);
402 progDlg.ShowModeless(this);
403 CString sBaseFile = m_TempFiles.GetTempFilePath();
404 if (!CAppUtils::GetVersionedFile(sFilePath, sVersion, sBaseFile, &progDlg, m_hWnd))
405 {
406 progDlg.Stop();
407 CString sErrMsg;
408 sErrMsg.Format(IDS_ERR_MAINFRAME_FILEVERSIONNOTFOUND, (LPCTSTR)sVersion, (LPCTSTR)sFilePath);
409 MessageBox(sErrMsg, NULL, MB_ICONERROR);
410 return FALSE;
411 }
412 progDlg.Stop();
413 CString sTempFile = m_TempFiles.GetTempFilePath();
414 if (!m_Patch.PatchFile(sFilePath, sTempFile, sBaseFile))
415 {
416 MessageBox(m_Patch.GetErrorMessage(), NULL, MB_ICONERROR);
417 return FALSE;
418 }
419 CString temp;
420 temp.Format(_T("%s Revision %s"), (LPCTSTR)CPathUtils::GetFileNameFromPath(sFilePath), (LPCTSTR)sVersion);
421 m_Data.m_baseFile.SetFileName(sBaseFile);
422 m_Data.m_baseFile.SetDescriptiveName(temp);
423 temp.Format(_T("%s %s"), (LPCTSTR)CPathUtils::GetFileNameFromPath(sFilePath), (LPCTSTR)m_Data.m_sPatchPatched);
424 m_Data.m_theirFile.SetFileName(sTempFile);
425 m_Data.m_theirFile.SetDescriptiveName(temp);
426 m_Data.m_yourFile.SetFileName(sFilePath);
427 m_Data.m_yourFile.SetDescriptiveName(CPathUtils::GetFileNameFromPath(sFilePath));
428 m_Data.m_mergedFile.SetFileName(sFilePath);
429 m_Data.m_mergedFile.SetDescriptiveName(CPathUtils::GetFileNameFromPath(sFilePath));
430 TRACE(_T("comparing %s and %s\nagainst the base file %s\n"), (LPCTSTR)sTempFile, (LPCTSTR)sFilePath, (LPCTSTR)sBaseFile);
431 }
432 else
433 {
434 //"dry run" was successful, so save the patched file somewhere...
435 CString sTempFile = m_TempFiles.GetTempFilePath();
436 if (!m_Patch.PatchFile(sFilePath, sTempFile))
437 {
438 MessageBox(m_Patch.GetErrorMessage(), NULL, MB_ICONERROR);
439 return FALSE;
440 }
441 if (m_bReversedPatch)
442 {
443 m_Data.m_baseFile.SetFileName(sTempFile);
444 CString temp;
445 temp.Format(_T("%s %s"), (LPCTSTR)CPathUtils::GetFileNameFromPath(sFilePath), (LPCTSTR)m_Data.m_sPatchPatched);
446 m_Data.m_baseFile.SetDescriptiveName(temp);
447 m_Data.m_yourFile.SetFileName(sFilePath);
448 temp.Format(_T("%s %s"), (LPCTSTR)CPathUtils::GetFileNameFromPath(sFilePath), (LPCTSTR)m_Data.m_sPatchOriginal);
449 m_Data.m_yourFile.SetDescriptiveName(temp);
450 m_Data.m_theirFile.SetOutOfUse();
451 m_Data.m_mergedFile.SetOutOfUse();
452 }
453 else
454 {
455 if (!PathFileExists(sFilePath))
456 {
457 m_Data.m_baseFile.SetFileName(m_TempFiles.GetTempFilePath());
458 m_Data.m_baseFile.CreateEmptyFile();
459 }
460 else
461 {
462 m_Data.m_baseFile.SetFileName(sFilePath);
463 }
464 CString sDescription;
465 sDescription.Format(_T("%s %s"), (LPCTSTR)CPathUtils::GetFileNameFromPath(sFilePath), (LPCTSTR)m_Data.m_sPatchOriginal);
466 m_Data.m_baseFile.SetDescriptiveName(sDescription);
467 m_Data.m_yourFile.SetFileName(sTempFile);
468 CString temp;
469 temp.Format(_T("%s %s"), (LPCTSTR)CPathUtils::GetFileNameFromPath(sFilePath), (LPCTSTR)m_Data.m_sPatchPatched);
470 m_Data.m_yourFile.SetDescriptiveName(temp);
471 m_Data.m_theirFile.SetOutOfUse();
472 m_Data.m_mergedFile.SetFileName(sFilePath);
473 }
474 TRACE(_T("comparing %s\nwith the patched result %s\n"), (LPCTSTR)sFilePath, (LPCTSTR)sTempFile);
475 }
476 LoadViews();
477 if (bAutoPatch)
478 {
479 OnFileSave();
480 }
481 return TRUE;
482 }
483
484 // Callback function
485 BOOL CMainFrame::DiffFiles(CString sURL1, CString sRev1, CString sURL2, CString sRev2)
486 {
487 CString tempfile1 = m_TempFiles.GetTempFilePath();
488 CString tempfile2 = m_TempFiles.GetTempFilePath();
489
490 ASSERT(tempfile1.Compare(tempfile2));
491
492 CString sTemp;
493 CSysProgressDlg progDlg;
494 sTemp.Format(IDS_GETVERSIONOFFILE, (LPCTSTR)sRev1);
495 progDlg.SetLine(1, sTemp, true);
496 progDlg.SetLine(2, sURL1, true);
497 sTemp.LoadString(IDS_GETVERSIONOFFILETITLE);
498 progDlg.SetTitle(sTemp);
499 progDlg.SetShowProgressBar(true);
500 progDlg.SetAnimation(IDR_DOWNLOAD);
501 progDlg.SetTime(FALSE);
502 progDlg.SetProgress(1,100);
503 progDlg.ShowModeless(this);
504 if (!CAppUtils::GetVersionedFile(sURL1, sRev1, tempfile1, &progDlg, m_hWnd))
505 {
506 progDlg.Stop();
507 CString sErrMsg;
508 sErrMsg.Format(IDS_ERR_MAINFRAME_FILEVERSIONNOTFOUND, (LPCTSTR)sRev1, (LPCTSTR)sURL1);
509 MessageBox(sErrMsg, NULL, MB_ICONERROR);
510 return FALSE;
511 }
512 sTemp.Format(IDS_GETVERSIONOFFILE, (LPCTSTR)sRev2);
513 progDlg.SetLine(1, sTemp, true);
514 progDlg.SetLine(2, sURL2, true);
515 progDlg.SetProgress(50, 100);
516 if (!CAppUtils::GetVersionedFile(sURL2, sRev2, tempfile2, &progDlg, m_hWnd))
517 {
518 progDlg.Stop();
519 CString sErrMsg;
520 sErrMsg.Format(IDS_ERR_MAINFRAME_FILEVERSIONNOTFOUND, (LPCTSTR)sRev2, (LPCTSTR)sURL2);
521 MessageBox(sErrMsg, NULL, MB_ICONERROR);
522 return FALSE;
523 }
524 progDlg.SetProgress(100,100);
525 progDlg.Stop();
526 CString temp;
527 temp.Format(_T("%s Revision %s"), (LPCTSTR)CPathUtils::GetFileNameFromPath(sURL1), (LPCTSTR)sRev1);
528 m_Data.m_baseFile.SetFileName(tempfile1);
529 m_Data.m_baseFile.SetDescriptiveName(temp);
530 temp.Format(_T("%s Revision %s"), (LPCTSTR)CPathUtils::GetFileNameFromPath(sURL2), (LPCTSTR)sRev2);
531 m_Data.m_yourFile.SetFileName(tempfile2);
532 m_Data.m_yourFile.SetDescriptiveName(temp);
533
534 LoadViews();
535
536 return TRUE;
537 }
538
539 void CMainFrame::OnFileOpen()
540 {
541 if (CheckForSave()==IDCANCEL)
542 return;
543 COpenDlg dlg;
544 if (dlg.DoModal()!=IDOK)
545 {
546 return;
547 }
548 m_dlgFilePatches.ShowWindow(SW_HIDE);
549 m_dlgFilePatches.Init(NULL, NULL, CString(), NULL);
550 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,
551 (LPCTSTR)dlg.m_sUnifiedDiffFile, (LPCTSTR)dlg.m_sPatchDirectory);
552 m_Data.m_baseFile.SetFileName(dlg.m_sBaseFile);
553 m_Data.m_theirFile.SetFileName(dlg.m_sTheirFile);
554 m_Data.m_yourFile.SetFileName(dlg.m_sYourFile);
555 m_Data.m_sDiffFile = dlg.m_sUnifiedDiffFile;
556 m_Data.m_sPatchPath = dlg.m_sPatchDirectory;
557 m_Data.m_mergedFile.SetOutOfUse();
558 g_crasher.AddFile((LPCSTR)(LPCTSTR)dlg.m_sBaseFile, (LPCSTR)(LPCTSTR)_T("Basefile"));
559 g_crasher.AddFile((LPCSTR)(LPCTSTR)dlg.m_sTheirFile, (LPCSTR)(LPCTSTR)_T("Theirfile"));
560 g_crasher.AddFile((LPCSTR)(LPCTSTR)dlg.m_sYourFile, (LPCSTR)(LPCTSTR)_T("Yourfile"));
561 g_crasher.AddFile((LPCSTR)(LPCTSTR)dlg.m_sUnifiedDiffFile, (LPCSTR)(LPCTSTR)_T("Difffile"));
562
563 if (!m_Data.IsBaseFileInUse() && m_Data.IsTheirFileInUse() && m_Data.IsYourFileInUse())
564 {
565 // a diff between two files means "Yours" against "Base", not "Theirs" against "Yours"
566 m_Data.m_baseFile.TransferDetailsFrom(m_Data.m_theirFile);
567 }
568 if (m_Data.IsBaseFileInUse() && m_Data.IsTheirFileInUse() && !m_Data.IsYourFileInUse())
569 {
570 // a diff between two files means "Yours" against "Base", not "Theirs" against "Base"
571 m_Data.m_yourFile.TransferDetailsFrom(m_Data.m_theirFile);
572 }
573
574 LoadViews();
575 }
576
577 void CMainFrame::ClearViewNamesAndPaths() {
578 m_pwndLeftView->m_sWindowName.Empty();
579 m_pwndLeftView->m_sFullFilePath.Empty();
580 m_pwndRightView->m_sWindowName.Empty();
581 m_pwndRightView->m_sFullFilePath.Empty();
582 m_pwndBottomView->m_sWindowName.Empty();
583 m_pwndBottomView->m_sFullFilePath.Empty();
584 }
585
586 bool CMainFrame::LoadViews(bool bRetainPosition)
587 {
588 m_Data.SetBlame(m_bBlame);
589 m_bHasConflicts = false;
590 CBaseView* pwndActiveView = m_pwndLeftView;
591 int nOldLine = m_pwndLeftView ? m_pwndLeftView->m_nTopLine : -1;
592 int nOldLineNumber =
593 m_pwndLeftView && m_pwndLeftView->m_pViewData ?
594 m_pwndLeftView->m_pViewData->GetLineNumber(m_pwndLeftView->m_nTopLine) : -1;
595 if (!m_Data.Load())
596 {
597 ::MessageBox(NULL, m_Data.GetError(), _T("TortoiseMerge"), MB_ICONERROR);
598 m_Data.m_mergedFile.SetOutOfUse();
599 return false;
600 }
601
602 m_pwndRightView->UseCaret(false);
603 m_pwndBottomView->UseCaret(false);
604
605 if (!m_Data.IsBaseFileInUse())
606 {
607 if (m_Data.IsYourFileInUse() && m_Data.IsTheirFileInUse())
608 {
609 m_Data.m_baseFile.TransferDetailsFrom(m_Data.m_theirFile);
610 }
611 else if ((!m_Data.m_sDiffFile.IsEmpty())&&(!m_Patch.OpenUnifiedDiffFile(m_Data.m_sDiffFile)))
612 {
613 ClearViewNamesAndPaths();
614 MessageBox(m_Patch.GetErrorMessage(), NULL, MB_ICONERROR);
615 return false;
616 }
617 if (m_Patch.GetNumberOfFiles() > 0)
618 {
619 CString firstpath = m_Patch.GetFilename(0);
620 CString path=firstpath;
621 path.Replace('/','\\');
622 if ( !PathIsRelative(path) && !PathFileExists(path) )
623 {
624 // The absolute path mentioned in the patch does not exist. Lets
625 // try to find the correct relative path by stripping prefixes.
626 BOOL bFound = m_Patch.StripPrefixes(m_Data.m_sPatchPath);
627 CString strippedpath = m_Patch.GetFilename(0);
628 if (bFound)
629 {
630 CString msg;
631 msg.Format(IDS_WARNABSOLUTEPATHFOUND, (LPCTSTR)firstpath, (LPCTSTR)strippedpath);
632 if (CMessageBox::Show(m_hWnd, msg, _T("TortoiseMerge"), MB_ICONQUESTION | MB_YESNO)==IDNO)
633 return false;
634 }
635 else
636 {
637 CString msg;
638 msg.Format(IDS_WARNABSOLUTEPATHNOTFOUND, (LPCTSTR)firstpath);
639 CMessageBox::Show(m_hWnd, msg, _T("TortoiseMerge"), MB_ICONEXCLAMATION);
640 return false;
641 }
642 }
643 CString betterpatchpath = m_Patch.CheckPatchPath(m_Data.m_sPatchPath);
644 if (betterpatchpath.CompareNoCase(m_Data.m_sPatchPath)!=0)
645 {
646 CString msg;
647 msg.Format(IDS_WARNBETTERPATCHPATHFOUND, (LPCTSTR)m_Data.m_sPatchPath, (LPCTSTR)betterpatchpath);
648 if (CMessageBox::Show(m_hWnd, msg, _T("TortoiseMerge"), MB_ICONQUESTION | MB_YESNO)==IDYES)
649 m_Data.m_sPatchPath = betterpatchpath;
650 }
651 m_dlgFilePatches.Init(&m_Patch, this, m_Data.m_sPatchPath, this);
652 m_dlgFilePatches.ShowWindow(SW_SHOW);
653 ClearViewNamesAndPaths();
654 if (!m_wndSplitter.IsRowHidden(1))
655 m_wndSplitter.HideRow(1);
656 m_pwndLeftView->SetHidden(FALSE);
657 m_pwndRightView->SetHidden(FALSE);
658 m_pwndBottomView->SetHidden(TRUE);
659 }
660 }
661 if (m_Data.IsBaseFileInUse() && !m_Data.IsYourFileInUse() && m_Data.IsTheirFileInUse())
662 {
663 m_Data.m_yourFile.TransferDetailsFrom(m_Data.m_theirFile);
664 }
665 if (m_Data.IsBaseFileInUse() && m_Data.IsYourFileInUse() && !m_Data.IsTheirFileInUse())
666 {
667 //diff between YOUR and BASE
668 m_pwndRightView->UseCaret();
669 if (m_bOneWay)
670 {
671 if (!m_wndSplitter2.IsColumnHidden(1))
672 m_wndSplitter2.HideColumn(1);
673
674 m_pwndLeftView->m_pViewData = &m_Data.m_YourBaseBoth;
675 m_pwndLeftView->texttype = m_Data.m_arYourFile.GetUnicodeType();
676 m_pwndLeftView->lineendings = m_Data.m_arYourFile.GetLineEndings();
677 m_pwndLeftView->m_sWindowName = m_Data.m_baseFile.GetWindowName() + _T(" - ") + m_Data.m_yourFile.GetWindowName();
678 m_pwndLeftView->m_sFullFilePath = m_Data.m_baseFile.GetFilename() + _T(" - ") + m_Data.m_yourFile.GetFilename();
679
680 m_pwndRightView->m_pViewData = NULL;
681 m_pwndBottomView->m_pViewData = NULL;
682
683 if (!m_wndSplitter.IsRowHidden(1))
684 m_wndSplitter.HideRow(1);
685 m_pwndLeftView->SetHidden(FALSE);
686 m_pwndRightView->SetHidden(TRUE);
687 m_pwndBottomView->SetHidden(TRUE);
688 ::SetWindowPos(m_pwndLeftView->m_hWnd, NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
689 }
690 else
691 {
692 pwndActiveView = m_pwndRightView;
693 if (m_wndSplitter2.IsColumnHidden(1))
694 m_wndSplitter2.ShowColumn();
695
696 m_pwndLeftView->m_pViewData = &m_Data.m_YourBaseLeft;
697 m_pwndLeftView->texttype = m_Data.m_arBaseFile.GetUnicodeType();
698 m_pwndLeftView->lineendings = m_Data.m_arBaseFile.GetLineEndings();
699 m_pwndLeftView->m_sWindowName = m_Data.m_baseFile.GetWindowName();
700 m_pwndLeftView->m_sFullFilePath = m_Data.m_baseFile.GetFilename();
701
702 m_pwndRightView->m_pViewData = &m_Data.m_YourBaseRight;
703 m_pwndRightView->texttype = m_Data.m_arYourFile.GetUnicodeType();
704 m_pwndRightView->lineendings = m_Data.m_arYourFile.GetLineEndings();
705 m_pwndRightView->m_sWindowName = m_Data.m_yourFile.GetWindowName();
706 m_pwndRightView->m_sFullFilePath = m_Data.m_yourFile.GetFilename();
707
708 m_pwndBottomView->m_pViewData = NULL;
709
710 if (!m_wndSplitter.IsRowHidden(1))
711 m_wndSplitter.HideRow(1);
712 m_pwndLeftView->SetHidden(FALSE);
713 m_pwndRightView->SetHidden(FALSE);
714 m_pwndBottomView->SetHidden(TRUE);
715 }
716 }
717 else if (m_Data.IsBaseFileInUse() && m_Data.IsYourFileInUse() && m_Data.IsTheirFileInUse())
718 {
719 //diff between THEIR, YOUR and BASE
720 m_pwndBottomView->UseCaret();
721 pwndActiveView = m_pwndBottomView;
722
723 m_pwndLeftView->m_pViewData = &m_Data.m_TheirBaseBoth;
724 m_pwndLeftView->texttype = m_Data.m_arTheirFile.GetUnicodeType();
725 m_pwndLeftView->lineendings = m_Data.m_arTheirFile.GetLineEndings();
726 m_pwndLeftView->m_sWindowName.LoadString(IDS_VIEWTITLE_THEIRS);
727 m_pwndLeftView->m_sWindowName += _T(" - ") + m_Data.m_theirFile.GetWindowName();
728 m_pwndLeftView->m_sFullFilePath = m_Data.m_theirFile.GetFilename();
729
730 m_pwndRightView->m_pViewData = &m_Data.m_YourBaseBoth;
731 m_pwndRightView->texttype = m_Data.m_arYourFile.GetUnicodeType();
732 m_pwndRightView->lineendings = m_Data.m_arYourFile.GetLineEndings();
733 m_pwndRightView->m_sWindowName.LoadString(IDS_VIEWTITLE_MINE);
734 m_pwndRightView->m_sWindowName += _T(" - ") + m_Data.m_yourFile.GetWindowName();
735 m_pwndRightView->m_sFullFilePath = m_Data.m_yourFile.GetFilename();
736
737 m_pwndBottomView->m_pViewData = &m_Data.m_Diff3;
738 m_pwndBottomView->texttype = m_Data.m_arTheirFile.GetUnicodeType();
739 m_pwndBottomView->lineendings = m_Data.m_arTheirFile.GetLineEndings();
740 m_pwndBottomView->m_sWindowName.LoadString(IDS_VIEWTITLE_MERGED);
741 m_pwndBottomView->m_sWindowName += _T(" - ") + m_Data.m_mergedFile.GetWindowName();
742 m_pwndBottomView->m_sFullFilePath = m_Data.m_mergedFile.GetFilename();
743
744 if (m_wndSplitter2.IsColumnHidden(1))
745 m_wndSplitter2.ShowColumn();
746 if (m_wndSplitter.IsRowHidden(1))
747 m_wndSplitter.ShowRow();
748 m_pwndLeftView->SetHidden(FALSE);
749 m_pwndRightView->SetHidden(FALSE);
750 m_pwndBottomView->SetHidden(FALSE);
751 // in three pane view, hide the line diff bar
752 m_wndLineDiffBar.ShowPane(false, false, true);
753 m_wndLineDiffBar.DocumentUpdated();
754 }
755 if (!m_Data.m_mergedFile.InUse())
756 {
757 m_Data.m_mergedFile.SetFileName(m_Data.m_yourFile.GetFilename());
758 }
759 m_pwndLeftView->DocumentUpdated();
760 m_pwndRightView->DocumentUpdated();
761 m_pwndBottomView->DocumentUpdated();
762 m_wndLocatorBar.DocumentUpdated();
763 m_wndLineDiffBar.DocumentUpdated();
764 UpdateLayout();
765 SetActiveView(pwndActiveView);
766
767 if (bRetainPosition && m_pwndLeftView->m_pViewData)
768 {
769 int n = nOldLineNumber;
770 if (n >= 0)
771 n = m_pwndLeftView->m_pViewData->FindLineNumber(n);
772 if (n < 0)
773 n = nOldLine;
774
775 m_pwndLeftView->ScrollAllToLine(n);
776 POINT p;
777 p.x = 0;
778 p.y = n;
779 m_pwndLeftView->SetCaretPosition(p);
780 }
781 else
782 {
783 bool bGoFirstDiff = (0 != (DWORD)CRegDWORD(_T("Software\\TortoiseMerge\\FirstDiffOnLoad"), TRUE));
784 if (bGoFirstDiff) {
785 pwndActiveView->GoToFirstDifference();
786 // Ignore the first few Mouse Move messages, so that the line diff stays on
787 // the first diff line until the user actually moves the mouse
788 m_nMoveMovesToIgnore = 3;
789 }
790
791 }
792 // Avoid incorrect rendering of active pane.
793 m_pwndBottomView->ScrollToChar(0);
794 m_pwndLeftView->ScrollToChar(0);
795 m_pwndRightView->ScrollToChar(0);
796 CheckResolved();
797 CUndo::GetInstance().Clear();
798 return true;
799 }
800
801 void CMainFrame::UpdateLayout()
802 {
803 if (m_bInitSplitter)
804 {
805 CRect cr, rclocbar;
806 GetWindowRect(&cr);
807 int width = cr.Width();
808 if (::IsWindow(m_wndLocatorBar) && m_wndLocatorBar.IsWindowVisible())
809 {
810 m_wndLocatorBar.GetWindowRect(&rclocbar);
811 width -= rclocbar.Width();
812 }
813 m_wndSplitter.SetRowInfo(0, cr.Height()/2, 0);
814 m_wndSplitter.SetRowInfo(1, cr.Height()/2, 0);
815 m_wndSplitter.SetColumnInfo(0, width / 2, 50);
816 m_wndSplitter2.SetRowInfo(0, cr.Height()/2, 0);
817 m_wndSplitter2.SetColumnInfo(0, width / 2, 50);
818 m_wndSplitter2.SetColumnInfo(1, width / 2, 50);
819
820 m_wndSplitter.RecalcLayout();
821 }
822 }
823
824 void CMainFrame::OnSize(UINT nType, int cx, int cy)
825 {
826 if (m_bInitSplitter && nType != SIZE_MINIMIZED)
827 {
828 UpdateLayout();
829 }
830 CFrameWndEx::OnSize(nType, cx, cy);
831 }
832
833 void CMainFrame::OnViewWhitespaces()
834 {
835 CRegDWORD regViewWhitespaces = CRegDWORD(_T("Software\\TortoiseMerge\\ViewWhitespaces"), 1);
836 BOOL bViewWhitespaces = regViewWhitespaces;
837 if (m_pwndLeftView)
838 bViewWhitespaces = m_pwndLeftView->m_bViewWhitespace;
839
840 bViewWhitespaces = !bViewWhitespaces;
841 regViewWhitespaces = bViewWhitespaces;
842 if (m_pwndLeftView)
843 {
844 m_pwndLeftView->m_bViewWhitespace = bViewWhitespaces;
845 m_pwndLeftView->Invalidate();
846 }
847 if (m_pwndRightView)
848 {
849 m_pwndRightView->m_bViewWhitespace = bViewWhitespaces;
850 m_pwndRightView->Invalidate();
851 }
852 if (m_pwndBottomView)
853 {
854 m_pwndBottomView->m_bViewWhitespace = bViewWhitespaces;
855 m_pwndBottomView->Invalidate();
856 }
857 }
858
859 void CMainFrame::OnUpdateViewWhitespaces(CCmdUI *pCmdUI)
860 {
861 if (m_pwndLeftView)
862 pCmdUI->SetCheck(m_pwndLeftView->m_bViewWhitespace);
863 }
864
865 void CMainFrame::OnViewOnewaydiff()
866 {
867 if (CheckForSave()==IDCANCEL)
868 return;
869 m_bOneWay = !m_bOneWay;
870 if (m_bOneWay)
871 {
872 // in one way view, hide the line diff bar
873 m_wndLineDiffBar.ShowPane(false, false, true);
874 m_wndLineDiffBar.DocumentUpdated();
875 }
876 else
877 {
878 // restore the line diff bar
879 m_wndLineDiffBar.ShowPane(m_bLineDiff, false, true);
880 m_wndLineDiffBar.DocumentUpdated();
881 m_wndLocatorBar.ShowPane(m_bLocatorBar, false, true);
882 m_wndLocatorBar.DocumentUpdated();
883 }
884 LoadViews(true);
885 }
886
887 void CMainFrame::ShowDiffBar(bool bShow)
888 {
889 if (bShow)
890 {
891 // restore the line diff bar
892 m_wndLineDiffBar.ShowPane(m_bLineDiff, false, true);
893 m_wndLineDiffBar.DocumentUpdated();
894 m_wndLocatorBar.ShowPane(m_bLocatorBar, false, true);
895 m_wndLocatorBar.DocumentUpdated();
896 }
897 else
898 {
899 // in one way view, hide the line diff bar
900 m_wndLineDiffBar.ShowPane(false, false, true);
901 m_wndLineDiffBar.DocumentUpdated();
902 }
903 }
904
905 int CMainFrame::CheckResolved()
906 {
907 //only in three way diffs can be conflicts!
908 m_bHasConflicts = true;
909 if (m_pwndBottomView->IsWindowVisible())
910 {
911 if (m_pwndBottomView->m_pViewData)
912 {
913 for (int i=0; i<m_pwndBottomView->m_pViewData->GetCount(); i++)
914 {
915 if ((DIFFSTATE_CONFLICTED == m_pwndBottomView->m_pViewData->GetState(i))||
916 (DIFFSTATE_CONFLICTED_IGNORED == m_pwndBottomView->m_pViewData->GetState(i)))
917 return i;
918 }
919 }
920 }
921 m_bHasConflicts = false;
922 return -1;
923 }
924
925 int CMainFrame::SaveFile(const CString& sFilePath)
926 {
927 CViewData * pViewData = NULL;
928 CFileTextLines * pOriginFile = &m_Data.m_arBaseFile;
929 if ((m_pwndBottomView)&&(m_pwndBottomView->IsWindowVisible()))
930 {
931 pViewData = m_pwndBottomView->m_pViewData;
932 Invalidate();
933 }
934 else if ((m_pwndRightView)&&(m_pwndRightView->IsWindowVisible()))
935 {
936 pViewData = m_pwndRightView->m_pViewData;
937 if (m_Data.IsYourFileInUse())
938 pOriginFile = &m_Data.m_arYourFile;
939 else if (m_Data.IsTheirFileInUse())
940 pOriginFile = &m_Data.m_arTheirFile;
941 Invalidate();
942 }
943 else
944 {
945 // nothing to save!
946 return -1;
947 }
948 if ((pViewData)&&(pOriginFile))
949 {
950 CFileTextLines file;
951 pOriginFile->CopySettings(&file);
952 for (int i=0; i<pViewData->GetCount(); i++)
953 {
954 //only copy non-removed lines
955 DiffStates state = pViewData->GetState(i);
956 switch (state)
957 {
958 case DIFFSTATE_CONFLICTED:
959 case DIFFSTATE_CONFLICTED_IGNORED:
960 {
961 int first = i;
962 int last = i;
963 do
964 {
965 last++;
966 } while((last<pViewData->GetCount()) && ((pViewData->GetState(last)==DIFFSTATE_CONFLICTED)||(pViewData->GetState(last)==DIFFSTATE_CONFLICTED_IGNORED)));
967 file.Add(_T("<<<<<<< .mine"), EOL_NOENDING);
968 for (int j=first; j<last; j++)
969 {
970 file.Add(m_pwndRightView->m_pViewData->GetLine(j), m_pwndRightView->m_pViewData->GetLineEnding(j));
971 }
972 file.Add(_T("======="), EOL_NOENDING);
973 for (int j=first; j<last; j++)
974 {
975 file.Add(m_pwndLeftView->m_pViewData->GetLine(j), m_pwndLeftView->m_pViewData->GetLineEnding(j));
976 }
977 file.Add(_T(">>>>>>> .theirs"), EOL_NOENDING);
978 i = last-1;
979 }
980 break;
981 case DIFFSTATE_EMPTY:
982 case DIFFSTATE_CONFLICTEMPTY:
983 case DIFFSTATE_IDENTICALREMOVED:
984 case DIFFSTATE_REMOVED:
985 case DIFFSTATE_THEIRSREMOVED:
986 case DIFFSTATE_YOURSREMOVED:
987 case DIFFSTATE_CONFLICTRESOLVEDEMPTY:
988 // do not save removed lines
989 break;
990 default:
991 file.Add(pViewData->GetLine(i), pViewData->GetLineEnding(i));
992 break;
993 }
994 }
995 if (!file.Save(sFilePath, false))
996 {
997 CMessageBox::Show(m_hWnd, file.GetErrorString(), _T("TortoiseMerge"), MB_ICONERROR);
998 return -1;
999 }
1000 m_dlgFilePatches.SetFileStatusAsPatched(sFilePath);
1001 if (m_pwndBottomView)
1002 m_pwndBottomView->SetModified(FALSE);
1003 if (m_pwndRightView)
1004 m_pwndRightView->SetModified(FALSE);
1005 CUndo::GetInstance().MarkAsOriginalState();
1006 return file.GetCount();
1007 }
1008 return -1;
1009 }
1010
1011 void CMainFrame::OnFileSave()
1012 {
1013 FileSave();
1014 }
1015
1016 bool CMainFrame::FileSave(bool bCheckResolved /*=true*/)
1017 {
1018 if (!m_Data.m_mergedFile.InUse())
1019 return FileSaveAs(bCheckResolved);
1020 // check if the file has the readonly attribute set
1021 bool bDoesNotExist = false;
1022 DWORD fAttribs = GetFileAttributes(m_Data.m_mergedFile.GetFilename());
1023 if ((fAttribs != INVALID_FILE_ATTRIBUTES)&&(fAttribs & FILE_ATTRIBUTE_READONLY))
1024 return FileSaveAs(bCheckResolved);
1025 if (fAttribs == INVALID_FILE_ATTRIBUTES)
1026 {
1027 bDoesNotExist = (GetLastError() == ERROR_FILE_NOT_FOUND);
1028 }
1029 if (bCheckResolved)
1030 {
1031 int nConflictLine = CheckResolved();
1032 if (nConflictLine >= 0)
1033 {
1034 CString sTemp;
1035 sTemp.Format(IDS_ERR_MAINFRAME_FILEHASCONFLICTS, m_pwndBottomView->m_pViewData->GetLineNumber(nConflictLine)+1);
1036 if (MessageBox(sTemp, 0, MB_ICONERROR | MB_YESNO)!=IDYES)
1037 {
1038 if (m_pwndBottomView)
1039 m_pwndBottomView->GoToLine(nConflictLine);
1040 return false;
1041 }
1042 }
1043 }
1044 if (((DWORD)CRegDWORD(_T("Software\\TortoiseMerge\\Backup"))) != 0)
1045 {
1046 MoveFileEx(m_Data.m_mergedFile.GetFilename(), m_Data.m_mergedFile.GetFilename() + _T(".bak"), MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH);
1047 }
1048 if (SaveFile(m_Data.m_mergedFile.GetFilename())==0)
1049 {
1050 // file was saved with 0 lines!
1051 // ask the user if the file should be deleted
1052 CString sTemp;
1053 sTemp.Format(IDS_DELETEWHENEMPTY, (LPCTSTR)m_Data.m_mergedFile.GetFilename());
1054 if (CMessageBox::ShowCheck(m_hWnd, sTemp, _T("TortoiseMerge"), MB_YESNO, _T("DeleteFileWhenEmpty")) == IDYES)
1055 {
1056 DeleteFile(m_Data.m_mergedFile.GetFilename());
1057 }
1058 }
1059
1060 if (bDoesNotExist)
1061 {
1062 // call TortoiseProc to add the new file to version control
1063 CString cmd = _T("\"") + CPathUtils::GetAppDirectory();
1064 cmd += _T("TortoiseProc.exe\" /command:add /noui /path:\"");
1065 cmd += m_Data.m_mergedFile.GetFilename() + _T("\"");
1066 TCHAR * buf = new TCHAR[cmd.GetLength()+1];
1067 _tcscpy_s(buf, cmd.GetLength()+1, cmd);
1068 STARTUPINFO startup;
1069 PROCESS_INFORMATION process;
1070 memset(&startup, 0, sizeof(startup));
1071 startup.cb = sizeof(startup);
1072 memset(&process, 0, sizeof(process));
1073 if (CreateProcess(NULL, buf, NULL, NULL, FALSE, 0, 0, 0, &startup, &process)==0)
1074 {
1075 delete [] buf;
1076 LPVOID lpMsgBuf;
1077 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
1078 FORMAT_MESSAGE_FROM_SYSTEM |
1079 FORMAT_MESSAGE_IGNORE_INSERTS,
1080 NULL,
1081 GetLastError(),
1082 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
1083 (LPTSTR) &lpMsgBuf,
1084 0,
1085 NULL
1086 );
1087 MessageBox((LPCTSTR)lpMsgBuf, _T("TortoiseMerge"), MB_OK | MB_ICONINFORMATION);
1088 LocalFree( lpMsgBuf );
1089 return FALSE;
1090 }
1091 delete [] buf;
1092 CloseHandle(process.hThread);
1093 CloseHandle(process.hProcess);
1094 }
1095 return true;
1096 }
1097
1098 void CMainFrame::OnFileSaveAs()
1099 {
1100 FileSaveAs();
1101 }
1102
1103 bool CMainFrame::FileSaveAs(bool bCheckResolved /*=true*/)
1104 {
1105 if (bCheckResolved)
1106 {
1107 int nConflictLine = CheckResolved();
1108 if (nConflictLine >= 0)
1109 {
1110 CString sTemp;
1111 sTemp.Format(IDS_ERR_MAINFRAME_FILEHASCONFLICTS, m_pwndBottomView->m_pViewData->GetLineNumber(nConflictLine)+1);
1112 if (MessageBox(sTemp, 0, MB_ICONERROR | MB_YESNO)!=IDYES)
1113 {
1114 if (m_pwndBottomView)
1115 m_pwndBottomView->GoToLine(nConflictLine);
1116 return false;
1117 }
1118 }
1119 }
1120 OPENFILENAME ofn = {0}; // common dialog box structure
1121 TCHAR szFile[MAX_PATH] = {0}; // buffer for file name
1122 ofn.lStructSize = sizeof(OPENFILENAME);
1123 ofn.hwndOwner = m_hWnd;
1124 ofn.lpstrFile = szFile;
1125 ofn.nMaxFile = sizeof(szFile)/sizeof(TCHAR);
1126 CString temp;
1127 temp.LoadString(IDS_SAVEASTITLE);
1128 if (!temp.IsEmpty())
1129 ofn.lpstrTitle = temp;
1130 ofn.Flags = OFN_OVERWRITEPROMPT;
1131 CString sFilter;
1132 sFilter.LoadString(IDS_COMMONFILEFILTER);
1133 TCHAR * pszFilters = new TCHAR[sFilter.GetLength()+4];
1134 _tcscpy_s (pszFilters, sFilter.GetLength()+4, sFilter);
1135 // Replace '|' delimiters with '\0's
1136 TCHAR *ptr = pszFilters + _tcslen(pszFilters); //set ptr at the NULL
1137 while (ptr != pszFilters)
1138 {
1139 if (*ptr == '|')
1140 *ptr = '\0';
1141 ptr--;
1142 }
1143 ofn.lpstrFilter = pszFilters;
1144 ofn.nFilterIndex = 1;
1145
1146 // Display the Open dialog box.
1147 CString sFile;
1148 if (GetSaveFileName(&ofn)==TRUE)
1149 {
1150 sFile = CString(ofn.lpstrFile);
1151 SaveFile(sFile);
1152 delete [] pszFilters;
1153 return true;
1154 }
1155 delete [] pszFilters;
1156 return false;
1157 }
1158
1159 void CMainFrame::OnUpdateFileSave(CCmdUI *pCmdUI)
1160 {
1161 BOOL bEnable = FALSE;
1162 if (m_Data.m_mergedFile.InUse())
1163 {
1164 if (m_pwndBottomView)
1165 {
1166 if ((m_pwndBottomView->IsWindowVisible())&&(m_pwndBottomView->m_pViewData))
1167 {
1168 bEnable = TRUE;
1169 }
1170 }
1171 if (m_pwndRightView)
1172 {
1173 if ((m_pwndRightView->IsWindowVisible())&&(m_pwndRightView->m_pViewData))
1174 {
1175 if (m_pwndRightView->IsModified() || (m_Data.m_yourFile.GetWindowName().Right(9).Compare(_T(": patched"))==0))
1176 bEnable = TRUE;
1177 }
1178 }
1179 }
1180 pCmdUI->Enable(bEnable);
1181 }
1182
1183 void CMainFrame::OnUpdateFileSaveAs(CCmdUI *pCmdUI)
1184 {
1185 BOOL bEnable = FALSE;
1186 if (m_pwndBottomView)
1187 {
1188 if ((m_pwndBottomView->IsWindowVisible())&&(m_pwndBottomView->m_pViewData))
1189 {
1190 bEnable = TRUE;
1191 }
1192 }
1193 if (m_pwndRightView)
1194 {
1195 if ((m_pwndRightView->IsWindowVisible())&&(m_pwndRightView->m_pViewData))
1196 {
1197 bEnable = TRUE;
1198 }
1199 }
1200 pCmdUI->Enable(bEnable);
1201 }
1202
1203
1204 void CMainFrame::OnUpdateViewOnewaydiff(CCmdUI *pCmdUI)
1205 {
1206 pCmdUI->SetCheck(!m_bOneWay);
1207 BOOL bEnable = TRUE;
1208 if (m_pwndBottomView)
1209 {
1210 if (m_pwndBottomView->IsWindowVisible())
1211 bEnable = FALSE;
1212 }
1213 pCmdUI->Enable(bEnable);
1214 }
1215
1216 void CMainFrame::OnViewOptions()
1217 {
1218 CString sTemp;
1219 sTemp.LoadString(IDS_SETTINGSTITLE);
1220 CSettings dlg(sTemp);
1221 dlg.DoModal();
1222 if (dlg.IsReloadNeeded())
1223 {
1224 if (CheckForSave()==IDCANCEL)
1225 return;
1226 CDiffColors::GetInstance().LoadRegistry();
1227 LoadViews();
1228 return;
1229 }
1230 CDiffColors::GetInstance().LoadRegistry();
1231 if (m_pwndBottomView)
1232 m_pwndBottomView->Invalidate();
1233 if (m_pwndLeftView)
1234 m_pwndLeftView->Invalidate();
1235 if (m_pwndRightView)
1236 m_pwndRightView->Invalidate();
1237 }
1238
1239 void CMainFrame::OnClose()
1240 {
1241 if ((m_pFindDialog)&&(!m_pFindDialog->IsTerminating()))
1242 {
1243 m_pFindDialog->SendMessage(WM_CLOSE);
1244 return;
1245 }
1246 int ret = IDNO;
1247 if (((m_pwndBottomView)&&(m_pwndBottomView->IsModified())) ||
1248 ((m_pwndRightView)&&(m_pwndRightView->IsModified())))
1249 {
1250 CString sTemp;
1251 sTemp.LoadString(IDS_ASKFORSAVE);
1252 ret = MessageBox(sTemp, 0, MB_YESNOCANCEL | MB_ICONQUESTION);
1253 if (ret == IDYES)
1254 {
1255 if (!FileSave())
1256 return;
1257 }
1258 }
1259 if ((ret == IDNO)||(ret == IDYES))
1260 {
1261 WINDOWPLACEMENT wp;
1262
1263 // before it is destroyed, save the position of the window
1264 wp.length = sizeof wp;
1265
1266 if (GetWindowPlacement(&wp))
1267 {
1268
1269 if (IsIconic())
1270 // never restore to Iconic state
1271 wp.showCmd = SW_SHOW ;
1272
1273 if ((wp.flags & WPF_RESTORETOMAXIMIZED) != 0)
1274 // if maximized and maybe iconic restore maximized state
1275 wp.showCmd = SW_SHOWMAXIMIZED ;
1276
1277 // and write it to the .INI file
1278 WriteWindowPlacement(&wp);
1279 }
1280 __super::OnClose();
1281 }
1282 }
1283
1284 void CMainFrame::OnEditFind()
1285 {
1286 if (m_pFindDialog)
1287 {
1288 return;
1289 }
1290 else
1291 {
1292 // start searching from the start again
1293 // if no line is selected, otherwise start from
1294 // the selected line
1295 m_nSearchIndex = FindSearchStart(0);
1296 m_pFindDialog = new CFindDlg();
1297 m_pFindDialog->Create(this);
1298 }
1299 }
1300
1301 LRESULT CMainFrame::OnFindDialogMessage(WPARAM /*wParam*/, LPARAM /*lParam*/)
1302 {
1303 ASSERT(m_pFindDialog != NULL);
1304
1305 if (m_pFindDialog->IsTerminating())
1306 {
1307 // invalidate the handle identifying the dialog box.
1308 m_pFindDialog = NULL;
1309 return 0;
1310 }
1311
1312 if(m_pFindDialog->FindNext())
1313 {
1314 //read data from dialog
1315 m_sFindText = m_pFindDialog->GetFindString();
1316 m_bMatchCase = (m_pFindDialog->MatchCase() == TRUE);
1317 m_bLimitToDiff = m_pFindDialog->LimitToDiffs();
1318 m_bWholeWord = m_pFindDialog->WholeWord();
1319
1320 OnEditFindnext();
1321 }
1322
1323 return 0;
1324 }
1325
1326 bool CharIsDelimiter(const CString& ch)
1327 {
1328 CString delimiters(_T(" .,:;=+-*/\\\n\t()[]<>@"));
1329 return delimiters.Find(ch) >= 0;
1330 }
1331
1332 bool CMainFrame::StringFound(const CString& str)const
1333 {
1334 int nSubStringStartIdx = str.Find(m_sFindText);
1335 bool bStringFound = (nSubStringStartIdx >= 0);
1336 if (bStringFound && m_bWholeWord)
1337 {
1338 if (nSubStringStartIdx)
1339 bStringFound = CharIsDelimiter(str.Mid(nSubStringStartIdx-1,1));
1340
1341 if (bStringFound)
1342 {
1343 int nEndIndex = nSubStringStartIdx + m_sFindText.GetLength();
1344 if (str.GetLength() > nEndIndex)
1345 bStringFound = CharIsDelimiter(str.Mid(nEndIndex, 1));
1346 }
1347 }
1348 return bStringFound;
1349 }
1350
1351 void CMainFrame::OnEditFindprev()
1352 {
1353 Search(SearchPrevious);
1354 }
1355
1356 void CMainFrame::OnEditFindnext()
1357 {
1358 Search(SearchNext);
1359 }
1360
1361 void CMainFrame::Search(SearchDirection srchDir)
1362 {
1363 if (m_sFindText.IsEmpty())
1364 return;
1365
1366 if ((m_pwndLeftView)&&(m_pwndLeftView->m_pViewData))
1367 {
1368 bool bFound = FALSE;
1369
1370 CString left;
1371 CString right;
1372 CString bottom;
1373 DiffStates leftstate = DIFFSTATE_NORMAL;
1374 DiffStates rightstate = DIFFSTATE_NORMAL;
1375 DiffStates bottomstate = DIFFSTATE_NORMAL;
1376 int i = 0;
1377
1378 m_nSearchIndex = FindSearchStart(m_nSearchIndex);
1379 m_nSearchIndex++;
1380 if (m_nSearchIndex >= m_pwndLeftView->m_pViewData->GetCount())
1381 m_nSearchIndex = 0;
1382 if (srchDir == SearchPrevious)
1383 {
1384 // SearchIndex points 1 past where we found the last match,
1385 // so if we are searching backwards we need to adjust accordingly
1386 m_nSearchIndex -= 2;
1387 // if at the top, start again from the end
1388 if (m_nSearchIndex < 0)
1389 m_nSearchIndex += m_pwndLeftView->m_pViewData->GetCount();
1390 }
1391 const int idxLimits[2][2][2]={{{m_nSearchIndex, m_pwndLeftView->m_pViewData->GetCount()},
1392 {0, m_nSearchIndex}},
1393 {{m_nSearchIndex, -1},
1394 {m_pwndLeftView->m_pViewData->GetCount()-1, m_nSearchIndex}}};
1395 const int offsets[2]={+1, -1};
1396
1397 for (int j=0; j != 2 && !bFound; ++j)
1398 {
1399 for (i=idxLimits[srchDir][j][0]; i != idxLimits[srchDir][j][1]; i += offsets[srchDir])
1400 {
1401 left = m_pwndLeftView->m_pViewData->GetLine(i);
1402 leftstate = m_pwndLeftView->m_pViewData->GetState(i);
1403 if ((!m_bOneWay)&&(m_pwndRightView->m_pViewData))
1404 {
1405 right = m_pwndRightView->m_pViewData->GetLine(i);
1406 rightstate = m_pwndRightView->m_pViewData->GetState(i);
1407 }
1408 if ((m_pwndBottomView)&&(m_pwndBottomView->m_pViewData))
1409 {
1410 bottom = m_pwndBottomView->m_pViewData->GetLine(i);
1411 bottomstate = m_pwndBottomView->m_pViewData->GetState(i);
1412 }
1413
1414 if (!m_bMatchCase)
1415 {
1416 left = left.MakeLower();
1417 right = right.MakeLower();
1418 bottom = bottom.MakeLower();
1419 m_sFindText = m_sFindText.MakeLower();
1420 }
1421 if (StringFound(left))
1422 {
1423 if ((!m_bLimitToDiff)||(leftstate != DIFFSTATE_NORMAL))
1424 {
1425 bFound = TRUE;
1426 break;
1427 }
1428 }
1429 else if (StringFound(right))
1430 {
1431 if ((!m_bLimitToDiff)||(rightstate != DIFFSTATE_NORMAL))
1432 {
1433 bFound = TRUE;
1434 break;
1435 }
1436 }
1437 else if (StringFound(bottom))
1438 {
1439 if ((!m_bLimitToDiff)||(bottomstate != DIFFSTATE_NORMAL))
1440 {
1441 bFound = TRUE;
1442 break;
1443 }
1444 }
1445 }
1446 }
1447 if (bFound)
1448 {
1449 m_nSearchIndex = i;
1450 m_pwndLeftView->GoToLine(m_nSearchIndex);
1451 if (StringFound(left))
1452 {
1453 m_pwndLeftView->SetFocus();
1454 m_pwndLeftView->HiglightLines(m_nSearchIndex);
1455 }
1456 else if (StringFound(right))
1457 {
1458 m_pwndRightView->SetFocus();
1459 m_pwndRightView->HiglightLines(m_nSearchIndex);
1460 }
1461 else if (StringFound(bottom))
1462 {
1463 m_pwndBottomView->SetFocus();
1464 m_pwndBottomView->HiglightLines(m_nSearchIndex);
1465 }
1466 }
1467 else
1468 {
1469 m_nSearchIndex = 0;
1470 }
1471 }
1472 }
1473
1474 int CMainFrame::FindSearchStart(int nDefault)
1475 {
1476 // TortoiseMerge doesn't have a cursor which we could use to
1477 // anchor the search on.
1478 // Instead we use a line that is selected.
1479 // If however no line is selected, use the default line (which could
1480 // be the top of the document for a new search, or the line where the
1481 // search was successful on)
1482 int nLine = nDefault;
1483 int nSelStart = 0;
1484 int nSelEnd = 0;
1485 if (m_pwndLeftView)
1486 {
1487 if (m_pwndLeftView->GetSelection(nSelStart, nSelEnd))
1488 {
1489 if (nSelStart == nSelEnd)
1490 nLine = nSelStart;
1491 }
1492 }
1493 else if ((nLine == nDefault)&&(m_pwndRightView))
1494 {
1495 if (m_pwndRightView->GetSelection(nSelStart, nSelEnd))
1496 {
1497 if (nSelStart == nSelEnd)
1498 nLine = nSelStart;
1499 }
1500 }
1501 else if ((nLine == nDefault)&&(m_pwndBottomView))
1502 {
1503 if (m_pwndBottomView->GetSelection(nSelStart, nSelEnd))
1504 {
1505 if (nSelStart == nSelEnd)
1506 nLine = nSelStart;
1507 }
1508 }
1509 return nLine;
1510 }
1511
1512 void CMainFrame::OnViewLinedown()
1513 {
1514 if (m_pwndLeftView)
1515 m_pwndLeftView->ScrollToLine(m_pwndLeftView->m_nTopLine+1);
1516 if (m_pwndRightView)
1517 m_pwndRightView->ScrollToLine(m_pwndRightView->m_nTopLine+1);
1518 if (m_pwndBottomView)
1519 m_pwndBottomView->ScrollToLine(m_pwndBottomView->m_nTopLine+1);
1520 m_wndLocatorBar.Invalidate();
1521 }
1522
1523 void CMainFrame::OnViewLineup()
1524 {
1525 if (m_pwndLeftView)
1526 m_pwndLeftView->ScrollToLine(m_pwndLeftView->m_nTopLine-1);
1527 if (m_pwndRightView)
1528 m_pwndRightView->ScrollToLine(m_pwndRightView->m_nTopLine-1);
1529 if (m_pwndBottomView)
1530 m_pwndBottomView->ScrollToLine(m_pwndBottomView->m_nTopLine-1);
1531 m_wndLocatorBar.Invalidate();
1532 }
1533
1534 void CMainFrame::OnViewLineleft()
1535 {
1536 if (m_pwndLeftView)
1537 m_pwndLeftView->ScrollSide(-1);
1538 if (m_pwndRightView)
1539 m_pwndRightView->ScrollSide(-1);
1540 if (m_pwndBottomView)
1541 m_pwndBottomView->ScrollSide(-1);
1542 }
1543
1544 void CMainFrame::OnViewLineright()
1545 {
1546 if (m_pwndLeftView)
1547 m_pwndLeftView->ScrollSide(1);
1548 if (m_pwndRightView)
1549 m_pwndRightView->ScrollSide(1);
1550 if (m_pwndBottomView)
1551 m_pwndBottomView->ScrollSide(1);
1552 }
1553
1554 void CMainFrame::OnEditUseTheirs()
1555 {
1556 if (m_pwndBottomView)
1557 m_pwndBottomView->UseTheirTextBlock();
1558 }
1559 void CMainFrame::OnUpdateEditUsetheirblock(CCmdUI *pCmdUI)
1560 {
1561 int nSelBlockStart = -1;
1562 int nSelBlockEnd = -1;
1563 if (m_pwndBottomView)
1564 m_pwndBottomView->GetSelection(nSelBlockStart, nSelBlockEnd);
1565 pCmdUI->Enable((nSelBlockStart >= 0)&&(nSelBlockEnd >= 0));
1566 }
1567
1568
1569 void CMainFrame::OnEditUseMine()
1570 {
1571 if (m_pwndBottomView)
1572 m_pwndBottomView->UseMyTextBlock();
1573 }
1574 void CMainFrame::OnUpdateEditUsemyblock(CCmdUI *pCmdUI)
1575 {
1576 int nSelBlockStart = -1;
1577 int nSelBlockEnd = -1;
1578 if (m_pwndBottomView)
1579 m_pwndBottomView->GetSelection(nSelBlockStart, nSelBlockEnd);
1580 pCmdUI->Enable((nSelBlockStart >= 0)&&(nSelBlockEnd >= 0));
1581 }
1582
1583
1584 void CMainFrame::OnEditUseTheirsThenMine()
1585 {
1586 if (m_pwndBottomView)
1587 m_pwndBottomView->UseTheirThenMyTextBlock();
1588 }
1589 void CMainFrame::OnUpdateEditUsetheirthenmyblock(CCmdUI *pCmdUI)
1590 {
1591 int nSelBlockStart = -1;
1592 int nSelBlockEnd = -1;
1593 if (m_pwndBottomView)
1594 m_pwndBottomView->GetSelection(nSelBlockStart, nSelBlockEnd);
1595 pCmdUI->Enable((nSelBlockStart >= 0)&&(nSelBlockEnd >= 0));
1596 }
1597
1598
1599 void CMainFrame::OnEditUseMineThenTheirs()
1600 {
1601 if (m_pwndBottomView)
1602 m_pwndBottomView->UseMyThenTheirTextBlock();
1603 }
1604 void CMainFrame::OnUpdateEditUseminethentheirblock(CCmdUI *pCmdUI)
1605 {
1606 int nSelBlockStart = -1;
1607 int nSelBlockEnd = -1;
1608 if (m_pwndBottomView)
1609 m_pwndBottomView->GetSelection(nSelBlockStart, nSelBlockEnd);
1610 pCmdUI->Enable((nSelBlockStart >= 0)&&(nSelBlockEnd >= 0));
1611 }
1612
1613 void CMainFrame::OnEditUseleftblock()
1614 {
1615 if (m_pwndRightView)
1616 m_pwndRightView->UseBlock();
1617 }
1618
1619 void CMainFrame::OnUpdateEditUseleftblock(CCmdUI *pCmdUI)
1620 {
1621 pCmdUI->Enable(m_pwndRightView && m_pwndRightView->IsWindowVisible() && m_pwndRightView->HasCaret() && m_pwndRightView->HasSelection());
1622 }
1623
1624 void CMainFrame::OnEditUseleftfile()
1625 {
1626 if (m_pwndRightView)
1627 m_pwndRightView->UseFile();
1628 }
1629
1630 void CMainFrame::OnUpdateEditUseleftfile(CCmdUI *pCmdUI)
1631 {
1632 pCmdUI->Enable(m_pwndRightView && m_pwndRightView->IsWindowVisible() && m_pwndRightView->HasCaret());
1633 }
1634
1635 void CMainFrame::OnEditUseblockfromleftbeforeright()
1636 {
1637 if (m_pwndRightView)
1638 m_pwndRightView->UseLeftBeforeRight();
1639 }
1640
1641 void CMainFrame::OnUpdateEditUseblockfromleftbeforeright(CCmdUI *pCmdUI)
1642 {
1643 pCmdUI->Enable(m_pwndRightView && m_pwndRightView->IsWindowVisible() && m_pwndRightView->HasCaret() && m_pwndRightView->HasSelection());
1644 }
1645
1646 void CMainFrame::OnEditUseblockfromrightbeforeleft()
1647 {
1648 if (m_pwndRightView)
1649 m_pwndRightView->UseRightBeforeLeft();
1650 }
1651
1652 void CMainFrame::OnUpdateEditUseblockfromrightbeforeleft(CCmdUI *pCmdUI)
1653 {
1654 pCmdUI->Enable(m_pwndRightView && m_pwndRightView->IsWindowVisible() && m_pwndRightView->HasCaret() && m_pwndRightView->HasSelection());
1655 }
1656
1657
1658 void CMainFrame::OnFileReload()
1659 {
1660 if (CheckForSave()==IDCANCEL)
1661 return;
1662 CDiffColors::GetInstance().LoadRegistry();
1663 LoadViews(true);
1664 }
1665
1666 void CMainFrame::ActivateFrame(int nCmdShow)
1667 {
1668 // nCmdShow is the normal show mode this frame should be in
1669 // translate default nCmdShow (-1)
1670 if (nCmdShow == -1)
1671 {
1672 if (!IsWindowVisible())
1673 nCmdShow = SW_SHOWNORMAL;
1674 else if (IsIconic())
1675 nCmdShow = SW_RESTORE;
1676 }
1677
1678 // bring to top before showing
1679 BringToTop(nCmdShow);
1680
1681 if (nCmdShow != -1)
1682 {
1683 // show the window as specified
1684 WINDOWPLACEMENT wp;
1685
1686 if ( !ReadWindowPlacement(&wp) )
1687 {
1688 ShowWindow(nCmdShow);
1689 }
1690 else
1691 {
1692 if ( nCmdShow != SW_SHOWNORMAL )
1693 wp.showCmd = nCmdShow;
1694
1695 SetWindowPlacement(&wp);
1696 }
1697
1698 // and finally, bring to top after showing
1699 BringToTop(nCmdShow);
1700 }
1701 return;
1702 }
1703
1704 BOOL CMainFrame::ReadWindowPlacement(WINDOWPLACEMENT * pwp)
1705 {
1706 CRegString placement = CRegString(_T("Software\\TortoiseMerge\\WindowPos"));
1707 CString sPlacement = placement;
1708 if (sPlacement.IsEmpty())
1709 return FALSE;
1710 int nRead = _stscanf_s(sPlacement, _T("%u,%u,%d,%d,%d,%d,%d,%d,%d,%d"),
1711 &pwp->flags, &pwp->showCmd,
1712 &pwp->ptMinPosition.x, &pwp->ptMinPosition.y,
1713 &pwp->ptMaxPosition.x, &pwp->ptMaxPosition.y,
1714 &pwp->rcNormalPosition.left, &pwp->rcNormalPosition.top,
1715 &pwp->rcNormalPosition.right, &pwp->rcNormalPosition.bottom);
1716 if ( nRead != 10 )
1717 return FALSE;
1718 pwp->length = sizeof(WINDOWPLACEMENT);
1719
1720 return TRUE;
1721 }
1722
1723 void CMainFrame::WriteWindowPlacement(WINDOWPLACEMENT * pwp)
1724 {
1725 CRegString placement = CRegString(_T("Software\\TortoiseMerge\\WindowPos"));
1726 TCHAR szBuffer[sizeof("-32767")*8 + sizeof("65535")*2];
1727 CString s;
1728
1729 _stprintf_s(szBuffer, sizeof("-32767")*8 + sizeof("65535")*2, _T("%u,%u,%d,%d,%d,%d,%d,%d,%d,%d"),
1730 pwp->flags, pwp->showCmd,
1731 pwp->ptMinPosition.x, pwp->ptMinPosition.y,
1732 pwp->ptMaxPosition.x, pwp->ptMaxPosition.y,
1733 pwp->rcNormalPosition.left, pwp->rcNormalPosition.top,
1734 pwp->rcNormalPosition.right, pwp->rcNormalPosition.bottom);
1735 placement = szBuffer;
1736 }
1737
1738 void CMainFrame::OnUpdateMergeMarkasresolved(CCmdUI *pCmdUI)
1739 {
1740 if (pCmdUI == NULL)
1741 return;
1742 BOOL bEnable = FALSE;
1743 if ((!m_bReadOnly)&&(m_Data.m_mergedFile.InUse()))
1744 {
1745 if (m_pwndBottomView)
1746 {
1747 if ((m_pwndBottomView->IsWindowVisible())&&(m_pwndBottomView->m_pViewData))
1748 {
1749 bEnable = TRUE;
1750 }
1751 }
1752 }
1753 pCmdUI->Enable(bEnable);
1754 }
1755
1756 void CMainFrame::OnMergeMarkasresolved()
1757 {
1758 int nConflictLine = CheckResolved();
1759 if (nConflictLine >= 0)
1760 {
1761 CString sTemp;
1762 sTemp.Format(IDS_ERR_MAINFRAME_FILEHASCONFLICTS, m_pwndBottomView->m_pViewData->GetLineNumber(nConflictLine)+1);
1763 if (MessageBox(sTemp, 0, MB_ICONERROR | MB_YESNO)!=IDYES)
1764 {
1765 if (m_pwndBottomView)
1766 m_pwndBottomView->GoToLine(nConflictLine);
1767 return;
1768 }
1769 }
1770 // now check if the file has already been saved and if not, save it.
1771 if (m_Data.m_mergedFile.InUse())
1772 {
1773 if (m_pwndBottomView)
1774 {
1775 if ((m_pwndBottomView->IsWindowVisible())&&(m_pwndBottomView->m_pViewData))
1776 {
1777 FileSave(false);
1778 }
1779 }
1780 }
1781 MarkAsResolved();
1782 }
1783
1784 BOOL CMainFrame::MarkAsResolved()
1785 {
1786 if (m_bReadOnly)
1787 return FALSE;
1788 if ((m_pwndBottomView)&&(m_pwndBottomView->IsWindowVisible()))
1789 {
1790 TCHAR buf[MAX_PATH*3];
1791 GetModuleFileName(NULL, buf, MAX_PATH);
1792 TCHAR * end = _tcsrchr(buf, '\\');
1793 end++;
1794 (*end) = 0;
1795 _tcscat_s(buf, MAX_PATH*3, _T("TortoiseProc.exe /command:resolve /path:\""));
1796 _tcscat_s(buf, MAX_PATH*3, m_Data.m_mergedFile.GetFilename());
1797 _tcscat_s(buf, MAX_PATH*3, _T("\" /closeonend:1 /noquestion /skipcheck"));
1798 STARTUPINFO startup;
1799 PROCESS_INFORMATION process;
1800 memset(&startup, 0, sizeof(startup));
1801 startup.cb = sizeof(startup);
1802 memset(&process, 0, sizeof(process));
1803 if (CreateProcess(NULL, buf, NULL, NULL, FALSE, 0, 0, 0, &startup, &process)==0)
1804 {
1805 LPVOID lpMsgBuf;
1806 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
1807 FORMAT_MESSAGE_FROM_SYSTEM |
1808 FORMAT_MESSAGE_IGNORE_INSERTS,
1809 NULL,
1810 GetLastError(),
1811 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
1812 (LPTSTR) &lpMsgBuf,
1813 0,
1814 NULL
1815 );
1816 MessageBox((LPCTSTR)lpMsgBuf, _T("TortoiseMerge"), MB_OK | MB_ICONINFORMATION);
1817 LocalFree( lpMsgBuf );
1818 return FALSE;
1819 }
1820 CloseHandle(process.hThread);
1821 CloseHandle(process.hProcess);
1822 }
1823 else
1824 return FALSE;
1825 return TRUE;
1826 }
1827
1828 void CMainFrame::OnUpdateMergeNextconflict(CCmdUI *pCmdUI)
1829 {
1830 pCmdUI->Enable(m_bHasConflicts);
1831 }
1832
1833 void CMainFrame::OnUpdateMergePreviousconflict(CCmdUI *pCmdUI)
1834 {
1835 pCmdUI->Enable(m_bHasConflicts);
1836 }
1837
1838 void CMainFrame::OnMoving(UINT fwSide, LPRECT pRect)
1839 {
1840 // if the pathfilelist dialog is attached to the mainframe,
1841 // move it along with the mainframe
1842 if (::IsWindow(m_dlgFilePatches.m_hWnd))
1843 {
1844 RECT patchrect;
1845 m_dlgFilePatches.GetWindowRect(&patchrect);
1846 if (::IsWindow(m_hWnd))
1847 {
1848 RECT thisrect;
1849 GetWindowRect(&thisrect);
1850 if (patchrect.right == thisrect.left)
1851 {
1852 m_dlgFilePatches.SetWindowPos(NULL, patchrect.left - (thisrect.left - pRect->left), patchrect.top - (thisrect.top - pRect->top),
1853 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
1854 }
1855 }
1856 }
1857 __super::OnMoving(fwSide, pRect);
1858 }
1859
1860 void CMainFrame::OnUpdateEditCopy(CCmdUI *pCmdUI)
1861 {
1862 BOOL bShow = FALSE;
1863 if ((m_pwndBottomView)&&(m_pwndBottomView->HasSelection()))
1864 bShow = TRUE;
1865 if ((m_pwndRightView)&&(m_pwndRightView->HasSelection()))
1866 bShow = TRUE;
1867 if ((m_pwndLeftView)&&(m_pwndLeftView->HasSelection()))
1868 bShow = TRUE;
1869 pCmdUI->Enable(bShow);
1870 }
1871
1872 void CMainFrame::OnViewSwitchleft()
1873 {
1874 int ret = IDNO;
1875 if (((m_pwndBottomView)&&(m_pwndBottomView->IsModified())) ||
1876 ((m_pwndRightView)&&(m_pwndRightView->IsModified())))
1877 {
1878 CString sTemp;
1879 sTemp.LoadString(IDS_ASKFORSAVE);
1880 ret = MessageBox(sTemp, 0, MB_YESNOCANCEL | MB_ICONQUESTION);
1881 if (ret == IDYES)
1882 {
1883 if (!FileSave())
1884 return;
1885 }
1886 }
1887 if ((ret == IDNO)||(ret == IDYES))
1888 {
1889 CWorkingFile file = m_Data.m_baseFile;
1890 m_Data.m_baseFile = m_Data.m_yourFile;
1891 m_Data.m_yourFile = file;
1892 if (m_Data.m_mergedFile.GetFilename().CompareNoCase(m_Data.m_yourFile.GetFilename())==0)
1893 {
1894 m_Data.m_mergedFile = m_Data.m_baseFile;
1895 }
1896 else if (m_Data.m_mergedFile.GetFilename().CompareNoCase(m_Data.m_baseFile.GetFilename())==0)
1897 {
1898 m_Data.m_mergedFile = m_Data.m_yourFile;
1899 }
1900 LoadViews();
1901 }
1902 }
1903
1904 void CMainFrame::OnUpdateViewSwitchleft(CCmdUI *pCmdUI)
1905 {
1906 BOOL bEnable = TRUE;
1907 if (m_pwndBottomView)
1908 {
1909 if (m_pwndBottomView->IsWindowVisible())
1910 bEnable = FALSE;
1911 }
1912 pCmdUI->Enable(bEnable);
1913 }
1914
1915
1916 void CMainFrame::OnUpdateViewShowfilelist(CCmdUI *pCmdUI)
1917 {
1918 if (m_dlgFilePatches.HasFiles())
1919 {
1920 pCmdUI->Enable(true);
1921 }
1922 else
1923 pCmdUI->Enable(false);
1924 pCmdUI->SetCheck(m_dlgFilePatches.IsWindowVisible());
1925 }
1926
1927 void CMainFrame::OnViewShowfilelist()
1928 {
1929 m_dlgFilePatches.ShowWindow(m_dlgFilePatches.IsWindowVisible() ? SW_HIDE : SW_SHOW);
1930 }
1931
1932 void CMainFrame::OnEditUndo()
1933 {
1934 if (CUndo::GetInstance().CanUndo())
1935 {
1936 CUndo::GetInstance().Undo(m_pwndLeftView, m_pwndRightView, m_pwndBottomView);
1937
1938 }
1939 }
1940
1941 void CMainFrame::OnUpdateEditUndo(CCmdUI *pCmdUI)
1942 {
1943 pCmdUI->Enable(CUndo::GetInstance().CanUndo());
1944 }
1945
1946 int CMainFrame::CheckForSave()
1947 {
1948 int ret = IDNO;
1949 if (((m_pwndBottomView)&&(m_pwndBottomView->IsModified())) ||
1950 ((m_pwndRightView)&&(m_pwndRightView->IsModified())))
1951 {
1952 CString sTemp;
1953 sTemp.LoadString(IDS_WARNMODIFIEDLOOSECHANGES);
1954 ret = MessageBox(sTemp, 0, MB_YESNOCANCEL | MB_ICONQUESTION);
1955
1956 if (ret == IDYES)
1957 {
1958 FileSave();
1959 }
1960 }
1961 return ret;
1962 }
1963
1964 void CMainFrame::OnViewInlinediffword()
1965 {
1966 m_bInlineWordDiff = !m_bInlineWordDiff;
1967 if (m_pwndLeftView)
1968 {
1969 m_pwndLeftView->SetInlineWordDiff(m_bInlineWordDiff);
1970 m_pwndLeftView->Invalidate();
1971 }
1972 if (m_pwndRightView)
1973 {
1974 m_pwndRightView->SetInlineWordDiff(m_bInlineWordDiff);
1975 m_pwndRightView->Invalidate();
1976 }
1977 if (m_pwndBottomView)
1978 {
1979 m_pwndBottomView->SetInlineWordDiff(m_bInlineWordDiff);
1980 m_pwndBottomView->Invalidate();
1981 }
1982 m_wndLineDiffBar.Invalidate();
1983 }
1984
1985 void CMainFrame::OnUpdateViewInlinediffword(CCmdUI *pCmdUI)
1986 {
1987 pCmdUI->Enable(m_pwndLeftView && m_pwndLeftView->IsWindowVisible() &&
1988 m_pwndRightView && m_pwndRightView->IsWindowVisible());
1989 pCmdUI->SetCheck(m_bInlineWordDiff);
1990 }
1991
1992 void CMainFrame::OnUpdateEditCreateunifieddifffile(CCmdUI *pCmdUI)
1993 {
1994 // "create unified diff file" is only available if two files
1995 // are diffed, not three.
1996 bool bEnabled = true;
1997 if ((m_pwndLeftView == NULL)||(!m_pwndLeftView->IsWindowVisible()))
1998 bEnabled = false;
1999 if ((m_pwndRightView == NULL)||(!m_pwndRightView->IsWindowVisible()))
2000 bEnabled = false;
2001 if ((m_pwndBottomView)&&(m_pwndBottomView->IsWindowVisible()))
2002 bEnabled = false;
2003 pCmdUI->Enable(bEnabled);
2004 }
2005
2006 void CMainFrame::OnEditCreateunifieddifffile()
2007 {
2008 CString origFile, modifiedFile, outputFile;
2009 // the original file is the one on the left
2010 if (m_pwndLeftView)
2011 origFile = m_pwndLeftView->m_sFullFilePath;
2012 if (m_pwndRightView)
2013 modifiedFile = m_pwndRightView->m_sFullFilePath;
2014 if (!origFile.IsEmpty() && !modifiedFile.IsEmpty())
2015 {
2016 // ask for the path to save the unified diff file to
2017 OPENFILENAME ofn = {0}; // common dialog box structure
2018 TCHAR szFile[MAX_PATH] = {0}; // buffer for file name
2019 ofn.lStructSize = sizeof(OPENFILENAME);
2020 ofn.lpstrFile = szFile;
2021 ofn.nMaxFile = sizeof(szFile)/sizeof(TCHAR);
2022 CString temp;
2023 temp.LoadString(IDS_SAVEASTITLE);
2024 if (!temp.IsEmpty())
2025 ofn.lpstrTitle = temp;
2026 ofn.Flags = OFN_OVERWRITEPROMPT;
2027 CString sFilter;
2028 sFilter.LoadString(IDS_COMMONFILEFILTER);
2029 TCHAR * pszFilters = new TCHAR[sFilter.GetLength()+4];
2030 _tcscpy_s (pszFilters, sFilter.GetLength()+4, sFilter);
2031 // Replace '|' delimiters with '\0's
2032 TCHAR *ptr = pszFilters + _tcslen(pszFilters); //set ptr at the NULL
2033 while (ptr != pszFilters)
2034 {
2035 if (*ptr == '|')
2036 *ptr = '\0';
2037 ptr--;
2038 }
2039 ofn.lpstrFilter = pszFilters;
2040 ofn.nFilterIndex = 1;
2041
2042 // Display the Save dialog box.
2043 CString sFile;
2044 if (GetSaveFileName(&ofn)==TRUE)
2045 {
2046 outputFile = CString(ofn.lpstrFile);
2047 CAppUtils::CreateUnifiedDiff(origFile, modifiedFile, outputFile, true);
2048 }
2049 delete [] pszFilters;
2050 }
2051 }
2052
2053 void CMainFrame::OnUpdateViewLinediffbar(CCmdUI *pCmdUI)
2054 {
2055 pCmdUI->SetCheck(m_bLineDiff);
2056 pCmdUI->Enable();
2057 }
2058
2059 void CMainFrame::OnViewLinediffbar()
2060 {
2061 m_bLineDiff = !m_bLineDiff;
2062 m_wndLineDiffBar.ShowPane(m_bLineDiff, false, true);
2063 m_wndLineDiffBar.DocumentUpdated();
2064 m_wndLocatorBar.ShowPane(m_bLocatorBar, false, true);
2065 m_wndLocatorBar.DocumentUpdated();
2066 }
2067
2068 void CMainFrame::OnUpdateViewLocatorbar(CCmdUI *pCmdUI)
2069 {
2070 pCmdUI->SetCheck(m_bLocatorBar);
2071 pCmdUI->Enable();
2072 }
2073
2074 void CMainFrame::OnViewLocatorbar()
2075 {
2076 m_bLocatorBar = !m_bLocatorBar;
2077 m_wndLocatorBar.ShowPane(m_bLocatorBar, false, true);
2078 m_wndLocatorBar.DocumentUpdated();
2079 m_wndLineDiffBar.ShowPane(m_bLineDiff, false, true);
2080 m_wndLineDiffBar.DocumentUpdated();
2081 }
2082
Windows Explorer Extension to Operate Git