Browse Source

Fixed NullReferenceException in DynamicHelpPad. Updated layout configuration to hide DynamicHelpPad by default.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@766 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
81f0f4322c
  1. 27
      data/resources/layouts/Debug.xml
  2. 60
      data/resources/layouts/Default.xml
  3. 56
      data/resources/layouts/Plain.xml
  4. 16
      src/AddIns/Misc/HtmlHelp2/Project/src/BaseControls/DynamicHelpPad.cs
  5. 5
      src/AddIns/Misc/HtmlHelp2/Project/src/Service/SharpDevLanguageClass.cs
  6. 11
      src/Main/Base/Project/Src/Services/AmbienceService/AmbienceService.cs

27
data/resources/layouts/Debug.xml

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- DockPanel configuration file. Author: Weifen Luo, all rights reserved. -->
<!-- !!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!! -->
<DockPanel FormatVersion="0.9.3" DockLeftPortion="0.162210282258557" DockRightPortion="0.159760856281619" DockTopPortion="0.25" DockBottomPortion="0.271028728576449" ActiveDocumentPane="12" ActivePane="-1">
<DockPanel FormatVersion="0.9.3" DockLeftPortion="0.162210282258557" DockRightPortion="0.159760856281619" DockTopPortion="0.25" DockBottomPortion="0.271028728576449" ActiveDocumentPane="-1" ActivePane="-1">
<Contents Count="25">
<Content ID="0" PersistString="ICSharpCode.MbUnitPad.MbUnitPadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="1" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
@ -27,16 +27,16 @@ @@ -27,16 +27,16 @@
<Content ID="21" PersistString="HtmlHelp2.HtmlHelp2IndexResultsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="Boo.InterpreterAddIn.InterpreterPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="ICSharpCode.NAntAddIn.Gui.NAntPadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="24" PersistString="ICSharpCode.SharpDevelop.Gui.SdiWorkspaceWindow" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="24" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
</Contents>
<Panes Count="13">
<Panes Count="12">
<Pane ID="0" DockState="Float" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="0" />
</Contents>
</Pane>
<Pane ID="1" DockState="DockRight" ActiveContent="13">
<Contents Count="12">
<Contents Count="13">
<Content ID="0" RefID="0" />
<Content ID="1" RefID="9" />
<Content ID="2" RefID="13" />
@ -49,6 +49,7 @@ @@ -49,6 +49,7 @@
<Content ID="9" RefID="21" />
<Content ID="10" RefID="22" />
<Content ID="11" RefID="23" />
<Content ID="12" RefID="24" />
</Contents>
</Pane>
<Pane ID="2" DockState="Float" ActiveContent="-1">
@ -111,30 +112,20 @@ @@ -111,30 +112,20 @@
<Content ID="0" RefID="4" />
</Contents>
</Pane>
<Pane ID="12" DockState="Document" ActiveContent="24">
<Contents Count="1">
<Content ID="0" RefID="24" />
</Contents>
</Pane>
</Panes>
<DockWindows Count="4">
<DockWindow ID="0" DockState="Document" ZOrderIndex="1">
<DockList Count="1">
<Pane ID="0" RefID="12" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>
</DockWindow>
<DockWindow ID="1" DockState="DockLeft" ZOrderIndex="5">
<DockWindows Count="3">
<DockWindow ID="0" DockState="DockLeft" ZOrderIndex="5">
<DockList Count="1">
<Pane ID="0" RefID="6" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
</DockList>
</DockWindow>
<DockWindow ID="2" DockState="DockRight" ZOrderIndex="7">
<DockWindow ID="1" DockState="DockRight" ZOrderIndex="7">
<DockList Count="2">
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
<Pane ID="1" RefID="3" PrevPane="1" Alignment="Bottom" Proportion="0.574444444444444" />
</DockList>
</DockWindow>
<DockWindow ID="3" DockState="DockBottom" ZOrderIndex="6">
<DockWindow ID="2" DockState="DockBottom" ZOrderIndex="6">
<DockList Count="1">
<Pane ID="0" RefID="4" PrevPane="-1" Alignment="Left" Proportion="0.5" />
</DockList>

60
data/resources/layouts/Default.xml

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- DockPanel configuration file. Author: Weifen Luo, all rights reserved. -->
<!-- !!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!! -->
<DockPanel FormatVersion="0.9.3" DockLeftPortion="0.212388764222485" DockRightPortion="0.178922617303663" DockTopPortion="0.25" DockBottomPortion="0.259014607431894" ActiveDocumentPane="-1" ActivePane="-1">
<Contents Count="24">
<DockPanel FormatVersion="0.9.3" DockLeftPortion="0.176451264222485" DockRightPortion="0.178922617303663" DockTopPortion="0.25" DockBottomPortion="0.259014607431894" ActiveDocumentPane="-1" ActivePane="6">
<Contents Count="25">
<Content ID="0" PersistString="ICSharpCode.MbUnitPad.MbUnitPadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="1" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.SideBarView" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
@ -18,35 +18,37 @@ @@ -18,35 +18,37 @@
<Content ID="12" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="13" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="14" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="15" PersistString="ICSharpCode.SharpDevelop.Bookmarks.BookmarkPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="15" PersistString="ICSharpCode.SharpDevelop.Bookmarks.BookmarkPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="16" PersistString="ICSharpCode.SharpDevelop.Gui.DefinitionViewPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="17" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.ExceptionHistoryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="18" PersistString="HtmlHelp2.HtmlHelp2TocPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="19" PersistString="HtmlHelp2.HtmlHelp2IndexPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="20" PersistString="HtmlHelp2.HtmlHelp2SearchPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="21" PersistString="HtmlHelp2.HtmlHelp2IndexResultsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="Boo.InterpreterAddIn.InterpreterPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="23" PersistString="ICSharpCode.NAntAddIn.Gui.NAntPadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="ICSharpCode.NAntAddIn.Gui.NAntPadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="24" PersistString="Boo.InterpreterAddIn.InterpreterPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
</Contents>
<Panes Count="12">
<Panes Count="13">
<Pane ID="0" DockState="Float" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="0" />
</Contents>
</Pane>
<Pane ID="1" DockState="DockRight" ActiveContent="-1">
<Contents Count="11">
<Content ID="0" RefID="18" />
<Content ID="1" RefID="0" />
<Content ID="2" RefID="10" />
<Content ID="3" RefID="11" />
<Content ID="4" RefID="12" />
<Content ID="5" RefID="13" />
<Content ID="6" RefID="14" />
<Content ID="7" RefID="17" />
<Content ID="8" RefID="19" />
<Content ID="9" RefID="20" />
<Content ID="10" RefID="23" />
<Contents Count="12">
<Content ID="0" RefID="0" />
<Content ID="1" RefID="22" />
<Content ID="2" RefID="23" />
<Content ID="3" RefID="18" />
<Content ID="4" RefID="10" />
<Content ID="5" RefID="11" />
<Content ID="6" RefID="12" />
<Content ID="7" RefID="13" />
<Content ID="8" RefID="14" />
<Content ID="9" RefID="17" />
<Content ID="10" RefID="19" />
<Content ID="11" RefID="20" />
</Contents>
</Pane>
<Pane ID="2" DockState="Float" ActiveContent="-1">
@ -69,7 +71,7 @@ @@ -69,7 +71,7 @@
<Content ID="4" RefID="8" />
<Content ID="5" RefID="21" />
<Content ID="6" RefID="15" />
<Content ID="7" RefID="22" />
<Content ID="7" RefID="24" />
</Contents>
</Pane>
<Pane ID="5" DockState="Float" ActiveContent="-1">
@ -110,26 +112,31 @@ @@ -110,26 +112,31 @@
<Content ID="0" RefID="4" />
</Contents>
</Pane>
<Pane ID="12" DockState="Float" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="23" />
</Contents>
</Pane>
</Panes>
<DockWindows Count="3">
<DockWindow ID="0" DockState="DockLeft" ZOrderIndex="7">
<DockWindow ID="0" DockState="DockLeft" ZOrderIndex="6">
<DockList Count="1">
<Pane ID="0" RefID="6" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
</DockList>
</DockWindow>
<DockWindow ID="1" DockState="DockRight" ZOrderIndex="6">
<DockWindow ID="1" DockState="DockRight" ZOrderIndex="5">
<DockList Count="2">
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
<Pane ID="1" RefID="3" PrevPane="1" Alignment="Bottom" Proportion="0.663630620587142" />
<Pane ID="1" RefID="3" PrevPane="1" Alignment="Bottom" Proportion="0.654712002972872" />
</DockList>
</DockWindow>
<DockWindow ID="2" DockState="DockBottom" ZOrderIndex="5">
<DockWindow ID="2" DockState="DockBottom" ZOrderIndex="4">
<DockList Count="1">
<Pane ID="0" RefID="4" PrevPane="-1" Alignment="Left" Proportion="0.5" />
</DockList>
</DockWindow>
</DockWindows>
<FloatWindows Count="8">
<FloatWindows Count="9">
<FloatWindow ID="0" Bounds="598, 282, 300, 300" AllowRedocking="True" ZOrderIndex="0">
<DockList Count="1">
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Right" Proportion="0.5" />
@ -170,5 +177,10 @@ @@ -170,5 +177,10 @@
<Pane ID="0" RefID="11" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>
</FloatWindow>
<FloatWindow ID="8" Bounds="654, 252, 300, 300" AllowRedocking="True" ZOrderIndex="8">
<DockList Count="1">
<Pane ID="0" RefID="12" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>
</FloatWindow>
</FloatWindows>
</DockPanel>

56
data/resources/layouts/Plain.xml

@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- DockPanel configuration file. Author: Weifen Luo, all rights reserved. -->
<!-- !!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!! -->
<DockPanel FormatVersion="0.9.3" DockLeftPortion="0.212388764222485" DockRightPortion="0.178922617303663" DockTopPortion="0.25" DockBottomPortion="0.259014607431894" ActiveDocumentPane="-1" ActivePane="-1">
<Contents Count="24">
<DockPanel FormatVersion="0.9.3" DockLeftPortion="0.176451264222485" DockRightPortion="0.178922617303663" DockTopPortion="0.25" DockBottomPortion="0.259014607431894" ActiveDocumentPane="-1" ActivePane="1">
<Contents Count="25">
<Content ID="0" PersistString="ICSharpCode.MbUnitPad.MbUnitPadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="1" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.SideBarView" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
@ -25,28 +25,30 @@ @@ -25,28 +25,30 @@
<Content ID="19" PersistString="HtmlHelp2.HtmlHelp2IndexPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="20" PersistString="HtmlHelp2.HtmlHelp2SearchPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="21" PersistString="HtmlHelp2.HtmlHelp2IndexResultsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="Boo.InterpreterAddIn.InterpreterPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="ICSharpCode.NAntAddIn.Gui.NAntPadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="ICSharpCode.NAntAddIn.Gui.NAntPadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="24" PersistString="Boo.InterpreterAddIn.InterpreterPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
</Contents>
<Panes Count="12">
<Panes Count="13">
<Pane ID="0" DockState="Float" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="0" />
</Contents>
</Pane>
<Pane ID="1" DockState="DockRight" ActiveContent="-1">
<Contents Count="11">
<Content ID="0" RefID="18" />
<Content ID="1" RefID="0" />
<Content ID="2" RefID="10" />
<Content ID="3" RefID="11" />
<Content ID="4" RefID="12" />
<Content ID="5" RefID="13" />
<Content ID="6" RefID="14" />
<Content ID="7" RefID="17" />
<Content ID="8" RefID="19" />
<Content ID="9" RefID="20" />
<Content ID="10" RefID="23" />
<Contents Count="12">
<Content ID="0" RefID="0" />
<Content ID="1" RefID="22" />
<Content ID="2" RefID="23" />
<Content ID="3" RefID="18" />
<Content ID="4" RefID="10" />
<Content ID="5" RefID="11" />
<Content ID="6" RefID="12" />
<Content ID="7" RefID="13" />
<Content ID="8" RefID="14" />
<Content ID="9" RefID="17" />
<Content ID="10" RefID="19" />
<Content ID="11" RefID="20" />
</Contents>
</Pane>
<Pane ID="2" DockState="Float" ActiveContent="-1">
@ -69,7 +71,7 @@ @@ -69,7 +71,7 @@
<Content ID="4" RefID="8" />
<Content ID="5" RefID="21" />
<Content ID="6" RefID="15" />
<Content ID="7" RefID="22" />
<Content ID="7" RefID="24" />
</Contents>
</Pane>
<Pane ID="5" DockState="Float" ActiveContent="-1">
@ -110,9 +112,14 @@ @@ -110,9 +112,14 @@
<Content ID="0" RefID="4" />
</Contents>
</Pane>
<Pane ID="12" DockState="Float" ActiveContent="-1">
<Contents Count="1">
<Content ID="0" RefID="23" />
</Contents>
</Pane>
</Panes>
<DockWindows Count="3">
<DockWindow ID="0" DockState="DockLeft" ZOrderIndex="4">
<DockWindow ID="0" DockState="DockLeft" ZOrderIndex="6">
<DockList Count="1">
<Pane ID="0" RefID="6" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
</DockList>
@ -120,16 +127,16 @@ @@ -120,16 +127,16 @@
<DockWindow ID="1" DockState="DockRight" ZOrderIndex="5">
<DockList Count="2">
<Pane ID="0" RefID="1" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
<Pane ID="1" RefID="3" PrevPane="1" Alignment="Bottom" Proportion="0.663630620587142" />
<Pane ID="1" RefID="3" PrevPane="1" Alignment="Bottom" Proportion="0.654712002972872" />
</DockList>
</DockWindow>
<DockWindow ID="2" DockState="DockBottom" ZOrderIndex="7">
<DockWindow ID="2" DockState="DockBottom" ZOrderIndex="4">
<DockList Count="1">
<Pane ID="0" RefID="4" PrevPane="-1" Alignment="Left" Proportion="0.5" />
</DockList>
</DockWindow>
</DockWindows>
<FloatWindows Count="8">
<FloatWindows Count="9">
<FloatWindow ID="0" Bounds="598, 282, 300, 300" AllowRedocking="True" ZOrderIndex="0">
<DockList Count="1">
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Right" Proportion="0.5" />
@ -170,5 +177,10 @@ @@ -170,5 +177,10 @@
<Pane ID="0" RefID="11" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>
</FloatWindow>
<FloatWindow ID="8" Bounds="654, 252, 300, 300" AllowRedocking="True" ZOrderIndex="8">
<DockList Count="1">
<Pane ID="0" RefID="12" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>
</FloatWindow>
</FloatWindows>
</DockPanel>

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

@ -8,8 +8,8 @@ @@ -8,8 +8,8 @@
namespace HtmlHelp2
{
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Drawing;
using System.Windows.Forms;
using System.Reflection;
@ -351,6 +351,7 @@ namespace HtmlHelp2 @@ -351,6 +351,7 @@ namespace HtmlHelp2
dynamicHelpToolbar.Dock = DockStyle.Top;
dynamicHelpToolbar.AllowItemReorder = false;
dynamicHelpToolbar.ShowItemToolTips = false;
dynamicHelpToolbar.GripStyle = ToolStripGripStyle.Hidden;
dynamicHelpToolbar.Enabled = HtmlHelp2Environment.IsReady;
for(int i = 0; i < toolbarButtons.Length; i++)
{
@ -385,16 +386,7 @@ namespace HtmlHelp2 @@ -385,16 +386,7 @@ namespace HtmlHelp2
private void RenderModeChanged(object sender, EventArgs e)
{
if(ToolbarService.Renderer is ToolStripProfessionalRenderer)
{
ProfessionalColorTable colorTable = new ProfessionalColorTable();
colorTable.UseSystemColors = true;
dynamicHelpToolbar.Renderer = new ToolStripProfessionalRenderer(colorTable);
}
else
{
dynamicHelpToolbar.Renderer = ToolbarService.Renderer;
}
dynamicHelpToolbar.Renderer = ToolbarService.Renderer;
}
private void ToolStripButtonClicked(object sender, EventArgs e)

5
src/AddIns/Misc/HtmlHelp2/Project/src/Service/SharpDevLanguageClass.cs

@ -80,7 +80,10 @@ namespace HtmlHelp2.SharpDevLanguageClass @@ -80,7 +80,10 @@ namespace HtmlHelp2.SharpDevLanguageClass
public static string GetPatchedLanguage()
{
return GetPatchedLanguage(ProjectService.CurrentProject.Language);
if (ProjectService.CurrentProject == null)
return GetPatchedLanguage(AmbienceService.DefaultAmbienceName);
else
return GetPatchedLanguage(ProjectService.CurrentProject.Language);
}
public static string GetPatchedLanguage(string expectedLanguage)

11
src/Main/Base/Project/Src/Services/AmbienceService/AmbienceService.cs

@ -61,7 +61,7 @@ namespace ICSharpCode.Core @@ -61,7 +61,7 @@ namespace ICSharpCode.Core
}
}
if (defaultAmbience == null) {
string language = PropertyService.Get(ambienceProperty, "C#");
string language = DefaultAmbienceName;
IAmbience ambience = (IAmbience)AddInTree.BuildItem("/SharpDevelop/Workbench/Ambiences/" + language, null);
if (ambience == null) {
MessageService.ShowError("${res:ICSharpCode.SharpDevelop.Services.AmbienceService.AmbienceNotFoundError}");
@ -73,6 +73,15 @@ namespace ICSharpCode.Core @@ -73,6 +73,15 @@ namespace ICSharpCode.Core
}
}
public static string DefaultAmbienceName {
get {
return PropertyService.Get(ambienceProperty, "C#");
}
set {
PropertyService.Set(ambienceProperty, value);
}
}
static void PropertyChanged(object sender, PropertyChangedEventArgs e)
{
if (e.Key == ambienceProperty) {

Loading…
Cancel
Save