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", TRUE)
 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         // workaround for ribbon interface when taskbar is on the left/top
 938         if (nType == SIZE_MAXIMIZED)
 939         {
 940                 WINDOWPLACEMENT wp;
 941                 GetWindowPlacement(&wp);
 942                 wp.ptMaxPosition.x = wp.ptMaxPosition.y = 0;
 943                 SetWindowPlacement(&wp);
 944         }
 945 }
 946
 947 void CMainFrame::OnViewWhitespaces()
 948 {
 949         CRegDWORD regViewWhitespaces = CRegDWORD(_T("Software\\TortoiseGitMerge\\ViewWhitespaces"), 1);
 950         BOOL bViewWhitespaces = regViewWhitespaces;
 951         if (m_pwndLeftView)
 952                 bViewWhitespaces = m_pwndLeftView->m_bViewWhitespace;
 953
 954         bViewWhitespaces = !bViewWhitespaces;
 955         regViewWhitespaces = bViewWhitespaces;
 956         if (m_pwndLeftView)
 957         {
 958                 m_pwndLeftView->m_bViewWhitespace = bViewWhitespaces;
 959                 m_pwndLeftView->Invalidate();
 960         }
 961         if (m_pwndRightView)
 962         {
 963                 m_pwndRightView->m_bViewWhitespace = bViewWhitespaces;
 964                 m_pwndRightView->Invalidate();
 965         }
 966         if (m_pwndBottomView)
 967         {
 968                 m_pwndBottomView->m_bViewWhitespace = bViewWhitespaces;
 969                 m_pwndBottomView->Invalidate();
 970         }
 971 }
 972
 973 void CMainFrame::OnUpdateViewWhitespaces(CCmdUI *pCmdUI)
 974 {
 975         if (m_pwndLeftView)
 976                 pCmdUI->SetCheck(m_pwndLeftView->m_bViewWhitespace);
 977 }
 978
 979 void CMainFrame::OnViewCollapsed()
 980 {
 981         m_regCollapsed = !(DWORD)m_regCollapsed;
 982         m_bCollapsed = !!(DWORD)m_regCollapsed;
 983
 984         OnViewTextFoldUnfold();
 985         m_wndLocatorBar.Invalidate();
 986 }
 987
 988 void CMainFrame::OnUpdateViewCollapsed(CCmdUI *pCmdUI)
 989 {
 990         pCmdUI->SetCheck(m_bCollapsed);
 991 }
 992
 993 void CMainFrame::OnViewWraplonglines()
 994 {
 995         m_bWrapLines = !(DWORD)m_regWrapLines;
 996         m_regWrapLines = m_bWrapLines;
 997
 998         if (m_pwndLeftView)   m_pwndLeftView  ->WrapChanged();
 999         if (m_pwndRightView)  m_pwndRightView ->WrapChanged();
1000         if (m_pwndBottomView) m_pwndBottomView->WrapChanged();
1001         OnViewTextFoldUnfold();
1002         m_wndLocatorBar.DocumentUpdated();
1003 }
1004
1005 void CMainFrame::OnViewTextFoldUnfold()
1006 {
1007         OnViewTextFoldUnfold(m_pwndLeftView);
1008         OnViewTextFoldUnfold(m_pwndRightView);
1009         OnViewTextFoldUnfold(m_pwndBottomView);
1010 }
1011
1012 void CMainFrame::OnViewTextFoldUnfold(CBaseView* view)
1013 {
1014         if (view == 0)
1015                 return;
1016         view->BuildAllScreen2ViewVector();
1017         view->UpdateCaret();
1018         view->Invalidate();
1019         view->EnsureCaretVisible();
1020 }
1021
1022 void CMainFrame::OnUpdateViewWraplonglines(CCmdUI *pCmdUI)
1023 {
1024         pCmdUI->SetCheck(m_bWrapLines);
1025 }
1026
1027 void CMainFrame::OnViewOnewaydiff()
1028 {
1029         if (CheckForSave()==IDCANCEL)
1030                 return;
1031         m_bOneWay = !m_bOneWay;
1032         ShowDiffBar(!m_bOneWay);
1033         LoadViews(-1);
1034 }
1035
1036 void CMainFrame::ShowDiffBar(bool bShow)
1037 {
1038         if (bShow)
1039         {
1040                 // restore the line diff bar
1041                 m_wndLineDiffBar.ShowPane(m_bLineDiff, false, true);
1042                 m_wndLineDiffBar.DocumentUpdated();
1043                 m_wndLocatorBar.ShowPane(m_bLocatorBar, false, true);
1044                 m_wndLocatorBar.DocumentUpdated();
1045         }
1046         else
1047         {
1048                 // in one way view, hide the line diff bar
1049                 m_wndLineDiffBar.ShowPane(false, false, true);
1050                 m_wndLineDiffBar.DocumentUpdated();
1051         }
1052 }
1053
1054 int CMainFrame::CheckResolved()
1055 {
1056         //only in three way diffs can be conflicts!
1057         m_bHasConflicts = true;
1058         if (m_pwndBottomView->IsWindowVisible())
1059         {
1060                 CViewData* viewdata = m_pwndBottomView->m_pViewData;
1061                 if (viewdata)
1062                 {
1063                         for (int i=0; i<viewdata->GetCount(); i++)
1064                         {
1065                                 const DiffStates state = viewdata->GetState(i);
1066                                 if ((DIFFSTATE_CONFLICTED == state)||(DIFFSTATE_CONFLICTED_IGNORED == state))
1067                                         return i;
1068                         }
1069                 }
1070         }
1071         m_bHasConflicts = false;
1072         return -1;
1073 }
1074
1075 int CMainFrame::SaveFile(const CString& sFilePath)
1076 {
1077         CViewData * pViewData = NULL;
1078         CFileTextLines * pOriginFile = &m_Data.m_arBaseFile;
1079         if (IsViewGood(m_pwndBottomView))
1080         {
1081                 pViewData = m_pwndBottomView->m_pViewData;
1082                 Invalidate();
1083         }
1084         else if (IsViewGood(m_pwndRightView))
1085         {
1086                 pViewData = m_pwndRightView->m_pViewData;
1087                 if (m_Data.IsYourFileInUse())
1088                         pOriginFile = &m_Data.m_arYourFile;
1089                 else if (m_Data.IsTheirFileInUse())
1090                         pOriginFile = &m_Data.m_arTheirFile;
1091                 Invalidate();
1092         }
1093         else
1094         {
1095                 // nothing to save!
1096                 return 1;
1097         }
1098         if ((pViewData)&&(pOriginFile))
1099         {
1100                 CFileTextLines file;
1101                 pOriginFile->CopySettings(&file);
1102                 for (int i=0; i<pViewData->GetCount(); i++)
1103                 {
1104                         //only copy non-removed lines
1105                         DiffStates state = pViewData->GetState(i);
1106                         switch (state)
1107                         {
1108                         case DIFFSTATE_CONFLICTED:
1109                         case DIFFSTATE_CONFLICTED_IGNORED:
1110                                 {
1111                                         int first = i;
1112                                         int last = i;
1113                                         do
1114                                         {
1115                                                 last++;
1116                                         } while((last<pViewData->GetCount()) && ((pViewData->GetState(last)==DIFFSTATE_CONFLICTED)||(pViewData->GetState(last)==DIFFSTATE_CONFLICTED_IGNORED)));
1117                                         // TortoiseGitMerge changes here
1118                                         file.Add(_T("<<<<<<< .mine"), m_pwndRightView->lineendings);
1119                                         for (int j=first; j<last; j++)
1120                                         {
1121                                                 EOL lineending = m_pwndRightView->m_pViewData->GetLineEnding(j);
1122                                                 if (lineending == EOL_NOENDING)
1123                                                         lineending = m_pwndRightView->lineendings;
1124                                                 file.Add(m_pwndRightView->m_pViewData->GetLine(j), lineending);
1125                                         }
1126                                         file.Add(_T("======="), m_pwndRightView->lineendings);
1127                                         for (int j=first; j<last; j++)
1128                                         {
1129                                                 EOL lineending = m_pwndLeftView->m_pViewData->GetLineEnding(j);
1130                                                 if (lineending == EOL_NOENDING)
1131                                                         lineending = m_pwndLeftView->lineendings;
1132                                                 file.Add(m_pwndLeftView->m_pViewData->GetLine(j), lineending);
1133                                         }
1134                                         file.Add(_T(">>>>>>> .theirs"), m_pwndRightView->lineendings);
1135                                         i = last-1;
1136                                 }
1137                                 break;
1138                         case DIFFSTATE_EMPTY:
1139                         case DIFFSTATE_CONFLICTEMPTY:
1140                         case DIFFSTATE_IDENTICALREMOVED:
1141                         case DIFFSTATE_REMOVED:
1142                         case DIFFSTATE_THEIRSREMOVED:
1143                         case DIFFSTATE_YOURSREMOVED:
1144                         case DIFFSTATE_CONFLICTRESOLVEDEMPTY:
1145                                 // do not save removed lines
1146                                 break;
1147                         default:
1148                                 file.Add(pViewData->GetLine(i), pViewData->GetLineEnding(i));
1149                                 break;
1150                         }
1151                 }
1152                 if (!file.Save(sFilePath, false, false))
1153                 {
1154                         CMessageBox::Show(m_hWnd, file.GetErrorString(), _T("TortoiseGitMerge"), MB_ICONERROR);
1155                         return -1;
1156                 }
1157                 if (sFilePath == m_Data.m_baseFile.GetFilename())
1158                 {
1159                         m_Data.m_baseFile.StoreFileAttributes();
1160                 }
1161                 if (sFilePath == m_Data.m_theirFile.GetFilename())
1162                 {
1163                         m_Data.m_theirFile.StoreFileAttributes();
1164                 }
1165                 if (sFilePath == m_Data.m_yourFile.GetFilename())
1166                 {
1167                         m_Data.m_yourFile.StoreFileAttributes();
1168                 }
1169                 /*if (sFilePath == m_Data.m_mergedFile.GetFilename())
1170                 {
1171                         m_Data.m_mergedFile.StoreFileAttributes();
1172                 }//*/
1173                 m_dlgFilePatches.SetFileStatusAsPatched(sFilePath);
1174                 if (m_pwndBottomView)
1175                         m_pwndBottomView->SetModified(FALSE);
1176                 if (m_pwndRightView)
1177                         m_pwndRightView->SetModified(FALSE);
1178                 CUndo::GetInstance().MarkAsOriginalState();
1179                 if (file.GetCount() == 1 && file.GetAt(0).IsEmpty() && file.GetLineEnding(0) == EOL_NOENDING)
1180                         return 0;
1181                 return file.GetCount();
1182         }
1183         return 1;
1184 }
1185
1186 void CMainFrame::OnFileSave()
1187 {
1188         FileSave();
1189 }
1190
1191 void CMainFrame::PatchSave()
1192 {
1193         bool bDoesNotExist = !PathFileExists(m_Data.m_mergedFile.GetFilename());
1194         if (m_Data.m_bPatchRequired)
1195         {
1196                 m_Patch.PatchPath(m_Data.m_mergedFile.GetFilename());
1197         }
1198         if (!PathIsDirectory(m_Data.m_mergedFile.GetFilename()))
1199         {
1200                 int saveret = SaveFile(m_Data.m_mergedFile.GetFilename());
1201                 if (saveret==0)
1202                 {
1203                         // file was saved with 0 lines, remove it.
1204                         m_Patch.RemoveFile(m_Data.m_mergedFile.GetFilename());
1205                         // just in case
1206                         DeleteFile(m_Data.m_mergedFile.GetFilename());
1207                 }
1208                 m_Data.m_mergedFile.StoreFileAttributes();
1209                 if (m_Data.m_mergedFile.GetFilename() == m_Data.m_yourFile.GetFilename())
1210                         m_Data.m_yourFile.StoreFileAttributes();
1211                 if ((bDoesNotExist)&&(DWORD(CRegDWORD(_T("Software\\TortoiseGitMerge\\AutoAdd"), TRUE))))
1212                 {
1213                         // call TortoiseProc to add the new file to version control
1214                         CString cmd = _T("/command:add /noui /path:\"");
1215                         cmd += m_Data.m_mergedFile.GetFilename() + _T("\"");
1216                         CAppUtils::RunTortoiseGitProc(cmd);
1217                 }
1218         }
1219 }
1220
1221 bool CMainFrame::FileSave(bool bCheckResolved /*=true*/)
1222 {
1223         if (!m_Data.m_mergedFile.InUse())
1224                 return FileSaveAs(bCheckResolved);
1225         // check if the file has the readonly attribute set
1226         bool bDoesNotExist = false;
1227         DWORD fAttribs = GetFileAttributes(m_Data.m_mergedFile.GetFilename());
1228         if ((fAttribs != INVALID_FILE_ATTRIBUTES)&&(fAttribs & FILE_ATTRIBUTE_READONLY))
1229                 return FileSaveAs(bCheckResolved);
1230         if (fAttribs == INVALID_FILE_ATTRIBUTES)
1231         {
1232                 bDoesNotExist = (GetLastError() == ERROR_FILE_NOT_FOUND);
1233         }
1234         if (bCheckResolved && HasConflictsWontKeep())
1235                 return false;
1236
1237         if (((DWORD)CRegDWORD(_T("Software\\TortoiseGitMerge\\Backup"))) != 0)
1238         {
1239                 MoveFileEx(m_Data.m_mergedFile.GetFilename(), m_Data.m_mergedFile.GetFilename() + _T(".bak"), MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH);
1240         }
1241         if (m_Data.m_bPatchRequired)
1242         {
1243                 m_Patch.PatchPath(m_Data.m_mergedFile.GetFilename());
1244         }
1245         int saveret = SaveFile(m_Data.m_mergedFile.GetFilename());
1246         if (saveret==0)
1247         {
1248                 // file was saved with 0 lines!
1249                 // ask the user if the file should be deleted
1250                 CString sTemp;
1251                 sTemp.Format(IDS_DELETEWHENEMPTY, (LPCTSTR)m_Data.m_mergedFile.GetFilename());
1252                 if (CMessageBox::ShowCheck(m_hWnd, sTemp, _T("TortoiseGitMerge"), MB_YESNO, _T("DeleteFileWhenEmpty")) == IDYES)
1253                 {
1254                         m_Patch.RemoveFile(m_Data.m_mergedFile.GetFilename());
1255                         DeleteFile(m_Data.m_mergedFile.GetFilename());
1256                 }
1257         }
1258         else if (saveret < 0)
1259         {
1260                 // error while saving the file
1261                 return false;
1262         }
1263
1264         // if we're in conflict resolve mode (three pane view), check if there are no more conflicts
1265         // and if there aren't, ask to mark the file as resolved
1266         if (IsViewGood(m_pwndBottomView) && !m_bHasConflicts)
1267         {
1268                 CString projectRoot;
1269                 if (g_GitAdminDir.HasAdminDir(m_Data.m_mergedFile.GetFilename(), false, &projectRoot))
1270                 {
1271                         CString subpath = m_Data.m_mergedFile.GetFilename();
1272                         subpath.Replace(_T('\\'), _T('/'));
1273                         if (subpath.GetLength() >= projectRoot.GetLength())
1274                         {
1275                                 if (subpath[projectRoot.GetLength()] == _T('/'))
1276                                         subpath = subpath.Right(subpath.GetLength() - projectRoot.GetLength() - 1);
1277                                 else
1278                                         subpath = subpath.Right(subpath.GetLength() - projectRoot.GetLength());
1279                         }
1280
1281                         CStringA gitdir = CUnicodeUtils::GetMulti(projectRoot, CP_UTF8);
1282                         git_repository *repository = NULL;
1283                         git_index *index = NULL;
1284                         bool hasConflictInIndex = false;
1285                         do
1286                         {
1287                                 if (git_repository_open(&repository, gitdir.GetBuffer()))
1288                                 {
1289                                         gitdir.ReleaseBuffer();
1290                                         break;
1291                                 }
1292                                 gitdir.ReleaseBuffer();
1293
1294                                 if (git_repository_index(&index, repository))
1295                                         break;
1296
1297                                 CStringA path = CUnicodeUtils::GetMulti(subpath, CP_UTF8);
1298                                 const git_index_entry * entry = git_index_get_bypath(index, path.GetBuffer(), 1);
1299                                 path.ReleaseBuffer();
1300                                 hasConflictInIndex = entry != nullptr;
1301                         } while(0);
1302
1303                         if (index)
1304                                 git_index_free(index);
1305
1306                         if (repository)
1307                                 git_repository_free(repository);
1308
1309                         if (hasConflictInIndex)
1310                         {
1311                                 CString sTemp;
1312                                 sTemp.Format(IDS_MARKASRESOLVED, (LPCTSTR)CPathUtils::GetFileNameFromPath(m_Data.m_mergedFile.GetFilename()));
1313                                 if (CMessageBox::Show(m_hWnd, sTemp, _T("TortoiseGitMerge"), MB_YESNO | MB_ICONQUESTION) == IDYES)
1314                                         MarkAsResolved();
1315                         }
1316                 }
1317         }
1318
1319         m_bSaveRequired = false;
1320         m_Data.m_mergedFile.StoreFileAttributes();
1321
1322         if ((bDoesNotExist)&&(DWORD(CRegDWORD(_T("Software\\TortoiseGitMerge\\AutoAdd"), TRUE))))
1323         {
1324                 // call TortoiseProc to add the new file to version control
1325                 CString cmd = _T("/command:add /noui /path:\"");
1326                 cmd += m_Data.m_mergedFile.GetFilename() + _T("\"");
1327                 if(!CAppUtils::RunTortoiseGitProc(cmd))
1328                         return false;
1329         }
1330         return true;
1331 }
1332
1333 void CMainFrame::OnFileSaveAs()
1334 {
1335         FileSaveAs();
1336 }
1337
1338 bool CMainFrame::FileSaveAs(bool bCheckResolved /*=true*/)
1339 {
1340         if (bCheckResolved && HasConflictsWontKeep())
1341                 return false;
1342
1343         CString fileName;
1344         if(!TryGetFileName(fileName))
1345                 return false;
1346
1347         SaveFile(fileName);
1348         return true;
1349 }
1350
1351 void CMainFrame::OnUpdateFileSave(CCmdUI *pCmdUI)
1352 {
1353         BOOL bEnable = FALSE;
1354         if (m_Data.m_mergedFile.InUse())
1355         {
1356                 if (IsViewGood(m_pwndBottomView)&&(m_pwndBottomView->m_pViewData))
1357                         bEnable = TRUE;
1358                 else if ( (IsViewGood(m_pwndRightView)&&(m_pwndRightView->m_pViewData)) &&
1359                                   (m_pwndRightView->IsModified() || (m_Data.m_yourFile.GetWindowName().Right(9).Compare(_T(": patched"))==0)) )
1360                         bEnable = TRUE;
1361         }
1362         pCmdUI->Enable(bEnable);
1363 }
1364
1365 void CMainFrame::OnUpdateFileSaveAs(CCmdUI *pCmdUI)
1366 {
1367         BOOL bEnable = FALSE;
1368         if (IsViewGood(m_pwndBottomView)&&(m_pwndBottomView->m_pViewData))
1369                 bEnable = TRUE;
1370         else if (IsViewGood(m_pwndRightView)&&(m_pwndRightView->m_pViewData))
1371                 bEnable = TRUE;
1372         pCmdUI->Enable(bEnable);
1373 }
1374
1375 void CMainFrame::OnUpdateViewOnewaydiff(CCmdUI *pCmdUI)
1376 {
1377         pCmdUI->SetCheck(!m_bOneWay);
1378         BOOL bEnable = TRUE;
1379         if (IsViewGood(m_pwndBottomView))
1380         {
1381                 bEnable = FALSE;
1382         }
1383         pCmdUI->Enable(bEnable);
1384 }
1385
1386 void CMainFrame::OnViewOptions()
1387 {
1388         CString sTemp;
1389         sTemp.LoadString(IDS_SETTINGSTITLE);
1390         CSettings dlg(sTemp);
1391         dlg.DoModal();
1392         if (dlg.IsReloadNeeded())
1393         {
1394                 if (CheckForSave()==IDCANCEL)
1395                         return;
1396                 CDiffColors::GetInstance().LoadRegistry();
1397                 LoadViews();
1398                 return;
1399         }
1400         CDiffColors::GetInstance().LoadRegistry();
1401         if (m_pwndBottomView)
1402                 m_pwndBottomView->Invalidate();
1403         if (m_pwndLeftView)
1404                 m_pwndLeftView->Invalidate();
1405         if (m_pwndRightView)
1406                 m_pwndRightView->Invalidate();
1407 }
1408
1409 void CMainFrame::OnClose()
1410 {
1411         UINT ret = IDNO;
1412         if (HasUnsavedEdits())
1413         {
1414                 CString sTemp;
1415                 sTemp.LoadString(IDS_ASKFORSAVE);
1416                 ret = MessageBox(sTemp, 0, MB_YESNOCANCEL | MB_ICONQUESTION);
1417
1418                 if (ret == IDYES)
1419                 {
1420                         if (!FileSave())
1421                                 return;
1422                 }
1423         }
1424         if ((ret == IDNO)||(ret == IDYES))
1425         {
1426                 WINDOWPLACEMENT wp;
1427
1428                 // before it is destroyed, save the position of the window
1429                 wp.length = sizeof wp;
1430
1431                 if (GetWindowPlacement(&wp))
1432                 {
1433
1434                         if (IsIconic())
1435                                 // never restore to Iconic state
1436                                 wp.showCmd = SW_SHOW ;
1437
1438                         if ((wp.flags & WPF_RESTORETOMAXIMIZED) != 0)
1439                                 // if maximized and maybe iconic restore maximized state
1440                                 wp.showCmd = SW_SHOWMAXIMIZED ;
1441
1442                         // and write it to the .INI file
1443                         WriteWindowPlacement(&wp);
1444                 }
1445                 __super::OnClose();
1446         }
1447 }
1448
1449 void CMainFrame::OnActivate(UINT nValue, CWnd* /*pwnd*/, BOOL /*bActivated?*/) {
1450         if (nValue != 0) // activated
1451         {
1452                 if (IsIconic())
1453                 {
1454                         m_bCheckReload = TRUE;
1455                 }
1456                 else
1457                         CheckForReload();
1458         }
1459 }
1460
1461 void CMainFrame::OnViewLinedown()
1462 {
1463         OnViewLineUpDown(1);
1464 }
1465
1466 void CMainFrame::OnViewLineup()
1467 {
1468         OnViewLineUpDown(-1);
1469 }
1470
1471 void CMainFrame::OnViewLineUpDown(int direction)
1472 {
1473         if (m_pwndLeftView)
1474                 m_pwndLeftView->ScrollToLine(m_pwndLeftView->m_nTopLine+direction);
1475         if (m_pwndRightView)
1476                 m_pwndRightView->ScrollToLine(m_pwndRightView->m_nTopLine+direction);
1477         if (m_pwndBottomView)
1478                 m_pwndBottomView->ScrollToLine(m_pwndBottomView->m_nTopLine+direction);
1479         m_wndLocatorBar.Invalidate();
1480         m_nMoveMovesToIgnore = MOVESTOIGNORE;
1481 }
1482
1483 void CMainFrame::OnViewLineleft()
1484 {
1485         OnViewLineLeftRight(-1);
1486 }
1487
1488 void CMainFrame::OnViewLineright()
1489 {
1490         OnViewLineLeftRight(1);
1491 }
1492
1493 void CMainFrame::OnViewLineLeftRight(int direction)
1494 {
1495         if (m_pwndLeftView)
1496                 m_pwndLeftView->ScrollSide(direction);
1497         if (m_pwndRightView)
1498                 m_pwndRightView->ScrollSide(direction);
1499         if (m_pwndBottomView)
1500                 m_pwndBottomView->ScrollSide(direction);
1501 }
1502
1503 void CMainFrame::OnEditUseTheirs()
1504 {
1505         if (m_pwndBottomView)
1506                 m_pwndBottomView->UseTheirTextBlock();
1507 }
1508 void CMainFrame::OnUpdateEditUsetheirblock(CCmdUI *pCmdUI)
1509 {
1510         pCmdUI->Enable(m_pwndBottomView && m_pwndBottomView->HasSelection());
1511 }
1512
1513 void CMainFrame::OnEditUseMine()
1514 {
1515         if (m_pwndBottomView)
1516                 m_pwndBottomView->UseMyTextBlock();
1517 }
1518 void CMainFrame::OnUpdateEditUsemyblock(CCmdUI *pCmdUI)
1519 {
1520         OnUpdateEditUsetheirblock(pCmdUI);
1521 }
1522
1523 void CMainFrame::OnEditUseTheirsThenMine()
1524 {
1525         if (m_pwndBottomView)
1526                 m_pwndBottomView->UseTheirAndYourBlock();
1527 }
1528
1529 void CMainFrame::OnUpdateEditUsetheirthenmyblock(CCmdUI *pCmdUI)
1530 {
1531         OnUpdateEditUsetheirblock(pCmdUI);
1532 }
1533
1534 void CMainFrame::OnEditUseMineThenTheirs()
1535 {
1536         if (m_pwndBottomView)
1537                 m_pwndBottomView->UseYourAndTheirBlock();
1538 }
1539
1540 void CMainFrame::OnUpdateEditUseminethentheirblock(CCmdUI *pCmdUI)
1541 {
1542         OnUpdateEditUsetheirblock(pCmdUI);
1543 }
1544
1545 void CMainFrame::OnEditUseleftblock()
1546 {
1547         if (m_pwndBottomView->IsWindowVisible())
1548                 m_pwndBottomView->UseRightBlock();
1549         else
1550                 m_pwndRightView->UseLeftBlock();
1551 }
1552
1553 void CMainFrame::OnUpdateEditUseleftblock(CCmdUI *pCmdUI)
1554 {
1555         pCmdUI->Enable(IsViewGood(m_pwndRightView) && m_pwndRightView->IsTarget() && m_pwndRightView->HasSelection());
1556 }
1557
1558 void CMainFrame::OnUpdateUseBlock(CCmdUI *pCmdUI)
1559 {
1560         pCmdUI->Enable(TRUE);
1561 }
1562
1563 void CMainFrame::OnEditUseleftfile()
1564 {
1565         if (m_pwndBottomView->IsWindowVisible())
1566                 m_pwndBottomView->UseRightFile();
1567         else
1568                 m_pwndRightView->UseLeftFile();
1569 }
1570
1571 void CMainFrame::OnUpdateEditUseleftfile(CCmdUI *pCmdUI)
1572 {
1573         pCmdUI->Enable(IsViewGood(m_pwndRightView) && m_pwndRightView->IsTarget());
1574 }
1575
1576 void CMainFrame::OnEditUseblockfromleftbeforeright()
1577 {
1578         if (m_pwndRightView)
1579                 m_pwndRightView->UseBothLeftFirst();
1580 }
1581
1582 void CMainFrame::OnUpdateEditUseblockfromleftbeforeright(CCmdUI *pCmdUI)
1583 {
1584         OnUpdateEditUseleftblock(pCmdUI);
1585 }
1586
1587 void CMainFrame::OnEditUseblockfromrightbeforeleft()
1588 {
1589         if (m_pwndRightView)
1590                 m_pwndRightView->UseBothRightFirst();
1591 }
1592
1593 void CMainFrame::OnUpdateEditUseblockfromrightbeforeleft(CCmdUI *pCmdUI)
1594 {
1595         OnUpdateEditUseleftblock(pCmdUI);
1596 }
1597
1598 void CMainFrame::OnFileReload()
1599 {
1600         if (CheckForSave()==IDCANCEL)
1601                 return;
1602         CDiffColors::GetInstance().LoadRegistry();
1603         LoadViews(-1);
1604 }
1605
1606 void CMainFrame::ActivateFrame(int nCmdShow)
1607 {
1608         // nCmdShow is the normal show mode this frame should be in
1609         // translate default nCmdShow (-1)
1610         if (nCmdShow == -1)
1611         {
1612                 if (!IsWindowVisible())
1613                         nCmdShow = SW_SHOWNORMAL;
1614                 else if (IsIconic())
1615                         nCmdShow = SW_RESTORE;
1616         }
1617
1618         // bring to top before showing
1619         BringToTop(nCmdShow);
1620
1621         if (nCmdShow != -1)
1622         {
1623                 // show the window as specified
1624                 WINDOWPLACEMENT wp;
1625
1626                 if ( !ReadWindowPlacement(&wp) )
1627                 {
1628                         ShowWindow(nCmdShow);
1629                 }
1630                 else
1631                 {
1632                         if ( nCmdShow != SW_SHOWNORMAL )
1633                                 wp.showCmd = nCmdShow;
1634
1635                         SetWindowPlacement(&wp);
1636                 }
1637
1638                 // and finally, bring to top after showing
1639                 BringToTop(nCmdShow);
1640         }
1641 }
1642
1643 BOOL CMainFrame::ReadWindowPlacement(WINDOWPLACEMENT * pwp)
1644 {
1645         CRegString placement = CRegString(_T("Software\\TortoiseGitMerge\\WindowPos"));
1646         CString sPlacement = placement;
1647         if (sPlacement.IsEmpty())
1648                 return FALSE;
1649         int nRead = _stscanf_s(sPlacement, _T("%u,%u,%d,%d,%d,%d,%d,%d,%d,%d"),
1650                                 &pwp->flags, &pwp->showCmd,
1651                                 &pwp->ptMinPosition.x, &pwp->ptMinPosition.y,
1652                                 &pwp->ptMaxPosition.x, &pwp->ptMaxPosition.y,
1653                                 &pwp->rcNormalPosition.left,  &pwp->rcNormalPosition.top,
1654                                 &pwp->rcNormalPosition.right, &pwp->rcNormalPosition.bottom);
1655         if ( nRead != 10 )
1656                 return FALSE;
1657         pwp->length = sizeof(WINDOWPLACEMENT);
1658
1659         return TRUE;
1660 }
1661
1662 void CMainFrame::WriteWindowPlacement(WINDOWPLACEMENT * pwp)
1663 {
1664         CRegString placement = CRegString(_T("Software\\TortoiseGitMerge\\WindowPos"));
1665         TCHAR szBuffer[_countof("-32767")*8 + sizeof("65535")*2];
1666
1667         _stprintf_s(szBuffer, _T("%u,%u,%d,%d,%d,%d,%d,%d,%d,%d"),
1668                         pwp->flags, pwp->showCmd,
1669                         pwp->ptMinPosition.x, pwp->ptMinPosition.y,
1670                         pwp->ptMaxPosition.x, pwp->ptMaxPosition.y,
1671                         pwp->rcNormalPosition.left, pwp->rcNormalPosition.top,
1672                         pwp->rcNormalPosition.right, pwp->rcNormalPosition.bottom);
1673         placement = szBuffer;
1674 }
1675
1676 void CMainFrame::OnUpdateMergeMarkasresolved(CCmdUI *pCmdUI)
1677 {
1678         if (pCmdUI == NULL)
1679                 return;
1680         BOOL bEnable = FALSE;
1681         if ((!m_bReadOnly)&&(m_Data.m_mergedFile.InUse()))
1682         {
1683                 if (IsViewGood(m_pwndBottomView)&&(m_pwndBottomView->m_pViewData))
1684                 {
1685                         bEnable = TRUE;
1686                 }
1687         }
1688         pCmdUI->Enable(bEnable);
1689 }
1690
1691 void CMainFrame::OnMergeMarkasresolved()
1692 {
1693         if(HasConflictsWontKeep())
1694                 return;
1695
1696         // now check if the file has already been saved and if not, save it.
1697         if (m_Data.m_mergedFile.InUse())
1698         {
1699                 if (IsViewGood(m_pwndBottomView)&&(m_pwndBottomView->m_pViewData))
1700                 {
1701                         FileSave(false);
1702                         m_bSaveRequired = false;
1703                 }
1704         }
1705         MarkAsResolved();
1706 }
1707
1708 BOOL CMainFrame::MarkAsResolved()
1709 {
1710         if (m_bReadOnly)
1711                 return FALSE;
1712         if (!IsViewGood(m_pwndBottomView))
1713                 return FALSE;
1714
1715         CString cmd = _T("/command:resolve /path:\"");
1716         cmd += m_Data.m_mergedFile.GetFilename();
1717         cmd += _T("\" /closeonend:1 /noquestion /skipcheck /silent");
1718         if (resolveMsgWnd)
1719         {
1720                 CString s;
1721                 s.Format(L" /resolvemsghwnd:%I64d /resolvemsgwparam:%I64d /resolvemsglparam:%I64d", (__int64)resolveMsgWnd, (__int64)resolveMsgWParam, (__int64)resolveMsgLParam);
1722                 cmd += s;
1723         }
1724         if(!CAppUtils::RunTortoiseGitProc(cmd))
1725                 return FALSE;
1726         m_bSaveRequired = false;
1727         return TRUE;
1728 }
1729
1730 void CMainFrame::OnUpdateMergeNextconflict(CCmdUI *pCmdUI)
1731 {
1732         BOOL bShow = FALSE;
1733         if (HasNextConflict(m_pwndBottomView))
1734                 bShow = TRUE;
1735         else if (HasNextConflict(m_pwndRightView))
1736                 bShow = TRUE;
1737         else if (HasNextConflict(m_pwndLeftView))
1738                 bShow = TRUE;
1739         pCmdUI->Enable(bShow);
1740 }
1741
1742 bool CMainFrame::HasNextConflict(CBaseView* view)
1743 {
1744         if (view == 0)
1745                 return false;
1746         if (!view->IsTarget())
1747                 return false;
1748         return view->HasNextConflict();
1749 }
1750
1751 void CMainFrame::OnUpdateMergePreviousconflict(CCmdUI *pCmdUI)
1752 {
1753         BOOL bShow = FALSE;
1754         if (HasPrevConflict(m_pwndBottomView))
1755                 bShow = TRUE;
1756         else if (HasPrevConflict(m_pwndRightView))
1757                 bShow = TRUE;
1758         else if (HasPrevConflict(m_pwndLeftView))
1759                 bShow = TRUE;
1760         pCmdUI->Enable(bShow);
1761 }
1762
1763 bool CMainFrame::HasPrevConflict(CBaseView* view)
1764 {
1765         if (view == 0)
1766                 return false;
1767         if (!view->IsTarget())
1768                 return false;
1769         return view->HasPrevConflict();
1770 }
1771
1772 void CMainFrame::OnUpdateNavigateNextdifference(CCmdUI *pCmdUI)
1773 {
1774         CBaseView* baseView = GetActiveBaseView();
1775         BOOL bShow = FALSE;
1776         if (baseView != 0)
1777                 bShow = baseView->HasNextDiff();
1778         pCmdUI->Enable(bShow);
1779 }
1780
1781 void CMainFrame::OnUpdateNavigatePreviousdifference(CCmdUI *pCmdUI)
1782 {
1783         CBaseView* baseView = GetActiveBaseView();
1784         BOOL bShow = FALSE;
1785         if (baseView != 0)
1786                 bShow = baseView->HasPrevDiff();
1787         pCmdUI->Enable(bShow);
1788 }
1789
1790 void CMainFrame::OnUpdateNavigateNextinlinediff(CCmdUI *pCmdUI)
1791 {
1792         BOOL bShow = FALSE;
1793         if (HasNextInlineDiff(m_pwndBottomView))
1794                 bShow = TRUE;
1795         else if (HasNextInlineDiff(m_pwndRightView))
1796                 bShow = TRUE;
1797         else if (HasNextInlineDiff(m_pwndLeftView))
1798                 bShow = TRUE;
1799         pCmdUI->Enable(bShow);
1800 }
1801
1802 bool CMainFrame::HasNextInlineDiff(CBaseView* view)
1803 {
1804         if (view == 0)
1805                 return false;
1806         if (!view->IsTarget())
1807                 return false;
1808         return view->HasNextInlineDiff();
1809 }
1810
1811 void CMainFrame::OnUpdateNavigatePrevinlinediff(CCmdUI *pCmdUI)
1812 {
1813         BOOL bShow = FALSE;
1814         if (HasPrevInlineDiff(m_pwndBottomView))
1815                 bShow = TRUE;
1816         else if (HasPrevInlineDiff(m_pwndRightView))
1817                 bShow = TRUE;
1818         else if (HasPrevInlineDiff(m_pwndLeftView))
1819                 bShow = TRUE;
1820         pCmdUI->Enable(bShow);
1821 }
1822
1823 bool CMainFrame::HasPrevInlineDiff(CBaseView* view)
1824 {
1825         if (view == 0)
1826                 return false;
1827         if (!view->IsTarget())
1828                 return false;
1829         return view->HasPrevInlineDiff();
1830 }
1831
1832 void CMainFrame::OnMoving(UINT fwSide, LPRECT pRect)
1833 {
1834         // if the pathfilelist dialog is attached to the mainframe,
1835         // move it along with the mainframe
1836         if (::IsWindow(m_dlgFilePatches.m_hWnd))
1837         {
1838                 RECT patchrect;
1839                 m_dlgFilePatches.GetWindowRect(&patchrect);
1840                 if (::IsWindow(m_hWnd))
1841                 {
1842                         RECT thisrect;
1843                         GetWindowRect(&thisrect);
1844                         if (patchrect.right == thisrect.left)
1845                         {
1846                                 m_dlgFilePatches.SetWindowPos(NULL, patchrect.left - (thisrect.left - pRect->left), patchrect.top - (thisrect.top - pRect->top),
1847                                         0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
1848                         }
1849                 }
1850         }
1851         __super::OnMoving(fwSide, pRect);
1852 }
1853
1854 void CMainFrame::OnUpdateEditCopy(CCmdUI *pCmdUI)
1855 {
1856         BOOL bShow = FALSE;
1857         if ((m_pwndBottomView)&&(m_pwndBottomView->HasSelection()))
1858                 bShow = TRUE;
1859         else if ((m_pwndRightView)&&(m_pwndRightView->HasSelection()))
1860                 bShow = TRUE;
1861         else if ((m_pwndLeftView)&&(m_pwndLeftView->HasSelection()))
1862                 bShow = TRUE;
1863         pCmdUI->Enable(bShow);
1864 }
1865
1866 void CMainFrame::OnUpdateEditPaste(CCmdUI *pCmdUI)
1867 {
1868         BOOL bWritable = FALSE;
1869         if ((m_pwndBottomView)&&(m_pwndBottomView->IsWritable()))
1870                 bWritable = TRUE;
1871         else if ((m_pwndRightView)&&(m_pwndRightView->IsWritable()))
1872                 bWritable = TRUE;
1873         else if ((m_pwndLeftView)&&(m_pwndLeftView->IsWritable()))
1874                 bWritable = TRUE;
1875         pCmdUI->Enable(bWritable && ::IsClipboardFormatAvailable(CF_TEXT));
1876 }
1877
1878 void CMainFrame::OnViewSwitchleft()
1879 {
1880         int ret = IDNO;
1881         if (HasUnsavedEdits())
1882         {
1883                 CString sTemp;
1884                 sTemp.LoadString(IDS_ASKFORSAVE);
1885                 ret = MessageBox(sTemp, 0, MB_YESNOCANCEL | MB_ICONQUESTION);
1886                 if (ret == IDYES)
1887                 {
1888                         if (!FileSave())
1889                                 return;
1890                 }
1891         }
1892         if ((ret == IDNO)||(ret == IDYES))
1893         {
1894                 CWorkingFile file = m_Data.m_baseFile;
1895                 m_Data.m_baseFile = m_Data.m_yourFile;
1896                 m_Data.m_yourFile = file;
1897                 if (m_Data.m_mergedFile.GetFilename().CompareNoCase(m_Data.m_yourFile.GetFilename())==0)
1898                 {
1899                         m_Data.m_mergedFile = m_Data.m_baseFile;
1900                 }
1901                 else if (m_Data.m_mergedFile.GetFilename().CompareNoCase(m_Data.m_baseFile.GetFilename())==0)
1902                 {
1903                         m_Data.m_mergedFile = m_Data.m_yourFile;
1904                 }
1905                 LoadViews();
1906         }
1907 }
1908
1909 void CMainFrame::OnUpdateViewSwitchleft(CCmdUI *pCmdUI)
1910 {
1911         BOOL bEnable = !IsViewGood(m_pwndBottomView);
1912         pCmdUI->Enable(bEnable);
1913 }
1914
1915 void CMainFrame::OnUpdateViewShowfilelist(CCmdUI *pCmdUI)
1916 {
1917         BOOL bEnable = m_dlgFilePatches.HasFiles();
1918         pCmdUI->Enable(bEnable);
1919         pCmdUI->SetCheck(m_dlgFilePatches.IsWindowVisible());
1920 }
1921
1922 void CMainFrame::OnViewShowfilelist()
1923 {
1924         m_dlgFilePatches.ShowWindow(m_dlgFilePatches.IsWindowVisible() ? SW_HIDE : SW_SHOW);
1925 }
1926
1927 void CMainFrame::OnEditUndo()
1928 {
1929         if (CUndo::GetInstance().CanUndo())
1930         {
1931                 CUndo::GetInstance().Undo(m_pwndLeftView, m_pwndRightView, m_pwndBottomView);
1932         }
1933 }
1934
1935 void CMainFrame::OnUpdateEditUndo(CCmdUI *pCmdUI)
1936 {
1937         pCmdUI->Enable(CUndo::GetInstance().CanUndo());
1938 }
1939
1940 int CMainFrame::CheckForReload()
1941 {
1942         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
1943         if (bLock)
1944         {
1945                 return IDNO;
1946         }
1947         bLock = true;
1948         bool bSourceChanged =
1949                         m_Data.m_baseFile.HasSourceFileChanged()
1950                         || m_Data.m_yourFile.HasSourceFileChanged()
1951                         || m_Data.m_theirFile.HasSourceFileChanged()
1952                         /*|| m_Data.m_mergedFile.HasSourceFileChanged()*/;
1953         if (!bSourceChanged)
1954         {
1955                 bLock = false;
1956                 return IDNO;
1957         }
1958
1959         int idsMessage = HasUnsavedEdits() ? IDS_WARNMODIFIEDOUTSIDELOOSECHANGES : IDS_WARNMODIFIEDOUTSIDE;
1960         UINT ret = CMessageBox::Show(m_hWnd, idsMessage, IDS_APPNAME, MB_YESNO | MB_ICONQUESTION);
1961
1962         if (ret == IDYES)
1963         {
1964                 CDiffColors::GetInstance().LoadRegistry();
1965                 LoadViews(-1);
1966         }
1967         else
1968         {
1969                 if (IsViewGood(m_pwndBottomView)) // three pane view
1970                 {
1971                         /*if (m_Data.m_sourceFile.HasSourceFileChanged())
1972                                 m_pwndBottomView->SetModified();
1973                         if (m_Data.m_mergedFile.HasSourceFileChanged())
1974                                 m_pwndBottomView->SetModified();//*/
1975                         if (m_Data.m_yourFile.HasSourceFileChanged())
1976                                 m_pwndRightView->SetModified();
1977                         if (m_Data.m_theirFile.HasSourceFileChanged())
1978                                 m_pwndLeftView->SetModified();
1979                 }
1980                 else if (IsViewGood(m_pwndRightView)) // two pane view
1981                 {
1982                         if (m_Data.m_baseFile.HasSourceFileChanged())
1983                                 m_pwndLeftView->SetModified();
1984                         if (m_Data.m_yourFile.HasSourceFileChanged())
1985                                 m_pwndRightView->SetModified();
1986                 }
1987                 else
1988                 {
1989                         if (m_Data.m_yourFile.HasSourceFileChanged())
1990                                 m_pwndLeftView->SetModified();
1991                 }
1992
1993                 // no reload just store updated file time
1994                 m_Data.m_baseFile.StoreFileAttributes();
1995                 m_Data.m_theirFile.StoreFileAttributes();
1996                 m_Data.m_yourFile.StoreFileAttributes();
1997                 //m_Data.m_mergedFile.StoreFileAttributes();
1998         }
1999         bLock = false;
2000         return ret;
2001 }
2002
2003 int CMainFrame::CheckForSave()
2004 {
2005         UINT ret = IDNO;
2006         if (HasUnsavedEdits())
2007         {
2008                 CString sTemp;
2009                 sTemp.LoadString(IDS_WARNMODIFIEDLOOSECHANGES);
2010                 ret = MessageBox(sTemp, 0, MB_YESNOCANCEL | MB_ICONQUESTION);
2011
2012                 if (ret == IDYES)
2013                 {
2014                         if (!FileSave())
2015                                 ret = IDCANCEL;
2016                 }
2017         }
2018         return ret;
2019 }
2020
2021 bool CMainFrame::HasUnsavedEdits() const
2022 {
2023         return HasUnsavedEdits(m_pwndBottomView) || HasUnsavedEdits(m_pwndRightView) || m_bSaveRequired;
2024 }
2025
2026 bool CMainFrame::HasUnsavedEdits(const CBaseView* view)
2027 {
2028         if(view == 0)
2029                 return false;
2030         return view->IsModified();
2031 }
2032
2033 bool CMainFrame::IsViewGood(const CBaseView* view)
2034 {
2035         return CBaseView::IsViewGood(view);
2036 }
2037
2038 void CMainFrame::OnViewInlinediffword()
2039 {
2040         m_bInlineWordDiff = !m_bInlineWordDiff;
2041         if (m_pwndLeftView)
2042         {
2043                 m_pwndLeftView->SetInlineWordDiff(m_bInlineWordDiff);
2044                 m_pwndLeftView->BuildAllScreen2ViewVector();
2045                 m_pwndLeftView->DocumentUpdated();
2046         }
2047         if (m_pwndRightView)
2048         {
2049                 m_pwndRightView->SetInlineWordDiff(m_bInlineWordDiff);
2050                 m_pwndRightView->BuildAllScreen2ViewVector();
2051                 m_pwndRightView->DocumentUpdated();
2052         }
2053         if (m_pwndBottomView)
2054         {
2055                 m_pwndBottomView->SetInlineWordDiff(m_bInlineWordDiff);
2056                 m_pwndBottomView->BuildAllScreen2ViewVector();
2057                 m_pwndBottomView->DocumentUpdated();
2058         }
2059         m_wndLineDiffBar.DocumentUpdated();
2060 }
2061
2062 void CMainFrame::OnUpdateViewInlinediffword(CCmdUI *pCmdUI)
2063 {
2064         pCmdUI->Enable(m_bInlineDiff && IsViewGood(m_pwndLeftView) && IsViewGood(m_pwndRightView));
2065         pCmdUI->SetCheck(m_bInlineWordDiff);
2066 }
2067
2068 void CMainFrame::OnViewInlinediff()
2069 {
2070         m_bInlineDiff = !m_bInlineDiff;
2071         if (m_pwndLeftView)
2072         {
2073                 m_pwndLeftView->SetInlineDiff(m_bInlineDiff);
2074                 m_pwndLeftView->BuildAllScreen2ViewVector();
2075                 m_pwndLeftView->DocumentUpdated();
2076         }
2077         if (m_pwndRightView)
2078         {
2079                 m_pwndRightView->SetInlineDiff(m_bInlineDiff);
2080                 m_pwndRightView->BuildAllScreen2ViewVector();
2081                 m_pwndRightView->DocumentUpdated();
2082         }
2083         if (m_pwndBottomView)
2084         {
2085                 m_pwndBottomView->SetInlineDiff(m_bInlineDiff);
2086                 m_pwndBottomView->BuildAllScreen2ViewVector();
2087                 m_pwndBottomView->DocumentUpdated();
2088         }
2089         m_wndLineDiffBar.DocumentUpdated();
2090 }
2091
2092 void CMainFrame::OnUpdateViewInlinediff(CCmdUI *pCmdUI)
2093 {
2094         pCmdUI->Enable(IsViewGood(m_pwndLeftView) && IsViewGood(m_pwndRightView));
2095         pCmdUI->SetCheck(m_bInlineDiff);
2096 }
2097
2098 void CMainFrame::OnUpdateEditCreateunifieddifffile(CCmdUI *pCmdUI)
2099 {
2100         // "create unified diff file" is only available if two files
2101         // are diffed, not three.
2102         bool bEnabled = true;
2103         if (!IsViewGood(m_pwndLeftView))
2104                 bEnabled = false;
2105         else if (!IsViewGood(m_pwndRightView))
2106                 bEnabled = false;
2107         else if (IsViewGood(m_pwndBottomView)) //no negation here
2108                 bEnabled = false;
2109         pCmdUI->Enable(bEnabled);
2110 }
2111
2112 void CMainFrame::OnEditCreateunifieddifffile()
2113 {
2114         CString origFile, modifiedFile;
2115         // the original file is the one on the left
2116         if (m_pwndLeftView)
2117                 origFile = m_pwndLeftView->m_sFullFilePath;
2118         if (m_pwndRightView)
2119                 modifiedFile = m_pwndRightView->m_sFullFilePath;
2120         if (origFile.IsEmpty() || modifiedFile.IsEmpty())
2121                 return;
2122
2123         CString outputFile;
2124         if(!TryGetFileName(outputFile))
2125                 return;
2126
2127         CAppUtils::CreateUnifiedDiff(origFile, modifiedFile, outputFile, true);
2128 }
2129
2130 void CMainFrame::OnUpdateViewLinediffbar(CCmdUI *pCmdUI)
2131 {
2132         pCmdUI->SetCheck(m_bLineDiff);
2133         pCmdUI->Enable();
2134 }
2135
2136 void CMainFrame::OnViewLinediffbar()
2137 {
2138         m_bLineDiff = !m_bLineDiff;
2139         m_wndLineDiffBar.ShowPane(m_bLineDiff, false, true);
2140         m_wndLineDiffBar.DocumentUpdated();
2141         m_wndLocatorBar.ShowPane(m_bLocatorBar, false, true);
2142         m_wndLocatorBar.DocumentUpdated();
2143 }
2144
2145 void CMainFrame::OnUpdateViewLocatorbar(CCmdUI *pCmdUI)
2146 {
2147         pCmdUI->SetCheck(m_bLocatorBar);
2148         pCmdUI->Enable();
2149 }
2150
2151 void CMainFrame::OnViewLocatorbar()
2152 {
2153         m_bLocatorBar = !m_bLocatorBar;
2154         m_wndLocatorBar.ShowPane(m_bLocatorBar, false, true);
2155         m_wndLocatorBar.DocumentUpdated();
2156         m_wndLineDiffBar.ShowPane(m_bLineDiff, false, true);
2157         m_wndLineDiffBar.DocumentUpdated();
2158 }
2159
2160 void CMainFrame::OnViewComparewhitespaces()
2161 {
2162         if (CheckForSave()==IDCANCEL)
2163                 return;
2164         CRegDWORD regIgnoreWS = CRegDWORD(_T("Software\\TortoiseGitMerge\\IgnoreWS"));
2165         regIgnoreWS = 0;
2166         LoadViews(-1);
2167 }
2168
2169 void CMainFrame::OnUpdateViewComparewhitespaces(CCmdUI *pCmdUI)
2170 {
2171         CRegDWORD regIgnoreWS = CRegDWORD(_T("Software\\TortoiseGitMerge\\IgnoreWS"));
2172         DWORD dwIgnoreWS = regIgnoreWS;
2173         pCmdUI->SetCheck(dwIgnoreWS == 0);
2174 }
2175
2176 void CMainFrame::OnViewIgnorewhitespacechanges()
2177 {
2178         if (CheckForSave()==IDCANCEL)
2179                 return;
2180         CRegDWORD regIgnoreWS = CRegDWORD(_T("Software\\TortoiseGitMerge\\IgnoreWS"));
2181         regIgnoreWS = 2;
2182         LoadViews(-1);
2183 }
2184
2185 void CMainFrame::OnUpdateViewIgnorewhitespacechanges(CCmdUI *pCmdUI)
2186 {
2187         CRegDWORD regIgnoreWS = CRegDWORD(_T("Software\\TortoiseGitMerge\\IgnoreWS"));
2188         DWORD dwIgnoreWS = regIgnoreWS;
2189         pCmdUI->SetCheck(dwIgnoreWS == 2);
2190 }
2191
2192 void CMainFrame::OnViewIgnoreallwhitespacechanges()
2193 {
2194         if (CheckForSave()==IDCANCEL)
2195                 return;
2196         CRegDWORD regIgnoreWS = CRegDWORD(_T("Software\\TortoiseGitMerge\\IgnoreWS"));
2197         regIgnoreWS = 1;
2198         LoadViews(-1);
2199 }
2200
2201 void CMainFrame::OnUpdateViewIgnoreallwhitespacechanges(CCmdUI *pCmdUI)
2202 {
2203         CRegDWORD regIgnoreWS = CRegDWORD(_T("Software\\TortoiseGitMerge\\IgnoreWS"));
2204         DWORD dwIgnoreWS = regIgnoreWS;
2205         pCmdUI->SetCheck(dwIgnoreWS == 1);
2206 }
2207
2208 void CMainFrame::OnViewMovedBlocks()
2209 {
2210         m_bViewMovedBlocks = !(DWORD)m_regViewModedBlocks;
2211         m_regViewModedBlocks = m_bViewMovedBlocks;
2212         LoadViews(-1);
2213 }
2214
2215 void CMainFrame::OnUpdateViewMovedBlocks(CCmdUI *pCmdUI)
2216 {
2217         pCmdUI->SetCheck(m_bViewMovedBlocks);
2218         BOOL bEnable = TRUE;
2219         if (IsViewGood(m_pwndBottomView))
2220         {
2221                 bEnable = FALSE;
2222         }
2223         pCmdUI->Enable(bEnable);
2224 }
2225
2226 bool CMainFrame::HasConflictsWontKeep()
2227 {
2228         const int nConflictLine = CheckResolved();
2229         if (nConflictLine < 0)
2230                 return false;
2231
2232         CString sTemp;
2233         sTemp.Format(IDS_ERR_MAINFRAME_FILEHASCONFLICTS, m_pwndBottomView->m_pViewData->GetLineNumber(nConflictLine)+1);
2234         if (MessageBox(sTemp, 0, MB_ICONERROR | MB_YESNO)==IDYES)
2235                 return false;
2236
2237         if (m_pwndBottomView)
2238                 m_pwndBottomView->GoToLine(nConflictLine);
2239         return true;
2240 }
2241
2242 bool CMainFrame::TryGetFileName(CString& result)
2243 {
2244         return CCommonAppUtils::FileOpenSave(result, NULL, IDS_SAVEASTITLE, IDS_COMMONFILEFILTER, false, m_hWnd);
2245 }
2246
2247 CBaseView* CMainFrame::GetActiveBaseView() const
2248 {
2249         CView* activeView = GetActiveView();
2250         CBaseView* activeBase = dynamic_cast<CBaseView*>( activeView );
2251         return activeBase;
2252 }
2253
2254 void CMainFrame::SetWindowTitle()
2255 {
2256         // try to find a suitable window title
2257         CString sYour = m_Data.m_yourFile.GetDescriptiveName();
2258         if (sYour.Find(_T(" - "))>=0)
2259                 sYour = sYour.Left(sYour.Find(_T(" - ")));
2260         if (sYour.Find(_T(" : "))>=0)
2261                 sYour = sYour.Left(sYour.Find(_T(" : ")));
2262         CString sTheir = m_Data.m_theirFile.GetDescriptiveName();
2263         if (sTheir.IsEmpty())
2264                 sTheir = m_Data.m_baseFile.GetDescriptiveName();
2265         if (sTheir.Find(_T(" - "))>=0)
2266                 sTheir = sTheir.Left(sTheir.Find(_T(" - ")));
2267         if (sTheir.Find(_T(" : "))>=0)
2268                 sTheir = sTheir.Left(sTheir.Find(_T(" : ")));
2269
2270         if (!sYour.IsEmpty() && !sTheir.IsEmpty())
2271         {
2272                 if (sYour.CompareNoCase(sTheir)==0)
2273                         SetWindowText(sYour + _T(" - TortoiseGitMerge"));
2274                 else if ((sYour.GetLength() < 10) &&
2275                         (sTheir.GetLength() < 10))
2276                         SetWindowText(sYour + _T(" - ") + sTheir + _T(" - TortoiseGitMerge"));
2277                 else
2278                 {
2279                         // we have two very long descriptive texts here, which
2280                         // means we have to find a way to use them as a window
2281                         // title in a shorter way.
2282                         // for simplicity, we just use the one from "yourfile"
2283                         SetWindowText(sYour + _T(" - TortoiseGitMerge"));
2284                 }
2285         }
2286         else if (!sYour.IsEmpty())
2287                 SetWindowText(sYour + _T(" - TortoiseGitMerge"));
2288         else if (!sTheir.IsEmpty())
2289                 SetWindowText(sTheir + _T(" - TortoiseGitMerge"));
2290         else
2291                 SetWindowText(L"TortoiseGitMerge");
2292 }