tried to fix a Virtual PC (no SDK) crash; HiliteMatches restored for testing (it doesn't work here :o( )

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

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

@@ -51,7 +51,7 @@ namespace HtmlHelp2
 		public HtmlHelp2IndexPad()
 		{
 			help2IndexControl = new MsHelp2IndexControl();
-			help2IndexControl.LoadIndex();
+			if(help2IndexControl.IsEnabled) help2IndexControl.LoadIndex();
 		}
 	}
 
@@ -63,6 +63,7 @@ namespace HtmlHelp2
 		Label label1               = new Label();
 		Label label2               = new Label();
 		bool itemClicked           = false;
+		bool controlIsEnabled      = false;
 
 		protected override void Dispose(bool disposing)
 		{
@@ -70,6 +71,11 @@ namespace HtmlHelp2
 			if(disposing && indexControl != null) { indexControl.Dispose(); }
 		}
 
+		public bool IsEnabled
+		{
+			get { return this.controlIsEnabled; }
+		}
+
 		public void RedrawContent()
 		{
 			label1.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.FilteredBy}");
@@ -78,10 +84,10 @@ namespace HtmlHelp2
 
 		public MsHelp2IndexControl()
 		{
-			bool Help2EnvIsReady = (HtmlHelp2Environment.IsReady &&
-			                        Help2ControlsValidation.IsIndexControlRegistered);
+			this.controlIsEnabled = (HtmlHelp2Environment.IsReady &&
+			                         Help2ControlsValidation.IsIndexControlRegistered);
 
-			if(Help2EnvIsReady)
+			if(this.controlIsEnabled)
 			{
 				try
 				{
@@ -117,7 +123,7 @@ namespace HtmlHelp2
 			filterCombobox.Dock                   = DockStyle.Top;
 			filterCombobox.DropDownStyle          = ComboBoxStyle.DropDownList;
 			filterCombobox.Sorted                 = true;
-			filterCombobox.Enabled                = Help2EnvIsReady;
+			filterCombobox.Enabled                = this.controlIsEnabled;
 			filterCombobox.SelectedIndexChanged  += new EventHandler(FilterChanged);
 
 			// Filter label
@@ -125,7 +131,7 @@ namespace HtmlHelp2
 			label1.Text      = StringParser.Parse("${res:AddIns.HtmlHelp2.FilteredBy}");
 			label1.Dock      = DockStyle.Top;
 			label1.TextAlign = ContentAlignment.MiddleLeft;
-			label1.Enabled   = Help2EnvIsReady;
+			label1.Enabled   = this.controlIsEnabled;
 
 			// SearchTerm Combobox
 			Panel panel2            = new Panel();
@@ -134,7 +140,7 @@ namespace HtmlHelp2
 			panel2.Height           = searchTerm.Height + 7;
 			panel2.Controls.Add(searchTerm);
 			searchTerm.Dock         = DockStyle.Top;
-			searchTerm.Enabled      = Help2EnvIsReady;
+			searchTerm.Enabled      = this.controlIsEnabled;
 			searchTerm.TextChanged += new EventHandler(SearchTextChanged);
 			searchTerm.KeyPress    += new KeyPressEventHandler(KeyPressed);
 
@@ -143,7 +149,7 @@ namespace HtmlHelp2
 			label2.Text             = StringParser.Parse("${res:AddIns.HtmlHelp2.LookFor}");
 			label2.Dock             = DockStyle.Top;
 			label2.TextAlign        = ContentAlignment.MiddleLeft;
-			label2.Enabled          = Help2EnvIsReady;
+			label2.Enabled          = this.controlIsEnabled;
 		}
 
 		private void FakeHelpControl()
@@ -160,13 +166,11 @@ namespace HtmlHelp2
 
 		public void LoadIndex()
 		{
+			if(!this.controlIsEnabled) return;
+			
 			searchTerm.Text                       = "";
 			searchTerm.Items.Clear();
-			try
-			{
-				indexControl.IndexData            = HtmlHelp2Environment.GetIndex(HtmlHelp2Environment.CurrentFilterQuery);
-			}
-			catch {}
+			indexControl.IndexData                = HtmlHelp2Environment.GetIndex(HtmlHelp2Environment.CurrentFilterQuery);
 			filterCombobox.SelectedIndexChanged  -= new EventHandler(FilterChanged);
 			HtmlHelp2Environment.BuildFilterList(filterCombobox);
 			filterCombobox.SelectedIndexChanged  += new EventHandler(FilterChanged);

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

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

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

@@ -55,22 +55,22 @@ namespace HtmlHelp2
 		public HtmlHelp2TocPad()
 		{
 			help2TocControl = new MsHelp2TocControl();
-			help2TocControl.LoadToc();
+			if(help2TocControl.IsEnabled) help2TocControl.LoadToc();
 		}
 
 		public void SyncToc(string topicUrl)
 		{
-			help2TocControl.SynToc(topicUrl);
+			if(help2TocControl.IsEnabled) help2TocControl.SynToc(topicUrl);
 		}
 
 		public void GetPrevFromNode()
 		{
-			help2TocControl.GetPrevFromNode();
+			if(help2TocControl.IsEnabled) help2TocControl.GetPrevFromNode();
 		}
 
 		public void GetNextFromNode()
 		{
-			help2TocControl.GetNextFromNode();
+			if(help2TocControl.IsEnabled) help2TocControl.GetNextFromNode();
 		}
 
 		public bool IsNotFirstNode
@@ -92,6 +92,7 @@ namespace HtmlHelp2
 		ContextMenuStrip printPopup        = new ContextMenuStrip();
 		ToolStripMenuItem printTopic       = new ToolStripMenuItem();
 		ToolStripMenuItem printChildTopics = new ToolStripMenuItem();
+		bool controlIsEnabled              = false;
 
 		protected override void Dispose(bool disposing)
 		{
@@ -99,6 +100,11 @@ namespace HtmlHelp2
 			if(disposing && tocControl != null) { tocControl.Dispose(); }
 		}
 
+		public bool IsEnabled
+		{
+			get { return this.controlIsEnabled; }
+		}
+
 		public void RedrawContent()
 		{
 			label1.Text = StringParser.Parse("${res:AddIns.HtmlHelp2.FilteredBy}");
@@ -106,9 +112,10 @@ namespace HtmlHelp2
 
 		public MsHelp2TocControl()
 		{
-			bool Help2EnvIsReady = (HtmlHelp2Environment.IsReady && Help2ControlsValidation.IsTocControlRegistered);
+			this.controlIsEnabled = (HtmlHelp2Environment.IsReady &&
+			                         Help2ControlsValidation.IsTocControlRegistered);
 
-			if(Help2EnvIsReady)
+			if(this.controlIsEnabled)
 			{
 				try
 				{
@@ -155,7 +162,7 @@ namespace HtmlHelp2
 			filterCombobox.Dock                   = DockStyle.Top;
 			filterCombobox.DropDownStyle          = ComboBoxStyle.DropDownList;
 			filterCombobox.Sorted                 = true;
-			filterCombobox.Enabled                = Help2EnvIsReady;
+			filterCombobox.Enabled                = this.controlIsEnabled;
 			filterCombobox.SelectedIndexChanged  += new EventHandler(this.FilterChanged);
 
 			// Filter label
@@ -163,9 +170,9 @@ namespace HtmlHelp2
 			label1.Text                           = StringParser.Parse("${res:AddIns.HtmlHelp2.FilteredBy}");
 			label1.Dock                           = DockStyle.Top;
 			label1.TextAlign                      = ContentAlignment.MiddleLeft;
-			label1.Enabled                        = Help2EnvIsReady;
+			label1.Enabled                        = this.controlIsEnabled;
 
-			if(Help2EnvIsReady)
+			if(this.controlIsEnabled)
 			{
 				HtmlHelp2Environment.FilterQueryChanged  += new EventHandler(this.FilterQueryChanged);
 				HtmlHelp2Environment.NamespaceReloaded   += new EventHandler(this.NamespaceReloaded);
@@ -184,11 +191,9 @@ namespace HtmlHelp2
 
 		public void LoadToc()
 		{
-			try
-			{
-				tocControl.Hierarchy             = HtmlHelp2Environment.GetTocHierarchy(HtmlHelp2Environment.CurrentFilterQuery);
-			}
-			catch {}
+			if(!this.controlIsEnabled) return;
+
+			tocControl.Hierarchy                 = HtmlHelp2Environment.GetTocHierarchy(HtmlHelp2Environment.CurrentFilterQuery);
 			filterCombobox.SelectedIndexChanged -= new EventHandler(this.FilterChanged);
 			HtmlHelp2Environment.BuildFilterList(filterCombobox);
 			filterCombobox.SelectedIndexChanged += new EventHandler(this.FilterChanged);

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

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

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

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