Browse Source

changed FullTypeName search to DynamicHelp engine

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@366 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Mathias Simmack 20 years ago
parent
commit
512ea6b7e8
  1. 25
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs
  2. 4
      src/AddIns/Misc/HtmlHelp2/Project/src/MsHelpProvider.cs

25
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs

@ -242,6 +242,11 @@ namespace HtmlHelp2 @@ -242,6 +242,11 @@ namespace HtmlHelp2
#region FTS
private void PerformFTS(string searchWord)
{
this.PerformFTS(searchWord, false);
}
private void PerformFTS(string searchWord, bool useDynamicHelp)
{
if(!HtmlHelp2Environment.IsReady || searchIsBusy) {
return;
@ -251,6 +256,7 @@ namespace HtmlHelp2 @@ -251,6 +256,7 @@ namespace HtmlHelp2
try {
searchIsBusy = true;
IHxTopicList matchingTopics = null;
HxQuery_Options searchFlags = HxQuery_Options.HxQuery_No_Option;
searchFlags |= (titlesOnly.Checked)?HxQuery_Options.HxQuery_FullTextSearch_Title_Only:HxQuery_Options.HxQuery_No_Option;
@ -266,7 +272,14 @@ namespace HtmlHelp2 @@ -266,7 +272,14 @@ namespace HtmlHelp2
Application.DoEvents();
Cursor.Current = Cursors.WaitCursor;
IHxTopicList matchingTopics = HtmlHelp2Environment.FTS.Query(searchWord, searchFlags);
if(useDynamicHelp) {
matchingTopics = HtmlHelp2Environment.GetMatchingTopicsForDynamicHelp(searchWord);
}
else {
matchingTopics = HtmlHelp2Environment.FTS.Query(searchWord, searchFlags);
}
Cursor.Current = Cursors.Default;
searchDialog.Dispose();
@ -302,14 +315,18 @@ namespace HtmlHelp2 @@ -302,14 +315,18 @@ namespace HtmlHelp2
}
}
public bool PerformF1FTS(string fullTypeName)
public bool PerformF1FTS(string keyword)
{
return this.PerformF1FTS(keyword, false);
}
public bool PerformF1FTS(string keyword, bool useDynamicHelp)
{
if(!HtmlHelp2Environment.IsReady || searchIsBusy) {
return false;
}
// call internal "PerformFTS" method
this.PerformFTS(fullTypeName);
this.PerformFTS(keyword, useDynamicHelp);
HtmlHelp2SearchResultsView searchResults = HtmlHelp2SearchResultsView.Instance;
return searchResults.SearchResultsListView.Items.Count > 0;

4
src/AddIns/Misc/HtmlHelp2/Project/src/MsHelpProvider.cs

@ -24,13 +24,13 @@ namespace HtmlHelp2 @@ -24,13 +24,13 @@ namespace HtmlHelp2
try {
PadDescriptor search = WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2SearchPad));
return ((HtmlHelp2SearchPad)search.PadContent).PerformF1FTS(fullTypeName);
return ((HtmlHelp2SearchPad)search.PadContent).PerformF1FTS(fullTypeName, true);
}
catch {
return false;
}
}
public override bool TryShowHelpByKeyword(string keyword)
{
LoggingService.Info("MsHelpProvider.TryShowHelpByKeyword");

Loading…
Cancel
Save