From: Frank Li <lznuaa@gmail.com>
Date: Thu, 15 Jan 2009 14:33:16 +0000 (+0800)
Subject: Git Blame Find okay
X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain;h=8a1dc1cdb9c765a2e0d8f676a5cf25994225f65a

Git Blame Find okay

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

diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln
index 5506657..964a25a 100644
--- a/src/TortoiseGit.sln
+++ b/src/TortoiseGit.sln
@@ -40,6 +40,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoisePlink", "TortoisePl
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CustomActions", "TortoiseGitSetup\CustomActions\CustomActions.vcproj", "{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IBugTraqProvider", "IBugTraqProvider\IBugTraqProvider.vcproj", "{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseGitBlame", "TortoiseGitBlame\TortoiseGitBlame.vcproj", "{62507C2F-9290-4342-910F-BFC44DF99B01}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A2C38606-3D96-4A2C-B5C5-22CEAC523B37} = {A2C38606-3D96-4A2C-B5C5-22CEAC523B37}
@@ -47,10 +49,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseGitBlame", "Tortois
 		{A5498556-CE09-4095-8335-08FC8370552D} = {A5498556-CE09-4095-8335-08FC8370552D}
 		{12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB} = {12E5B4AE-D7EF-4A57-A22D-6F9F9D8CE1FB}
 		{7CA5B1EB-8CC9-40A6-96D8-83649C1A870B} = {7CA5B1EB-8CC9-40A6-96D8-83649C1A870B}
+		{4BE529FB-C2F2-49F7-A897-054B955564CF} = {4BE529FB-C2F2-49F7-A897-054B955564CF}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IBugTraqProvider", "IBugTraqProvider\IBugTraqProvider.vcproj", "{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		debug_static|Mixed Platforms = debug_static|Mixed Platforms
@@ -462,30 +463,6 @@ Global
 		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|x64.ActiveCfg = Release|x64
 		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|x64.Build.0 = Release|x64
 		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}.Release|x86.ActiveCfg = Release|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Mixed Platforms.Build.0 = Debug|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Win32.ActiveCfg = Debug|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Win32.Build.0 = Debug|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|x64.ActiveCfg = Debug|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|x86.ActiveCfg = Debug|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.ActiveCfg = Debug|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.Build.0 = Debug|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x64.ActiveCfg = Debug|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x86.ActiveCfg = Debug|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Mixed Platforms.ActiveCfg = Release|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Mixed Platforms.Build.0 = Release|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Win32.ActiveCfg = Release|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Win32.Build.0 = Release|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x64.ActiveCfg = Release|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x86.ActiveCfg = Release|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.ActiveCfg = Release|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.Build.0 = Release|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.ActiveCfg = Release|Win32
-		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x86.ActiveCfg = Release|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Mixed Platforms.Build.0 = Debug|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.debug_static|Win32.ActiveCfg = Debug|Win32
@@ -510,6 +487,30 @@ Global
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|Win32.Build.0 = Release|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x64.ActiveCfg = Release|Win32
 		{2C879469-DB8F-4BF0-B016-AE864D2A7BBC}.Release|x86.ActiveCfg = Release|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Mixed Platforms.Build.0 = Debug|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Win32.ActiveCfg = Debug|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|Win32.Build.0 = Debug|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|x64.ActiveCfg = Debug|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.debug_static|x86.ActiveCfg = Debug|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.ActiveCfg = Debug|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|Win32.Build.0 = Debug|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x64.ActiveCfg = Debug|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Debug|x86.ActiveCfg = Debug|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Mixed Platforms.ActiveCfg = Release|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Mixed Platforms.Build.0 = Release|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Win32.ActiveCfg = Release|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|Win32.Build.0 = Release|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x64.ActiveCfg = Release|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.release_static|x86.ActiveCfg = Release|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.ActiveCfg = Release|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|Win32.Build.0 = Release|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x64.ActiveCfg = Release|Win32
+		{62507C2F-9290-4342-910F-BFC44DF99B01}.Release|x86.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
index 075564a..8e8c0f9 100644
--- a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
+++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
@@ -339,19 +339,19 @@
 				>
 			</File>
 			<File
-				RelativePath=".\res\output_wnd.ico"
+				RelativePath="..\Resources\blameres\output_wnd.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\output_wnd.ico"
+				RelativePath=".\res\output_wnd.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\res\output_wnd_hc.ico"
+				RelativePath="..\Resources\blameres\output_wnd_hc.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\output_wnd_hc.ico"
+				RelativePath=".\res\output_wnd_hc.ico"
 				>
 			</File>
 			<File
@@ -363,19 +363,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\properties_hc.bmp"
+				RelativePath=".\res\properties_hc.bmp"
 				>
 			</File>
 			<File
-				RelativePath=".\res\properties_hc.bmp"
+				RelativePath="..\Resources\blameres\properties_hc.bmp"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\properties_wnd.ico"
+				RelativePath=".\res\properties_wnd.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\res\properties_wnd.ico"
+				RelativePath="..\Resources\blameres\properties_wnd.ico"
 				>
 			</File>
 			<File
@@ -387,19 +387,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\Toolbar.bmp"
+				RelativePath=".\res\Toolbar.bmp"
 				>
 			</File>
 			<File
-				RelativePath=".\res\Toolbar.bmp"
+				RelativePath="..\Resources\blameres\Toolbar.bmp"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\Toolbar256.bmp"
+				RelativePath=".\res\Toolbar256.bmp"
 				>
 			</File>
 			<File
-				RelativePath=".\res\Toolbar256.bmp"
+				RelativePath="..\Resources\blameres\Toolbar256.bmp"
 				>
 			</File>
 			<File
@@ -431,11 +431,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"
+				RelativePath=".\res\TortoiseGitBlameDoc.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\res\TortoiseGitBlameDoc.ico"
+				RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"
 				>
 			</File>
 			<File
diff --git a/src/TortoiseGitBlame/TortoiseGitBlameView.cpp b/src/TortoiseGitBlame/TortoiseGitBlameView.cpp
index 98283f2..782a7f1 100644
--- a/src/TortoiseGitBlame/TortoiseGitBlameView.cpp
+++ b/src/TortoiseGitBlame/TortoiseGitBlameView.cpp
@@ -104,6 +104,7 @@ CTortoiseGitBlameView::CTortoiseGitBlameView()
 	m_bShowDate=false;
 
     m_FindDialogMessage   =   ::RegisterWindowMessage(FINDMSGSTRING);   
+	m_pFindDialog = NULL;
 }
 
 CTortoiseGitBlameView::~CTortoiseGitBlameView()
@@ -593,7 +594,7 @@ void CTortoiseGitBlameView::InitialiseEditor()
 
 void CTortoiseGitBlameView::StartSearch()
 {
-	if (currentDialog)
+	if (m_pFindDialog)
 		return;
 	bool bCase = false;
 	// Initialize FINDREPLACE
@@ -610,87 +611,53 @@ void CTortoiseGitBlameView::StartSearch()
 	currentDialog = FindText(&fr);
 }
 
-bool CTortoiseGitBlameView::DoSearch(LPSTR what, DWORD flags)
+bool CTortoiseGitBlameView::DoSearch(CString what, DWORD flags)
 {
-#if 0
-	TCHAR szWhat[80];
+
+	//char szWhat[80];
 	int pos = SendEditor(SCI_GETCURRENTPOS);
 	int line = SendEditor(SCI_LINEFROMPOSITION, pos);
 	bool bFound = false;
 	bool bCaseSensitive = !!(flags & FR_MATCHCASE);
 
-	strcpy_s(szWhat, sizeof(szWhat), what);
+	//strcpy_s(szWhat, sizeof(szWhat), what);
 
 	if(!bCaseSensitive)
 	{
-		char *p;
-		size_t len = strlen(szWhat);
-		for (p = szWhat; p < szWhat + len; p++)
-		{
-			if (isupper(*p)&&__isascii(*p))
-				*p = _tolower(*p);
-		}
+		what=what.MakeLower();
 	}
 
-	CString sWhat = CString(szWhat);
+	//CString sWhat = CString(szWhat);
 	
-	char buf[20];
-	int i=0;
-	for (i=line; (i<(int)authors.size())&&(!bFound); ++i)
+	//char buf[20];
+	//int i=0;
+	int i=line;
+	do
 	{
 		int bufsize = SendEditor(SCI_GETLINE, i);
 		char * linebuf = new char[bufsize+1];
 		SecureZeroMemory(linebuf, bufsize+1);
 		SendEditor(SCI_GETLINE, i, (LPARAM)linebuf);
+		CString oneline=this->m_TextView.StringFromControl(linebuf);
 		if (!bCaseSensitive)
 		{
-			char *p;
-			for (p = linebuf; p < linebuf + bufsize; p++)
-			{
-				if (isupper(*p)&&__isascii(*p))
-					*p = _tolower(*p);
-			}
+			oneline=oneline.MakeLower();
 		}
-		_stprintf_s(buf, 20, _T("%ld"), revs[i]);
-		if (authors[i].compare(sWhat)==0)
+		//_stprintf_s(buf, 20, _T("%ld"), revs[i]);
+		if (this->m_Authors[i].Find(what)>=0)
 			bFound = true;
-		else if ((!bCaseSensitive)&&(_stricmp(authors[i].c_str(), szWhat)==0))
+		else if ((!bCaseSensitive)&&(this->m_Authors[i].MakeLower().Find(what)>=0))
 			bFound = true;
-		else if (strcmp(buf, szWhat) == 0)
-			bFound = true;
-		else if (strstr(linebuf, szWhat))
+		else if (oneline.Find(what) >=0)
 			bFound = true;
+		
 		delete [] linebuf;
-	}
-	if (!bFound)
-	{
-		for (i=0; (i<line)&&(!bFound); ++i)
-		{
-			int bufsize = SendEditor(SCI_GETLINE, i);
-			char * linebuf = new char[bufsize+1];
-			SecureZeroMemory(linebuf, bufsize+1);
-			SendEditor(SCI_GETLINE, i, (LPARAM)linebuf);
-			if (!bCaseSensitive)
-			{
-				char *p;
-				for (p = linebuf; p < linebuf + bufsize; p++)
-				{
-					if (isupper(*p)&&__isascii(*p))
-						*p = _tolower(*p);
-				}
-			}
-			_stprintf_s(buf, 20, _T("%ld"), revs[i]);
-			if (authors[i].compare(sWhat)==0)
-				bFound = true;
-			else if ((!bCaseSensitive)&&(_stricmp(authors[i].c_str(), szWhat)==0))
-				bFound = true;
-			else if (strcmp(buf, szWhat) == 0)
-				bFound = true;
-			else if (strstr(linebuf, szWhat))
-				bFound = true;
-			delete [] linebuf;
-		}
-	}
+
+		i++;
+		if(i>=m_CommitHash.size())
+			i=0;
+	}while(i!=line &&(!bFound));
+
 	if (bFound)
 	{
 		GotoLine(i);
@@ -702,9 +669,9 @@ bool CTortoiseGitBlameView::DoSearch(LPSTR what, DWORD flags)
 	}
 	else
 	{
-		::MessageBox(wMain, searchstringnotfound, "CTortoiseGitBlameView", MB_ICONINFORMATION);
+		::MessageBox(wMain, what+_T(" not found"), _T("CTortoiseGitBlameView"), MB_ICONINFORMATION);
 	}
-#endif
+
 	return true;
 }
 
@@ -1201,7 +1168,7 @@ void CTortoiseGitBlameView::DrawBlame(HDC hDC)
 				Left += m_authorwidth;
 			}
 #endif
-			if ((i==m_SelectedLine)&&(currentDialog))
+			if ((i==m_SelectedLine)&&(m_pFindDialog))
 			{
 				LOGBRUSH brush;
 				brush.lbColor = m_textcolor;
@@ -2705,6 +2672,7 @@ BOOL CTortoiseGitBlameView::PreTranslateMessage(MSG* pMsg)
 void CTortoiseGitBlameView::OnEditFind()
 {
     m_pFindDialog=new CFindReplaceDialog();
+	
     m_pFindDialog->Create(TRUE,_T(""),NULL,FR_DOWN,this);  
 }
 
@@ -2739,7 +2707,8 @@ LRESULT CTortoiseGitBlameView::OnFindDialogMessage(WPARAM   wParam,   LPARAM   l
         bool   bMatchCase   =   m_pFindDialog->MatchCase()   ==   TRUE;   
         bool   bMatchWholeWord   =   m_pFindDialog->MatchWholeWord()   ==   TRUE;   
         bool   bSearchDown   =   m_pFindDialog->SearchDown()   ==   TRUE;   
-
+		
+		DoSearch(FindName,m_pFindDialog->m_fr.Flags);
             //with   given   name   do   search   
     //        *FindWhatYouNeed(FindName,   bMatchCase,   bMatchWholeWord,   bSearchDown);   
     }   
diff --git a/src/TortoiseGitBlame/TortoiseGitBlameView.h b/src/TortoiseGitBlame/TortoiseGitBlameView.h
index b68be6c..fd5f837 100644
--- a/src/TortoiseGitBlame/TortoiseGitBlameView.h
+++ b/src/TortoiseGitBlame/TortoiseGitBlameView.h
@@ -139,7 +139,7 @@ public:
 	void BlamePreviousRevision();
 	void DiffPreviousRevision();
 	void ShowLog();
-	bool DoSearch(LPSTR what, DWORD flags);
+	bool DoSearch(CString what, DWORD flags);
 	bool GotoLine(long line);
 	bool ScrollToLine(long line);
 	void GotoLineDlg();