[f-spot/FSPOT_0_6_0_STABLE] move DissolveExtension to src, as default

[Stephane Delcroix <sdelcroix src gnome org>]

commit 3fa3c5b87fa6f7a23e9fc869e52fd56795bbc26b
Author: Stephane Delcroix <stephane delcroix org>
Date:   Wed Aug 19 10:43:16 2009 +0200

    move DissolveExtension to src, as default
    
    Dissolve is now the default extension (first one in the list). new CoverTransition extension.

 configure.ac                                       |    2 +-
 .../CoverTransition.addin.xml}                     |    8 ++++----
 .../CoverTransition.cs}                            |   14 ++++++++------
 .../Makefile.am                                    |    4 ++--
 extensions/Transitions/Makefile.am                 |    2 +-
 src/FSpot.addin.xml                                |    1 +
 src/Makefile.am                                    |    1 +
 .../Widgets}/DissolveTransition.cs                 |    2 +-
 8 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b230fa5..0c14654 100644
--- a/configure.ac
+++ b/configure.ac
@@ -343,7 +343,7 @@ extensions/Tools/HashJob/Makefile
 extensions/Tools/DevelopInUFraw/Makefile
 extensions/Tools/MergeDb/Makefile
 extensions/Transitions/Makefile
-extensions/Transitions/DissolveTransition/Makefile
+extensions/Transitions/CoverTransition/Makefile
 tests/Makefile
 tests/src/Makefile
 f-spot.pc
diff --git a/extensions/Transitions/DissolveTransition/DissolveTransition.addin.xml b/extensions/Transitions/CoverTransition/CoverTransition.addin.xml
similarity index 59%
rename from extensions/Transitions/DissolveTransition/DissolveTransition.addin.xml
rename to extensions/Transitions/CoverTransition/CoverTransition.addin.xml
index 03cb0ad..18594e7 100644
--- a/extensions/Transitions/DissolveTransition/DissolveTransition.addin.xml
+++ b/extensions/Transitions/CoverTransition/CoverTransition.addin.xml
@@ -1,8 +1,8 @@
 <Addin namespace="FSpot"
-	id="DissolveTransition"
+	id="CoverTransition"
 	version="0.6.0.1"
-	name="Dissolve Transition"
-	description="A Slideshow transition that dissolve images"
+	name="Cover Transition"
+	description="A Slideshow transition that covers images"
 	author="Stephane Delcroix"
 	url="http://f-spot.org/Extensions";
 	category="Transitions">
@@ -10,6 +10,6 @@
 		<Addin id="Core" version="0.6.0.1"/>
 	</Dependencies>
 	<Extension path = "/FSpot/SlideShow">
-		<Transition transition_type="DissolveTransition.DissolveTransition"/>
+		<Transition transition_type="CoverTransition.CoverTransition"/>
 	</Extension>
 </Addin>
diff --git a/extensions/Transitions/DissolveTransition/DissolveTransition.cs b/extensions/Transitions/CoverTransition/CoverTransition.cs
similarity index 82%
copy from extensions/Transitions/DissolveTransition/DissolveTransition.cs
copy to extensions/Transitions/CoverTransition/CoverTransition.cs
index c51ed38..0164de2 100644
--- a/extensions/Transitions/DissolveTransition/DissolveTransition.cs
+++ b/extensions/Transitions/CoverTransition/CoverTransition.cs
@@ -1,5 +1,5 @@
 //
-// FSpot.Widgets.DissolveTransition.cs
+// FSpot.Widgets.CoverTransition.cs
 //
 // Author(s):
 //	Stephane Delcroix  <stephane delcroix org>
@@ -19,21 +19,23 @@ using FSpot.Widgets;
 
 using Color = Cairo.Color;
 
-namespace DissolveTransition
+namespace CoverTransition
 {
-	public class DissolveTransition : CairoTransition
+	public class CoverTransition : CairoTransition
 	{
-		public DissolveTransition () : base ("Dissolve")
+		public CoverTransition () : base ("Cover")
 		{
 		}
 
 		protected override void Draw (Context cr, Pixbuf prev, Pixbuf next, int width, int height, double progress)
 		{
-			cr.Color = new Color (0, 0, 0, progress);
+			cr.Color = new Color (0, 0, 0);
 			if (next != null) {
 				double scale = Math.Min ((double)width/(double)next.Width, (double)height/(double)next.Height);
 				cr.Save ();
 
+				cr.Translate (width * (1.0 - progress), 0);
+
 				cr.Rectangle (0, 0, width, .5 * (height - scale*next.Height));
 				cr.Fill ();
 
@@ -49,7 +51,7 @@ namespace DissolveTransition
 				cr.Rectangle (0, 0, width, height);
 				cr.Scale (scale, scale);
 				CairoHelper.SetSourcePixbuf (cr, next, .5 * ((double)width/scale - next.Width), .5 * ((double)height/scale - next.Height));
-				cr.PaintWithAlpha (progress);
+				cr.Paint ();
 				cr.Restore ();
 			}
 		}
diff --git a/extensions/Transitions/DissolveTransition/Makefile.am b/extensions/Transitions/CoverTransition/Makefile.am
similarity index 93%
rename from extensions/Transitions/DissolveTransition/Makefile.am
rename to extensions/Transitions/CoverTransition/Makefile.am
index d81fa4e..300526e 100644
--- a/extensions/Transitions/DissolveTransition/Makefile.am
+++ b/extensions/Transitions/CoverTransition/Makefile.am
@@ -1,13 +1,13 @@
 include $(top_srcdir)/Makefile.include
 
-PLUGIN_NAME = DissolveTransition
+PLUGIN_NAME = CoverTransition
 
 PLUGIN_MANIFEST = $(PLUGIN_NAME).addin.xml
 
 PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
 
 PLUGIN_SOURCES =			\
-	$(srcdir)/DissolveTransition.cs
+	$(srcdir)/CoverTransition.cs
 
 
 REFS =					\
diff --git a/extensions/Transitions/Makefile.am b/extensions/Transitions/Makefile.am
index 112a18f..a07e737 100644
--- a/extensions/Transitions/Makefile.am
+++ b/extensions/Transitions/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS = 			\
-	DissolveTransition
+	CoverTransition
diff --git a/src/FSpot.addin.xml b/src/FSpot.addin.xml
index 649961e..ba88646 100644
--- a/src/FSpot.addin.xml
+++ b/src/FSpot.addin.xml
@@ -79,6 +79,7 @@
 	</Extension>
 
 	<Extension path = "/FSpot/SlideShow">
+		<Transition transition_type = "FSpot.Widgets.DissolveTransition"/>
 		<Transition transition_type = "FSpot.Widgets.PushTransition"/>
 	</Extension>
 </Addin>
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e4bdcf..02add7d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,6 +89,7 @@ WIDGETS_CSDISTFILES =				\
 	$(srcdir)/Widgets/CustomPrintWidget.cs	\
 	$(srcdir)/Widgets/DateEdit.cs		\
 	$(srcdir)/Widgets/DateEditFlags.cs	\
+	$(srcdir)/Widgets/DissolveTransition.cs	\
 	$(srcdir)/Widgets/HighlightedBox.cs	\
 	$(srcdir)/Widgets/ImageView.cs		\
 	$(srcdir)/Widgets/Layout.cs		\
diff --git a/extensions/Transitions/DissolveTransition/DissolveTransition.cs b/src/Widgets/DissolveTransition.cs
similarity index 97%
rename from extensions/Transitions/DissolveTransition/DissolveTransition.cs
rename to src/Widgets/DissolveTransition.cs
index c51ed38..2618ec3 100644
--- a/extensions/Transitions/DissolveTransition/DissolveTransition.cs
+++ b/src/Widgets/DissolveTransition.cs
@@ -19,7 +19,7 @@ using FSpot.Widgets;
 
 using Color = Cairo.Color;
 
-namespace DissolveTransition
+namespace FSpot.Widgets
 {
 	public class DissolveTransition : CairoTransition
 	{