OSDN > Buscar Software > Software Development > Version Control > TortoiseGit Japanese language pack > SCM > git > TortoiseGitJp > Commit

Fork

TortoiseGitJp: Commit

TortoiseGit日本語言語ファイル作成

Disable File diff dialog when fetch difference

Signed-off-by: Frank Li <lznuaa@gmail.com>

--- a/src/TortoiseProc/FileDiffDlg.cpp

+++ b/src/TortoiseProc/FileDiffDlg.cpp

		@@ -290,6 +290,7 @@ UINT CFileDiffDlg::DiffThread()
290	290	m_cFileList.ShowText(CString(MAKEINTRESOURCE(IDS_FILEDIFF_WAIT)));
291	291	m_cFileList.DeleteAllItems();
292	292	m_arFileList.Clear();
	293	+ EnableInputControl(false);
293	294	#if 0
294	295	if (m_bDoPegDiff)
295	296	{

		@@ -334,6 +335,7 @@ UINT CFileDiffDlg::DiffThread()
334	335	InterlockedExchange(&m_bThreadRunning, FALSE);
335	336	InvalidateRect(NULL);
336	337	RefreshCursor();
	338	+ EnableInputControl(true);
337	339	return 0;
338	340	}
339	341

		@@ -360,6 +362,17 @@ int CFileDiffDlg::AddEntry(const CTGitPath * fd)
360	362	return ret;
361	363	}
362	364
	365	+void CFileDiffDlg::EnableInputControl(bool b)
	366	+{
	367	+ this->m_ctrRev1Edit.EnableWindow(b);
	368	+ this->m_ctrRev2Edit.EnableWindow(b);
	369	+ this->m_cRev1Btn.EnableWindow(b);
	370	+ this->m_cRev2Btn.EnableWindow(b);
	371	+ m_cFilter.EnableWindow(b);
	372	+ m_SwitchButton.EnableWindow(b);
	373	+
	374	+}
	375	+
363	376	void CFileDiffDlg::DoDiff(int selIndex, bool blame)
364	377	{
365	378

--- a/src/TortoiseProc/FileDiffDlg.h

+++ b/src/TortoiseProc/FileDiffDlg.h

		@@ -103,6 +103,8 @@ protected:
103	103
104	104	void ClickRevButton(CMenuButton button,GitRev rev, CEdit *edit);
105	105
	106	+ void EnableInputControl(bool b=true);
	107	+
106	108	int FillRevFromString(GitRev *rev, CString str)
107	109	{
108	110	GitRev gitrev;