src/TortoiseProc/SubmoduleResolveConflictDlg.h

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2012, 2014 - TortoiseGit
   4
   5 // This program is free software; you can redistribute it and/or
   6 // modify it under the terms of the GNU General Public License
   7 // as published by the Free Software Foundation; either version 2
   8 // of the License, or (at your option) any later version.
   9
  10 // This program is distributed in the hope that it will be useful,
  11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  13 // GNU General Public License for more details.
  14
  15 // You should have received a copy of the GNU General Public License
  16 // along with this program; if not, write to the Free Software Foundation,
  17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  18 //
  19 #pragma once
  20 #include "HorizontalResizableStandAloneDialog.h"
  21 #include "resource.h"
  22 #include "GitDiff.h"
  23
  24 class CSubmoduleResolveConflictDlg : public CHorizontalResizableStandAloneDialog
  25 {
  26         DECLARE_DYNAMIC(CSubmoduleResolveConflictDlg)
  27
  28 public:
  29         CSubmoduleResolveConflictDlg(CWnd* pParent = NULL);
  30         virtual ~CSubmoduleResolveConflictDlg();
  31
  32         enum { IDD = IDD_RESOLVESUBMODULECONFLICT };
  33
  34         void SetDiff(const CString& path, bool revertTheirMy, const CString& baseHash, const CString& baseSubject, bool baseOK, const CString& mineHash, const CString& mineSubject, bool mineOK, CGitDiff::ChangeType mineChangeType, const CString& theirsHash, const CString& theirsSubject, bool theirsOK, CGitDiff::ChangeType theirsChangeType);
  35
  36         bool m_bResolved;
  37
  38 protected:
  39         virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
  40         virtual BOOL OnInitDialog();
  41         virtual HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
  42
  43         void Resolve(const CString& path, bool useMine);
  44
  45         afx_msg void OnBnClickedLog();
  46         afx_msg void OnBnClickedLog2();
  47         afx_msg void OnBnClickedLog3();
  48         void ShowLog(CString hash);
  49         afx_msg void OnBnClickedButtonUpdate2();
  50         afx_msg void OnBnClickedButtonUpdate3();
  51
  52         DECLARE_MESSAGE_MAP()
  53
  54         CString m_sPath;
  55
  56         CString m_sBaseHash;
  57         CString m_sBaseSubject;
  58         bool    m_bBaseOK;
  59         CString m_sMineHash;
  60         CString m_sMineSubject;
  61         bool    m_bMineOK;
  62         CString m_sTheirsHash;
  63         CString m_sTheirsSubject;
  64         bool    m_bTheirsOK;
  65         CGitDiff::ChangeType m_nChangeTypeMine;
  66         CGitDiff::ChangeType m_nChangeTypeTheirs;
  67         bool    m_bRevertTheirMy;
  68 };