Browse Source

intermediate

pull/30/head
PeterForstmeier 13 years ago
parent
commit
6d16d13c47
  1. 3
      src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.addin
  2. 18
      src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj
  3. 45
      src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml.cs
  4. 5
      src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.addin
  5. 5
      src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.csproj
  6. 46
      src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageOptionsPanelXaml.xaml
  7. 40
      src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageOptionsPanelXaml.xaml.cs
  8. 3
      src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptions.cs

3
src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.addin

@ -23,6 +23,9 @@ @@ -23,6 +23,9 @@
<OptionPanel id = "CodeAnalysis"
label = "${res:ICSharpCode.CodeAnalysis}"
class = "ICSharpCode.CodeAnalysis.AnalysisProjectOptionsPanel"/>
<OptionPanel id = "CodeAnalysis"
label = "${res:ICSharpCode.CodeAnalysis}"
class = "ICSharpCode.CodeAnalysis.AnalysisProjectOptionsPanelXaml"/>
</Path>
<Path name = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ProjectActions">

18
src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj

@ -39,12 +39,18 @@ @@ -39,12 +39,18 @@
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<None Include="CodeAnalysis.addin">
@ -62,6 +68,10 @@ @@ -62,6 +68,10 @@
<EmbeddedResource Include="Src\AnalysisProjectOptions.resx">
<DependentUpon>AnalysisProjectOptions.cs</DependentUpon>
</EmbeddedResource>
<Compile Include="Src\AnalysisProjectOptionsPanelXaml.xaml.cs">
<DependentUpon>AnalysisProjectOptionsPanelXaml.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Src\FxCopWrapper.cs" />
<Compile Include="Src\FxCopRule.cs" />
<Compile Include="Src\CheckCurrentProjectCommand.cs" />
@ -86,6 +96,11 @@ @@ -86,6 +96,11 @@
<Name>NRefactory</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj">
<Project>{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}</Project>
<Name>ICSharpCode.Core.Presentation</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
<Project>{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}</Project>
<Name>ICSharpCode.SharpDevelop.Dom</Name>
@ -93,5 +108,8 @@ @@ -93,5 +108,8 @@
</ProjectReference>
<Folder Include="Resources" />
</ItemGroup>
<ItemGroup>
<Page Include="Src\AnalysisProjectOptionsPanelXaml.xaml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
</Project>

45
src/AddIns/Analysis/CodeAnalysis/Src/AnalysisProjectOptionsPanelXaml.xaml.cs

@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
/*
* Created by SharpDevelop.
* User: Peter Forstmeier
* Date: 06/09/2012
* Time: 18:27
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Gui.OptionPanels;
using ICSharpCode.SharpDevelop.Project;
namespace ICSharpCode.CodeAnalysis
{
/// <summary>
/// Interaction logic for AnalysisProjectOptionsPanelXaml.xaml
/// </summary>
public partial class AnalysisProjectOptionsPanelXaml : ProjectOptionPanel
{
public AnalysisProjectOptionsPanelXaml()
{
InitializeComponent();
}
public ProjectProperty<bool> RunCodeAnalysis {
get { return GetProperty("RunCodeAnalysis", false); }
}
public ProjectProperty<string> CodeAnalysisRuleAssemblies {
get { return GetProperty("CodeAnalysisRuleAssemblies","",TextBoxEditMode.EditEvaluatedProperty); }
}
}
}

5
src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.addin

@ -53,7 +53,10 @@ @@ -53,7 +53,10 @@
insertafter = "CodeAnalysisOptionPanel"
class = "ICSharpCode.CodeCoverage.CodeCoverageOptionsPanel"/>
<OptionPanel id = "CodeCoverageOptionsPanel1"
label = "${res:ICSharpCode.UnitTesting.CodeCoverage}"
insertafter = "CodeAnalysisOptionPanel"
class = "ICSharpCode.CodeCoverage.CodeCoverageOptionsPanelXaml"/>
</Path>
<Path name = "/SharpDevelop/Pads/UnitTestsPad/CommonTestCommands">

5
src/AddIns/Analysis/CodeCoverage/Project/CodeCoverage.csproj

@ -60,6 +60,10 @@ @@ -60,6 +60,10 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Src\CodeCoverageControl.cs" />
<Compile Include="Src\CodeCoverageOptionsPanelXaml.xaml.cs">
<DependentUpon>CodeCoverageOptionsPanelXaml.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Src\CodeCoverageProjectOptionsPanel.xaml.cs">
<DependentUpon>CodeCoverageProjectOptionsPanel.xaml</DependentUpon>
<SubType>Code</SubType>
@ -151,6 +155,7 @@ @@ -151,6 +155,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Include="Src\CodeCoverageOptionsPanelXaml.xaml" />
<Page Include="Src\CodeCoverageProjectOptionsPanel.xaml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />

46
src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageOptionsPanelXaml.xaml

@ -0,0 +1,46 @@ @@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<gui:OptionPanel
x:Class="ICSharpCode.CodeCoverage.CodeCoverageOptionsPanelXaml"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:core="http://icsharpcode.net/sharpdevelop/core"
xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop"
xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets">
<GroupBox Header="{core:Localize ICSharpCode.CodeCoverage.OptionsPanel.CodeCoverageColoursGroupBoxText}">
<Grid ShowGridLines="True" >
<Grid.RowDefinitions>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
<RowDefinition Height="Auto"></RowDefinition>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition></ColumnDefinition>
<ColumnDefinition Width="Auto"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Label Content="{core:Localize ICSharpCode.CodeCoverage.OptionsPanel.DisplayItemsLabel}"></Label>
<Label Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="3,0,0,3"
Content="{core:Localize ICSharpCode.CodeCoverage.OptionsPanel.ItemForegroundLabel}"></Label>
<Button Grid.Row="1" Grid.Column="3" Padding="9,1" VerticalAlignment="Center"
Content="..."></Button>
<Label Grid.Row="2" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="3,0,0,3"
Content="{core:Localize ICSharpCode.CodeCoverage.OptionsPanel.ItemBackgroundLabel}"></Label>
<Button Grid.Row="4" Grid.Column="3" Padding="9,1" VerticalAlignment="Center"
Content="..."></Button>
<ListView x:Name="displayItemsListBox" Grid.Row="1" Grid.ColumnSpan="2" Grid.RowSpan="3"
ItemsSource="{Binding DisplayItems}">
</ListView>
</Grid>
</GroupBox>
</gui:OptionPanel>

40
src/AddIns/Analysis/CodeCoverage/Project/Src/CodeCoverageOptionsPanelXaml.xaml.cs

@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
/*
* Created by SharpDevelop.
* User: Peter Forstmeier
* Date: 09.06.2012
* Time: 17:03
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui;
namespace ICSharpCode.CodeCoverage
{
/// <summary>
/// Interaction logic for CodeCoverageOptionsPanelXaml.xaml
/// </summary>
public partial class CodeCoverageOptionsPanelXaml : OptionPanel
{
public CodeCoverageOptionsPanelXaml()
{
InitializeComponent();
DisplayItems = new ObservableCollection<CodeCoverageDisplayItem>();
DataContext = this;
DisplayItems.Add(new CodeCoverageDisplayItem(StringParser.Parse("${res:ICSharpCode.CodeCoverage.CodeCovered}"), CodeCoverageOptions.VisitedColorProperty, CodeCoverageOptions.VisitedColor, CodeCoverageOptions.VisitedForeColorProperty, CodeCoverageOptions.VisitedForeColor));
DisplayItems.Add(new CodeCoverageDisplayItem(StringParser.Parse("${res:ICSharpCode.CodeCoverage.CodeNotCovered}"), CodeCoverageOptions.NotVisitedColorProperty, CodeCoverageOptions.NotVisitedColor, CodeCoverageOptions.NotVisitedForeColorProperty, CodeCoverageOptions.NotVisitedForeColor));
}
public ObservableCollection<CodeCoverageDisplayItem> DisplayItems {get; private set;}
}
}

3
src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptions.cs

@ -8,11 +8,11 @@ @@ -8,11 +8,11 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Linq;
using ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
@ -20,7 +20,6 @@ using ICSharpCode.SharpDevelop.Dom; @@ -20,7 +20,6 @@ using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Gui.OptionPanels;
using ICSharpCode.SharpDevelop.Project;
using Microsoft.Win32;
namespace ICSharpCode.CppBinding.Project
{

Loading…
Cancel
Save