Fixed issue #1557: Submodule Diff Dialog should launch diff with working copy if...
[TortoiseGit.git] / src / TortoiseProc / SubmoduleDiffDlg.cpp
blob12bf7c9a113c33c40e39d21bb86730302ac33be8
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"
23 #include "LoglistCommonResource.h"
25 IMPLEMENT_DYNAMIC(CSubmoduleDiffDlg, CHorizontalResizableStandAloneDialog)
26 CSubmoduleDiffDlg::CSubmoduleDiffDlg(CWnd* pParent /*=NULL*/)
27 : CHorizontalResizableStandAloneDialog(CSubmoduleDiffDlg::IDD, pParent)
28 , m_bFromOK(false)
29 , m_bToOK(false)
30 , m_bDirty(false)
34 CSubmoduleDiffDlg::~CSubmoduleDiffDlg()
38 void CSubmoduleDiffDlg::DoDataExchange(CDataExchange* pDX)
40 CHorizontalResizableStandAloneDialog::DoDataExchange(pDX);
41 DDX_Text(pDX, IDC_FROMHASH, m_sFromHash);
42 DDX_Text(pDX, IDC_FROMSUBJECT, m_sFromSubject);
43 DDX_Text(pDX, IDC_TOHASH, m_sToHash);
44 DDX_Text(pDX, IDC_TOSUBJECT, m_sToSubject);
45 DDX_Control(pDX, IDC_SHOW_DIFF, m_ctrlShowDiffBtn);
48 BEGIN_MESSAGE_MAP(CSubmoduleDiffDlg, CHorizontalResizableStandAloneDialog)
49 ON_BN_CLICKED(IDC_LOG, &CSubmoduleDiffDlg::OnBnClickedLog)
50 ON_BN_CLICKED(IDC_LOG2, &CSubmoduleDiffDlg::OnBnClickedLog2)
51 ON_BN_CLICKED(IDC_SHOW_DIFF, &CSubmoduleDiffDlg::OnBnClickedShowDiff)
52 ON_WM_CTLCOLOR()
53 END_MESSAGE_MAP()
55 BOOL CSubmoduleDiffDlg::OnInitDialog()
57 CHorizontalResizableStandAloneDialog::OnInitDialog();
59 CString sWindowTitle;
60 GetWindowText(sWindowTitle);
61 CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle);
63 AddAnchor(IDC_SUBMODULEDIFFTITLE, TOP_LEFT, TOP_RIGHT);
64 AddAnchor(IDC_STATIC_REVISION, TOP_LEFT);
65 AddAnchor(IDC_STATIC_REVISION2, TOP_LEFT);
66 AddAnchor(IDC_STATIC_SUBJECT, TOP_LEFT);
67 AddAnchor(IDC_STATIC_SUBJECT2, TOP_LEFT);
68 AddAnchor(IDC_STATIC_CHANGETYPE, TOP_LEFT);
70 AddAnchor(IDC_FROMGROUP, TOP_LEFT, TOP_RIGHT);
71 AddAnchor(IDC_TOGROUP, TOP_LEFT, TOP_RIGHT);
73 AddAnchor(IDC_LOG, TOP_RIGHT);
74 AddAnchor(IDC_LOG2, TOP_RIGHT);
75 AddAnchor(IDC_SHOW_DIFF, TOP_RIGHT);
77 AddAnchor(IDC_FROMHASH, TOP_LEFT, TOP_RIGHT);
78 AddAnchor(IDC_FROMSUBJECT, TOP_LEFT, TOP_RIGHT);
79 AddAnchor(IDC_CHANGETYPE, TOP_LEFT, TOP_RIGHT);
80 AddAnchor(IDC_TOHASH, TOP_LEFT, TOP_RIGHT);
81 AddAnchor(IDC_TOSUBJECT, TOP_LEFT, TOP_RIGHT);
83 EnableSaveRestore(_T("SubmoduleDiffDlg"));
85 if (m_bToIsWorkingCopy)
87 CString toGroup;
88 GetDlgItem(IDC_TOGROUP)->GetWindowText(toGroup);
89 toGroup += _T(" (") + CString(MAKEINTRESOURCE(IDS_git_DEPTH_WORKING)) + _T(")");
90 GetDlgItem(IDC_TOGROUP)->SetWindowText(toGroup);
93 CString title = _T("Submodule \"") + m_sPath + _T("\"");
94 GetDlgItem(IDC_SUBMODULEDIFFTITLE)->SetWindowText(title);
96 UpdateData(FALSE);
97 if (m_bDirty)
98 GetDlgItem(IDC_TOHASH)->SetWindowText(m_sToHash + _T("-dirty"));
100 CString changeTypeTable[] =
102 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_UNKNOWN)),
103 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_NEWSUBMODULE)),
104 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_DELETESUBMODULE)),
105 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_FASTFORWARD)),
106 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_REWIND)),
107 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_NEWERTIME)),
108 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_OLDERTIME)),
109 CString(MAKEINTRESOURCE(IDS_SUBMODULEDIFF_SAMETIME))
111 GetDlgItem(IDC_CHANGETYPE)->SetWindowText(changeTypeTable[m_nChangeType]);
113 DialogEnableWindow(IDC_SHOW_DIFF, m_bFromOK && m_bToOK);
114 if (m_bDirty && m_nChangeType != Unknown)
116 m_ctrlShowDiffBtn.AddEntry(MAKEINTRESOURCE(IDS_PROC_SHOWDIFF));
117 m_ctrlShowDiffBtn.AddEntry(MAKEINTRESOURCE(IDS_LOG_POPUP_COMPARE));
120 return FALSE;
123 HBRUSH CSubmoduleDiffDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
125 if (pWnd->GetDlgCtrlID() == IDC_FROMSUBJECT && nCtlColor == CTLCOLOR_STATIC && !m_bFromOK)
127 pDC->SetBkColor(RGB(255, 0, 0));
128 pDC->SetTextColor(RGB(255, 255, 255));
129 return CreateSolidBrush(RGB(255, 0, 0));
132 if (pWnd->GetDlgCtrlID() == IDC_TOSUBJECT && nCtlColor == CTLCOLOR_STATIC && !m_bToOK)
134 pDC->SetBkColor(RGB(255, 0, 0));
135 pDC->SetTextColor(RGB(255, 255, 255));
136 return CreateSolidBrush(RGB(255, 0, 0));
139 if (pWnd->GetDlgCtrlID() == IDC_TOHASH && nCtlColor == CTLCOLOR_STATIC && m_bDirty)
141 pDC->SetBkColor(RGB(255, 255, 0));
142 pDC->SetTextColor(RGB(255, 0, 0));
143 return CreateSolidBrush(RGB(255, 255, 0));
146 if (pWnd->GetDlgCtrlID() == IDC_CHANGETYPE && nCtlColor == CTLCOLOR_STATIC)
148 if (m_nChangeType == FastForward)
150 // light green
151 pDC->SetBkColor(RGB(211, 249, 154));
152 pDC->SetTextColor(RGB(0, 0, 0));
153 return CreateSolidBrush(RGB(211, 249, 154));
155 else if (m_nChangeType == Rewind)
157 // pink
158 pDC->SetBkColor(RGB(249, 199, 229));
159 pDC->SetTextColor(RGB(0, 0, 0));
160 return CreateSolidBrush(RGB(249, 199, 229));
162 else if (m_nChangeType == NewerTime)
164 // light blue
165 pDC->SetBkColor(RGB(176, 223, 244));
166 pDC->SetTextColor(RGB(0, 0, 0));
167 return CreateSolidBrush(RGB(176, 223, 244));
169 else if (m_nChangeType == OlderTime)
171 // light orange
172 pDC->SetBkColor(RGB(244, 207, 159));
173 pDC->SetTextColor(RGB(0, 0, 0));
174 return CreateSolidBrush(RGB(244, 207, 159));
176 else
178 // light gray
179 pDC->SetBkColor(RGB(222, 222, 222));
180 pDC->SetTextColor(RGB(0, 0, 0));
181 return CreateSolidBrush(RGB(222, 222, 222));
185 return CHorizontalResizableStandAloneDialog::OnCtlColor(pDC, pWnd, nCtlColor);
188 void CSubmoduleDiffDlg::SetDiff(CString path, bool toIsWorkingCopy, CString fromHash, CString fromSubject, bool fromOK, CString toHash, CString toSubject, bool toOK, bool dirty, ChangeType changeType)
190 m_bToIsWorkingCopy = toIsWorkingCopy;
192 m_sPath = path;
194 m_sFromHash = fromHash;
195 m_sFromSubject = fromSubject;
196 m_bFromOK = fromOK;
197 m_sToHash = toHash;
198 m_sToSubject = toSubject;
199 m_bToOK = toOK;
200 m_bDirty = dirty;
201 m_nChangeType = changeType;
204 void CSubmoduleDiffDlg::ShowLog(CString hash)
206 CString sCmd;
207 sCmd.Format(_T("/command:log /path:\"%s\" /endrev:%s"), g_Git.m_CurrentDir + _T("\\") + m_sPath, hash);
208 CAppUtils::RunTortoiseProc(sCmd);
211 void CSubmoduleDiffDlg::OnBnClickedLog()
213 ShowLog(m_sFromHash);
216 void CSubmoduleDiffDlg::OnBnClickedLog2()
218 ShowLog(m_sToHash);
221 void CSubmoduleDiffDlg::OnBnClickedShowDiff()
223 CString sCmd;
224 sCmd.Format(_T("/command:showcompare /path:\"%s\" /revision1:%s /revision2:%s"), g_Git.m_CurrentDir + _T("\\") + m_sPath, m_sFromHash, ((m_bDirty && m_nChangeType == Unknown) || m_ctrlShowDiffBtn.GetCurrentEntry() == 1) ? GIT_REV_ZERO : m_sToHash);
225 CAppUtils::RunTortoiseProc(sCmd);