1
// TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2013, 2016-2017, 2024 - 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 // MergeAbort.cpp : implementation file
23 #include "TortoiseProc.h"
24 #include "MergeAbortDlg.h"
25 #include "FileDiffDlg.h"
28 // CMergeAbortDlg dialog
30 IMPLEMENT_DYNAMIC(CMergeAbortDlg
, CStateStandAloneDialog
)
32 CMergeAbortDlg::CMergeAbortDlg(CWnd
* pParent
/*=nullptr*/)
33 : CStateStandAloneDialog(CMergeAbortDlg::IDD
, pParent
)
38 CMergeAbortDlg::~CMergeAbortDlg()
42 void CMergeAbortDlg::DoDataExchange(CDataExchange
* pDX
)
44 CDialog::DoDataExchange(pDX
);
48 BEGIN_MESSAGE_MAP(CMergeAbortDlg
, CStateStandAloneDialog
)
49 ON_BN_CLICKED(IDC_SHOW_MODIFIED_FILES
, &CMergeAbortDlg::OnBnClickedShowModifiedFiles
)
53 // CMergeAbortDlg message handlers
54 BOOL
CMergeAbortDlg::OnInitDialog()
56 CStateStandAloneDialog::OnInitDialog();
57 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
59 CAppUtils::SetWindowTitle(*this, g_Git
.m_CurrentDir
);
61 AdjustControlSize(IDC_RADIO_RESET_MERGE
);
62 AdjustControlSize(IDC_RADIO_RESET_MIXED
);
63 AdjustControlSize(IDC_RADIO_RESET_HARD
);
65 EnableSaveRestore(L
"MergeAbortDlg");
67 this->CheckRadioButton(IDC_RADIO_RESET_MERGE
, IDC_RADIO_RESET_HARD
, IDC_RADIO_RESET_MERGE
+ m_ResetType
);
72 void CMergeAbortDlg::OnOK()
74 this->UpdateData(TRUE
);
75 m_ResetType
= this->GetCheckedRadioButton(IDC_RADIO_RESET_MERGE
, IDC_RADIO_RESET_HARD
) - IDC_RADIO_RESET_MERGE
;
76 return CStateStandAloneDialog::OnOK();
79 void CMergeAbortDlg::OnBnClickedShowModifiedFiles()
83 dlg
.m_strRev1
= L
"HEAD";
84 dlg
.m_strRev2
= GIT_REV_ZERO
;