From b805da617f1a674aba929e4789de3d420af92269 Mon Sep 17 00:00:00 2001 From: Mathias Simmack Date: Sun, 25 Sep 2005 19:50:30 +0000 Subject: [PATCH] Help 2.0: solution structure changed (you can enable the Dynamic Help by copying the new Addin file) git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@511 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/{Resources => }/ClosedBook.png | Bin .../Project/HtmlHelp2.DynamicHelp.addin | 28 ++++++++++++ .../Misc/HtmlHelp2/Project/HtmlHelp2.addin | 29 +------------ .../Misc/HtmlHelp2/Project/HtmlHelp2.csproj | 38 +++++++++-------- .../Project/{Resources => }/OpenBook.png | Bin .../Resources/DynamicHelpDefaultEntries.xml | 10 ----- .../Project/{Resources => }/context.html | 0 .../src/BaseControls/DynamicHelpPad.cs | 40 +++--------------- 8 files changed, 55 insertions(+), 90 deletions(-) rename src/AddIns/Misc/HtmlHelp2/Project/{Resources => }/ClosedBook.png (100%) create mode 100644 src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.DynamicHelp.addin rename src/AddIns/Misc/HtmlHelp2/Project/{Resources => }/OpenBook.png (100%) delete mode 100644 src/AddIns/Misc/HtmlHelp2/Project/Resources/DynamicHelpDefaultEntries.xml rename src/AddIns/Misc/HtmlHelp2/Project/{Resources => }/context.html (100%) diff --git a/src/AddIns/Misc/HtmlHelp2/Project/Resources/ClosedBook.png b/src/AddIns/Misc/HtmlHelp2/Project/ClosedBook.png similarity index 100% rename from src/AddIns/Misc/HtmlHelp2/Project/Resources/ClosedBook.png rename to src/AddIns/Misc/HtmlHelp2/Project/ClosedBook.png diff --git a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.DynamicHelp.addin b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.DynamicHelp.addin new file mode 100644 index 0000000000..88ecc5a04b --- /dev/null +++ b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.DynamicHelp.addin @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + diff --git a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin index dd74a45361..406ae9af06 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin +++ b/src/AddIns/Misc/HtmlHelp2/Project/HtmlHelp2.addin @@ -12,17 +12,12 @@ - + - + - - - - Debug AnyCPU {918487B7-2153-4618-BBB3-344DBDDF2A2A} - 8.0.50630 + 8.0.50215 2.0 @@ -45,7 +45,9 @@ UserControl - + + UserControl + UserControl @@ -69,14 +71,12 @@ Component - - UserControl - + - - - - + + + + @@ -87,15 +87,8 @@ - - Never - - - Never - - - Never - + + @@ -108,6 +101,15 @@ ICSharpCode.Core False + + Always + + + Always + + + Always + \ No newline at end of file diff --git a/src/AddIns/Misc/HtmlHelp2/Project/Resources/OpenBook.png b/src/AddIns/Misc/HtmlHelp2/Project/OpenBook.png similarity index 100% rename from src/AddIns/Misc/HtmlHelp2/Project/Resources/OpenBook.png rename to src/AddIns/Misc/HtmlHelp2/Project/OpenBook.png diff --git a/src/AddIns/Misc/HtmlHelp2/Project/Resources/DynamicHelpDefaultEntries.xml b/src/AddIns/Misc/HtmlHelp2/Project/Resources/DynamicHelpDefaultEntries.xml deleted file mode 100644 index 8dea93af7e..0000000000 --- a/src/AddIns/Misc/HtmlHelp2/Project/Resources/DynamicHelpDefaultEntries.xml +++ /dev/null @@ -1,10 +0,0 @@ - -
- - - -
-
- - - diff --git a/src/AddIns/Misc/HtmlHelp2/Project/Resources/context.html b/src/AddIns/Misc/HtmlHelp2/Project/context.html similarity index 100% rename from src/AddIns/Misc/HtmlHelp2/Project/Resources/context.html rename to src/AddIns/Misc/HtmlHelp2/Project/context.html diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs index f96379b432..0b1fe2f27b 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs @@ -84,21 +84,17 @@ namespace HtmlHelp2 helpResults = (this.CallDynamicHelp(currentHelpTerm, false) || helpResults); } } -// if(!helpResults) -// { - foreach(string currentHelpTerm in this.dynamicHelpTerms) + foreach(string currentHelpTerm in this.dynamicHelpTerms) + { + if(currentHelpTerm.StartsWith("!")) { - if(currentHelpTerm.StartsWith("!")) - { - helpResults = (this.CallDynamicHelp(currentHelpTerm.Substring(1), true) || helpResults); - } + helpResults = (this.CallDynamicHelp(currentHelpTerm.Substring(1), true) || helpResults); } -// } + } if(!helpResults) { dynamicHelpBrowser.BuildANothing(); } -// dynamicHelpBrowser.BuildDefaultHelpEntries(); Cursor.Current = Cursors.Default; this.debugPreElement += String.Format("
Current project language: {0}", @@ -420,7 +416,6 @@ namespace HtmlHelp2 { this.LoadDynamicHelpPage(); this.RemoveAllChildren(); - this.BuildDefaultHelpEntries(); } #endregion @@ -618,7 +613,6 @@ namespace HtmlHelp2 catch {} } - public void RemoveAllChildren() { try @@ -628,30 +622,6 @@ namespace HtmlHelp2 } catch {} } - - public void BuildDefaultHelpEntries() - { - try - { - XmlDocument xmldoc = new XmlDocument(); - xmldoc.Load(String.Format("{0}\\DynamicHelpDefaultEntries.xml", - Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location))); - - XmlNodeList sectionNodes = xmldoc.SelectNodes("/defaultentries/section[@name]"); - foreach(XmlNode sectionNode in sectionNodes) - { - XmlNodeList urlNodes = sectionNode.SelectNodes("url[@name and text()!=\"\"]"); - foreach(XmlNode urlNode in urlNodes) - { - string sectionName = sectionNode.Attributes.GetNamedItem("name").InnerText; - string url = urlNode.InnerText; - string id = urlNode.Attributes.GetNamedItem("name").InnerText; - this.BuildNewChild(StringParser.Parse(sectionName), id, url); - } - } - } - catch { /* I don't care about the results */ } - } #endregion #region DebugInfo