pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove .xml code template - the xml editor does not support templates. 

Fixed toolbar layout combo box to show the correct layout after resetting all layouts.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.1@2355 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 19 years ago
parent
5029cbe998
commit
d70442897c
7 changed files with 91 additions and 92 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      data/ConversionStyleSheets/SVNChangelogToXml.xsl
  2. 3
      data/options/SharpDevelop-templates.xml
  3. 72
      data/resources/layouts/Debug.xml
  4. 56
      data/resources/layouts/Default.xml
  5. 25
      src/AddIns/Misc/CodeAnalysis/Src/FxCopWrapper.cs
  6. 7
      src/Main/Base/Project/Src/Commands/ChooseLayoutCommand.cs
  7. 8
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs

12
data/ConversionStyleSheets/SVNChangelogToXml.xsl
Unescape View File

@ -64,6 +64,18 @@ @@ -64,6 +64,18 @@
<xsl:when test="$orig_author = 'dickonfield'">
<xsl:text>Dickon Field</xsl:text>
</xsl:when>
<xsl:when test="$orig_author = 'itaibarhaim'">
<xsl:text>Itai Bar-Haim</xsl:text>
</xsl:when>
<xsl:when test="$orig_author = 'christianhornung'">
<xsl:text>Christian Hornung</xsl:text>
</xsl:when>
<xsl:when test="$orig_author = 'justindearing'">
<xsl:text>Justin Dearing</xsl:text>
</xsl:when>
<xsl:when test="$orig_author = 'russellwilkins'">
<xsl:text>Russell Wilkins</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="./author" />
</xsl:otherwise>

3
data/options/SharpDevelop-templates.xml
Unescape View File

@ -114,7 +114,4 @@ End While</CodeTemplate> @@ -114,7 +114,4 @@ End While</CodeTemplate>
<CodeTemplate template="italicb" description="italic block">&lt;i&gt;|${Selection}&lt;/i&gt;</CodeTemplate>
<CodeTemplate template="parab" description="paragraph block">&lt;p&gt;|${Selection}&lt;/p&gt;</CodeTemplate>
</CodeTemplateGroup>
<CodeTemplateGroup extensions=".xml;.xfrm;.addin;.xft;.xpt">
<CodeTemplate template="commentb" description="comment block">&lt;!--|${Selection}--&gt;</CodeTemplate>
</CodeTemplateGroup>
</CodeTemplates>

72
data/resources/layouts/Debug.xml
Unescape View File

@ -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="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="0">
<Contents Count="32">
<DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="7" ActivePane="-1">
<Contents Count="28">
<Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.SideBarView" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
@ -21,22 +21,18 @@ @@ -21,22 +21,18 @@
<Content ID="15" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="16" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="17" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="18" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.ExceptionHistoryPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="19" PersistString="HtmlHelp2.HtmlHelp2TocPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="20" PersistString="HtmlHelp2.HtmlHelp2IndexPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="21" PersistString="HtmlHelp2.HtmlHelp2SearchPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="HtmlHelp2.HtmlHelp2IndexResultsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="24" PersistString="ICSharpCode.NAntAddIn.Gui.NAntPadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="25" PersistString="SharpQuery.Pads.SharpQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="26" PersistString="SharpReportAddin.FieldsExplorer" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="27" PersistString="ICSharpCode.UnitTesting.PadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="28" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="29" PersistString="SharpServerTools.Forms.ServerBrowserTool" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="30" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="31" PersistString="SharpReportAddin.ReportExplorer" 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="HtmlHelp2.HtmlHelp2DynamicHelpPad" 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="SharpQuery.Pads.SharpQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="25" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="26" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="27" PersistString="ICSharpCode.SharpDevelop.Gui.SdiWorkspaceWindow" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
</Contents>
<Panes Count="7">
<Panes Count="8">
<Pane ID="0" DockState="DockLeft" ActiveContent="0">
<Contents Count="4">
<Content ID="0" RefID="0" />
@ -52,16 +48,15 @@ @@ -52,16 +48,15 @@
</Contents>
</Pane>
<Pane ID="2" DockState="DockRight" ActiveContent="16">
<Contents Count="9">
<Content ID="0" RefID="23" />
<Content ID="1" RefID="19" />
<Content ID="2" RefID="20" />
<Content ID="3" RefID="21" />
<Content ID="4" RefID="27" />
<Content ID="5" RefID="16" />
<Content ID="6" RefID="22" />
<Content ID="7" RefID="13" />
<Content ID="8" RefID="24" />
<Contents Count="8">
<Content ID="0" RefID="22" />
<Content ID="1" RefID="18" />
<Content ID="2" RefID="19" />
<Content ID="3" RefID="20" />
<Content ID="4" RefID="16" />
<Content ID="5" RefID="21" />
<Content ID="6" RefID="13" />
<Content ID="7" RefID="23" />
</Contents>
</Pane>
<Pane ID="3" DockState="Float" ActiveContent="-1">
@ -91,26 +86,31 @@ @@ -91,26 +86,31 @@
<Content ID="0" RefID="6" />
</Contents>
</Pane>
<Pane ID="6" DockState="DockRight" ActiveContent="18">
<Contents Count="5">
<Pane ID="6" DockState="DockRight" ActiveContent="15">
<Contents Count="3">
<Content ID="0" RefID="6" />
<Content ID="1" RefID="26" />
<Content ID="2" RefID="18" />
<Content ID="3" RefID="15" />
<Content ID="4" RefID="25" />
<Content ID="1" RefID="15" />
<Content ID="2" RefID="24" />
</Contents>
</Pane>
<Pane ID="7" DockState="Document" ActiveContent="27">
<Contents Count="1">
<Content ID="0" RefID="27" />
</Contents>
</Pane>
</Panes>
<DockWindows>
<DockWindow ID="0" DockState="Document" ZOrderIndex="0">
<DockList Count="0" />
<DockList Count="1">
<Pane ID="0" RefID="7" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>
</DockWindow>
<DockWindow ID="1" DockState="DockLeft" ZOrderIndex="2">
<DockList Count="1">
<Pane ID="0" RefID="0" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
</DockList>
</DockWindow>
<DockWindow ID="2" DockState="DockRight" ZOrderIndex="5">
<DockWindow ID="2" DockState="DockRight" ZOrderIndex="4">
<DockList Count="2">
<Pane ID="0" RefID="6" PrevPane="-1" Alignment="Bottom" Proportion="0.5" />
<Pane ID="1" RefID="2" PrevPane="6" Alignment="Top" Proportion="0.353459972862958" />
@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
<DockWindow ID="3" DockState="DockTop" ZOrderIndex="1">
<DockList Count="0" />
</DockWindow>
<DockWindow ID="4" DockState="DockBottom" ZOrderIndex="4">
<DockWindow ID="4" DockState="DockBottom" ZOrderIndex="3">
<DockList Count="1">
<Pane ID="0" RefID="4" PrevPane="-1" Alignment="Right" Proportion="0.5" />
</DockList>

56
data/resources/layouts/Default.xml
Unescape View File

@ -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="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="-1">
<Contents Count="32">
<DockPanel FormatVersion="1.0" DockLeftPortion="0.196180555555556" DockRightPortion="0.172743055555556" DockTopPortion="0.25" DockBottomPortion="0.25" ActiveDocumentPane="-1" ActivePane="0">
<Contents Count="29">
<Content ID="0" PersistString="ICSharpCode.SharpDevelop.Project.ProjectBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="1" PersistString="ICSharpCode.SharpDevelop.Gui.ClassBrowser.ClassBrowserPad" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
<Content ID="2" PersistString="ICSharpCode.SharpDevelop.Gui.SideBarView" AutoHidePortion="0.25" IsHidden="False" IsFloat="False" />
@ -21,31 +21,28 @@ @@ -21,31 +21,28 @@
<Content ID="15" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LoadedModulesPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="16" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.RunningThreadsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="17" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.LocalVarPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="18" PersistString="ICSharpCode.SharpDevelop.Gui.Pads.ExceptionHistoryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="19" PersistString="HtmlHelp2.HtmlHelp2TocPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="20" PersistString="HtmlHelp2.HtmlHelp2IndexPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="21" PersistString="HtmlHelp2.HtmlHelp2SearchPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="22" PersistString="HtmlHelp2.HtmlHelp2IndexResultsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="23" PersistString="HtmlHelp2.HtmlHelp2DynamicHelpPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="24" PersistString="ICSharpCode.NAntAddIn.Gui.NAntPadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="25" PersistString="SharpQuery.Pads.SharpQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="26" PersistString="SharpReportAddin.FieldsExplorer" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="27" PersistString="ICSharpCode.UnitTesting.PadContent" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="28" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="29" PersistString="SharpServerTools.Forms.ServerBrowserTool" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="30" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="31" PersistString="SharpReportAddin.ReportExplorer" 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="HtmlHelp2.HtmlHelp2DynamicHelpPad" 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="SharpQuery.Pads.SharpQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="25" PersistString="ICSharpCode.WixBinding.SetupDialogListPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="26" PersistString="ICSharpCode.XmlEditor.XPathQueryPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="27" PersistString="ICSharpCode.UnitTesting.UnitTestsPad" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
<Content ID="28" PersistString="ICSharpCode.Reports.Addin.ReportExplorer" AutoHidePortion="0.25" IsHidden="True" IsFloat="False" />
</Contents>
<Panes Count="5">
<Pane ID="0" DockState="DockRight" ActiveContent="6">
<Pane ID="0" DockState="DockRight" ActiveContent="1">
<Contents Count="7">
<Content ID="0" RefID="6" />
<Content ID="1" RefID="1" />
<Content ID="2" RefID="25" />
<Content ID="2" RefID="24" />
<Content ID="3" RefID="14" />
<Content ID="4" RefID="15" />
<Content ID="5" RefID="18" />
<Content ID="6" RefID="26" />
<Content ID="5" RefID="27" />
<Content ID="6" RefID="28" />
</Contents>
</Pane>
<Pane ID="1" DockState="DockLeft" ActiveContent="0">
@ -78,16 +75,15 @@ @@ -78,16 +75,15 @@
</Contents>
</Pane>
<Pane ID="4" DockState="DockRight" ActiveContent="-1">
<Contents Count="9">
<Content ID="0" RefID="23" />
<Content ID="1" RefID="19" />
<Content ID="2" RefID="20" />
<Content ID="3" RefID="21" />
<Content ID="4" RefID="27" />
<Content ID="5" RefID="16" />
<Content ID="6" RefID="22" />
<Content ID="7" RefID="13" />
<Content ID="8" RefID="24" />
<Contents Count="8">
<Content ID="0" RefID="22" />
<Content ID="1" RefID="18" />
<Content ID="2" RefID="19" />
<Content ID="3" RefID="20" />
<Content ID="4" RefID="16" />
<Content ID="5" RefID="21" />
<Content ID="6" RefID="13" />
<Content ID="7" RefID="23" />
</Contents>
</Pane>
</Panes>

25
src/AddIns/Misc/CodeAnalysis/Src/FxCopWrapper.cs
Unescape View File

@ -86,17 +86,20 @@ namespace ICSharpCode.CodeAnalysis @@ -86,17 +86,20 @@ namespace ICSharpCode.CodeAnalysis
public static string FindFxCopPath()
{
string fxCopPath = AnalysisIdeOptionsPanel.FxCopPath;
if (IsFxCopPath(fxCopPath)) {
return fxCopPath;
}
// Code duplication: FxCop.cs in ICSharpCode.Build.Tasks
fxCopPath = FromRegistry(Registry.CurrentUser.OpenSubKey(@"Software\Classes\FxCopProject\Shell\Open\Command"));
if (IsFxCopPath(fxCopPath)) {
return fxCopPath;
}
fxCopPath = FromRegistry(Registry.ClassesRoot.OpenSubKey(@"FxCopProject\Shell\Open\Command"));
if (IsFxCopPath(fxCopPath)) {
return fxCopPath;
if (string.IsNullOrEmpty(fxCopPath)) {
// Code duplication: FxCop.cs in ICSharpCode.Build.Tasks
fxCopPath = FromRegistry(Registry.CurrentUser.OpenSubKey(@"Software\Classes\FxCopProject\Shell\Open\Command"));
if (IsFxCopPath(fxCopPath)) {
return fxCopPath;
}
fxCopPath = FromRegistry(Registry.ClassesRoot.OpenSubKey(@"FxCopProject\Shell\Open\Command"));
if (IsFxCopPath(fxCopPath)) {
return fxCopPath;
}
} else {
if (IsFxCopPath(fxCopPath)) {
return fxCopPath;
}
}
return null;
}

7
src/Main/Base/Project/Src/Commands/ChooseLayoutCommand.cs
Unescape View File

@ -55,12 +55,9 @@ namespace ICSharpCode.SharpDevelop.Commands @@ -55,12 +55,9 @@ namespace ICSharpCode.SharpDevelop.Commands
editingLayout = true;
ShowLayoutEditor();
OnOwnerChanged(EventArgs.Empty);
comboBox.SelectedIndex = oldItem;
editingLayout = false;
} else if (comboBox.SelectedIndex == resetIndex) {
ResetToDefaults();
comboBox.SelectedIndex = oldItem;
} else {
LayoutConfiguration config = (LayoutConfiguration)LayoutConfiguration.Layouts[comboBox.SelectedIndex];
LayoutConfiguration.CurrentLayoutName = config.Name;
@ -89,7 +86,7 @@ namespace ICSharpCode.SharpDevelop.Commands @@ -89,7 +86,7 @@ namespace ICSharpCode.SharpDevelop.Commands
ed.ManualOrder = false;
ed.BrowseForDirectory = false;
ed.TitleText = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.ChooseLayoutCommand.EditLayouts.Label}");
ed.AddButtonText = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.ChooseLayoutCommand.EditLayouts.AddLayout}");
ed.AddButtonText = StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.ChooseLayoutCommand.EditLayouts.AddLayout}");
ed.LoadList(CustomLayoutNames);
FlowLayoutPanel p = new FlowLayoutPanel();
@ -151,6 +148,8 @@ namespace ICSharpCode.SharpDevelop.Commands @@ -151,6 +148,8 @@ namespace ICSharpCode.SharpDevelop.Commands
}
}
WorkbenchSingleton.Workbench.WorkbenchLayout.LoadConfiguration();
LayoutChanged(null, null);
}
}

8
src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs
Unescape View File

@ -243,14 +243,6 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor @@ -243,14 +243,6 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
ActivateQuickClassBrowserOnDemand();
}
//// Alex: routine for pulsing parser thread
// protected void PulseParser() {
// lock(DefaultParserService.ParserPulse) {
// Monitor.Pulse(DefaultParserService.ParserPulse);
// }
// }
//// ALex: end of mod
static ICodeCompletionBinding[] codeCompletionBindings;
public static ICodeCompletionBinding[] CodeCompletionBindings {

Write Preview
Loading…
Cancel
Save