BuildOptions for VBNetBinding

src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml.cs

@@ -84,66 +84,36 @@ namespace CSharpBinding.OptionPanels
 		
 		protected override void Initialize()
 		{
-//			this.UpdateProjectCommand  = new RelayCommand(UpdateProjectExecute);
-//			this.ChangeOutputPath = new RelayCommand(ChangeOutputPathExecute);
-//			UpdateTargetFrameworkCombo();
-//			if (DocumentationFile.Value.Length > 0) {
-//				documentFileIsChecked = true;
-//			}
-//			XmlDocHelper();
+			base.Initialize();
+			buildOutput.SetProjectOptions(this);
+			this.buildAdvanced.SetProjectOptions(this);
+			this.errorsAndWarnings.SetProjectOptions(this);
+			this.treatErrorsAndWarnings.SetProjectOptions(this);
 		}
 		
-		
 		protected override void Load(MSBuildBasedProject project, string configuration, string platform)
 		{
 			base.Load(project, configuration, platform);
-			buildOutput.SetProjectOptions(this);
-			this.buildAdvanced.SetProjectOptions(this);
-			this.errorsAndWarnings.SetProjectOptions(this);
-			this.treatErrorsAndWarnings.SetProjectOptions(this);
+//			buildOutput.SetProjectOptions(this);
+//			this.buildAdvanced.SetProjectOptions(this);
+//			this.errorsAndWarnings.SetProjectOptions(this);
+//			this.treatErrorsAndWarnings.SetProjectOptions(this);
 			IsDirty = false;
 		}
 		
 		
 		protected override bool Save(MSBuildBasedProject project, string configuration, string platform)
 		{
-//			if (buildAdvanced.SaveProjectOptions()) {
+			if (buildAdvanced.SaveProjectOptions()) {
 				treatErrorsAndWarnings.SaveProjectOptions();
 				return base.Save(project, configuration, platform);
-//			}
-//			return false;
+			}
+			return false;
 		}
 		
 		
 		#endregion
 		
-//		#region Documentation File
-//		
-//		private bool documentFileIsChecked;
-//		
-//		public bool DocumentFileIsChecked {
-//			get { return documentFileIsChecked; }
-//			set { documentFileIsChecked = value;
-//				XmlDocHelper();
-//				base.RaisePropertyChanged(() => DocumentFileIsChecked);
-//			}
-//		}
-//		
-//		private void XmlDocHelper()
-//		{
-//			/*
-//			if (DocumentFileIsChecked) {
-//				this.xmlDocumentationTextBox.Text = MSBuildInternals.Escape(
-//					Path.ChangeExtension(ICSharpCode.Core.FileUtility.GetRelativePath(base.Project.Directory, base.Project.OutputAssemblyFullPath),
-//					                     ".xml"));
-//			} else {
-//				this.xmlDocumentationTextBox.Text = string.Empty;
-//			}
-//			*/
-//		}
-//		
-//		
-//		#endregion
 		
 		#region Command Update Project
 		

src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptions.cs

@@ -1,62 +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 ICSharpCode.SharpDevelop.Gui.OptionPanels;
-using ICSharpCode.SharpDevelop.Project;
-using StringPair = System.Collections.Generic.KeyValuePair<System.String, System.String>;
-
-namespace ICSharpCode.VBNetBinding.OptionPanels
-{
-	public class BuildOptions : AbstractBuildOptions
-	{
-		public override void LoadPanelContents()
-		{
-			SetupFromXmlResource("BuildOptions.xfrm");
-			InitializeHelper();
-			
-			ConfigurationGuiBinding b;
-			
-			b = helper.BindString("conditionalSymbolsTextBox", "DefineConstants", TextBoxEditMode.EditRawProperty);
-			b.DefaultLocation = PropertyStorageLocations.ConfigurationSpecific;
-			b.CreateLocationButton("conditionalSymbolsTextBox");
-			
-			b = helper.BindBoolean("optimizeCodeCheckBox", "Optimize", false);
-			b.DefaultLocation = PropertyStorageLocations.ConfigurationSpecific;
-			b.CreateLocationButton("optimizeCodeCheckBox");
-			
-			b = helper.BindBoolean("removeOverflowCheckBox", "RemoveIntegerChecks", false);
-			b.CreateLocationButton("removeOverflowCheckBox");
-			
-			ChooseStorageLocationButton locationButton;
-			b = helper.BindStringEnum("optionExplicitComboBox", "OptionExplicit", "On",
-			                          new StringPair("Off", "Explicit Off"),
-			                          new StringPair("On", "Explicit On"));
-			locationButton = b.CreateLocationButton("optionExplicitComboBox");
-			b = helper.BindStringEnum("optionStrictComboBox", "OptionStrict", "Off",
-			                          new StringPair("Off", "Strict Off"),
-			                          new StringPair("On", "Strict On"));
-			b.RegisterLocationButton(locationButton);
-			b = helper.BindStringEnum("optionCompareComboBox", "OptionCompare", "Binary",
-			                          new StringPair("Binary", "Compare Binary"),
-			                          new StringPair("Text", "Compare Text"));
-			b.RegisterLocationButton(locationButton);
-			b = helper.BindStringEnum("optionInferComboBox", "OptionInfer", "Off",
-			                          new StringPair("Off", "Infer Off"),
-			                          new StringPair("On", "Infer On"));
-			b.RegisterLocationButton(locationButton);
-			
-			InitBaseIntermediateOutputPath();
-			InitIntermediateOutputPath();
-			InitOutputPath();
-			InitXmlDoc();
-			InitTargetFramework();
-
-			InitDebugInfo();
-			InitAdvanced();
-			InitWarnings();
-			
-			helper.AddConfigurationSelector(this);
-		}
-	}
-}

src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml

@@ -123,60 +123,10 @@
 						<ColumnDefinition Width="*"></ColumnDefinition>
 						<ColumnDefinition Width="50"></ColumnDefinition>
 					</Grid.ColumnDefinitions>
+					<optionpanels:BuildOutput x:Name="buildOutput" Grid.ColumnSpan="3">
+					</optionpanels:BuildOutput>
 					
-					<Label Grid.ColumnSpan="2" Content="{core:Localize Dialog.ProjectOptions.Build.OutputPath}"></Label>
-					
-					<optionpanels:StorageLocationPicker Grid.Row="1" DockPanel.Dock="Left"
-						Location="{Binding OutputPath.Location}"/>
-					
-					<TextBox x:Name="outputPathTextBox" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2"
-					         Text="{Binding OutputPath.Value, UpdateSourceTrigger=PropertyChanged}"></TextBox>
-					
-					<Button Grid.Row="1" Grid.Column="3"  Margin="3,0,3,0"
-					        VerticalAlignment="Center"
-					        Content="..."
-					        Command="{Binding ChangeOutputPath}"></Button>
-					
-					<optionpanels:StorageLocationPicker Grid.Row="2" DockPanel.Dock="Left" Location="{Binding DocumentationFile.Location}"/>
-					
-					<CheckBox x:Name="xmlDocumentationCheckBox" Grid.Row="2" Grid.Column="1"
-					          VerticalAlignment="Center"
-					          Margin="3,0,3,0"
-					          IsChecked="{Binding DocumentFileIsChecked}"
-					          Content="{core:Localize Dialog.ProjectOptions.Build.XmlDocumentationFile}"></CheckBox>
-					
-					<TextBox x:Name="xmlDocumentationTextBox" Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2"
-					         IsEnabled="{Binding DocumentFileIsChecked}"
-					         Text="{Binding DocumentationFile.Value, UpdateSourceTrigger=PropertyChanged}"></TextBox>
-					
-					<optionpanels:StorageLocationPicker Grid.Row="3" DockPanel.Dock="Left" Location="{Binding DebugType.Location}" />
-					
-					<Label Grid.Row="3" Grid.Column="1" Margin="3,0,3,0"
-					       HorizontalAlignment="Right"
-					       Content="{core:Localize Dialog.ProjectOptions.Build.DebugInfo}"></Label>
-					
-					<ComboBox Grid.Row="3" Grid.Column="2" Width="150"
-					          VerticalAlignment="Center"
-					          HorizontalAlignment="Left"
-					          SelectedValue="{Binding Path=DebugType.Value}"
-					          gui:EnumBinding.EnumType="{x:Type project:DebugSymbolType}"></ComboBox>
-					
-					<Label Grid.Row="4" Grid.Column="1" Margin="3,0,3,0"
-					       HorizontalAlignment="Right"
-					       Content="{core:Localize Dialog.ProjectOptions.Build.TargetFramework}"></Label>
-					
-					<StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2">
-						
-						<ComboBox x:Name="targetFrameworkComboBox" Width="200" Margin="0,0,3,0"
-						          VerticalAlignment="Center"
-						          IsEnabled="False"></ComboBox>
-						
-						<Button Margin="3,0,3,0" VerticalAlignment="Center"
-						        Content="Change"
-						        Command="{Binding UpdateProjectCommand}"
-						        Style="{x:Static core:GlobalStyles.ButtonStyle}"></Button>
-					</StackPanel>
-					
+		
 					<GroupBox Grid.Row="5" Grid.ColumnSpan="4" Margin="5,10,0,0" Header="{core:Localize Dialog.ProjectOptions.Build.Advanced}">
 						<optionpanels:BuildAdvanced x:Name="buildAdvanced">
 						</optionpanels:BuildAdvanced>

src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml.cs

@@ -121,12 +121,24 @@ namespace ICSharpCode.VBNetBinding.OptionPanels
 		
 		#region overrides
 		
-		protected override void Load(MSBuildBasedProject project, string configuration, string platform)
+		
+		protected override void Initialize()
 		{
-			base.Load(project, configuration, platform);
+			base.Initialize();
+			buildOutput.SetProjectOptions(this);
 			this.buildAdvanced.SetProjectOptions(this);
 			this.errorsAndWarnings.SetProjectOptions(this);
 			this.treatErrorsAndWarnings.SetProjectOptions(this);
+		}
+		
+		
+		protected override void Load(MSBuildBasedProject project, string configuration, string platform)
+		{
+			base.Load(project, configuration, platform);
+//			buildOutput.SetProjectOptions(this);
+//			this.buildAdvanced.SetProjectOptions(this);
+//			this.errorsAndWarnings.SetProjectOptions(this);
+//			this.treatErrorsAndWarnings.SetProjectOptions(this);
 			IsDirty = false;
 		}
 		

src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin

@@ -81,11 +81,11 @@
 		<OptionPanel id    = "BuildEvents"
 		             label = "${res:Dialog.ProjectOptions.BuildEvents}"
 		             class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>
-		<OptionPanel id    = "BuildOptions"
+		<!--<OptionPanel id    = "BuildOptions"
 		             label = "${res:Dialog.ProjectOptions.BuildOptions}"
-		             class = "ICSharpCode.VBNetBinding.OptionPanels.BuildOptions"/>
+		             class = "ICSharpCode.VBNetBinding.OptionPanels.BuildOptions"/>-->
 		
-		<OptionPanel id    = "BuildOptions1"
+		<OptionPanel id    = "BuildOptions"
 		             label = "${res:Dialog.ProjectOptions.BuildOptions}"
 		             class = "ICSharpCode.VBNetBinding.OptionPanels.BuildOptionsXaml"/>
 		<OptionPanel id    = "DebugOptions"

src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj

@@ -83,9 +83,6 @@
     <Compile Include="Src\VBNetLanguageBinding.cs" />
     <Compile Include="Src\VBNetProjectBinding.cs" />
     <Compile Include="Src\FormattingStrategy\VBNetFormattingStrategy.cs" />
-    <Compile Include="Src\OptionPanels\BuildOptions.cs">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="Src\Parser\Parser.cs" />
     <Compile Include="Src\Project\VBNetProject.cs" />
     <None Include="VBNetBinding.addin">