Browse Source

FormsDesigner - GeneralOptions

pull/30/head
PeterForstmeier 13 years ago
parent
commit
ff282a6a51
  1. 16
      src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj
  2. 2
      src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/BooDesignerGenerator.cs
  3. 6
      src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin
  4. 6
      src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs
  5. 2
      src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs
  6. 4
      src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin
  7. 7
      src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj
  8. 84
      src/AddIns/DisplayBindings/FormsDesigner/Project/Resources/WindowsFormsGeneralOptions.xfrm
  9. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/CSharpDesignerGenerator.cs
  10. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/VBNetDesignerGenerator.cs
  11. 76
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/GeneralOptions.cs
  12. 37
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/GeneralOptionsPanelXaml.xaml
  13. 9
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/GridOptionsPanel.xaml.cs
  14. 4
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/DesignerOptionService.cs
  15. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/EventBindingService.cs
  16. 7
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  17. 82
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/SigningXaml.xaml
  18. 2
      src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/old_Publish.cs

16
src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.csproj

@ -42,8 +42,17 @@ @@ -42,8 +42,17 @@
<Reference Include="Boo.Lang.Interpreter">
<HintPath>..\..\RequiredLibraries\Boo.Lang.Interpreter.dll</HintPath>
</Reference>
<Reference Include="PresentationCore">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="PresentationFramework">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
@ -68,6 +77,9 @@ @@ -68,6 +77,9 @@
<HintPath>..\..\RequiredLibraries\Boo.Lang.Useful.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="WindowsBase">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Src\BooLanguageBinding.cs" />
@ -134,6 +146,10 @@ @@ -134,6 +146,10 @@
<Name>NRefactory</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
<Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
<Name>ICSharpCode.Core.Presentation</Name>
</ProjectReference>
<ProjectReference Include="..\..\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj">
<Project>{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}</Project>
<Name>NRefactoryToBooConverter</Name>

2
src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/BooDesignerGenerator.cs

@ -111,7 +111,7 @@ namespace Grunwald.BooBinding.Designer @@ -111,7 +111,7 @@ namespace Grunwald.BooBinding.Designer
b.AppendLine(indentation);
b.AppendLine(indentation + "private def " + eventMethodName + "(" + param + "):");
if (string.IsNullOrEmpty(body)) {
if (ICSharpCode.FormsDesigner.Gui.OptionPanels.GeneralOptionsPanel.InsertTodoComment) {
if (ICSharpCode.FormsDesigner.Gui.OptionPanels.GeneralOptionsPanelXaml.InsertTodoComment) {
body = "// TODO: Implement " + eventMethodName;
}
}

6
src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.addin

@ -83,6 +83,12 @@ @@ -83,6 +83,12 @@
<OptionPanel id = "Signing"
label = "${res:Dialog.ProjectOptions.Signing}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"/>
<OptionPanel id = "Signing1"
label = "${res:Dialog.ProjectOptions.Signing}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.SigningXaml"/>
<OptionPanel id = "BuildEvents"
label = "${res:Dialog.ProjectOptions.BuildEvents}"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>

6
src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs

@ -44,7 +44,7 @@ namespace ICSharpCode.CppBinding.Project @@ -44,7 +44,7 @@ namespace ICSharpCode.CppBinding.Project
this.additionalOptionsTextBox.Text = GetElementMetaData(msDefGroup,"AdditionalOptions");
var def = GetElementMetaData(msDefGroup,"GenerateDebugInformation");
string def = GetElementMetaData(msDefGroup,"GenerateDebugInformation");
bool check;
if (bool.TryParse(def, out check))
@ -175,8 +175,8 @@ namespace ICSharpCode.CppBinding.Project @@ -175,8 +175,8 @@ namespace ICSharpCode.CppBinding.Project
string[] strings = textBox.Text.Split(';');
stringListDialog.LoadList (strings);
stringListDialog.ShowDialog();
if (stringListDialog.DialogResult.HasValue && stringListDialog.DialogResult.Value)
{
// if (stringListDialog.DialogResult.HasValue && stringListDialog.DialogResult.Value)
if (stringListDialog.DialogResult ?? false) {
textBox.Text = String.Join(";",stringListDialog.GetList());
}
}

2
src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs

@ -40,7 +40,7 @@ namespace ICSharpCode.CppBinding.Project @@ -40,7 +40,7 @@ namespace ICSharpCode.CppBinding.Project
this.undefineTextBox.Text = GetElementMetaData(group,"UndefinePreprocessorDefinitions" );
var defs = GetElementMetaData(group,"UndefineAllPreprocessorDefinitions");
string defs = GetElementMetaData(group,"UndefineAllPreprocessorDefinitions");
bool check;
if (bool.TryParse(defs, out check))

4
src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.addin

@ -304,9 +304,9 @@ @@ -304,9 +304,9 @@
insertafter = "ToolsOptions"
label = "${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.PanelName}">
<OptionPanel id = "GeneralOptions"
<OptionPanel id = "GeneralOptions1"
label = "${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GeneralOptionsPanel.PanelName}"
class = "ICSharpCode.FormsDesigner.Gui.OptionPanels.GeneralOptionsPanel"/>
class = "ICSharpCode.FormsDesigner.Gui.OptionPanels.GeneralOptionsPanelXaml"/>
<OptionPanel id = "GridOptions"
label = "${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.PanelName}"

7
src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj

@ -84,6 +84,10 @@ @@ -84,6 +84,10 @@
<Compile Include="Src\Gui\ImageResourceEditorDialog.Designer.cs">
<DependentUpon>ImageResourceEditorDialog.cs</DependentUpon>
</Compile>
<Compile Include="Src\Gui\OptionPanels\GeneralOptionsPanelXaml.xaml.cs">
<DependentUpon>GeneralOptionsPanelXaml.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Src\Gui\OptionPanels\GridOptionsPanel.xaml.cs">
<DependentUpon>GridOptionsPanel.xaml</DependentUpon>
<SubType>Code</SubType>
@ -140,8 +144,6 @@ @@ -140,8 +144,6 @@
<Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
<Link>Configuration\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Src\Gui\OptionPanels\GeneralOptions.cs" />
<EmbeddedResource Include="Resources\WindowsFormsGeneralOptions.xfrm" />
<EmbeddedResource Include="Src\Gui\ImageResourceEditorDialog.resx">
<DependentUpon>ImageResourceEditorDialog.cs</DependentUpon>
</EmbeddedResource>
@ -190,6 +192,7 @@ @@ -190,6 +192,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Include="Src\Gui\OptionPanels\GeneralOptionsPanelXaml.xaml" />
<Page Include="Src\Gui\OptionPanels\GridOptionsPanel.xaml" />
<Page Include="Src\Gui\OptionPanels\LocalizationModelOptionsPanel.xaml" />
</ItemGroup>

84
src/AddIns/DisplayBindings/FormsDesigner/Project/Resources/WindowsFormsGeneralOptions.xfrm

@ -1,84 +0,0 @@ @@ -1,84 +0,0 @@
<Components version="1.0">
<System.Windows.Forms.UserControl>
<Name value="WindowsFormsGeneralOptions" />
<ClientSize value="{Width=391, Height=300}" />
<Controls>
<System.Windows.Forms.GroupBox>
<Name value="propertyPadOptionsGroupBox" />
<Location value="8, 206" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.PropertyGridGroupBox}" />
<Size value="373, 56" />
<Anchor value="Top, Left, Right" />
<TabIndex value="1" />
<Controls>
<System.Windows.Forms.CheckBox>
<Name value="sortAlphabeticalCheckBox" />
<Location value="6, 24" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.PropertyGridSortCheckBox}" />
<TabIndex value="0" />
<Size value="366, 24" />
<UseVisualStyleBackColor value="True" />
</System.Windows.Forms.CheckBox>
</Controls>
</System.Windows.Forms.GroupBox>
<System.Windows.Forms.GroupBox>
<Name value="generalOptionsGroupBox" />
<Location value="8, 8" />
<Text value="${res:Dialog.Options.IDEOptions.TextEditor.General.GeneralOptionsGroupBox}" />
<Size value="373, 192" />
<Anchor value="Top, Left, Right" />
<TabIndex value="0" />
<Controls>
<System.Windows.Forms.CheckBox>
<Name value="generateVSStyleHandlersCheckBox" />
<Location value="6, 162" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GenerateVisualStudioStyleEventHandlers}" />
<TabIndex value="4" />
<Size value="367, 24" />
<UseVisualStyleBackColor value="True" />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.CheckBox>
<Name value="insertTodoCommentCheckBox" />
<Location value="6, 136" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.InsertTodoCommentInEventHandlers}" />
<TabIndex value="3" />
<Size value="367, 24" />
<UseVisualStyleBackColor value="True" />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.CheckBox>
<Name value="optimizedCodeGenerationCheckBox" />
<Location value="6, 110" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.OptimizedCodeGenerationCheckBox}" />
<TabIndex value="3" />
<Size value="367, 24" />
<UseVisualStyleBackColor value="True" />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.CheckBox>
<Name value="smartTagAutoShowCheckBox" />
<Location value="6, 80" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.SmartTagAutoShowCheckBox}" />
<TabIndex value="2" />
<Size value="367, 24" />
<UseVisualStyleBackColor value="True" />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.CheckBox>
<Name value="inPlaceEditCheckBox" />
<Location value="6, 50" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.InPlaceEditCheckBox}" />
<TabIndex value="1" />
<Size value="367, 24" />
<UseVisualStyleBackColor value="True" />
</System.Windows.Forms.CheckBox>
<System.Windows.Forms.CheckBox>
<Name value="useSmartTagsCheckBox" />
<Location value="6, 20" />
<Text value="${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.SmartTagsCheckBox}" />
<TabIndex value="0" />
<Size value="367, 24" />
<UseVisualStyleBackColor value="True" />
</System.Windows.Forms.CheckBox>
</Controls>
</System.Windows.Forms.GroupBox>
</Controls>
</System.Windows.Forms.UserControl>
</Components>

2
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/CSharpDesignerGenerator.cs

@ -31,7 +31,7 @@ namespace ICSharpCode.FormsDesigner @@ -31,7 +31,7 @@ namespace ICSharpCode.FormsDesigner
b.AppendLine(indentation + "void " + eventMethodName + "(" + param + ")");
b.AppendLine(indentation + "{");
if (string.IsNullOrEmpty(body)) {
if (ICSharpCode.FormsDesigner.Gui.OptionPanels.GeneralOptionsPanel.InsertTodoComment) {
if (ICSharpCode.FormsDesigner.Gui.OptionPanels.GeneralOptionsPanelXaml.InsertTodoComment) {
body = "// TODO: Implement " + eventMethodName;
}
}

2
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/VBNetDesignerGenerator.cs

@ -49,7 +49,7 @@ namespace ICSharpCode.FormsDesigner @@ -49,7 +49,7 @@ namespace ICSharpCode.FormsDesigner
b.AppendLine(indentation);
b.AppendLine(indentation + "Sub " + eventMethodName + "(" + param + ")");
if (string.IsNullOrEmpty(body)) {
if (ICSharpCode.FormsDesigner.Gui.OptionPanels.GeneralOptionsPanel.InsertTodoComment) {
if (ICSharpCode.FormsDesigner.Gui.OptionPanels.GeneralOptionsPanelXaml.InsertTodoComment) {
body = "' TODO: Implement " + eventMethodName;
}
}

76
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/GeneralOptions.cs

@ -1,76 +0,0 @@ @@ -1,76 +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 ICSharpCode.SharpDevelop.Gui.OptionPanels;
using System;
using System.Windows.Forms;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.FormsDesigner.Gui.OptionPanels
{
public class GeneralOptionsPanel : XmlFormsOptionPanel
{
public override void LoadPanelContents()
{
SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("ICSharpCode.FormsDesigner.Resources.WindowsFormsGeneralOptions.xfrm"));
((CheckBox)ControlDictionary["sortAlphabeticalCheckBox"]).Checked = PropertyService.Get("FormsDesigner.DesignerOptions.PropertyGridSortAlphabetical", false);
((CheckBox)ControlDictionary["optimizedCodeGenerationCheckBox"]).Checked = PropertyService.Get("FormsDesigner.DesignerOptions.UseOptimizedCodeGeneration", true);
((CheckBox)ControlDictionary["smartTagAutoShowCheckBox"]).Checked = SmartTagAutoShow;
((CheckBox)ControlDictionary["inPlaceEditCheckBox"]).Checked = PropertyService.Get("FormsDesigner.DesignerOptions.EnableInSituEditing", true);
((CheckBox)ControlDictionary["useSmartTagsCheckBox"]).Checked = UseSmartTags;
((CheckBox)ControlDictionary["insertTodoCommentCheckBox"]).Checked = InsertTodoComment;
((CheckBox)ControlDictionary["generateVSStyleHandlersCheckBox"]).Checked = GenerateVisualStudioStyleEventHandlers;
}
public static bool UseSmartTags {
get {
return PropertyService.Get("FormsDesigner.DesignerOptions.UseSmartTags", true);
}
set {
PropertyService.Set("FormsDesigner.DesignerOptions.UseSmartTags", value);
}
}
public static bool SmartTagAutoShow {
get {
return PropertyService.Get("FormsDesigner.DesignerOptions.ObjectBoundSmartTagAutoShow", true);
}
set {
PropertyService.Set("FormsDesigner.DesignerOptions.ObjectBoundSmartTagAutoShow", value);
}
}
public static bool InsertTodoComment {
get {
return PropertyService.Get("FormsDesigner.DesignerOptions.InsertTodoComment", false);
}
set {
PropertyService.Set("FormsDesigner.DesignerOptions.InsertTodoComment", value);
}
}
public static bool GenerateVisualStudioStyleEventHandlers {
get {
return PropertyService.Get("FormsDesigner.DesignerOptions.GenerateVisualStudioStyleEventHandlers", false);
}
set {
PropertyService.Set("FormsDesigner.DesignerOptions.GenerateVisualStudioStyleEventHandlers", value);
}
}
public override bool StorePanelContents()
{
PropertyService.Set("FormsDesigner.DesignerOptions.PropertyGridSortAlphabetical", ((CheckBox)ControlDictionary["sortAlphabeticalCheckBox"]).Checked);
PropertyService.Set("FormsDesigner.DesignerOptions.UseOptimizedCodeGeneration", ((CheckBox)ControlDictionary["optimizedCodeGenerationCheckBox"]).Checked);
SmartTagAutoShow = ((CheckBox)ControlDictionary["smartTagAutoShowCheckBox"]).Checked;
PropertyService.Set("FormsDesigner.DesignerOptions.EnableInSituEditing", ((CheckBox)ControlDictionary["inPlaceEditCheckBox"]).Checked);
UseSmartTags = ((CheckBox)ControlDictionary["useSmartTagsCheckBox"]).Checked;
InsertTodoComment = ((CheckBox)ControlDictionary["insertTodoCommentCheckBox"]).Checked;
GenerateVisualStudioStyleEventHandlers = ((CheckBox)ControlDictionary["generateVSStyleHandlersCheckBox"]).Checked;
return true;
}
}
}

37
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/GeneralOptionsPanelXaml.xaml

@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
<gui:OptionPanel x:Class="ICSharpCode.FormsDesigner.Gui.OptionPanels.GeneralOptionsPanelXaml"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:core="http://icsharpcode.net/sharpdevelop/core"
xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets">
<StackPanel>
<GroupBox Header="{core:Localize Dialog.Options.IDEOptions.TextEditor.General.GeneralOptionsGroupBox}">
<StackPanel>
<CheckBox x:Name="useSmartTagsCheckBox" Margin="2,8,2,3"
Content="{core:Localize ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.SmartTagsCheckBox}" ></CheckBox>
<CheckBox x:Name="inPlaceEditCheckBox" Margin="2,8,2,3"
Content="{core:Localize ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.InPlaceEditCheckBox}"></CheckBox>
<CheckBox x:Name="smartTagAutoShowCheckBox" Margin="2,8,2,3"
Content="{core:Localize ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.SmartTagAutoShowCheckBox}"></CheckBox>
<CheckBox x:Name="optimizedCodeGenerationCheckBox" Margin="2,8,2,3"
Content="{core:Localize ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.OptimizedCodeGenerationCheckBox}"></CheckBox>
<CheckBox x:Name="insertTodoCommentCheckBox" Margin="2,8,2,3"
Content="{core:Localize ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.InsertTodoCommentInEventHandlers}"></CheckBox>
<CheckBox x:Name="generateVSStyleHandlersCheckBox" Margin="2,8,2,3"
Content="{core:Localize ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GenerateVisualStudioStyleEventHandlers}"></CheckBox>
</StackPanel>
</GroupBox>
<GroupBox Header="{core:Localize ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.PropertyGridGroupBox}">
<CheckBox x:Name="sortAlphabeticalCheckBox" Margin="2,3,2,3"
Content="{core:Localize ICSharpCode.SharpDevelop.FormDesigner.Gui.OptionPanels.GridOptionsPanel.PropertyGridSortCheckBox}"></CheckBox>
</GroupBox>
</StackPanel>
</gui:OptionPanel>

9
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/GridOptionsPanel.xaml.cs

@ -7,19 +7,10 @@ @@ -7,19 +7,10 @@
* 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 System.ComponentModel.Design.Serialization;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.FormsDesigner.Gui.OptionPanels
{
/// <summary>

4
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/DesignerOptionService.cs

@ -31,11 +31,11 @@ namespace ICSharpCode.FormsDesigner.Services @@ -31,11 +31,11 @@ namespace ICSharpCode.FormsDesigner.Services
this.showGrid = PropertyService.Get("FormsDesigner.DesignerOptions.ShowGrid", true);
this.snapToGrid = PropertyService.Get("FormsDesigner.DesignerOptions.SnapToGrid", true);
this.useSmartTags = GeneralOptionsPanel.UseSmartTags;
this.useSmartTags = GeneralOptionsPanelXaml.UseSmartTags;
this.useSnapLines = PropertyService.Get("FormsDesigner.DesignerOptions.UseSnapLines", true);
this.enableInSituEditing = PropertyService.Get("FormsDesigner.DesignerOptions.EnableInSituEditing", true);
this.objectBoundSmartTagAutoShow = GeneralOptionsPanel.SmartTagAutoShow;
this.objectBoundSmartTagAutoShow = GeneralOptionsPanelXaml.SmartTagAutoShow;
this.useOptimizedCodeGeneration = PropertyService.Get("FormsDesigner.DesignerOptions.UseOptimizedCodeGeneration", true);
}

2
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/EventBindingService.cs

@ -40,7 +40,7 @@ namespace ICSharpCode.FormsDesigner.Services @@ -40,7 +40,7 @@ namespace ICSharpCode.FormsDesigner.Services
string GetEventHandlerNameFormat()
{
if (GeneralOptionsPanel.GenerateVisualStudioStyleEventHandlers) {
if (GeneralOptionsPanelXaml.GenerateVisualStudioStyleEventHandlers) {
return "{0}_{1}";
}
return "{0}{1}";

7
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -282,6 +282,10 @@ @@ -282,6 +282,10 @@
<DependentUpon>ReferencePathsXAML.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\SigningXaml.xaml.cs">
<DependentUpon>SigningXaml.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\StorageLocationConverter.cs" />
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\StorageLocationPicker.cs" />
<Compile Include="Src\Gui\Dialogs\ReferenceDialog\ServiceReferenceHelper.cs" />
@ -739,7 +743,7 @@ @@ -739,7 +743,7 @@
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\Signing.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\Publish.cs">
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\old_Publish.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\BuildEvents.cs">
@ -897,6 +901,7 @@ @@ -897,6 +901,7 @@
<DependentUpon>ProjectOptionPanel.cs</DependentUpon>
</Page>
<Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\ReferencePathsXAML.xaml" />
<Page Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\SigningXaml.xaml" />
<Page Include="Src\Gui\Dialogs\ReferenceDialog\ServiceReference\AddServiceReferenceDialog.xaml" />
<Page Include="Src\Gui\Dialogs\ReferenceDialog\ServiceReference\AdvancedServiceDialog.xaml" />
<Page Include="Src\Services\RefactoringService\ContextActions\ContextActionsBulbControl.xaml" />

82
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/SigningXaml.xaml

@ -0,0 +1,82 @@ @@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<optionpanels:ProjectOptionPanel
x:Class="ICSharpCode.SharpDevelop.Gui.OptionPanels.SigningXaml" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels" xmlns:local="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels" xmlns:projects="clr-namespace:ICSharpCode.SharpDevelop.Project" xmlns:core="http://icsharpcode.net/sharpdevelop/core">
<StackPanel
Orientation="Vertical">
<GroupBox
Header="{core:Localize Dialog.ProjectOptions.Signing.StrongName}">
<Grid
ShowGridLines="True">
<Grid.RowDefinitions>
<RowDefinition
Height="30"></RowDefinition>
<RowDefinition
Height="30"></RowDefinition>
<RowDefinition
Height="30"></RowDefinition>
<RowDefinition
Height="30"></RowDefinition>
<RowDefinition
Height="30"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition
Width="30"></ColumnDefinition>
<ColumnDefinition
Width="2*"></ColumnDefinition>
<ColumnDefinition
Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<!--
Command="{Binding DataContext.Cmd, RelativeSource={RelativeSource FindAncestor,
AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}"
-->
<CheckBox
x:Name="signAssemblyCheckBox"
Grid.Column="1"
VerticalAlignment="Center"
Command="{Binding DataContext.Cmd, RelativeSource={RelativeSource FindAncestor,
AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=IsChecked}"
Content="{core:Localize Dialog.ProjectOptions.Signing.SignAssembly}">
</CheckBox>
<Label
Grid.Row="1"
Grid.Column="1"
Content="{core:Localize Dialog.ProjectOptions.Signing.ChooseKeyFile}"></Label>
<optionpanels:StorageLocationPicker
Grid.Row="2"></optionpanels:StorageLocationPicker>
<ComboBox
x:Name="keyFileComboBox"
Grid.Row="2"
Grid.Column="1"
Margin="0,0,0,0"></ComboBox>
<Button
x:Name="changePasswordButton"
Grid.Row="2"
Grid.Column="3"
Content="{core:Localize Dialog.ProjectOptions.Signing.ChangePassword}"
Margin="10,0,10,0"></Button>
<CheckBox
x:Name="delaySignOnlyCheckBox"
Grid.Row="3"
Grid.Column="1"
VerticalAlignment="Center"
Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignOnly}"></CheckBox>
<Label
Grid.Row="4"
Grid.Column="1"
Content="{core:Localize Dialog.ProjectOptions.Signing.DelaySignWarning}"></Label>
</Grid>
</GroupBox>
<GroupBox
Header="{core:Localize Dialog.ProjectOptions.Signing.ClickOnce}"
Margin="0,20,0,0">
<Label
Content="{core:Localize Dialog.ProjectOptions.Signing.ClickOnceNotSupported}"></Label>
</GroupBox>
</StackPanel>
</optionpanels:ProjectOptionPanel>

2
src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/Publish.cs → src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/old_Publish.cs

@ -5,7 +5,7 @@ using System; @@ -5,7 +5,7 @@ using System;
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
{
public class Publish : AbstractXmlFormsProjectOptionPanel
public class old_Publish : AbstractXmlFormsProjectOptionPanel
{
public override void LoadPanelContents()
{
Loading…
Cancel
Save