minor fixes (MSDN is the default search page again) and cosmetic (printer picture for ContextMenuStrip in TocPad.cs)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@347 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.csproj

@@ -77,6 +77,7 @@
     <EmbeddedResource Include="Resources\HtmlHelp2.16x16.AddToFavorites.png" />
     <Compile Include="src\BrowserControl\HelpBrowserCommands.cs" />
     <Compile Include="src\BrowserScheme.cs" />
+    <EmbeddedResource Include="Resources\HtmlHelp2.16x16.Print.bmp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">

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);
 				}
 

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()

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);

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

@@ -22,7 +22,8 @@ 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)

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
 	}
 }

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);
 		}