src/TortoiseMerge/MainFrm.cpp

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