From faab2b4fc90c9b048af3a9988f454a06d62c4584 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 20 Aug 2005 19:15:01 +0000 Subject: [PATCH] Improve project options panels and prepare editing different configurations. Fixed bug when closing form designer while the property pad was active. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@399 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/CSharpBinding.csproj | 1 - .../Resources/AdvancedBuildOptionsDialog.xfrm | 122 ----- .../Project/Resources/BuildOptions.xfrm | 297 ++++++++---- .../Project/Src/OptionPanels/BuildOptions.cs | 188 ++------ .../Project/Src/Project/CSharpProject.cs | 196 +------- .../ILAsmBinding/Project/ILAsmBinding.addin | 8 +- .../ILAsmBinding/Project/Src/ILAsmProject.cs | 2 +- .../Resources/AdvancedBuildOptionsDialog.xfrm | 122 ----- .../Project/Resources/BuildOptions.xfrm | 294 ++++++++---- .../Project/Src/OptionPanels/BuildOptions.cs | 180 ++----- .../Project/Src/Project/VBNetProject.cs | 220 +-------- .../VBNetBinding/Project/VBNetBinding.csproj | 1 - .../FormDesigner/FormDesignerViewContent.cs | 8 + .../Project/ICSharpCode.SharpDevelop.csproj | 11 +- .../Resources/CompileFileProjectOptions.xfrm | 26 - .../Project/Resources/DeployFileOptions.xfrm | 91 ---- .../Resources/ProjectOptions/CreateKey.xfrm | 95 ++++ .../Resources/ProjectOptions/Publish.xfrm | 152 +++--- .../Resources/ProjectOptions/Signing.xfrm | 161 +++---- src/Main/Base/Project/Src/Dom/XmlDoc.cs | 55 ++- .../Project/Src/Gui/AbstractViewContent.cs | 8 + .../Src/Gui/ContentInterfaces/ICanBeDirty.cs | 32 ++ .../Src/Gui/Dialogs/AbstractOptionPanel.cs | 22 +- .../Project/Src/Gui/Dialogs/FolderDialog.cs | 13 +- .../Src/Gui/Dialogs/NewProjectDialog.cs | 2 +- .../ProjectOptions/AbstractBuildOptions.cs | 149 ++++++ .../AbstractProjectOptionPanel.cs | 48 ++ .../ProjectOptions/ApplicationSettings.cs | 67 +-- .../ProjectOptions/BuildEvents.cs | 41 +- .../OptionPanels/ProjectOptions/CreateKey.cs | 106 +++++ .../ProjectOptions/DebugOptions.cs | 73 +-- .../OptionPanels/ProjectOptions/Publish.cs | 15 +- .../ProjectOptions/ReferencePaths.cs | 6 +- .../OptionPanels/ProjectOptions/Signing.cs | 112 +++-- .../Src/Gui/Dialogs/ProjectOptionsDialog.cs | 197 -------- .../Src/Gui/Dialogs/ProjectOptionsView.cs | 32 +- src/Main/Base/Project/Src/Gui/IViewContent.cs | 17 +- .../Project/Src/Gui/XmlForms/Lib/XmlForm.cs | 17 +- .../Src/Gui/XmlForms/Lib/XmlUserControl.cs | 13 +- .../Project/Src/Project/AbstractProject.cs | 121 ++++- .../Src/Project/AdvancedMSBuildProject.cs | 421 ---------------- .../Src/Project/ConfigurationGuiHelper.cs | 449 ++++++++++++++++++ src/Main/Base/Project/Src/Project/IProject.cs | 18 +- .../Base/Project/Src/Project/MSBuildEnums.cs | 60 +++ .../Project/Src/Project/MSBuildProject.cs | 89 +++- .../Base/Project/Src/Project/PropertyGroup.cs | 9 +- .../Resources/StringResources.resources | Bin 267661 -> 256682 bytes 47 files changed, 2005 insertions(+), 2362 deletions(-) delete mode 100644 src/AddIns/BackendBindings/CSharpBinding/Project/Resources/AdvancedBuildOptionsDialog.xfrm delete mode 100644 src/AddIns/BackendBindings/VBNetBinding/Project/Resources/AdvancedBuildOptionsDialog.xfrm delete mode 100644 src/Main/Base/Project/Resources/CompileFileProjectOptions.xfrm delete mode 100644 src/Main/Base/Project/Resources/DeployFileOptions.xfrm create mode 100644 src/Main/Base/Project/Resources/ProjectOptions/CreateKey.xfrm create mode 100644 src/Main/Base/Project/Src/Gui/ContentInterfaces/ICanBeDirty.cs create mode 100644 src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractBuildOptions.cs create mode 100644 src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AbstractProjectOptionPanel.cs create mode 100644 src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CreateKey.cs delete mode 100644 src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsDialog.cs delete mode 100644 src/Main/Base/Project/Src/Project/AdvancedMSBuildProject.cs create mode 100644 src/Main/Base/Project/Src/Project/ConfigurationGuiHelper.cs create mode 100644 src/Main/Base/Project/Src/Project/MSBuildEnums.cs diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj index 7af88ae50c..d73c849d86 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/CSharpBinding.csproj @@ -33,7 +33,6 @@ - diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/AdvancedBuildOptionsDialog.xfrm b/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/AdvancedBuildOptionsDialog.xfrm deleted file mode 100644 index ecc4feaf68..0000000000 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/AdvancedBuildOptionsDialog.xfrm +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/BuildOptions.xfrm b/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/BuildOptions.xfrm index 243d8737d9..3fdb8d9013 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/BuildOptions.xfrm +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Resources/BuildOptions.xfrm @@ -1,189 +1,298 @@ - - + + - - - + + + + + - - - - - - - - - - - - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + - + + - + - - + - - - - + + + - - + + + - - - - + + + + - + + - - - + + - + + - + + - - - - + + + + - + + - - + + - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.cs index 7eccb33a85..f010318e12 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.cs @@ -1,180 +1,50 @@ // // 2002-2005 AlphaSierraPapa // GNU General Public License -// +// // $Revision$ // using System; +using System.Collections.Generic; using System.Windows.Forms; -using ICSharpCode.SharpDevelop.Internal.ExternalTool; +using ICSharpCode.SharpDevelop.Project; using ICSharpCode.Core; +using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Gui.XmlForms; +using ICSharpCode.SharpDevelop.Gui.OptionPanels; + +using StringPair = System.Collections.Generic.KeyValuePair; namespace CSharpBinding.OptionPanels { - public class BuildOptions : AbstractOptionPanel + public class BuildOptions : AbstractBuildOptions { - CSharpProject project; - - public BuildOptions() - { - } - - void ShowAdvancedOptions(object sender, EventArgs e) - { - using (AdvancedBuildOptionsDialog advancedBuildOptionsDialog = new AdvancedBuildOptionsDialog(project)) { - advancedBuildOptionsDialog.ShowDialog(WorkbenchSingleton.MainForm); - } - } - string Config = "Debug"; - string Platform = "AnyCPU"; - public override void LoadPanelContents() { - SetupFromXmlStream(this.GetType().Assembly.GetManifestResourceStream("Resources.BuildOptions.xfrm")); - this.project = (CSharpProject)((Properties)CustomizationObject).Get("Project"); - - ConnectBrowseFolder("outputPathBrowseButton", "outputPathTextBox", "${res:Dialog.Options.PrjOptions.Configuration.FolderBrowserDescription}"); - Get