From: Frank Li <lznuaa@gmail.com>
Date: Fri, 30 Jan 2009 06:25:16 +0000 (+0800)
Subject: Show "Wait ... " at log list  when fetch git log.
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=2ba2deeafae9763cd67dc695b0f10962b1d05be8;p=tortoisegit%2FTortoiseGitJp.git

Show "Wait ... " at log list  when fetch git log.

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

diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp
index 68a9c19..63bf3eb 100644
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@ -1447,10 +1447,6 @@ UINT CGitLogListBase::LogThread()
 	//disable the "Get All" button while we're receiving
 	//log messages.
 
-	CString temp;
-	temp.LoadString(IDS_PROGRESSWAIT);
-	ShowText(temp, true);
-
 	FillGitShortLog();
 	
 	if(this->m_bExitThread)
diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp
index 5123c53..36fa972 100644
--- a/src/TortoiseProc/LogDlg.cpp
+++ b/src/TortoiseProc/LogDlg.cpp
@@ -374,6 +374,8 @@ LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM lParam)
 		CString temp;
 		temp.LoadString(IDS_PROGRESSWAIT);
 
+		this->m_LogList.ShowText(temp, true);
+
 		// change the text of the close button to "Cancel" since now the thread
 		// is running, and simply closing the dialog doesn't work.
 		if (!GetDlgItem(IDOK)->IsWindowVisible())
@@ -395,9 +397,8 @@ LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM lParam)
 		DialogEnableWindow(IDC_STATBUTTON, FALSE);
 		DialogEnableWindow(IDC_REFRESH, FALSE);
 		DialogEnableWindow(IDC_HIDEPATHS,FALSE);
-	}
 
-	if( cur == GITLOG_END)
+	}else if( cur == GITLOG_END)
 	{
 		
 		//if (!m_bShowedAll)
@@ -415,9 +416,13 @@ LRESULT CLogDlg::OnLogListLoading(WPARAM wParam, LPARAM lParam)
 		m_LogList.GetTimeRange(begin,end);
 		m_DateFrom.SetTime(&begin);
 		m_DateTo.SetTime(&end);
+	
+	}else
+	{
+		if(this->m_LogList.HasText())
+			this->m_LogList.ClearText();
+		m_LogProgress.SetPos(cur);
 	}
-
-	m_LogProgress.SetPos(cur);
 	return 0;
 }
 void CLogDlg::SetDlgTitle(bool bOffline)