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

Convert CodeGenerationPanel.cs to WPF

pull/30/head
PeterForstmeier 13 years ago
parent
5129e1b5d4
commit
7a03834bfe
7 changed files with 96 additions and 146 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. 3
      src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
  2. 9
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  3. 93
      src/Main/Base/Project/Resources/CodeGenerationOptionsPanel.xfrm
  4. 42
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs
  5. 33
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.xaml
  6. 55
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.xaml.cs
  7. 7
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/EditStandardHeaderPanel.xaml.cs

3
src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
Unescape View File

@ -1199,11 +1199,14 @@ @@ -1199,11 +1199,14 @@
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ProjectAndSolutionOptions"/>
</OptionPanel>
<OptionPanel id = "CodingOptions"
label = "${res:Dialog.Options.IDEOptions.CodingOptionsText}">
<OptionPanel id = "CodeGeneration"
label = "${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.Title}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.CodeGenerationPanel"/>
<OptionPanel id = "EditStandardHeaderPanel"
label = "${res:Dialog.Options.IDEOptions.EditStandardHeaderPanel.Title}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.EditStandardHeaderPanel"/>

9
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
Unescape View File

@ -241,6 +241,10 @@ @@ -241,6 +241,10 @@
<Compile Include="Src\Gui\Dialogs\OpenWithDialog.Designer.cs">
<DependentUpon>OpenWithDialog.cs</DependentUpon>
</Compile>
<Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\CodeGenerationPanel.xaml.cs">
<DependentUpon>CodeGenerationPanel.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\EditStandardHeaderPanel.xaml.cs">
<DependentUpon>EditStandardHeaderPanel.xaml</DependentUpon>
<SubType>Code</SubType>
@ -534,9 +538,6 @@ @@ -534,9 +538,6 @@
<Compile Include="Src\Gui\Dialogs\OptionPanels\ExternalToolPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\CodeGenerationPanel.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\AssemblyReferencePanel.cs">
<SubType>Component</SubType>
</Compile>
@ -700,7 +701,6 @@ @@ -700,7 +701,6 @@
<Compile Include="Src\Gui\Pads\ProjectBrowser\TreeNodes\Util\SolutionFolderRemoveVisitor.cs" />
<Compile Include="Src\Gui\Components\ExtTreeView\ExtTreeViewComparer.cs" />
<Compile Include="Src\Project\WebReferenceUrl.cs" />
<EmbeddedResource Include="Resources\CodeGenerationOptionsPanel.xfrm" />
<EmbeddedResource Include="Resources\CommonAboutDialog.xfrm" />
<Compile Include="Configuration\AssemblyInfo.cs" />
<EmbeddedResource Include="Resources\ExternalToolOptions.xfrm" />
@ -882,6 +882,7 @@ @@ -882,6 +882,7 @@
<ItemGroup>
<Page Include="Src\Bookmarks\Pad\Controls\ListViewPad.xaml" />
<Page Include="Src\Gui\Components\StringListEditorXaml.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\CodeGenerationPanel.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\EditStandardHeaderPanel.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\SelectStylePanel.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\IDEOptions\TaskListOptionsl.xaml" />

93
src/Main/Base/Project/Resources/CodeGenerationOptionsPanel.xfrm
Unescape View File

@ -1,93 +0,0 @@ @@ -1,93 +0,0 @@
<System.Windows.Forms.UserControl>
<DataBindings value="System.Windows.Forms.ControlBindingsCollection" />
<SnapToGrid value="True" />
<Size value="{Width=400, Height=256}" />
<DrawGrid value="True" />
<Name value="CreatedObject0" />
<DockPadding value="" />
<GridSize value="{Width=8, Height=8}" />
<Controls>
<System.Windows.Forms.GroupBox>
<Text value="${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.CommentGenerationOptionsGroupBox}" />
<Size value="{Width=384, Height=80}" />
<Anchor value="Top, Left, Right" />
<DataBindings value="System.Windows.Forms.ControlBindingsCollection" />
<Location value="{X=8,Y=136}" />
<TabIndex value="1" />
<Name value="commentGeneratingGroupBox" />
<Controls>
<System.Windows.Forms.CheckBox>
<Name value="generateAdditonalCommentsCheckBox" />
<TabIndex value="1" />
<Anchor value="Top, Left, Right" />
<Text value="${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.GenerateAdditionalCommentsCheckBox}" />
<Size value="{Width=368, Height=24}" />
<Location value="{X=8,Y=48}" />
<DataBindings value="System.Windows.Forms.ControlBindingsCollection" />
<Controls />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.CheckBox>
<Name value="generateDocCommentsCheckBox" />
<TabIndex value="0" />
<Anchor value="Top, Left, Right" />
<Text value="${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.GenerateDocCommentsCheckBox}" />
<Size value="{Width=368, Height=24}" />
<Location value="{X=8,Y=24}" />
<DataBindings value="System.Windows.Forms.ControlBindingsCollection" />
<Controls />
</System.Windows.Forms.CheckBox>
</Controls>
</System.Windows.Forms.GroupBox>
<System.Windows.Forms.GroupBox>
<Text value="${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.CodeGenerationOptionsGroupBox}" />
<Size value="{Width=384, Height=120}" />
<Anchor value="Top, Left, Right" />
<Name value="codeGenerationGroupBox" />
<DataBindings value="System.Windows.Forms.ControlBindingsCollection" />
<Location value="{X=8,Y=8}" />
<TabIndex value="0" />
<Controls>
<System.Windows.Forms.CheckBox>
<Name value="useFullTypeNamesCheckBox" />
<TabIndex value="3" />
<Anchor value="Top, Left, Right" />
<Text value="${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.UseFullTypeNamesCheckBox}" />
<Size value="{Width=368, Height=24}" />
<Location value="{X=8,Y=88}" />
<DataBindings value="System.Windows.Forms.ControlBindingsCollection" />
<Controls />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.CheckBox>
<Name value="blankLinesBetweenMemberCheckBox" />
<TabIndex value="2" />
<Anchor value="Top, Left, Right" />
<Text value="${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.BlankLinesBetweenMembersCheckBox}" />
<Size value="{Width=368, Height=24}" />
<Location value="{X=8,Y=64}" />
<DataBindings value="System.Windows.Forms.ControlBindingsCollection" />
<Controls />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.CheckBox>
<Name value="elseOnClosingCheckbox" />
<TabIndex value="1" />
<Anchor value="Top, Left, Right" />
<Text value="${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.ElseOnClosingCheckBox}" />
<Size value="{Width=368, Height=24}" />
<Location value="{X=8,Y=40}" />
<DataBindings value="System.Windows.Forms.ControlBindingsCollection" />
<Controls />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.CheckBox>
<Name value="startBlockOnTheSameLineCheckBox" />
<TabIndex value="0" />
<Anchor value="Top, Left, Right" />
<Text value="${res:Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.StartBlockOnTheSameLineCheckBox}" />
<Size value="{Width=368, Height=24}" />
<Location value="{X=8,Y=16}" />
<DataBindings value="System.Windows.Forms.ControlBindingsCollection" />
<Controls />
</System.Windows.Forms.CheckBox>
</Controls>
</System.Windows.Forms.GroupBox>
</Controls>
</System.Windows.Forms.UserControl>

42
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.cs
Unescape View File

@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System;
using System.Windows.Forms;
using ICSharpCode.Core;
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
public class CodeGenerationPanel : XmlFormsOptionPanel
{
static readonly string codeGenerationProperty = "SharpDevelop.UI.CodeGenerationOptions";
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.CodeGenerationOptionsPanel.xfrm"));
Properties p = (Properties)PropertyService.Get(codeGenerationProperty, new Properties());
((CheckBox)ControlDictionary["generateAdditonalCommentsCheckBox"]).Checked = p.Get("GenerateAdditionalComments", true);
((CheckBox)ControlDictionary["generateDocCommentsCheckBox"]).Checked = p.Get("GenerateDocumentComments", true);
((CheckBox)ControlDictionary["useFullTypeNamesCheckBox"]).Checked = p.Get("UseFullyQualifiedNames", true);
((CheckBox)ControlDictionary["blankLinesBetweenMemberCheckBox"]).Checked = p.Get("BlankLinesBetweenMembers", true);
((CheckBox)ControlDictionary["elseOnClosingCheckbox"]).Checked = p.Get("ElseOnClosing", true);
((CheckBox)ControlDictionary["startBlockOnTheSameLineCheckBox"]).Checked = p.Get("StartBlockOnSameLine", true);
}
public override bool StorePanelContents()
{
Properties p = (Properties)PropertyService.Get(codeGenerationProperty, new Properties());
p.Set("GenerateAdditionalComments", ((CheckBox)ControlDictionary["generateAdditonalCommentsCheckBox"]).Checked);
p.Set("GenerateDocumentComments", ((CheckBox)ControlDictionary["generateDocCommentsCheckBox"]).Checked);
p.Set("UseFullyQualifiedNames", ((CheckBox)ControlDictionary["useFullTypeNamesCheckBox"]).Checked);
p.Set("BlankLinesBetweenMembers", ((CheckBox)ControlDictionary["blankLinesBetweenMemberCheckBox"]).Checked);
p.Set("ElseOnClosing", ((CheckBox)ControlDictionary["elseOnClosingCheckbox"]).Checked);
p.Set("StartBlockOnSameLine", ((CheckBox)ControlDictionary["startBlockOnTheSameLineCheckBox"]).Checked);
PropertyService.Set(codeGenerationProperty, p);
return true;
}
}
}

33
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.xaml
Unescape View File

@ -0,0 +1,33 @@ @@ -0,0 +1,33 @@
<gui:OptionPanel x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.CodeGenerationPanel"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui"
xmlns:core="http://icsharpcode.net/sharpdevelop/core">
<Grid>
<StackPanel>
<GroupBox Margin="0,4,0,0"
Header="{core:Localize Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.CodeGenerationOptionsGroupBox}">
<StackPanel>
<CheckBox x:Name="startBlockOnTheSameLineCheckBox" Margin="0,6,0,0"
Content="{core:Localize Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.StartBlockOnTheSameLineCheckBox}"></CheckBox>
<CheckBox x:Name="elseOnClosingCheckbox" Margin="0,6,0,0"
Content="{core:Localize Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.ElseOnClosingCheckBox}"></CheckBox>
<CheckBox x:Name="blankLinesBetweenMemberCheckBox" Margin="0,6,0,0"
Content="{core:Localize Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.BlankLinesBetweenMembersCheckBox}"></CheckBox>
<CheckBox x:Name="useFullTypeNamesCheckBox" Margin="0,6,0,0"
Content="{core:Localize Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.UseFullTypeNamesCheckBox}"></CheckBox>
</StackPanel>
</GroupBox>
<GroupBox Margin="0,8,0,0"
Header="{core:Localize Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.CommentGenerationOptionsGroupBox}">
<StackPanel>
<CheckBox x:Name="generateDocCommentsCheckBox" Margin="0,6,0,0"
Content="{core:Localize Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.GenerateDocCommentsCheckBox}"></CheckBox>
<CheckBox x:Name="generateAdditonalCommentsCheckBox" Margin="0,6,0,0"
Content="{core:Localize Dialog.Options.IDEOptions.CodeGenerationOptionsPanel.GenerateAdditionalCommentsCheckBox}"></CheckBox>
</StackPanel>
</GroupBox>
</StackPanel>
</Grid>
</gui:OptionPanel>

55
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/CodeGenerationPanel.xaml.cs
Unescape View File

@ -0,0 +1,55 @@ @@ -0,0 +1,55 @@
/*
* Created by SharpDevelop.
* User: Peter Forstmeier
* Date: 31.03.2012
* Time: 19:24
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using ICSharpCode.Core;
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
/// <summary>
/// Interaction logic for CodeGenerationPanelXaml.xaml
/// </summary>
public partial class CodeGenerationPanel : OptionPanel
{
static readonly string codeGenerationProperty = "SharpDevelop.UI.CodeGenerationOptions";
public CodeGenerationPanel()
{
InitializeComponent();
}
public override void LoadOptions()
{
Properties p = (Properties)PropertyService.Get(codeGenerationProperty, new Properties());
startBlockOnTheSameLineCheckBox.IsChecked = p.Get("StartBlockOnSameLine", true);
elseOnClosingCheckbox.IsChecked = p.Get("ElseOnClosing", true);
blankLinesBetweenMemberCheckBox.IsChecked = p.Get("BlankLinesBetweenMembers", true);
useFullTypeNamesCheckBox.IsChecked = p.Get("UseFullyQualifiedNames", true);
generateDocCommentsCheckBox.IsChecked = p.Get("GenerateDocumentComments", true);
generateAdditonalCommentsCheckBox.IsChecked = p.Get("GenerateAdditionalComments", true);
}
public override bool SaveOptions()
{
Properties p = (Properties)PropertyService.Get(codeGenerationProperty, new Properties());
p.Set("StartBlockOnSameLine", startBlockOnTheSameLineCheckBox.IsChecked);
p.Set("ElseOnClosing", elseOnClosingCheckbox.IsChecked);
p.Set("BlankLinesBetweenMembers", blankLinesBetweenMemberCheckBox.IsChecked);
p.Set("UseFullyQualifiedNames", useFullTypeNamesCheckBox.IsChecked);
p.Set("GenerateDocumentComments", generateDocCommentsCheckBox.IsChecked);
p.Set("GenerateAdditionalComments", generateAdditonalCommentsCheckBox.IsChecked);
PropertyService.Set(codeGenerationProperty, p);
return true;
}
}
}

7
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/IDEOptions/EditStandardHeaderPanel.xaml.cs
Unescape View File

@ -7,16 +7,9 @@ @@ -7,16 +7,9 @@
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using ICSharpCode.Core.WinForms;
using ICSharpCode.SharpDevelop.Internal.Templates;
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels

Write Preview
Loading…
Cancel
Save