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 (file)
--- 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\r
        //log messages.\r
 \r
-       CString temp;\r
-       temp.LoadString(IDS_PROGRESSWAIT);\r
-       ShowText(temp, true);\r
-\r
        FillGitShortLog();\r
        \r
        if(this->m_bExitThread)\r

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