src/TortoiseProc/DeleteConflictDlg.h

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