Remove System.ComponentModel.Composition dependency.

PintaProject · Jan 10, 2011 · 078e689 · 078e689
1 parent 2b82dae
commit 078e689
Show file tree

Hide file tree

Showing 73 changed files with 173 additions and 108 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -5,7 +5,6 @@ BINFILES = \
 	$(BINDIR)/Pinta.Core.dll \
 	$(BINDIR)/Pinta.Gui.Widgets.dll \
 	$(BINDIR)/Pinta.Resources.dll \
-	$(BINDIR)/System.ComponentModel.Composition.dll \
 	$(BINDIR)/Extensions/Pinta.Effects.dll \
 	$(BINDIR)/Extensions/Pinta.Tools.dll
 
@@ -85,7 +84,7 @@ releasetar: $(BINFILES)
 releasezip: $(BINFILES)
 	cd $(BINDIR) && zip -r ../$(RELEASE_FILE).zip * -x "*.mdb"
 
-EXTRA_DIST = Pinta Pinta.Core Pinta.Effects Pinta.Gui.Widgets Pinta.Resources Pinta.Tools po Tarball System.ComponentModel.Composition xdg \
+EXTRA_DIST = Pinta Pinta.Core Pinta.Effects Pinta.Gui.Widgets Pinta.Resources Pinta.Tools po Tarball xdg \
 	license-mit.txt license-pdn.txt readme.txt todo.txt Pinta.sln Pinta.Install.proj
 
 .PHONY: install uninstall cleanall cleanbin cleanobj release releasetar releasezip
diff --git a/Pinta.Effects/Adjustments/AutoLevelEffect.cs b/Pinta.Effects/Adjustments/AutoLevelEffect.cs
@@ -13,7 +13,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class AutoLevelEffect : BaseEffect
 	{
 		UnaryPixelOps.Level op;

diff --git a/Pinta.Effects/Adjustments/BlackAndWhiteEffect.cs b/Pinta.Effects/Adjustments/BlackAndWhiteEffect.cs
@@ -13,7 +13,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class BlackAndWhiteEffect : BaseEffect
 	{
 		UnaryPixelOp op = new UnaryPixelOps.Desaturate ();

diff --git a/Pinta.Effects/Adjustments/BrightnessContrastEffect.cs b/Pinta.Effects/Adjustments/BrightnessContrastEffect.cs
@@ -14,7 +14,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class BrightnessContrastEffect : BaseEffect
 	{
 		private int multiply;

diff --git a/Pinta.Effects/Adjustments/CurvesEffect.cs b/Pinta.Effects/Adjustments/CurvesEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class CurvesEffect : BaseEffect
 	{
 		UnaryPixelOp op = null;

diff --git a/Pinta.Effects/Adjustments/HueSaturationEffect.cs b/Pinta.Effects/Adjustments/HueSaturationEffect.cs
@@ -14,7 +14,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class HueSaturationEffect : BaseEffect
 	{		
 		UnaryPixelOp op;

diff --git a/Pinta.Effects/Adjustments/InvertColorsEffect.cs b/Pinta.Effects/Adjustments/InvertColorsEffect.cs
@@ -13,7 +13,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class InvertColorsEffect : BaseEffect
 	{
 		UnaryPixelOp op = new UnaryPixelOps.Invert ();

diff --git a/Pinta.Effects/Adjustments/LevelsEffect.cs b/Pinta.Effects/Adjustments/LevelsEffect.cs
@@ -13,7 +13,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class LevelsEffect : BaseEffect
 	{		
 		public override string Icon {

diff --git a/Pinta.Effects/Adjustments/PosterizeEffect.cs b/Pinta.Effects/Adjustments/PosterizeEffect.cs
@@ -13,7 +13,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class PosterizeEffect : BaseEffect
 	{
 		UnaryPixelOps.PosterizePixel op = null;

diff --git a/Pinta.Effects/Adjustments/SepiaEffect.cs b/Pinta.Effects/Adjustments/SepiaEffect.cs
@@ -13,7 +13,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class SepiaEffect : BaseEffect
 	{
 		UnaryPixelOp desat = new UnaryPixelOps.Desaturate ();

diff --git a/Pinta.Effects/Effects/AddNoiseEffect.cs b/Pinta.Effects/Effects/AddNoiseEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class AddNoiseEffect : BaseEffect
 	{
 		private int intensity;

diff --git a/Pinta.Effects/Effects/BulgeEffect.cs b/Pinta.Effects/Effects/BulgeEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class BulgeEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/CloudsEffect.cs b/Pinta.Effects/Effects/CloudsEffect.cs
@@ -16,7 +16,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class CloudsEffect : BaseEffect
 	{
         // This is so that repetition of the effect with CTRL+F actually shows up differently.

diff --git a/Pinta.Effects/Effects/EdgeDetectEffect.cs b/Pinta.Effects/Effects/EdgeDetectEffect.cs
@@ -16,7 +16,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class EdgeDetectEffect : ColorDifferenceEffect
 	{
 		private double[][] weights;

diff --git a/Pinta.Effects/Effects/EmbossEffect.cs b/Pinta.Effects/Effects/EmbossEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class EmbossEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/FragmentEffect.cs b/Pinta.Effects/Effects/FragmentEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class FragmentEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/FrostedGlassEffect.cs b/Pinta.Effects/Effects/FrostedGlassEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class FrostedGlassEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/GaussianBlurEffect.cs b/Pinta.Effects/Effects/GaussianBlurEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class GaussianBlurEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/GlowEffect.cs b/Pinta.Effects/Effects/GlowEffect.cs
@@ -16,7 +16,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class GlowEffect : BaseEffect
 	{
 		private GaussianBlurEffect blurEffect;

diff --git a/Pinta.Effects/Effects/InkSketchEffect.cs b/Pinta.Effects/Effects/InkSketchEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class InkSketchEffect : BaseEffect
 	{
 		private static readonly int[][] conv;

diff --git a/Pinta.Effects/Effects/JuliaFractalEffect.cs b/Pinta.Effects/Effects/JuliaFractalEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class JuliaFractalEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/MandelbrotFractalEffect.cs b/Pinta.Effects/Effects/MandelbrotFractalEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class MandelbrotFractalEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/MedianEffect.cs b/Pinta.Effects/Effects/MedianEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class MedianEffect : LocalHistogramEffect
 	{
 		private int radius;

diff --git a/Pinta.Effects/Effects/MotionBlurEffect.cs b/Pinta.Effects/Effects/MotionBlurEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class MotionBlurEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/OilPaintingEffect.cs b/Pinta.Effects/Effects/OilPaintingEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class OilPaintingEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/OutlineEffect.cs b/Pinta.Effects/Effects/OutlineEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class OutlineEffect : LocalHistogramEffect
 	{
 		private int thickness;

diff --git a/Pinta.Effects/Effects/PencilSketchEffect.cs b/Pinta.Effects/Effects/PencilSketchEffect.cs
@@ -16,7 +16,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class PencilSketchEffect : BaseEffect
 	{
 		private GaussianBlurEffect blurEffect;

diff --git a/Pinta.Effects/Effects/PixelateEffect.cs b/Pinta.Effects/Effects/PixelateEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class PixelateEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/PolarInversionEffect.cs b/Pinta.Effects/Effects/PolarInversionEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class PolarInversionEffect : WarpEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/RadialBlurEffect.cs b/Pinta.Effects/Effects/RadialBlurEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class RadialBlurEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/RedEyeRemoveEffect.cs b/Pinta.Effects/Effects/RedEyeRemoveEffect.cs
@@ -16,7 +16,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class RedEyeRemoveEffect : BaseEffect
 	{
 		private UnaryPixelOp op;

diff --git a/Pinta.Effects/Effects/ReduceNoiseEffect.cs b/Pinta.Effects/Effects/ReduceNoiseEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class ReduceNoiseEffect : LocalHistogramEffect
 	{
 		private int radius;

diff --git a/Pinta.Effects/Effects/ReliefEffect.cs b/Pinta.Effects/Effects/ReliefEffect.cs
@@ -14,7 +14,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class ReliefEffect : ColorDifferenceEffect
 	{
 		public ReliefEffect () {

diff --git a/Pinta.Effects/Effects/SharpenEffect.cs b/Pinta.Effects/Effects/SharpenEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class SharpenEffect : LocalHistogramEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/SoftenPortraitEffect.cs b/Pinta.Effects/Effects/SoftenPortraitEffect.cs
@@ -43,7 +43,7 @@ THE SOFTWARE.
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class SoftenPortraitEffect : BaseEffect
 	{
 		private GaussianBlurEffect blurEffect;

diff --git a/Pinta.Effects/Effects/TileEffect.cs b/Pinta.Effects/Effects/TileEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class TileEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/TwistEffect.cs b/Pinta.Effects/Effects/TwistEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class TwistEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Effects/UnfocusEffect.cs b/Pinta.Effects/Effects/UnfocusEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class UnfocusEffect : LocalHistogramEffect
 	{
 		private int radius;

diff --git a/Pinta.Effects/Effects/ZoomBlurEffect.cs b/Pinta.Effects/Effects/ZoomBlurEffect.cs
@@ -15,7 +15,7 @@
 
 namespace Pinta.Effects
 {
-	[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
+	//[System.ComponentModel.Composition.Export (typeof (BaseEffect))]
 	public class ZoomBlurEffect : BaseEffect
 	{
 		public override string Icon {

diff --git a/Pinta.Effects/Pinta.Effects.csproj b/Pinta.Effects/Pinta.Effects.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -36,7 +36,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\bin\Extensions\</OutputPath>
+    <OutputPath>..\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -46,7 +46,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\bin\Extensions\</OutputPath>
+    <OutputPath>..\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -129,11 +129,6 @@
       <Name>Pinta.Gui.Widgets</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\System.ComponentModel.Composition\System.ComponentModel.Composition.csproj">
-      <Project>{1BBA5101-D4F0-48B8-A5D6-7B23A099DCE3}</Project>
-      <Name>System.ComponentModel.Composition</Name>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.