If there are submodule changes in the file list when resolving conflicts while rebasi...
[TortoiseGit.git] / src / TortoiseProc / DeleteConflictDlg.cpp
blob3d409b19d1e55a2f100652fe50417e7f9f0d1a56
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2009-2012 - TortoiseGit
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.
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.
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.
19 // DeleteConflictDlg.cpp : implementation file
22 #include "stdafx.h"
23 #include "resource.h"
24 #include "DeleteConflictDlg.h"
25 #include "AppUtils.h"
27 // CDeleteConflictDlg dialog
29 IMPLEMENT_DYNAMIC(CDeleteConflictDlg, CStandAloneDialog)
31 CDeleteConflictDlg::CDeleteConflictDlg(CWnd* pParent /*=NULL*/)
32 : CStandAloneDialog(CDeleteConflictDlg::IDD, pParent)
34 , m_LocalStatus(_T(""))
35 , m_RemoteStatus(_T(""))
37 m_bShowModifiedButton = FALSE;
38 m_bIsDelete =FALSE;
41 CDeleteConflictDlg::~CDeleteConflictDlg()
45 void CDeleteConflictDlg::DoDataExchange(CDataExchange* pDX)
47 CDialog::DoDataExchange(pDX);
49 DDX_Text(pDX, IDC_LOCAL_STATUS, m_LocalStatus);
50 DDX_Text(pDX, IDC_REMOTE_STATUS, m_RemoteStatus);
54 BEGIN_MESSAGE_MAP(CDeleteConflictDlg, CStandAloneDialog)
55 ON_BN_CLICKED(IDC_DELETE, &CDeleteConflictDlg::OnBnClickedDelete)
56 ON_BN_CLICKED(IDC_MODIFY, &CDeleteConflictDlg::OnBnClickedModify)
57 END_MESSAGE_MAP()
60 BOOL CDeleteConflictDlg::OnInitDialog()
62 CStandAloneDialog::OnInitDialog();
64 if(this->m_bShowModifiedButton )
65 this->GetDlgItem(IDC_MODIFY)->SetWindowText(CString(MAKEINTRESOURCE(IDS_SVNACTION_MODIFIED)));
66 else
67 this->GetDlgItem(IDC_MODIFY)->SetWindowText(CString(MAKEINTRESOURCE(IDS_PROC_CREATED)));
69 CString sWindowTitle;
70 GetWindowText(sWindowTitle);
71 CAppUtils::SetWindowTitle(m_hWnd, this->m_File, sWindowTitle);
73 return TRUE;
75 // CDeleteConflictDlg message handlers
77 void CDeleteConflictDlg::OnBnClickedDelete()
79 m_bIsDelete = TRUE;
80 OnOK();
83 void CDeleteConflictDlg::OnBnClickedModify()
85 m_bIsDelete = FALSE;
86 OnOK();