Browse Source

Merge branch 'FormsDesignerAppDomain' of SD.git-bundle into formsdesignerappdomain

formsdesignerappdomain
Siegfried Pammer 15 years ago
parent
commit
a34529729b
  1. 21
      SharpDevelop.sln
  2. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Commands/FormsCommands.cs
  3. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Commands/SideBarCommands.cs
  4. 16
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Configuration/AssemblyInfo.cs
  5. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerGenerator/AbstractDesignerGenerator.cs
  6. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerGenerator/CSharpDesignerGenerator.cs
  7. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerGenerator/CodeDOMGenerator.cs
  8. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerGenerator/VBNetDesignerGenerator.cs
  9. 52
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerLoader/AbstractCodeDomDesignerLoader.cs
  10. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerLoader/NRefactoryDesignerLoader.cs
  11. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerSourceCodeStorage.cs
  12. 5
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerViewContent.cs
  13. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormKeyHandler.cs
  14. 133
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesigner.AddIn.csproj
  15. 4
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesigner.addin
  16. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/ImageResourceEditorDialog.Designer.cs
  17. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/ImageResourceEditorDialog.cs
  18. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/ImageResourceEditorDialog.resx
  19. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/OptionPanels/GeneralOptions.cs
  20. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/OptionPanels/GridOptions.cs
  21. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/OptionPanels/LocalizationModelOptionsPanel.cs
  22. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/OptionPanels/LocalizationModelOptionsPanel.resx
  23. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/SecondaryDisplayBinding.cs
  24. 1
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Services/DesignerResourceService.cs
  25. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Services/HelpService.cs
  26. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Services/ProjectResourceService.cs
  27. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Services/ResourceStore.cs
  28. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/AddComponentsDialog.cs
  29. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ConfigureSideBarDialog.cs
  30. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/CustomComponentsSideTab.cs
  31. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/RenameCategoryDialog.cs
  32. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/SideTabDesigner.cs
  33. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/SideTabItemDesigner.cs
  34. 0
      src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ToolboxProvider.cs
  35. 93
      src/AddIns/DisplayBindings/FormsDesigner/Project/FormsDesigner.csproj
  36. 13
      src/AddIns/DisplayBindings/FormsDesigner/Project/PostBuildEvent.proj
  37. 20
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerAppDomainManager.cs
  38. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/DesignerLoaderProvider.cs
  39. 18
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/IDesignerLoader.cs
  40. 41
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/SharpDevelopDesignerLoader.cs
  41. 9
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ComponentLibraryLoader.cs
  42. 17
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/IDesignerGenerator.cs
  43. 25
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/IFormsDesigner.cs
  44. 35
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/LoggingService.cs
  45. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/DefaultMemberRelationshipService.cs
  46. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/DefaultServiceContainer.cs
  47. 109
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/DesignerOptionService.cs
  48. 17
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/EventBindingService.cs
  49. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ImageResourceEditor.cs
  50. 6
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/MenuCommandService.cs
  51. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ProjectResourceInfo.cs
  52. 3
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ProjectResourcesComponentCodeDomSerializer.cs
  53. 6
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ProjectResourcesMemberCodeDomSerializer.cs
  54. 2
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ToolboxService.cs
  55. 3
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/TypeDiscoveryService.cs
  56. 15
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/TypeResolutionService.cs
  57. 14
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/UIService.cs
  58. 1
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/XmlDesignerNameCreationService.cs
  59. 6
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/UndoRedo/UndoEngine.cs

21
SharpDevelop.sln

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# SharpDevelop 4.0.0.6474
# SharpDevelop 4.0.0.6745
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{256F5C28-532C-44C0-8AB8-D8EC5E492E01}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@ -295,6 +295,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display @@ -295,6 +295,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner.AddIn", "src\AddIns\DisplayBindings\FormsDesigner\FormsDesigner.AddIn\FormsDesigner.AddIn.csproj", "{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Data", "Data", "{C7F29FC2-1B03-4CDD-9E30-400F4765FF04}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@ -912,6 +914,22 @@ Global @@ -912,6 +914,22 @@ Global
{7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|x86.ActiveCfg = Release|x86
{7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|Debug.Build.0 = Release|x86
{7048AE18-EB93-4A84-82D0-DD60EB58ADBD}.Release|Debug.ActiveCfg = Release|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Debug|Any CPU.Build.0 = Debug|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Debug|Any CPU.ActiveCfg = Debug|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Debug|Win32.Build.0 = Debug|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Debug|Win32.ActiveCfg = Debug|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Debug|x86.Build.0 = Debug|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Debug|x86.ActiveCfg = Debug|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Debug|Debug.Build.0 = Debug|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Debug|Debug.ActiveCfg = Debug|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Release|Any CPU.Build.0 = Release|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Release|Any CPU.ActiveCfg = Release|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Release|Win32.Build.0 = Release|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Release|Win32.ActiveCfg = Release|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Release|x86.Build.0 = Release|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Release|x86.ActiveCfg = Release|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Release|Debug.Build.0 = Release|x86
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}.Release|Debug.ActiveCfg = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -988,6 +1006,7 @@ Global @@ -988,6 +1006,7 @@ Global
{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
{BFA3BF26-33BD-4A65-B84D-C7F30D131668} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
{C7F29FC2-1B03-4CDD-9E30-400F4765FF04} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
{53840EAB-984D-419F-A2A2-6D13C3F3D5B4} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
{A9F12710-24E4-46D4-832C-6ECB395B9EAD} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
{B7823AE9-4B43-4859-8796-2EBDC116FBB8} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}
{BAD94D6E-4159-4CB6-B991-486F412D9BB6} = {C7F29FC2-1B03-4CDD-9E30-400F4765FF04}

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/FormsCommands.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Commands/FormsCommands.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Commands/SideBarCommands.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Commands/SideBarCommands.cs

16
src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Configuration/AssemblyInfo.cs

@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
// 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.Reflection;
// Information about this assembly is defined by the following
// attributes.
//
// change them to the information which is associated with the assembly
// you compile.
[assembly: AssemblyTitle("SharpDevelop Windows.Forms Designer")]
[assembly: AssemblyDescription("A Windows.Forms designer implementation")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerGenerator/AbstractDesignerGenerator.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/CSharpDesignerGenerator.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerGenerator/CSharpDesignerGenerator.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/CodeDOMGenerator.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerGenerator/CodeDOMGenerator.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/VBNetDesignerGenerator.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerGenerator/VBNetDesignerGenerator.cs

52
src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerLoader/AbstractCodeDomDesignerLoader.cs

@ -0,0 +1,52 @@ @@ -0,0 +1,52 @@
// 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;
namespace ICSharpCode.FormsDesigner
{
/// <summary>
/// Description of AbstractCodeDomDesignerLoader.
/// </summary>
public class AbstractCodeDomDesignerLoader : IDesignerLoader
{
/// <summary>
/// When overridden in derived classes, this method should return the current
/// localization model of the designed file or None, if it cannot be determined.
/// </summary>
/// <returns>The default implementation always returns None.</returns>
protected virtual CodeDomLocalizationModel GetCurrentLocalizationModelFromDesignedFile()
{
return CodeDomLocalizationModel.None;
}
System.CodeDom.CodeCompileUnit IDesignerLoader.Parse()
{
throw new NotImplementedException();
}
void IDesignerLoader.Write(System.CodeDom.CodeCompileUnit unit)
{
throw new NotImplementedException();
}
CodeDomLocalizationModel IDesignerLoader.GetLocalizationModel()
{
CodeDomLocalizationModel model = FormsDesigner.Gui.OptionPanels.LocalizationModelOptionsPanel.DefaultLocalizationModel;
if (FormsDesigner.Gui.OptionPanels.LocalizationModelOptionsPanel.KeepLocalizationModel) {
// Try to find out the current localization model of the designed form
CodeDomLocalizationModel existingModel = this.GetCurrentLocalizationModelFromDesignedFile();
if (existingModel != CodeDomLocalizationModel.None) {
LoggingService.Debug("Determined existing localization model, using that: " + existingModel.ToString());
model = existingModel;
} else {
LoggingService.Debug("Could not determine existing localization model, using default: " + model.ToString());
}
} else {
LoggingService.Debug("Using default localization model: " + model.ToString());
}
return model;
}
}
}

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/NRefactoryDesignerLoader.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerLoader/NRefactoryDesignerLoader.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerSourceCodeStorage.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerSourceCodeStorage.cs

5
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/DesignerViewContent.cs

@ -604,11 +604,6 @@ namespace ICSharpCode.FormsDesigner @@ -604,11 +604,6 @@ namespace ICSharpCode.FormsDesigner
}
}
public ICollection GetCompatibleMethods(EventDescriptor edesc)
{
return generator.GetCompatibleMethods(edesc);
}
void IsActiveViewContentChangedHandler(object sender, EventArgs e)
{
if (this.IsActiveViewContent) {

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/FormKeyHandler.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormKeyHandler.cs

133
src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/FormsDesigner.AddIn.csproj

@ -0,0 +1,133 @@ @@ -0,0 +1,133 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<PropertyGroup>
<ProjectGuid>{53840EAB-984D-419F-A2A2-6D13C3F3D5B4}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<OutputType>Library</OutputType>
<RootNamespace>ICSharpCode.FormsDesigner</RootNamespace>
<AssemblyName>FormsDesigner.AddIn</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'x86' ">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath>
<DebugSymbols>True</DebugSymbols>
<DebugType>Full</DebugType>
<Optimize>False</Optimize>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<DefineConstants>DEBUG;TRACE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>bin\Release\</OutputPath>
<DebugSymbols>False</DebugSymbols>
<DebugType>None</DebugType>
<Optimize>True</Optimize>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<DefineConstants>TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<None Include="FormsDesigner.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\..\Main\GlobalAssemblyInfo.cs">
<Link>Configuration\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="Commands\FormsCommands.cs" />
<Compile Include="Commands\SideBarCommands.cs" />
<Compile Include="Configuration\AssemblyInfo.cs" />
<Compile Include="DesignerGenerator\AbstractDesignerGenerator.cs" />
<Compile Include="DesignerGenerator\CodeDOMGenerator.cs" />
<Compile Include="DesignerGenerator\CSharpDesignerGenerator.cs" />
<Compile Include="DesignerGenerator\VBNetDesignerGenerator.cs" />
<Compile Include="DesignerLoader\AbstractCodeDomDesignerLoader.cs" />
<Compile Include="DesignerLoader\NRefactoryDesignerLoader.cs" />
<Compile Include="DesignerSourceCodeStorage.cs" />
<Compile Include="DesignerViewContent.cs" />
<Compile Include="FormKeyHandler.cs" />
<Compile Include="ImageResourceEditorDialog.cs" />
<Compile Include="ImageResourceEditorDialog.Designer.cs">
<DependentUpon>ImageResourceEditorDialog.cs</DependentUpon>
</Compile>
<Compile Include="OptionPanels\GeneralOptions.cs" />
<Compile Include="OptionPanels\GridOptions.cs" />
<Compile Include="OptionPanels\LocalizationModelOptionsPanel.cs" />
<Compile Include="SecondaryDisplayBinding.cs" />
<Compile Include="Services\DesignerResourceService.cs" />
<Compile Include="Services\HelpService.cs" />
<Compile Include="Services\ProjectResourceService.cs" />
<Compile Include="Services\ResourceStore.cs" />
<Compile Include="Toolbox\AddComponentsDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Toolbox\ConfigureSideBarDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Toolbox\CustomComponentsSideTab.cs" />
<Compile Include="Toolbox\RenameCategoryDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Toolbox\SideTabDesigner.cs" />
<Compile Include="Toolbox\SideTabItemDesigner.cs" />
<Compile Include="Toolbox\ToolboxProvider.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
<Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
<Name>ICSharpCode.SharpDevelop</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
<Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\Project\FormsDesigner.csproj">
<Project>{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}</Project>
<Name>FormsDesigner</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Commands" />
<Folder Include="DesignerGenerator" />
<Folder Include="DesignerLoader" />
<Folder Include="Services" />
<Folder Include="OptionPanels" />
<Folder Include="Toolbox" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="ImageResourceEditorDialog.resx">
<DependentUpon>ImageResourceEditorDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="OptionPanels\LocalizationModelOptionsPanel.resx">
<DependentUpon>LocalizationModelOptionsPanel.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
</Project>

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

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<AddIn name = "Forms Designer"
<AddIn name = "Forms Designer"
author = "Mike Krueger"
copyright = "prj:///doc/copyright.txt"
description = "Windows Forms Designer"
@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
</Manifest>
<Runtime>
<Import assembly = "FormsDesigner.dll"/>
<Import assembly = "FormsDesigner.AddIn.dll"/>
<Import assembly = ":ICSharpCode.SharpDevelop"/>
</Runtime>

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ImageResourceEditorDialog.Designer.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/ImageResourceEditorDialog.Designer.cs generated

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ImageResourceEditorDialog.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/ImageResourceEditorDialog.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ImageResourceEditorDialog.resx → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/ImageResourceEditorDialog.resx

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/GeneralOptions.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/OptionPanels/GeneralOptions.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/GridOptions.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/OptionPanels/GridOptions.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/LocalizationModelOptionsPanel.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/OptionPanels/LocalizationModelOptionsPanel.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/LocalizationModelOptionsPanel.resx → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/OptionPanels/LocalizationModelOptionsPanel.resx

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/SecondaryDisplayBinding.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/SecondaryDisplayBinding.cs

1
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/DesignerResourceService.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Services/DesignerResourceService.cs

@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
using System;
using System.Globalization;
using ICSharpCode.Core;
namespace ICSharpCode.FormsDesigner.Services
{

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/HelpService.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Services/HelpService.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ProjectResourceService.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Services/ProjectResourceService.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ResourceStore.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Services/ResourceStore.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/AddComponentsDialog.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ConfigureSideBarDialog.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ConfigureSideBarDialog.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/CustomComponentsSideTab.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/CustomComponentsSideTab.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/RenameCategoryDialog.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/RenameCategoryDialog.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/SideTabDesigner.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/SideTabDesigner.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/SideTabItemDesigner.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/SideTabItemDesigner.cs

0
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs → src/AddIns/DisplayBindings/FormsDesigner/FormsDesigner.AddIn/Toolbox/ToolboxProvider.cs

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

@ -58,118 +58,37 @@ @@ -58,118 +58,37 @@
<EmbeddedResource Include="Resources\RenameSidebarCategoryDialog.xfrm" />
<EmbeddedResource Include="Resources\WindowsFormsGridOptions.xfrm" />
<Compile Include="Configuration\AssemblyInfo.cs" />
<Compile Include="Src\Commands\FormsCommands.cs" />
<Compile Include="Src\Commands\SideBarCommands.cs" />
<Compile Include="Src\DesignerGenerator\CodeDOMGenerator.cs" />
<Compile Include="Src\DesignerGenerator\CSharpDesignerGenerator.cs" />
<Compile Include="Src\DesignerGenerator\IDesignerGenerator.cs" />
<Compile Include="Src\DesignerLoader\AbstractCodeDomDesignerLoader.cs" />
<Compile Include="Src\DesignerLoader\NRefactoryDesignerLoader.cs" />
<Compile Include="Src\DesignerSourceCodeStorage.cs" />
<Compile Include="Src\Gui\ImageResourceEditorDialog.cs" />
<Compile Include="Src\Gui\ImageResourceEditorDialog.Designer.cs">
<DependentUpon>ImageResourceEditorDialog.cs</DependentUpon>
</Compile>
<Compile Include="Src\Gui\OptionPanels\LocalizationModelOptionsPanel.cs" />
<Compile Include="Src\SecondaryDisplayBinding.cs" />
<Compile Include="Src\DesignerViewContent.cs" />
<Compile Include="Src\FormKeyHandler.cs" />
<Compile Include="Src\Gui\AddComponentsDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\DesignerAppDomainManager.cs" />
<Compile Include="Src\DesignerLoader\SharpDevelopDesignerLoader.cs" />
<Compile Include="Src\DesignerLoader\IDesignerLoader.cs" />
<Compile Include="Src\Gui\ComponentLibraryLoader.cs" />
<Compile Include="Src\Gui\ConfigureSideBarDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\CustomComponentsSideTab.cs" />
<Compile Include="Src\Gui\OptionPanels\GridOptions.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\Gui\RenameCategoryDialog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Src\Gui\SideTabDesigner.cs" />
<Compile Include="Src\Gui\SideTabItemDesigner.cs" />
<Compile Include="Src\IDesignerGenerator.cs" />
<Compile Include="Src\IFormsDesigner.cs" />
<Compile Include="Src\LoggingService.cs" />
<Compile Include="Src\Services\DefaultMemberRelationshipService.cs" />
<Compile Include="Src\Services\DefaultServiceContainer.cs" />
<Compile Include="Src\Services\DesignerOptionService.cs" />
<Compile Include="Src\Services\DesignerResourceService.cs" />
<Compile Include="Src\Services\EventBindingService.cs" />
<Compile Include="Src\Services\HelpService.cs" />
<Compile Include="Src\Services\ImageResourceEditor.cs" />
<Compile Include="Src\Services\MenuCommandService.cs" />
<Compile Include="Src\Services\ProjectResourceInfo.cs" />
<Compile Include="Src\Services\ProjectResourcesComponentCodeDomSerializer.cs" />
<Compile Include="Src\Services\ProjectResourceService.cs" />
<Compile Include="Src\Services\ProjectResourcesMemberCodeDomSerializer.cs" />
<Compile Include="Src\Services\PropertyValueUIService.cs" />
<Compile Include="Src\Services\ResourceStore.cs" />
<Compile Include="Src\Services\SharpDevelopSerializationProvider.cs" />
<Compile Include="Src\Services\ToolboxService.cs" />
<Compile Include="Src\Services\TypeResolutionService.cs" />
<Compile Include="Src\Services\UIService.cs" />
<Compile Include="Src\Services\XmlDesignerNameCreationService.cs" />
<Compile Include="Src\ToolboxProvider.cs" />
<None Include="FormsDesigner.addin">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</None>
<Compile Include="Src\DesignerGenerator\VBNetDesignerGenerator.cs" />
<Compile Include="Src\DesignerLoader\DesignerLoaderProvider.cs" />
<Compile Include="Src\DesignerLoader\FormsDesignerLoadException.cs" />
<Compile Include="Src\DesignerGenerator\AbstractDesignerGenerator.cs" />
<Compile Include="Src\Services\TypeDiscoveryService.cs" />
<Compile Include="Src\UndoRedo\UndoEngine.cs" />
<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>
<EmbeddedResource Include="Src\Gui\OptionPanels\LocalizationModelOptionsPanel.resx">
<DependentUpon>LocalizationModelOptionsPanel.cs</DependentUpon>
</EmbeddedResource>
<Compile Include="Src\Services\DesignerSerializationService.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj">
<Project>{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}</Project>
<Name>ICSharpCode.AvalonEdit</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Libraries\NRefactory\Project\NRefactory.csproj">
<Project>{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}</Project>
<Name>NRefactory</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
<Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
<Name>ICSharpCode.SharpDevelop</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
<Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<Content Include="PostBuildEvent.proj" />
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
<Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
<Name>ICSharpCode.Core.WinForms</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
<Project>{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}</Project>
<Name>ICSharpCode.SharpDevelop.Dom</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
<Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
<Name>ICSharpCode.SharpDevelop.Widgets</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<Import Project="PostBuildEvent.proj" />
</Project>

13
src/AddIns/DisplayBindings/FormsDesigner/Project/PostBuildEvent.proj

@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PrepareForRunDependsOn>$(PrepareForRunDependsOn);MyPostBuildTarget</PrepareForRunDependsOn>
</PropertyGroup>
<ItemGroup>
<MyCopyItem Include="$(MSBuildProjectDirectory)\*.addin" />
</ItemGroup>
<Target Name="MyPostBuildTarget">
<!-- work around an MSBuild bug in CopyToOutputDirectory that causes this file to be copied -->
<!-- to projects referencing this project even if local copy on that reference is false -->
<Copy SourceFiles="@(MyCopyItem)" DestinationFolder="$(OutputPath)" />
</Target>
</Project>

20
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerAppDomainManager.cs

@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
// 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;
namespace ICSharpCode.FormsDesigner
{
/// <summary>
/// Description of DesignerAppDomainManager.
/// </summary>
public class DesignerAppDomainManager
{
/// <summary>
/// Gets whether this is a designer domain (and not the SharpDevelop domain)
/// </summary>
public static bool IsDesignerDomain {
get { throw new NotImplementedException(); }
}
}
}

2
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/DesignerLoaderProvider.cs

@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
using System;
using System.ComponentModel.Design.Serialization;
/*
using ICSharpCode.NRefactory;
namespace ICSharpCode.FormsDesigner
@ -27,3 +28,4 @@ namespace ICSharpCode.FormsDesigner @@ -27,3 +28,4 @@ namespace ICSharpCode.FormsDesigner
}
}
}
*/

18
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/IDesignerLoader.cs

@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
// 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.CodeDom;
using System.ComponentModel.Design.Serialization;
namespace ICSharpCode.FormsDesigner
{
public interface IDesignerLoader
{
CodeCompileUnit Parse();
void Write(CodeCompileUnit unit);
CodeDomLocalizationModel GetLocalizationModel();
}
}

41
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/AbstractCodeDomDesignerLoader.cs → src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/SharpDevelopDesignerLoader.cs

@ -9,7 +9,6 @@ using System.ComponentModel.Design; @@ -9,7 +9,6 @@ using System.ComponentModel.Design;
using System.ComponentModel.Design.Serialization;
using System.Reflection;
using ICSharpCode.Core;
using ICSharpCode.FormsDesigner.Services;
namespace ICSharpCode.FormsDesigner
@ -17,11 +16,12 @@ namespace ICSharpCode.FormsDesigner @@ -17,11 +16,12 @@ namespace ICSharpCode.FormsDesigner
/// <summary>
/// An abstract base class for CodeDOM designer loaders.
/// </summary>
public abstract class AbstractCodeDomDesignerLoader : CodeDomDesignerLoader
public class SharpDevelopDesignerLoader : CodeDomDesignerLoader
{
bool loading;
IDesignerLoaderHost designerLoaderHost = null;
ITypeResolutionService typeResolutionService = null;
readonly IDesignerLoader loader;
readonly IDesignerGenerator generator;
public override bool Loading {
@ -44,7 +44,7 @@ namespace ICSharpCode.FormsDesigner @@ -44,7 +44,7 @@ namespace ICSharpCode.FormsDesigner
get { return this.generator; }
}
protected AbstractCodeDomDesignerLoader(IDesignerGenerator generator)
protected SharpDevelopDesignerLoader(IDesignerGenerator generator)
{
if (generator == null) {
throw new ArgumentNullException("generator", "Generator cannot be null");
@ -102,20 +102,7 @@ namespace ICSharpCode.FormsDesigner @@ -102,20 +102,7 @@ namespace ICSharpCode.FormsDesigner
protected override void Initialize()
{
CodeDomLocalizationModel model = FormsDesigner.Gui.OptionPanels.LocalizationModelOptionsPanel.DefaultLocalizationModel;
if (FormsDesigner.Gui.OptionPanels.LocalizationModelOptionsPanel.KeepLocalizationModel) {
// Try to find out the current localization model of the designed form
CodeDomLocalizationModel existingModel = this.GetCurrentLocalizationModelFromDesignedFile();
if (existingModel != CodeDomLocalizationModel.None) {
LoggingService.Debug("Determined existing localization model, using that: " + existingModel.ToString());
model = existingModel;
} else {
LoggingService.Debug("Could not determine existing localization model, using default: " + model.ToString());
}
} else {
LoggingService.Debug("Using default localization model: " + model.ToString());
}
CodeDomLocalizationModel model = loader.GetLocalizationModel();
CodeDomLocalizationProvider localizationProvider = new CodeDomLocalizationProvider(designerLoaderHost, model);
IDesignerSerializationManager manager = (IDesignerSerializationManager)designerLoaderHost.GetService(typeof(IDesignerSerializationManager));
@ -132,16 +119,6 @@ namespace ICSharpCode.FormsDesigner @@ -132,16 +119,6 @@ namespace ICSharpCode.FormsDesigner
}
}
/// <summary>
/// When overridden in derived classes, this method should return the current
/// localization model of the designed file or None, if it cannot be determined.
/// </summary>
/// <returns>The default implementation always returns None.</returns>
protected virtual CodeDomLocalizationModel GetCurrentLocalizationModelFromDesignedFile()
{
return CodeDomLocalizationModel.None;
}
protected override void OnEndLoad(bool successful, ICollection errors)
{
this.loading = false;
@ -161,5 +138,15 @@ namespace ICSharpCode.FormsDesigner @@ -161,5 +138,15 @@ namespace ICSharpCode.FormsDesigner
throw;
}
}
protected override void Write(System.CodeDom.CodeCompileUnit unit)
{
loader.Write(unit);
}
protected override System.CodeDom.CodeCompileUnit Parse()
{
return loader.Parse();
}
}
}

9
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/ComponentLibraryLoader.cs

@ -10,6 +10,7 @@ using System.Xml; @@ -10,6 +10,7 @@ using System.Xml;
namespace ICSharpCode.FormsDesigner.Gui
{
[Serializable]
public class ToolComponent
{
string fullName;
@ -101,6 +102,8 @@ namespace ICSharpCode.FormsDesigner.Gui @@ -101,6 +102,8 @@ namespace ICSharpCode.FormsDesigner.Gui
public Assembly LoadAssembly()
{
if (!DesignerAppDomainManager.IsDesignerDomain)
throw new InvalidOperationException();
//ICSharpCode.Core.LoggingService.Debug("ToolComponent.LoadAssembly(): " + AssemblyName);
Assembly assembly;
if (HintPath != null) {
@ -123,6 +126,7 @@ namespace ICSharpCode.FormsDesigner.Gui @@ -123,6 +126,7 @@ namespace ICSharpCode.FormsDesigner.Gui
}
}
[Serializable]
public class Category
{
string name;
@ -174,6 +178,7 @@ namespace ICSharpCode.FormsDesigner.Gui @@ -174,6 +178,7 @@ namespace ICSharpCode.FormsDesigner.Gui
}
}
[Serializable]
public class ComponentAssembly
{
string name;
@ -329,7 +334,7 @@ namespace ICSharpCode.FormsDesigner.Gui @@ -329,7 +334,7 @@ namespace ICSharpCode.FormsDesigner.Gui
}
}
} catch (Exception e) {
ICSharpCode.Core.LoggingService.Warn("ComponentLibraryLoader.LoadToolComponentLibrary: " + e.Message);
LoggingService.Warn("ComponentLibraryLoader.LoadToolComponentLibrary: " + e.Message);
return false;
}
return true;
@ -359,7 +364,7 @@ namespace ICSharpCode.FormsDesigner.Gui @@ -359,7 +364,7 @@ namespace ICSharpCode.FormsDesigner.Gui
b.MakeTransparent();
}
} catch (Exception e) {
ICSharpCode.Core.LoggingService.Warn("ComponentLibraryLoader.GetIcon: " + e.Message);
LoggingService.Warn("ComponentLibraryLoader.GetIcon: " + e.Message);
}
}

17
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/IDesignerGenerator.cs → src/AddIns/DisplayBindings/FormsDesigner/Project/Src/IDesignerGenerator.cs

@ -7,20 +7,17 @@ using System.CodeDom.Compiler; @@ -7,20 +7,17 @@ using System.CodeDom.Compiler;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Reflection;
using ICSharpCode.SharpDevelop;
namespace ICSharpCode.FormsDesigner
{
public interface IDesignerGenerator
{
CodeDomProvider CodeDomProvider {
get;
}
void Attach(FormsDesignerViewContent viewContent);
void Detach();
FormsDesignerViewContent ViewContent { get; }
//CodeDomProvider CodeDomProvider { get; }
//void Attach(FormsDesignerViewContent viewContent);
//void Detach();
//FormsDesignerViewContent ViewContent { get; }
/*
/// <summary>
/// Gets the collection of OpenedFiles that contain code which belongs
/// to the designed form, not including resource files.
@ -29,6 +26,8 @@ namespace ICSharpCode.FormsDesigner @@ -29,6 +26,8 @@ namespace ICSharpCode.FormsDesigner
/// <returns>A collection of OpenedFiles that contain code which belongs to the designed form.</returns>
/// <remarks>The returned collection must include the <paramref name="designerCodeFile"/>.</remarks>
IEnumerable<OpenedFile> GetSourceFiles(out OpenedFile designerCodeFile);
*/
void MergeFormChanges(CodeCompileUnit unit);
bool InsertComponentEvent(IComponent component, EventDescriptor edesc, string eventMethodName, string body, out string file, out int position);
ICollection GetCompatibleMethods(EventDescriptor edesc);

25
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/IFormsDesigner.cs

@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
// 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.ComponentModel;
using ICSharpCode.FormsDesigner.Services;
namespace ICSharpCode.FormsDesigner
{
/// <summary>
/// Interface used within the foms designer to refer to the designer view content.
/// </summary>
public interface IFormsDesigner
{
IDesignerGenerator Generator { get; }
IntPtr GetDialogOwnerWindowHandle();
void ShowSourceCode();
void ShowSourceCode(int lineNumber);
void ShowSourceCode(IComponent component, EventDescriptor edesc, string methodName);
SharpDevelopDesignerOptions DesignerOptions { get; }
}
}

35
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/LoggingService.cs

@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
// 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;
namespace ICSharpCode.FormsDesigner
{
static class LoggingService
{
public static void Debug(string message)
{
throw new NotImplementedException();
}
public static void Info(string message)
{
throw new NotImplementedException();
}
public static void Warn(string message)
{
throw new NotImplementedException();
}
public static void Error(Exception error)
{
throw new NotImplementedException();
}
public static void Error(string message, Exception error)
{
throw new NotImplementedException();
}
}
}

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

@ -4,8 +4,6 @@ @@ -4,8 +4,6 @@
using System;
using System.ComponentModel.Design.Serialization;
using ICSharpCode.Core;
//#define WFDESIGN_LOG_MEMBERRELATIONSHIPSERVICE
namespace ICSharpCode.FormsDesigner.Services

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

@ -50,8 +50,6 @@ @@ -50,8 +50,6 @@
using System;
using System.ComponentModel.Design;
using ICSharpCode.Core;
namespace ICSharpCode.FormsDesigner.Services
{
public sealed class DefaultServiceContainer : ServiceContainer

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

@ -5,23 +5,39 @@ using System; @@ -5,23 +5,39 @@ using System;
using System.Drawing;
using System.Windows.Forms.Design;
using ICSharpCode.Core;
using ICSharpCode.FormsDesigner.Gui.OptionPanels;
namespace ICSharpCode.FormsDesigner.Services
{
public class SharpDevelopDesignerOptions : DesignerOptions
[Serializable]
public class SharpDevelopDesignerOptions
{
bool enableInSituEditing;
bool objectBoundSmartTagAutoShow;
bool useOptimizedCodeGeneration;
// Gets or sets a value that enables or disables in-place editing for ToolStrip controls.
public bool EnableInSituEditing { get; set; }
// Obtains and shows whether smart tags are automatically opened.
public bool ObjectBoundSmartTagAutoShow { get; set; }
// The component cache is a performance enhancement that is incompatible with certain designers.
// You can disable it with this property
public bool UseOptimizedCodeGeneration { get; set; }
Size gridSize = Size.Empty;
bool showGrid;
bool snapToGrid;
bool useSnapLines;
bool useSmartTags;
// Obtains and shows the size of the standard design-mode grid square.
public Size GridSize { get; set; }
// Obtains and shows whether the design mode surface grid is enabled.
public bool ShowGrid { get; set; }
// Obtains and shows whether components should be aligned with the surface grid.
public bool SnapToGrid { get; set; }
// Gets or sets a value that enables or disables snaplines in the designer.
public bool UseSnapLines { get; set; }
// Gets or sets a value that enables or disables smart tags in the designer.
public bool UseSmartTags { get; set; }
// Whether to include an underscore in the event handler name
public string EventHandlerNameFormat { get; set; }
/*
public SharpDevelopDesignerOptions()
{
int w = PropertyService.Get("FormsDesigner.DesignerOptions.GridSizeWidth", 8);
@ -38,76 +54,13 @@ namespace ICSharpCode.FormsDesigner.Services @@ -38,76 +54,13 @@ namespace ICSharpCode.FormsDesigner.Services
this.objectBoundSmartTagAutoShow = GeneralOptionsPanel.SmartTagAutoShow;
this.useOptimizedCodeGeneration = PropertyService.Get("FormsDesigner.DesignerOptions.UseOptimizedCodeGeneration", true);
}
// Obtains and shows the size of the standard design-mode grid square.
public override Size GridSize {
get {
return gridSize;
}
}
// Obtains and shows whether the design mode surface grid is enabled.
public override bool ShowGrid {
get {
return showGrid;
}
}
// Obtains and shows whether components should be aligned with the surface grid.
public override bool SnapToGrid {
get {
return snapToGrid;
}
}
// Gets or sets a value that enables or disables smart tags in the designer.
public override bool UseSmartTags {
get {
return useSmartTags;
}
}
// Gets or sets a value that enables or disables snaplines in the designer.
public override bool UseSnapLines {
get {
return useSnapLines;
}
}
// Gets or sets a value that enables or disables in-place editing for ToolStrip controls.
public override bool EnableInSituEditing {
get {
return enableInSituEditing;
}
}
// Obtains and shows whether smart tags are automatically opened.
public override bool ObjectBoundSmartTagAutoShow {
get {
return objectBoundSmartTagAutoShow;
}
}
// The component cache is a performance enhancement that is incompatible with certain designers.
// You can disable it with this property
public override bool UseOptimizedCodeGeneration {
get {
return useOptimizedCodeGeneration;
}
}
*/
}
public class SharpDevelopDesignerOptionService : WindowsFormsDesignerOptionService
{
public SharpDevelopDesignerOptionService()
{
ApplySharpDevelopSettings();
}
void ApplySharpDevelopSettings()
{
public SharpDevelopDesignerOptionService(SharpDevelopDesignerOptions options)
{
SharpDevelopDesignerOptions options = new SharpDevelopDesignerOptions();
this.Options.Properties.Find("GridSize", true).SetValue(this, options.GridSize);
this.Options.Properties.Find("EnableInSituEditing", true).SetValue(this, options.EnableInSituEditing);
this.Options.Properties.Find("ObjectBoundSmartTagAutoShow", true).SetValue(this, options.ObjectBoundSmartTagAutoShow);

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

@ -4,16 +4,14 @@ @@ -4,16 +4,14 @@
using System;
using System.Collections;
using System.ComponentModel;
using ICSharpCode.FormsDesigner.Gui.OptionPanels;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.FormsDesigner.Services
{
public class EventBindingService : System.ComponentModel.Design.EventBindingService
{
readonly FormsDesignerViewContent formDesigner;
readonly IFormsDesigner formDesigner;
public EventBindingService(FormsDesignerViewContent formDesigner, IServiceProvider provider) : base(provider)
public EventBindingService(IFormsDesigner formDesigner, IServiceProvider provider) : base(provider)
{
if (formDesigner == null)
throw new ArgumentNullException("formDesigner");
@ -40,16 +38,17 @@ namespace ICSharpCode.FormsDesigner.Services @@ -40,16 +38,17 @@ namespace ICSharpCode.FormsDesigner.Services
string GetEventHandlerNameFormat()
{
if (GeneralOptionsPanel.GenerateVisualStudioStyleEventHandlers) {
return "{0}_{1}";
}
return "{0}{1}";
// if (formDesigner.SharpDevelopDesignerOptions.GenerateVisualStudioStyleEventHandlers) {
// return "{0}_{1}";
// }
// return "{0}{1}";
return formDesigner.DesignerOptions.EventHandlerNameFormat;
}
// sohuld look around in form class for compatiable methodes
protected override ICollection GetCompatibleMethods(EventDescriptor e)
{
return this.formDesigner.GetCompatibleMethods(e);
return this.formDesigner.Generator.GetCompatibleMethods(e);
}
protected override bool ShowCode()

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

@ -10,9 +10,7 @@ using System.Security.Permissions; @@ -10,9 +10,7 @@ using System.Security.Permissions;
using System.Windows.Forms;
using System.Windows.Forms.Design;
using ICSharpCode.Core;
using ICSharpCode.FormsDesigner.Gui;
using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.FormsDesigner.Services
{

6
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/MenuCommandService.cs

@ -6,8 +6,6 @@ using System.Drawing; @@ -6,8 +6,6 @@ using System.Drawing;
using System.Windows.Forms;
using System.Windows.Forms.Design;
using ICSharpCode.Core.WinForms;
using ICSharpCode.FormsDesigner.Commands;
using CommandID = System.ComponentModel.Design.CommandID;
using MenuCommand = System.ComponentModel.Design.MenuCommand;
@ -16,9 +14,9 @@ namespace ICSharpCode.FormsDesigner.Services @@ -16,9 +14,9 @@ namespace ICSharpCode.FormsDesigner.Services
class MenuCommandService : System.ComponentModel.Design.MenuCommandService
{
FormsDesignerViewContent vc;
IFormsDesigner vc;
public MenuCommandService(FormsDesignerViewContent vc, IServiceProvider serviceProvider) : base(serviceProvider)
public MenuCommandService(IFormsDesigner vc, IServiceProvider serviceProvider) : base(serviceProvider)
{
this.vc = vc;
this.InitializeGlobalCommands( );

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

@ -6,8 +6,6 @@ using System.Collections; @@ -6,8 +6,6 @@ using System.Collections;
using System.IO;
using System.Resources;
using ICSharpCode.SharpDevelop;
namespace ICSharpCode.FormsDesigner.Services
{
/// <summary>

3
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ProjectResourcesComponentCodeDomSerializer.cs

@ -9,9 +9,6 @@ using System.ComponentModel.Design.Serialization; @@ -9,9 +9,6 @@ using System.ComponentModel.Design.Serialization;
using System.IO;
using System.Reflection;
using ICSharpCode.Core;
using ICSharpCode.NRefactory.Visitors;
namespace ICSharpCode.FormsDesigner.Services
{
/// <summary>

6
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ProjectResourcesMemberCodeDomSerializer.cs

@ -10,12 +10,6 @@ using System.IO; @@ -10,12 +10,6 @@ using System.IO;
using System.Linq;
using System.Resources.Tools;
using ICSharpCode.Core;
using ICSharpCode.EasyCodeDom;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.FormsDesigner.Services
{
/// <summary>

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

@ -7,8 +7,6 @@ using System.Collections.Specialized; @@ -7,8 +7,6 @@ using System.Collections.Specialized;
using System.ComponentModel.Design;
using System.Drawing.Design;
using ICSharpCode.Core;
namespace ICSharpCode.FormsDesigner.Services
{
public delegate void ToolboxEventHandler(object sender, ToolboxEventArgs tea);

3
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/TypeDiscoveryService.cs

@ -8,9 +8,6 @@ using System.ComponentModel.Design; @@ -8,9 +8,6 @@ using System.ComponentModel.Design;
using System.IO;
using System.Reflection;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Dom;
namespace ICSharpCode.FormsDesigner.Services
{
public class TypeDiscoveryService : ITypeDiscoveryService

15
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/TypeResolutionService.cs

@ -9,11 +9,6 @@ using System.IO; @@ -9,11 +9,6 @@ using System.IO;
using System.Linq;
using System.Reflection;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using Microsoft.Win32;
namespace ICSharpCode.FormsDesigner.Services
@ -74,13 +69,15 @@ namespace ICSharpCode.FormsDesigner.Services @@ -74,13 +69,15 @@ namespace ICSharpCode.FormsDesigner.Services
string formSourceFileName;
IProjectContent callingProject;
/// <summary>
/// Dictionary of file name -> hash of loaded assemblies for the currently designed document.
/// Used to detect changes in references assemblies.
/// </summary>
readonly Dictionary<string, string> loadedAssembliesForCurrentDocument = new Dictionary<string, string>(StringComparer.Ordinal);
/*
IProjectContent callingProject;
/// <summary>
/// Gets the project content of the project that created this TypeResolutionService.
/// Returns null when no calling project was specified.
@ -98,7 +95,7 @@ namespace ICSharpCode.FormsDesigner.Services @@ -98,7 +95,7 @@ namespace ICSharpCode.FormsDesigner.Services
}
return callingProject;
}
}
}*/
public TypeResolutionService()
{
@ -109,6 +106,7 @@ namespace ICSharpCode.FormsDesigner.Services @@ -109,6 +106,7 @@ namespace ICSharpCode.FormsDesigner.Services
this.formSourceFileName = formSourceFileName;
}
/*
static readonly Dictionary<IProjectContent, object> projectContentsCurrentlyLoadingAssembly = new Dictionary<IProjectContent, object>();
/// <summary>
@ -152,6 +150,7 @@ namespace ICSharpCode.FormsDesigner.Services @@ -152,6 +150,7 @@ namespace ICSharpCode.FormsDesigner.Services
return null;
}
}
*/
static string GetHash(string fileName)
{
@ -439,7 +438,7 @@ namespace ICSharpCode.FormsDesigner.Services @@ -439,7 +438,7 @@ namespace ICSharpCode.FormsDesigner.Services
public void ReferenceAssembly(AssemblyName name)
{
ICSharpCode.Core.LoggingService.Warn("TODO: Add Assembly reference : " + name);
LoggingService.Warn("TODO: Add Assembly reference : " + name);
}
/// <summary>

14
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/UIService.cs

@ -7,13 +7,11 @@ using System.Drawing; @@ -7,13 +7,11 @@ using System.Drawing;
using System.Windows.Forms;
using System.Windows.Forms.Design;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.FormsDesigner.Services
{
public class UIService : IUIService
{
IFormsDesigner designer;
IDictionary styles = new Hashtable();
public IDictionary Styles {
@ -22,8 +20,9 @@ namespace ICSharpCode.FormsDesigner.Services @@ -22,8 +20,9 @@ namespace ICSharpCode.FormsDesigner.Services
}
}
public UIService()
public UIService(IFormsDesigner designer)
{
this.designer = designer;
styles["DialogFont"] = Control.DefaultFont;
styles["HighlightColor"] = Color.LightYellow;
}
@ -48,7 +47,12 @@ namespace ICSharpCode.FormsDesigner.Services @@ -48,7 +47,12 @@ namespace ICSharpCode.FormsDesigner.Services
#region Dialog functions
public IWin32Window GetDialogOwnerWindow()
{
return WorkbenchSingleton.MainWin32Window;
return new Win32Window { Handle = designer.GetDialogOwnerWindowHandle() };
}
sealed class Win32Window : IWin32Window
{
public IntPtr Handle { get; set; }
}
public DialogResult ShowDialog(Form form)

1
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/XmlDesignerNameCreationService.cs

@ -10,7 +10,6 @@ using System.Windows.Forms; @@ -10,7 +10,6 @@ using System.Windows.Forms;
using System.Xml;
using ICSharpCode.FormsDesigner.Services;
using ICSharpCode.SharpDevelop.Gui.XmlForms;
namespace ICSharpCode.FormsDesigner
{

6
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/UndoRedo/UndoEngine.cs

@ -5,11 +5,9 @@ using System; @@ -5,11 +5,9 @@ using System;
using System.Collections.Generic;
using System.ComponentModel.Design;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.FormsDesigner.UndoRedo
{
public class FormsDesignerUndoEngine : UndoEngine, IUndoHandler
public class FormsDesignerUndoEngine : UndoEngine
{
Stack<UndoEngine.UndoUnit> undoStack = new Stack<UndoEngine.UndoUnit>();
Stack<UndoEngine.UndoUnit> redoStack = new Stack<UndoEngine.UndoUnit>();
@ -18,7 +16,6 @@ namespace ICSharpCode.FormsDesigner.UndoRedo @@ -18,7 +16,6 @@ namespace ICSharpCode.FormsDesigner.UndoRedo
{
}
#region IUndoHandler
public bool EnableUndo {
get {
return undoStack.Count > 0;
@ -48,7 +45,6 @@ namespace ICSharpCode.FormsDesigner.UndoRedo @@ -48,7 +45,6 @@ namespace ICSharpCode.FormsDesigner.UndoRedo
undoStack.Push(unit);
}
}
#endregion
protected override void AddUndoUnit(UndoEngine.UndoUnit unit)
{

Loading…
Cancel
Save