From eac242ffa39a3b2d109268886977723bd883261f Mon Sep 17 00:00:00 2001
From: PeterForstmeier <peter.forstmeier@t-online.de>
Date: Fri, 18 May 2012 21:45:46 +0200
Subject: [PATCH] BuildOptionsXaml.xaml

---
 .../Project/Src/OptionPanels/BuildOptionsXaml.xaml     |  6 +++++-
 .../Project/Src/OptionPanels/BuildOptionsXaml.xaml.cs  | 10 +++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
index 38cf38db1b..95fbe411dd 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
@@ -284,6 +284,7 @@
 								Grid.Column="1"
 								HorizontalAlignment="Right"
 								Content="{core:Localize Dialog.ProjectOptions.Build.DLLBaseAddress}"></Label>
+							
 							<!-- Hex binding -->
 							<TextBox
 								x:Name="dllBaseAddressTextBox"
@@ -294,6 +295,9 @@
 								Grid.Row="6"
 								Grid.ColumnSpan="2"
 								Content="{core:Localize Dialog.ProjectOptions.Build.BaseIntermediateOutputPath}"></Label>
+							
+						<!-- ok -->	
+							
 							<optionpanels:StorageLocationPicker
 								Grid.Row="7"
 								Location="{Binding BaseIntermediateOutputPath.Location}"
@@ -316,7 +320,7 @@
 								Content="{core:Localize Dialog.ProjectOptions.Build.IntermediateOutputPath}"></Label>
 							<optionpanels:StorageLocationPicker
 								Grid.Row="9"
-								Location="{Binding AssemblyName.Location}"
+								Location="{Binding IntermediateOutputPath.Location}"
 								DockPanel.Dock="Left" />
 							<TextBox
 								x:Name="intermediateOutputPathTextBox"
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml.cs
index 6346a743bb..fa3606960a 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml.cs
@@ -287,8 +287,7 @@ namespace CSharpBinding.OptionPanels
 			}
 		}
 		#endregion
-		//Property DebugType
-		//void DebugSymbolsLoaded(object sender, EventArgs e)
+		
 		
 		#region FileAlignment
 		
@@ -313,7 +312,7 @@ namespace CSharpBinding.OptionPanels
 		private void BaseIntermediateOutputPathExecute ()
 		{
 			BaseIntermediateOutputPath.Value = base.BrowseForFolder("${res:Dialog.Options.PrjOptions.Configuration.FolderBrowserDescription}",
-			                                        base.BaseDirectory,baseIntermediateOutputPathTextBox.Text);
+			                                        base.BaseDirectory,this.baseIntermediateOutputPathTextBox.Text);
 			base.RaisePropertyChanged(()=> BaseIntermediateOutputPath);
 		}
 		
@@ -322,7 +321,7 @@ namespace CSharpBinding.OptionPanels
 		#region IntermediateOutputPath
 		
 		public System.Windows.Input.ICommand IntermediateOutputPathCommand {
-			get{return this.baseIntermediateOutputPathCommand;}
+			get{return this.intermediateOutputPathCommand;}
 			set {this.intermediateOutputPathCommand = value;
 				base.RaisePropertyChanged(() => IntermediateOutputPathCommand);}
 		}
@@ -331,7 +330,7 @@ namespace CSharpBinding.OptionPanels
 		private void IntermediateOutputPathExecute ()
 		{
 			IntermediateOutputPath.Value = base.BrowseForFolder("${res:Dialog.Options.PrjOptions.Configuration.FolderBrowserDescription}",
-			                                        base.BaseDirectory,baseIntermediateOutputPathTextBox.Text);
+			                                        base.BaseDirectory,this.intermediateOutputPathTextBox.Text);
 			base.RaisePropertyChanged(()=> IntermediateOutputPath);
 		}
 		#endregion
@@ -348,6 +347,7 @@ namespace CSharpBinding.OptionPanels
 		private void LoadWarningsLevel ()
 		{
 			string val = WarningLevel.Value;
+			System.Console.WriteLine(val);
 			var i = WarnLevel.FindIndex(
 				delegate(KeyItemPair pair)
 				{