diff --git a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj index 22d4fdbde1..f8290f4ae7 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj +++ b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj @@ -77,6 +77,7 @@ + diff --git a/src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.Print.bmp b/src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.Print.bmp new file mode 100644 index 0000000000..03f50754e4 Binary files /dev/null and b/src/AddIns/Misc/HtmlHelp2/Project/Resources/HtmlHelp2.16x16.Print.bmp differ diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs index 8722bfead3..400f892e56 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexPad.cs @@ -272,6 +272,7 @@ namespace HtmlHelp2 } finally { ((HtmlHelp2IndexResultsPad)indexResults.PadContent).IndexResultsListView.EndUpdate(); + ((HtmlHelp2IndexResultsPad)indexResults.PadContent).SortLV(0); ((HtmlHelp2IndexResultsPad)indexResults.PadContent).SetStatusMessage(indexTerm); } diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs index de0b204227..1957d54052 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/IndexResultsPad.cs @@ -73,6 +73,12 @@ namespace HtmlHelp2 listView.CreateControl(); } + public void SortLV(int listViewColumn) + { + listView.ListViewItemSorter = new ListViewItemComparer(listViewColumn); + listView.Sort(); + } + private void SetListViewHeader() { title.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.Title}"); @@ -96,8 +102,7 @@ namespace HtmlHelp2 private void ColumnClick(object sender, ColumnClickEventArgs e) { - listView.ListViewItemSorter = new ListViewItemComparer(e.Column); - listView.Sort(); + this.SortLV(e.Column); } public void CleanUp() diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs index 64936530a5..9bc6b27285 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/TocPad.cs @@ -149,6 +149,8 @@ namespace HtmlHelp2 tocControl.TreeStyle = HxTreeStyleConstant.HxTreeStyle_TreelinesPlusMinusText; #endif + printTopic.Image = ResourcesHelper.GetBitmap("HtmlHelp2.16x16.Print.bmp"); + printTopic.DisplayStyle = ToolStripItemDisplayStyle.ImageAndText; printTopic.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.PrintTopic}"); printChildTopics.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.PrintSubtopics}"); printPopup.Items.Add(printTopic); diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BrowserScheme.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BrowserScheme.cs index 572492ce2f..eef3e6e171 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BrowserScheme.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BrowserScheme.cs @@ -22,9 +22,10 @@ namespace HtmlHelp2 public override void GoSearch(HtmlViewPane pane) { - new ShowSearchMenuCommand().Run(); +// new ShowSearchMenuCommand().Run(); + pane.Navigate(HtmlHelp2Service.HtmlHelp2Environment.SearchPage); } - + public override void DocumentCompleted(HtmlViewPane pane, WebBrowserDocumentCompletedEventArgs e) { ShowHelpBrowser.HighlightDocument(pane); diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/Help2RegistryWalker.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/Help2RegistryWalker.cs index c3831ced89..510795409f 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/Help2RegistryWalker.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/Help2RegistryWalker.cs @@ -8,6 +8,7 @@ namespace HtmlHelp2Service { using System; + using System.Runtime.InteropServices; using System.Windows.Forms; using MSHelpServices; @@ -82,8 +83,34 @@ namespace HtmlHelp2Service } } + public static string GetFirstMatchingNamespaceName(string matchingNamespaceName) + { + if(matchingNamespaceName == "") { + return ""; + } + + try { + HxRegistryWalker regWalker = new HxRegistryWalker(); + IHxRegNamespaceList nl = regWalker.get_RegisteredNamespaceList(""); + foreach(IHxRegNamespace currentNamespace in nl) { + if(PathMatchSpec(currentNamespace.Name, matchingNamespaceName)) { + return currentNamespace.Name; + } + } + } + catch { + } + + return ""; + } + public Help2RegistryWalker() { } + + #region PatchMatchSpec@Win32API + [DllImport("shlwapi.dll")] + static extern bool PathMatchSpec(string pwszFile, string pwszSpec); + #endregion } } diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs index 2c3a58a495..fe30b478eb 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs @@ -26,7 +26,7 @@ namespace HtmlHelp2Service static IHxRegFilterList namespaceFilters = null; static IHxQuery fulltextSearch = null; static IHxQuery dynamicHelp = null; - public static string DefaultNamespaceName = "MS.NETFramework.v20.en"; + public static string DefaultNamespaceName = "MS.NETFramework.v20*"; static string currentSelectedFilterQuery = ""; static string currentSelectedFilterName = ""; static string defaultPage = "about:blank"; @@ -36,7 +36,7 @@ namespace HtmlHelp2Service static HtmlHelp2Environment() { LoadHelp2Config(); - DefaultNamespaceName = Help2RegistryWalker.GetFirstNamespace(DefaultNamespaceName); + DefaultNamespaceName = Help2RegistryWalker.GetFirstMatchingNamespaceName(DefaultNamespaceName); InitializeNamespace(DefaultNamespaceName); }