AnalysisIdeOptionsPanel

src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.addin

@@ -62,8 +62,8 @@
 	
 	<!-- Options panel -->
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
-		<OptionPanel id    = "CodeAnalysisOptionPanel"
+	<OptionPanel id    = "CodeAnalysisOptionPanel"
 		             label = "${res:ICSharpCode.CodeAnalysis}"
-		             class = "ICSharpCode.CodeAnalysis.AnalysisIdeOptionsPanel"/>
+		             class = "ICSharpCode.CodeAnalysis.AnalysisIdeOptionsPanelXaml"/>
 	</Path>
 </AddIn>

src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj

@@ -60,7 +60,11 @@
     <Compile Include="..\..\..\Main\GlobalAssemblyInfo.cs">
       <Link>Configuration\GlobalAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Src\AnalysisProjectOptionsPanel.cs" />
+    <Compile Include="Src\AnalysisIdeOptionsPanelXaml.xaml.cs">
+      <DependentUpon>AnalysisIdeOptionsPanelXaml.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Src\old_AnalysisProjectOptionsPanel.cs" />
     <Compile Include="Src\old_AnalysisProjectOptions.Designer.cs">
       <DependentUpon>old_AnalysisProjectOptions.cs</DependentUpon>
     </Compile>
@@ -78,8 +82,8 @@
     <Compile Include="Src\CheckCurrentProjectCommand.cs" />
     <Compile Include="Src\FxCopLogger.cs" />
     <Compile Include="Src\SuppressMessageCommand.cs" />
-    <Compile Include="Src\AnalysisIdeOptionsPanel.cs" />
-    <EmbeddedResource Include="Resources\AnalysisIdeOptionPanel.xfrm" />
+    <Compile Include="Src\old_AnalysisIdeOptionsPanel.cs" />
+    <EmbeddedResource Include="Resources\old_AnalysisIdeOptionPanel.xfrm" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Libraries\SharpTreeView\ICSharpCode.TreeView\ICSharpCode.TreeView.csproj">
@@ -114,6 +118,7 @@
     <Folder Include="Resources" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="Src\AnalysisIdeOptionsPanelXaml.xaml" />
     <Page Include="Src\AnalysisProjectOptionsPanelXaml.xaml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />

src/AddIns/Analysis/CodeAnalysis/Src/AnalysisIdeOptionsPanelXaml.xaml

@@ -0,0 +1,20 @@
+<gui:OptionPanel x:Class="ICSharpCode.CodeAnalysis.AnalysisIdeOptionsPanelXaml"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:core="http://icsharpcode.net/sharpdevelop/core"
+                 xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets">
+	
+	<GroupBox Header="{core:Localize ICSharpCode.CodeAnalysis.IdeOptions.FxCopPath}">
+		<StackPanel>
+			<TextBlock Margin="3,5,3,20" x:Name="status"
+			           HorizontalAlignment="Center" TextWrapping="Wrap"
+			           Text="(showing current FxCop path)"></TextBlock>
+			<Button Content="{core:Localize ICSharpCode.CodeAnalysis.IdeOptions.FindFxCopPath}"
+			        HorizontalAlignment="Center" 
+			        Click="FindFxCopPath_Click"
+			        Style="{x:Static core:GlobalStyles.ButtonStyle}"></Button>
+		</StackPanel>
+	</GroupBox>
+</gui:OptionPanel>
+

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/OptionPanels/GeneralOptionsPanel.xaml.cs

@@ -6,7 +6,6 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 using System;
-using System.Windows;
 using ICSharpCode.Core;
 using ICSharpCode.SharpDevelop.Gui;