1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2009-2013, 2015-2016 - TortoiseGit
4 // Copyright (C) 2003-2008 - TortoiseSVN
6 // This program is free software; you can redistribute it and/or
7 // modify it under the terms of the GNU General Public License
8 // as published by the Free Software Foundation; either version 2
9 // of the License, or (at your option) any later version.
11 // This program is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
16 // You should have received a copy of the GNU General Public License
17 // along with this program; if not, write to the Free Software Foundation,
18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21 #include "TortoiseProc.h"
22 #include "MessageBox.h"
23 #include "ResolveDlg.h"
27 #define REFRESHTIMER 100
29 IMPLEMENT_DYNAMIC(CResolveDlg
, CResizableStandAloneDialog
)
30 CResolveDlg::CResolveDlg(CWnd
* pParent
/*=nullptr*/)
31 : CResizableStandAloneDialog(CResolveDlg::IDD
, pParent
)
32 , m_bThreadRunning(FALSE
)
37 CResolveDlg::~CResolveDlg()
41 void CResolveDlg::DoDataExchange(CDataExchange
* pDX
)
43 CResizableStandAloneDialog::DoDataExchange(pDX
);
44 DDX_Control(pDX
, IDC_RESOLVELIST
, m_resolveListCtrl
);
45 DDX_Control(pDX
, IDC_SELECTALL
, m_SelectAll
);
49 BEGIN_MESSAGE_MAP(CResolveDlg
, CResizableStandAloneDialog
)
50 ON_BN_CLICKED(IDC_SELECTALL
, OnBnClickedSelectall
)
51 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
, OnSVNStatusListCtrlNeedsRefresh
)
52 ON_REGISTERED_MESSAGE(CGitStatusListCtrl::GITSLNM_ADDFILE
, OnFileDropped
)
56 BOOL
CResolveDlg::OnInitDialog()
58 CResizableStandAloneDialog::OnInitDialog();
59 CAppUtils::MarkWindowAsUnpinnable(m_hWnd
);
61 m_resolveListCtrl
.Init(GITSLC_COLEXT
, L
"ResolveDlg", GITSLC_POPALL
^ (GITSLC_POPIGNORE
| GITSLC_POPADD
| GITSLC_POPCOMMIT
| GITSLC_POPEXPORT
| GITSLC_POPRESTORE
| GITSLC_POPSAVEAS
| GITSLC_PREPAREDIFF
));
62 m_resolveListCtrl
.SetConfirmButton((CButton
*)GetDlgItem(IDOK
));
63 m_resolveListCtrl
.SetSelectButton(&m_SelectAll
);
64 m_resolveListCtrl
.SetCancelBool(&m_bCancelled
);
65 m_resolveListCtrl
.SetBackgroundImage(IDI_RESOLVE_BKG
);
66 m_resolveListCtrl
.EnableFileDrop();
69 GetWindowText(sWindowTitle
);
70 CAppUtils::SetWindowTitle(m_hWnd
, g_Git
.m_CurrentDir
, sWindowTitle
);
72 AdjustControlSize(IDC_SELECTALL
);
74 AddAnchor(IDC_RESOLVELIST
, TOP_LEFT
, BOTTOM_RIGHT
);
75 AddAnchor(IDC_SELECTALL
, BOTTOM_LEFT
);
76 AddAnchor(IDOK
, BOTTOM_RIGHT
);
77 AddAnchor(IDCANCEL
, BOTTOM_RIGHT
);
78 AddAnchor(IDHELP
, BOTTOM_RIGHT
);
79 AddAnchor(IDC_STATIC_REMINDER
, BOTTOM_RIGHT
);
81 CenterWindow(CWnd::FromHandle(hWndExplorer
));
82 EnableSaveRestore(L
"ResolveDlg");
84 // first start a thread to obtain the file list with the status without
85 // blocking the dialog
86 if (!AfxBeginThread(ResolveThreadEntry
, this))
88 CMessageBox::Show(this->m_hWnd
, IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
90 InterlockedExchange(&m_bThreadRunning
, TRUE
);
95 void CResolveDlg::OnOK()
100 //save only the files the user has selected into the path list
101 m_resolveListCtrl
.WriteCheckedNamesToPathList(m_pathList
);
103 CResizableStandAloneDialog::OnOK();
106 void CResolveDlg::OnCancel()
109 if (m_bThreadRunning
)
112 CResizableStandAloneDialog::OnCancel();
115 void CResolveDlg::OnBnClickedSelectall()
117 UINT state
= (m_SelectAll
.GetState() & 0x0003);
118 if (state
== BST_INDETERMINATE
)
120 // It is not at all useful to manually place the checkbox into the indeterminate state...
121 // We will force this on to the unchecked state
122 state
= BST_UNCHECKED
;
123 m_SelectAll
.SetCheck(state
);
125 theApp
.DoWaitCursor(1);
126 m_resolveListCtrl
.SelectAll(state
== BST_CHECKED
);
127 theApp
.DoWaitCursor(-1);
130 UINT
CResolveDlg::ResolveThreadEntry(LPVOID pVoid
)
132 return reinterpret_cast<CResolveDlg
*>(pVoid
)->ResolveThread();
134 UINT
CResolveDlg::ResolveThread()
136 // get the status of all selected file/folders recursively
137 // and show the ones which are in conflict
138 DialogEnableWindow(IDOK
, false);
140 m_bCancelled
= false;
142 m_resolveListCtrl
.StoreScrollPos();
143 m_resolveListCtrl
.Clear();
144 if (!m_resolveListCtrl
.GetStatus(&m_pathList
))
145 m_resolveListCtrl
.SetEmptyString(m_resolveListCtrl
.GetLastErrorMessage());
146 m_resolveListCtrl
.Show(GITSLC_SHOWCONFLICTED
|GITSLC_SHOWINEXTERNALS
, GITSLC_SHOWCONFLICTED
);
148 InterlockedExchange(&m_bThreadRunning
, FALSE
);
152 BOOL
CResolveDlg::PreTranslateMessage(MSG
* pMsg
)
154 if (pMsg
->message
== WM_KEYDOWN
)
156 switch (pMsg
->wParam
)
160 if (GetAsyncKeyState(VK_CONTROL
)&0x8000)
162 if ( GetDlgItem(IDOK
)->IsWindowEnabled() )
163 PostMessage(WM_COMMAND
, IDOK
);
170 if (!m_bThreadRunning
)
172 if (!AfxBeginThread(ResolveThreadEntry
, this))
173 CMessageBox::Show(this->m_hWnd
, IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
175 InterlockedExchange(&m_bThreadRunning
, TRUE
);
182 return CResizableStandAloneDialog::PreTranslateMessage(pMsg
);
185 LRESULT
CResolveDlg::OnSVNStatusListCtrlNeedsRefresh(WPARAM
, LPARAM
)
187 if (!AfxBeginThread(ResolveThreadEntry
, this))
188 CMessageBox::Show(this->m_hWnd
, IDS_ERR_THREADSTARTFAILED
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
192 LRESULT
CResolveDlg::OnFileDropped(WPARAM
, LPARAM lParam
)
195 SetForegroundWindow();
197 // if multiple files/folders are dropped
198 // this handler is called for every single item
200 // To avoid creating multiple refresh threads and
201 // causing crashes, we only add the items to the
202 // list control and start a timer.
203 // When the timer expires, we start the refresh thread,
204 // but only if it isn't already running - otherwise we
205 // restart the timer.
207 path
.SetFromWin((LPCTSTR
)lParam
);
209 // check whether the dropped file belongs to the very same repository
211 if (!path
.HasAdminDir(&projectDir
) || !CTGitPath::ArePathStringsEqual(g_Git
.m_CurrentDir
, projectDir
))
214 if (!m_resolveListCtrl
.HasPath(path
))
216 if (m_pathList
.AreAllPathsFiles())
218 m_pathList
.AddPath(path
);
219 m_pathList
.RemoveDuplicates();
223 // if the path list contains folders, we have to check whether
224 // our just (maybe) added path is a child of one of those. If it is
225 // a child of a folder already in the list, we must not add it. Otherwise
226 // that path could show up twice in the list.
227 bool bHasParentInList
= false;
228 for (int i
=0; i
<m_pathList
.GetCount(); ++i
)
230 if (m_pathList
[i
].IsAncestorOf(path
))
232 bHasParentInList
= true;
236 if (!bHasParentInList
)
238 m_pathList
.AddPath(path
);
239 m_pathList
.RemoveDuplicates();
243 m_resolveListCtrl
.ResetChecked(path
);
245 // Always start the timer, since the status of an existing item might have changed
246 SetTimer(REFRESHTIMER
, 200, nullptr);
247 CTraceToOutputDebugString::Instance()(_T(__FUNCTION__
) L
": Item %s dropped, timer started\n", path
.GetWinPath());
251 void CResolveDlg::OnTimer(UINT_PTR nIDEvent
)
256 if (m_bThreadRunning
)
258 SetTimer(REFRESHTIMER
, 200, nullptr);
259 CTraceToOutputDebugString::Instance()(__FUNCTION__
": Wait some more before refreshing\n");
263 KillTimer(REFRESHTIMER
);
264 CTraceToOutputDebugString::Instance()(__FUNCTION__
": Refreshing after items dropped\n");
265 OnSVNStatusListCtrlNeedsRefresh(0, 0);
269 __super::OnTimer(nIDEvent
);