src/TortoiseProc/MergeDlg.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2007-2009 - 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
  20 // MergeDlg.cpp : implementation file
  21 //
  22
  23 #include "stdafx.h"
  24
  25 #include "Git.h"
  26 #include "TortoiseProc.h"
  27 #include "MergeDlg.h"
  28
  29
  30 #include "Messagebox.h"
  31 // CMergeDlg dialog
  32
  33 IMPLEMENT_DYNAMIC(CMergeDlg, CResizableStandAloneDialog)
  34
  35 CMergeDlg::CMergeDlg(CWnd* pParent /*=NULL*/)
  36         : CResizableStandAloneDialog(CMergeDlg::IDD, pParent),
  37         CChooseVersion(this)
  38 {
  39
  40         m_pDefaultText = _T("<Auto Generated by Git>");
  41         m_bNoFF=false;
  42         m_bSquash=false;
  43         m_bNoCommit=false;
  44
  45 }
  46
  47 CMergeDlg::~CMergeDlg()
  48 {
  49 }
  50
  51 void CMergeDlg::DoDataExchange(CDataExchange* pDX)
  52 {
  53         CDialog::DoDataExchange(pDX);
  54
  55         CHOOSE_VERSION_DDX;
  56
  57         DDX_Check(pDX,IDC_CHECK_NOFF,this->m_bNoFF);
  58         DDX_Check(pDX,IDC_CHECK_SQUASH,this->m_bSquash);
  59         DDX_Check(pDX,IDC_CHECK_NOCOMMIT,this->m_bNoCommit);
  60         DDX_Control(pDX, IDC_LOGMESSAGE, m_cLogMessage);
  61 }
  62
  63
  64 BEGIN_MESSAGE_MAP(CMergeDlg, CResizableStandAloneDialog)
  65         CHOOSE_VERSION_EVENT
  66         ON_BN_CLICKED(IDOK, &CMergeDlg::OnBnClickedOk)
  67         ON_WM_DESTROY()
  68 END_MESSAGE_MAP()
  69
  70
  71 BOOL CMergeDlg::OnInitDialog()
  72 {
  73         CResizableStandAloneDialog::OnInitDialog();
  74
  75
  76         CHOOSE_VERSION_ADDANCHOR;
  77
  78         AddAnchor(IDC_GROUP_OPTION, TOP_LEFT, TOP_RIGHT);
  79         AddAnchor(IDC_STATIC_MERGE_MESSAGE,TOP_LEFT,BOTTOM_RIGHT);
  80         AddAnchor(IDC_LOGMESSAGE,TOP_LEFT,BOTTOM_RIGHT);
  81
  82         AddAnchor(IDOK,BOTTOM_RIGHT);
  83         AddAnchor(IDCANCEL,BOTTOM_RIGHT);
  84         AddAnchor(IDHELP, BOTTOM_RIGHT);
  85
  86         this->AddOthersToAnchor();
  87
  88         CheckRadioButton(IDC_RADIO_BRANCH,IDC_RADIO_VERSION,IDC_RADIO_BRANCH);
  89         this->SetDefaultChoose(IDC_RADIO_BRANCH);
  90
  91         Init();
  92
  93
  94
  95         m_ProjectProperties.ReadProps(CTGitPath(g_Git.m_CurrentDir));
  96
  97         m_cLogMessage.Init(m_ProjectProperties);
  98         m_cLogMessage.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));
  99         m_cLogMessage.RegisterContextMenuHandler(this);
 100
 101         m_cLogMessage.SetText(m_pDefaultText);
 102
 103         EnableSaveRestore(_T("MergeDlg"));
 104
 105         return TRUE;
 106 }
 107
 108 // CMergeDlg message handlers
 109
 110
 111 void CMergeDlg::OnBnClickedOk()
 112 {
 113         // TODO: Add your control notification handler code here
 114         this->UpdateData(TRUE);
 115
 116         this->UpdateRevsionName();
 117
 118         this->m_strLogMesage = m_cLogMessage.GetText() ;
 119         if( m_strLogMesage == CString(this->m_pDefaultText) )
 120         {
 121                 m_strLogMesage.Empty();
 122         }
 123
 124         OnOK();
 125 }
 126
 127 void CMergeDlg::OnDestroy()
 128 {
 129         WaitForFinishLoading();
 130         __super::OnDestroy();
 131
 132         // TODO: Add your message handler code here
 133 }