Browse Source

disable 'highlight matching topics' because it doesn't work with the WebBrowser control

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@486 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Mathias Simmack 21 years ago
parent
commit
3d0b29be33
  1. 5
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs
  2. 6
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs
  3. 2
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/SearchPad.cs
  4. 6
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs
  5. 14
      src/AddIns/Misc/HtmlHelp2/Project/src/BrowserControl/ShowHelpBrowser.cs
  6. 8
      src/AddIns/Misc/HtmlHelp2/Project/src/BrowserScheme.cs
  7. 4
      src/AddIns/Misc/HtmlHelp2/Project/src/MsHelpProvider.cs

5
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs

@ -27,6 +27,11 @@ namespace HtmlHelp2
using HtmlHelp2.Environment; using HtmlHelp2.Environment;
using HtmlHelp2.ResourcesHelperClass; using HtmlHelp2.ResourcesHelperClass;
using MSHelpServices; using MSHelpServices;
// TODO: detect the active language (CSharp, VB#, ...) to limit the results
// TODO: if there are no DH results, implement Keyword search (index)
// TODO: insert some default entries (Homepage, Wiki, Community, ...)
public class ShowDynamicHelpMenuCommand : AbstractMenuCommand public class ShowDynamicHelpMenuCommand : AbstractMenuCommand

6
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs

@ -162,7 +162,11 @@ namespace HtmlHelp2
{ {
searchTerm.Text = ""; searchTerm.Text = "";
searchTerm.Items.Clear(); searchTerm.Items.Clear();
indexControl.IndexData = HtmlHelp2Environment.GetIndex(HtmlHelp2Environment.CurrentFilterQuery); try
{
indexControl.IndexData = HtmlHelp2Environment.GetIndex(HtmlHelp2Environment.CurrentFilterQuery);
}
catch {}
filterCombobox.SelectedIndexChanged -= new EventHandler(FilterChanged); filterCombobox.SelectedIndexChanged -= new EventHandler(FilterChanged);
HtmlHelp2Environment.BuildFilterList(filterCombobox); HtmlHelp2Environment.BuildFilterList(filterCombobox);
filterCombobox.SelectedIndexChanged += new EventHandler(FilterChanged); filterCombobox.SelectedIndexChanged += new EventHandler(FilterChanged);

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

@ -118,6 +118,8 @@ namespace HtmlHelp2
hiliteTopics.TextAlign = ContentAlignment.MiddleLeft; hiliteTopics.TextAlign = ContentAlignment.MiddleLeft;
hiliteTopics.Enabled = HtmlHelp2Environment.IsReady; hiliteTopics.Enabled = HtmlHelp2Environment.IsReady;
hiliteTopics.Checked = true; hiliteTopics.Checked = true;
// TODO: enable "hilite matches", if there is any way
hiliteTopics.Visible = false;
panel3.Dock = DockStyle.Fill; panel3.Dock = DockStyle.Fill;

6
src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs

@ -184,7 +184,11 @@ namespace HtmlHelp2
public void LoadToc() public void LoadToc()
{ {
tocControl.Hierarchy = HtmlHelp2Environment.GetTocHierarchy(HtmlHelp2Environment.CurrentFilterQuery); try
{
tocControl.Hierarchy = HtmlHelp2Environment.GetTocHierarchy(HtmlHelp2Environment.CurrentFilterQuery);
}
catch {}
filterCombobox.SelectedIndexChanged -= new EventHandler(this.FilterChanged); filterCombobox.SelectedIndexChanged -= new EventHandler(this.FilterChanged);
HtmlHelp2Environment.BuildFilterList(filterCombobox); HtmlHelp2Environment.BuildFilterList(filterCombobox);
filterCombobox.SelectedIndexChanged += new EventHandler(this.FilterChanged); filterCombobox.SelectedIndexChanged += new EventHandler(this.FilterChanged);

14
src/AddIns/Misc/HtmlHelp2/Project/src/BrowserControl/ShowHelpBrowser.cs

@ -73,12 +73,12 @@ namespace HtmlHelp2
return tempPane; return tempPane;
} }
public static void HighlightDocument(HtmlViewPane htmlViewPane) // public static void HighlightDocument(HtmlViewPane htmlViewPane)
{ // {
if (hiliteMatches && lastTopic != null) // if (hiliteMatches && lastTopic != null)
{ // {
lastTopic.HighlightDocument(htmlViewPane.WebBrowser.Document.DomDocument); // lastTopic.HighlightDocument(htmlViewPane.WebBrowser.Document);
} // }
} // }
} }
} }

8
src/AddIns/Misc/HtmlHelp2/Project/src/BrowserScheme.cs

@ -26,9 +26,9 @@ namespace HtmlHelp2
pane.Navigate(HtmlHelp2Environment.SearchPage); pane.Navigate(HtmlHelp2Environment.SearchPage);
} }
public override void DocumentCompleted(HtmlViewPane pane, WebBrowserDocumentCompletedEventArgs e) // public override void DocumentCompleted(HtmlViewPane pane, WebBrowserDocumentCompletedEventArgs e)
{ // {
ShowHelpBrowser.HighlightDocument(pane); // ShowHelpBrowser.HighlightDocument(pane);
} // }
} }
} }

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

@ -16,7 +16,7 @@ namespace HtmlHelp2
{ {
public override bool TryShowHelp(string fullTypeName) public override bool TryShowHelp(string fullTypeName)
{ {
LoggingService.Info("MsHelpProvider.TryShowHelp"); LoggingService.Info("Help 2.0: MsHelpProvider.TryShowHelp");
try { try {
PadDescriptor search = WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2SearchPad)); PadDescriptor search = WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2SearchPad));
@ -29,7 +29,7 @@ namespace HtmlHelp2
public override bool TryShowHelpByKeyword(string keyword) public override bool TryShowHelpByKeyword(string keyword)
{ {
LoggingService.Info("MsHelpProvider.TryShowHelpByKeyword"); LoggingService.Info("Help 2.0: MsHelpProvider.TryShowHelpByKeyword");
try { try {
PadDescriptor search = WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2SearchPad)); PadDescriptor search = WorkbenchSingleton.Workbench.GetPad(typeof(HtmlHelp2SearchPad));

Loading…
Cancel
Save