Browse Source

Use .Net SDK help ("MS.NETFramework.v20.en") as default collection displayed in help addin.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@341 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 21 years ago
parent
commit
166099716a
  1. 2
      src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs
  2. 14
      src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs
  3. 2
      src/Tools/Help/plugins.xml
  4. 2
      src/Tools/Help/register.xml

2
src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs

@ -24,7 +24,7 @@ namespace HtmlHelp2Service @@ -24,7 +24,7 @@ namespace HtmlHelp2Service
static string help2EnvironmentFile = "help2environment.xml";
bool Help2EnvIsReady = false;
ComboBox help2Collections = null;
string selectedHelp2Collection = "Corsavy";
string selectedHelp2Collection = HtmlHelp2Environment.DefaultNamespaceName;
public override void LoadPanelContents()
{

14
src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs

@ -26,7 +26,7 @@ namespace HtmlHelp2Service @@ -26,7 +26,7 @@ namespace HtmlHelp2Service
static IHxRegFilterList namespaceFilters = null;
static IHxQuery fulltextSearch = null;
static IHxQuery dynamicHelp = null;
static string corsavyNamespaceName = "Corsavy";
public static string DefaultNamespaceName = "MS.NETFramework.v20.en";
static string currentSelectedFilterQuery = "";
static string currentSelectedFilterName = "";
static string defaultPage = "about:blank";
@ -36,8 +36,8 @@ namespace HtmlHelp2Service @@ -36,8 +36,8 @@ namespace HtmlHelp2Service
static HtmlHelp2Environment()
{
LoadHelp2Config();
corsavyNamespaceName = Help2RegistryWalker.GetFirstNamespace(corsavyNamespaceName);
InitializeNamespace(corsavyNamespaceName);
DefaultNamespaceName = Help2RegistryWalker.GetFirstNamespace(DefaultNamespaceName);
InitializeNamespace(DefaultNamespaceName);
}
#region Properties
@ -51,7 +51,7 @@ namespace HtmlHelp2Service @@ -51,7 +51,7 @@ namespace HtmlHelp2Service
public static string CurrentSelectedNamespace
{
get {
return corsavyNamespaceName;
return DefaultNamespaceName;
}
}
@ -106,7 +106,7 @@ namespace HtmlHelp2Service @@ -106,7 +106,7 @@ namespace HtmlHelp2Service
xmldoc.Load(PropertyService.ConfigDirectory + help2EnvironmentFile);
XmlNode node = xmldoc.SelectSingleNode("/help2environment/collection");
if(node != null) corsavyNamespaceName = node.InnerText;
if(node != null) DefaultNamespaceName = node.InnerText;
}
catch {
}
@ -115,8 +115,8 @@ namespace HtmlHelp2Service @@ -115,8 +115,8 @@ namespace HtmlHelp2Service
public static void ReloadNamespace()
{
LoadHelp2Config();
corsavyNamespaceName = Help2RegistryWalker.GetFirstNamespace(corsavyNamespaceName);
InitializeNamespace(corsavyNamespaceName);
DefaultNamespaceName = Help2RegistryWalker.GetFirstNamespace(DefaultNamespaceName);
InitializeNamespace(DefaultNamespaceName);
OnNamespaceReloaded(EventArgs.Empty);
}

2
src/Tools/Help/plugins.xml

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<register>
<plugin parent="Corsavy">
<child name="MS.NETFrameworkSDKv2*"/>
<child name="MS.NETFramework.v20*"/>
</plugin>
</register>

2
src/Tools/Help/register.xml

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
<file Id="SharpZipLib" HxS="..\..\..\doc\help\3rdparty\ICSharpCode.SharpZipLib.HxS" HxI="..\..\..\doc\help\3rdparty\ICSharpCode.SharpZipLib.HxI" LangId="1033"/>
<filter name="(no filter)"/>
<plugin>
<child name="MS.NETFrameworkSDKv2*"/>
<child name="MS.NETFramework.v20*"/>
</plugin>
</namespace>
</register>
Loading…
Cancel
Save