added new log filter (for subject)
[TortoiseGit.git] / src / TortoiseProc / DeleteConflictDlg.cpp
blobe7210cd013a3cfc1e6808601c554fe546104838f
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2009-2011 - 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_bIsDelete =FALSE;
40 CDeleteConflictDlg::~CDeleteConflictDlg()
44 void CDeleteConflictDlg::DoDataExchange(CDataExchange* pDX)
46 CDialog::DoDataExchange(pDX);
48 DDX_Text(pDX, IDC_LOCAL_STATUS, m_LocalStatus);
49 DDX_Text(pDX, IDC_REMOTE_STATUS, m_RemoteStatus);
53 BEGIN_MESSAGE_MAP(CDeleteConflictDlg, CStandAloneDialog)
54 ON_BN_CLICKED(IDC_DELETE, &CDeleteConflictDlg::OnBnClickedDelete)
55 ON_BN_CLICKED(IDC_MODIFY, &CDeleteConflictDlg::OnBnClickedModify)
56 END_MESSAGE_MAP()
59 BOOL CDeleteConflictDlg::OnInitDialog()
61 CStandAloneDialog::OnInitDialog();
63 if(this->m_bShowModifiedButton )
64 this->GetDlgItem(IDC_MODIFY)->SetWindowText(_T("Modified"));
65 else
66 this->GetDlgItem(IDC_MODIFY)->SetWindowText(_T("Created"));
68 CString sWindowTitle;
69 GetWindowText(sWindowTitle);
70 CAppUtils::SetWindowTitle(m_hWnd, this->m_File, sWindowTitle);
72 return TRUE;
74 // CDeleteConflictDlg message handlers
76 void CDeleteConflictDlg::OnBnClickedDelete()
78 m_bIsDelete = TRUE;
79 OnOK();
82 void CDeleteConflictDlg::OnBnClickedModify()
84 m_bIsDelete = FALSE;
85 OnOK();