src/TortoiseProc/DeleteConflictDlg.h

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2009-2011, 2017 - 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
  21 #include "StandAloneDlg.h"
  22 #include "TGitPath.h"
  23 // CDeleteConflictDlg dialog
  24
  25 class CDeleteConflictDlg : public CStandAloneDialog
  26 {
  27         DECLARE_DYNAMIC(CDeleteConflictDlg)
  28
  29 public:
  30         CDeleteConflictDlg(CWnd* pParent = nullptr);   // standard constructor
  31         virtual ~CDeleteConflictDlg();
  32
  33 // Dialog Data
  34         enum { IDD = IDD_RESOLVE_CONFLICT };
  35
  36 protected:
  37         virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
  38         afx_msg void OnBnClickedLog();
  39         afx_msg void OnBnClickedLog2();
  40         afx_msg void OnBnClickedDelete();
  41         afx_msg void OnBnClickedModify();
  42         afx_msg void OnBnClickedShowdiff();
  43         virtual BOOL OnInitDialog() override;
  44         void ShowLog(CString hash);
  45         DECLARE_MESSAGE_MAP()
  46
  47 public:
  48         CString m_LocalStatus;
  49         CString m_RemoteStatus;
  50         CString m_LocalHash;
  51         CString m_RemoteHash;
  52         BOOL    m_bShowModifiedButton;
  53         CTGitPath       m_File;
  54         CTGitPath       m_FileBaseVersion;
  55         BOOL    m_bIsDelete;
  56         bool    m_bDiffMine;
  57 };