remove unused *.xrfm File, small cleanup in PythonBinding

icsharpcode · May 26, 2012 · 8af15ec · 8af15ec
1 parent 585bb4e
commit 8af15ec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 73 deletions.
diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj
@@ -214,7 +214,6 @@
     <None Include="PythonBinding.addin">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <EmbeddedResource Include="Resources\PythonOptionsPanel.xfrm" />
     <EmbeddedResource Include="Resources\ApplicationSettingsPanel.xfrm" />
     <EmbeddedResource Include="Resources\CompilingOptionsPanel.xfrm" />
     <None Include="Templates\ConsoleProject.xpt">
@@ -276,6 +275,10 @@
       <Name>ICSharpCode.SharpDevelop</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
+      <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
+      <Name>ICSharpCode.SharpDevelop</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
       <Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
       <Name>ICSharpCode.Core</Name>

diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Resources/PythonOptionsPanel.xfrm b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Resources/PythonOptionsPanel.xfrm
diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonOptionsPanel.xaml.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonOptionsPanel.xaml.cs
@@ -3,12 +3,11 @@
 
 using System;
 using System.ComponentModel;
-using System.Windows.Controls;
 using System.Windows.Input;
 
 using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
 using ICSharpCode.SharpDevelop.Widgets;
-using Microsoft.Win32;
 using SDCore = ICSharpCode.Core;
 
 namespace ICSharpCode.PythonBinding
@@ -34,7 +33,7 @@ public PythonOptionsPanel()
 			get { return pythonFileName; }
 			set {
 				pythonFileName = value;
-				OnPropertyChanged("PythonFileName");
+				base.RaisePropertyChanged(() => PythonFileName);
 			}
 		}
 
@@ -45,11 +44,10 @@ public PythonOptionsPanel()
 
 		void Browse()
 		{
-			var dialog = new OpenFileDialog();
-			dialog.Filter = SDCore.StringParser.Parse("${res:SharpDevelop.FileFilter.ExecutableFiles}|*.exe");
-			if (dialog.ShowDialog() ?? false) {
-				PythonFileName = dialog.FileName;
-			}
+			var str = OptionsHelper.OpenFile (SDCore.StringParser.Parse("${res:SharpDevelop.FileFilter.ExecutableFiles}|*.exe"));
+			if (String.IsNullOrEmpty(str))
+				return;
+			PythonFileName = str;
 		}
 
 		public override bool SaveOptions()
@@ -58,14 +56,5 @@ public override bool SaveOptions()
 			options.PythonLibraryPath = pythonLibraryPath;
 			return true;
 		}
-
-		public event PropertyChangedEventHandler PropertyChanged;
-
-		void OnPropertyChanged(string name)
-		{
-			if (PropertyChanged != null) {
-				PropertyChanged(this, new PropertyChangedEventArgs(name));
-			}
-		}
 	}
 }