Dynamic help pad now checks for a null grid item label when building the list of dynamic search terms. Removed reference to the Tip of the Day menu item in the HtmlHelp2.addin file. Modified the HtmlHelp2 project so full debug information is generated when building the debug configuration.

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

src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin

@@ -51,7 +51,7 @@
 	<Path name = "/SharpDevelop/Workbench/MainMenu/Help">
 		<MenuItem id           = "HtmlHelp2Separator2"
 		          type         = "Separator"
-		          insertafter  = "TipOfTheDay"/>
+		          insertafter  = "Help"/>
 		<MenuItem id           = "TocPadCommand"
 		          insertafter  = "HtmlHelp2Separator2"
 		          label        = "${res:AddIns.HtmlHelp2.Contents}"

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

@@ -12,7 +12,6 @@
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
     <NoStdLib>False</NoStdLib>
-    <DebugType>None</DebugType>
     <RegisterForComInterop>False</RegisterForComInterop>
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
     <BaseAddress>119537664</BaseAddress>
@@ -20,7 +19,6 @@
     <FileAlignment>4096</FileAlignment>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <DebugSymbols>false</DebugSymbols>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\HtmlHelp2\</OutputPath>
@@ -32,6 +30,14 @@
     <Optimize>true</Optimize>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DebugType>Full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugType>None</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />

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

@@ -236,10 +236,8 @@ namespace HtmlHelp2
 			this.dynamicHelpTerms.Clear();
 
 			Type myObject = selectedObject.GetType();
-			if (selectedItem != null)
+			if (selectedItem != null && selectedItem.Label != null) {
-			{
+				foreach (Type type in TypeHandling.FindDeclaringType(myObject, selectedItem.Label)) {
-				foreach (Type type in TypeHandling.FindDeclaringType(myObject, selectedItem.Label))
-				{
 					this.AddToStringCollection(string.Format(CultureInfo.InvariantCulture,
 					                                         "{0}.{1}", type.FullName, selectedItem.Label));
 				}