src/TortoiseProc/ConflictResolveDlg.h

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2007-2008 - TortoiseSVN
   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 "svn_wc.h"
  21 #include "StandAloneDlg.h"
  22
  23 /**
  24  * \ingroup TortoiseProc
  25  * Helper dialog used in merge callbacks to resolve conflicts.
  26  */
  27 class CConflictResolveDlg : public CResizableStandAloneDialog
  28 {
  29         DECLARE_DYNAMIC(CConflictResolveDlg)
  30
  31 public:
  32         CConflictResolveDlg(CWnd* pParent = NULL);   // standard constructor
  33         virtual ~CConflictResolveDlg();
  34
  35         void SetConflictDescription(const svn_wc_conflict_description_t * description) {m_pConflictDescription = description;}
  36         svn_wc_conflict_choice_t GetResult() {return m_choice;}
  37         const CString& GetMergedFile() {return m_mergedfile;}
  38         bool IsCancelled() const {return m_bCancelled;}
  39         enum { IDD = IDD_CONFLICTRESOLVE };
  40
  41 protected:
  42         virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
  43         virtual void OnCancel();
  44         virtual BOOL OnInitDialog();
  45         afx_msg void OnBnClickedUselocal();
  46         afx_msg void OnBnClickedUserepo();
  47         afx_msg void OnBnClickedEditconflict();
  48         afx_msg void OnBnClickedResolved();
  49         afx_msg void OnBnClickedResolvealllater();
  50         afx_msg void OnBnClickedHelp();
  51         afx_msg void OnBnClickedAbort();
  52
  53         DECLARE_MESSAGE_MAP()
  54
  55 private:
  56         const svn_wc_conflict_description_t *   m_pConflictDescription;
  57         svn_wc_conflict_choice_t                                m_choice;
  58         CString                                                                 m_mergedfile;
  59         bool                                                                    m_bCancelled;
  60 };