Fixed issue #1519: Quotes in notes break Merge command
[TortoiseGit.git] / src / TortoiseProc / SubmoduleDiffDlg.cpp
blob595dfc8e73431f585083e8b417b8eb84987bf0d1
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 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 #include "stdafx.h"
20 #include "TortoiseProc.h"
21 #include "AppUtils.h"
22 #include "SubmoduleDiffDlg.h"
24 IMPLEMENT_DYNAMIC(CSubmoduleDiffDlg, CHorizontalResizableStandAloneDialog)
25 CSubmoduleDiffDlg::CSubmoduleDiffDlg(CWnd* pParent /*=NULL*/)
26 : CHorizontalResizableStandAloneDialog(CSubmoduleDiffDlg::IDD, pParent)
27 , m_bFromOK(false)
28 , m_bToOK(false)
29 , m_bDirty(false)
33 CSubmoduleDiffDlg::~CSubmoduleDiffDlg()
37 void CSubmoduleDiffDlg::DoDataExchange(CDataExchange* pDX)
39 CHorizontalResizableStandAloneDialog::DoDataExchange(pDX);
40 DDX_Text(pDX, IDC_FROMHASH, m_sFromHash);
41 DDX_Text(pDX, IDC_FROMSUBJECT, m_sFromSubject);
42 DDX_Text(pDX, IDC_TOHASH, m_sToHash);
43 DDX_Text(pDX, IDC_TOSUBJECT, m_sToSubject);
46 BEGIN_MESSAGE_MAP(CSubmoduleDiffDlg, CHorizontalResizableStandAloneDialog)
47 ON_BN_CLICKED(IDC_LOG, &CSubmoduleDiffDlg::OnBnClickedLog)
48 ON_BN_CLICKED(IDC_LOG2, &CSubmoduleDiffDlg::OnBnClickedLog2)
49 ON_WM_CTLCOLOR()
50 END_MESSAGE_MAP()
52 BOOL CSubmoduleDiffDlg::OnInitDialog()
54 CHorizontalResizableStandAloneDialog::OnInitDialog();
56 CString sWindowTitle;
57 GetWindowText(sWindowTitle);
58 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle);
60 AddAnchor(IDC_SUBMODULEDIFFTITLE, TOP_LEFT, TOP_RIGHT);
61 AddAnchor(IDC_STATIC_REVISION, TOP_LEFT);
62 AddAnchor(IDC_STATIC_REVISION2, TOP_LEFT);
63 AddAnchor(IDC_STATIC_SUBJECT, TOP_LEFT);
64 AddAnchor(IDC_STATIC_SUBJECT2, TOP_LEFT);
65 AddAnchor(IDC_STATIC_CHANGETYPE, TOP_LEFT);
67 AddAnchor(IDC_FROMGROUP, TOP_LEFT, TOP_RIGHT);
68 AddAnchor(IDC_TOGROUP, TOP_LEFT, TOP_RIGHT);
70 AddAnchor(IDC_LOG, TOP_RIGHT);
71 AddAnchor(IDC_LOG2, TOP_RIGHT);
73 AddAnchor(IDC_FROMHASH, TOP_LEFT, TOP_RIGHT);
74 AddAnchor(IDC_FROMSUBJECT, TOP_LEFT, TOP_RIGHT);
75 AddAnchor(IDC_CHANGETYPE, TOP_LEFT, TOP_RIGHT);
76 AddAnchor(IDC_TOHASH, TOP_LEFT, TOP_RIGHT);
77 AddAnchor(IDC_TOSUBJECT, TOP_LEFT, TOP_RIGHT);
79 EnableSaveRestore(_T("SubmoduleDiffDlg"));
81 if (m_bToIsWorkingCopy)
83 CString toGroup;
84 GetDlgItem(IDC_TOGROUP)->GetWindowText(toGroup);
85 toGroup += _T(" (") + CString(MAKEINTRESOURCE(IDS_git_DEPTH_WORKING)) + _T(")");
86 GetDlgItem(IDC_TOGROUP)->SetWindowText(toGroup);
89 CString title = _T("Submodule \"") + m_sPath + _T("\"");
90 GetDlgItem(IDC_SUBMODULEDIFFTITLE)->SetWindowText(title);
92 UpdateData(FALSE);
93 if (m_bDirty)
94 GetDlgItem(IDC_TOHASH)->SetWindowText(m_sToHash + _T("-dirty"));
96 CString changeTypeTable[] =
98 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_UNKNOWN)),
99 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_NEWSUBMODULE)),
100 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_FASTFORWARD)),
101 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_REWIND)),
102 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_NEWERTIME)),
103 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_OLDERTIME)),
104 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_SAMETIME))
106 GetDlgItem(IDC_CHANGETYPE)->SetWindowText(changeTypeTable[m_nChangeType]);
108 return FALSE;
111 HBRUSH CSubmoduleDiffDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
113 if (pWnd->GetDlgCtrlID() == IDC_FROMSUBJECT && nCtlColor == CTLCOLOR_STATIC && !m_bFromOK)
115 pDC->SetBkColor(RGB(255, 0, 0));
116 pDC->SetTextColor(RGB(255, 255, 255));
117 return CreateSolidBrush(RGB(255, 0, 0));
120 if (pWnd->GetDlgCtrlID() == IDC_TOSUBJECT && nCtlColor == CTLCOLOR_STATIC && !m_bToOK)
122 pDC->SetBkColor(RGB(255, 0, 0));
123 pDC->SetTextColor(RGB(255, 255, 255));
124 return CreateSolidBrush(RGB(255, 0, 0));
127 if (pWnd->GetDlgCtrlID() == IDC_TOHASH && nCtlColor == CTLCOLOR_STATIC && m_bDirty)
129 pDC->SetBkColor(RGB(255, 255, 0));
130 pDC->SetTextColor(RGB(255, 0, 0));
131 return CreateSolidBrush(RGB(255, 255, 0));
134 if (pWnd->GetDlgCtrlID() == IDC_CHANGETYPE && nCtlColor == CTLCOLOR_STATIC)
136 if (m_nChangeType == FastForward)
138 // light green
139 pDC->SetBkColor(RGB(211, 249, 154));
140 pDC->SetTextColor(RGB(0, 0, 0));
141 return CreateSolidBrush(RGB(211, 249, 154));
143 else if (m_nChangeType == Rewind)
145 // pink
146 pDC->SetBkColor(RGB(249, 199, 229));
147 pDC->SetTextColor(RGB(0, 0, 0));
148 return CreateSolidBrush(RGB(249, 199, 229));
150 else if (m_nChangeType == NewerTime)
152 // light blue
153 pDC->SetBkColor(RGB(176, 223, 244));
154 pDC->SetTextColor(RGB(0, 0, 0));
155 return CreateSolidBrush(RGB(176, 223, 244));
157 else if (m_nChangeType == OlderTime)
159 // light orange
160 pDC->SetBkColor(RGB(244, 207, 159));
161 pDC->SetTextColor(RGB(0, 0, 0));
162 return CreateSolidBrush(RGB(244, 207, 159));
164 else
166 // light gray
167 pDC->SetBkColor(RGB(222, 222, 222));
168 pDC->SetTextColor(RGB(0, 0, 0));
169 return CreateSolidBrush(RGB(222, 222, 222));
173 return CHorizontalResizableStandAloneDialog::OnCtlColor(pDC, pWnd, nCtlColor);
176 void CSubmoduleDiffDlg::SetDiff(CString path, bool toIsWorkingCopy, CString fromHash, CString fromSubject, bool fromOK, CString toHash, CString toSubject, bool toOK, bool dirty, ChangeType changeType)
178 m_bToIsWorkingCopy = toIsWorkingCopy;
180 m_sPath = path;
182 m_sFromHash = fromHash;
183 m_sFromSubject = fromSubject;
184 m_bFromOK = fromOK;
185 m_sToHash = toHash;
186 m_sToSubject = toSubject;
187 m_bToOK = toOK;
188 m_bDirty = dirty;
189 m_nChangeType = changeType;
192 void CSubmoduleDiffDlg::ShowLog(CString hash)
194 CString sCmd;
195 sCmd.Format(_T("/command:log /path:\"%s\" /endrev:%s"), g_Git.m_CurrentDir + _T("\\") + m_sPath, hash);
196 CAppUtils::RunTortoiseProc(sCmd);
199 void CSubmoduleDiffDlg::OnBnClickedLog()
201 ShowLog(m_sFromHash);
204 void CSubmoduleDiffDlg::OnBnClickedLog2()
206 ShowLog(m_sToHash);