f-spot r3946 - in trunk/src: . Core

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue May 20 09:36:51 2008
New Revision: 3946
URL: http://svn.gnome.org/viewvc/f-spot?rev=3946&view=rev

Log:
moving Delay in Core, splitting it in Animator + Delay

Added:
   trunk/src/Core/Animator.cs
   trunk/src/Core/Delay.cs
      - copied, changed from r3945, /trunk/src/Delay.cs
Removed:
   trunk/src/Delay.cs
Modified:
   trunk/src/Makefile.am

Added: trunk/src/Core/Animator.cs
==============================================================================
--- (empty file)
+++ trunk/src/Core/Animator.cs	Tue May 20 09:36:51 2008
@@ -0,0 +1,78 @@
+/*
+ * Delay.cs
+ *
+ * Copyright 2007 Novell Inc.
+ * 
+ * Author
+ *   Larry Ewing <lewing novell com>
+ *
+ * See COPYING for license information.
+ *
+ */
+
+using System;
+
+namespace FSpot
+{
+	public class Animator
+	{
+		Delay delay;
+		DateTime start;
+		TimeSpan duration;
+		float percent;
+		EventHandler tick;
+		bool run_first;
+
+		public float Percent {
+			get { return percent; }
+		}
+
+		public bool RunWhenStarted {
+			get { return run_first; }
+			set { run_first = value; }
+		}
+
+		public Animator (TimeSpan duration, TimeSpan interval, EventHandler tick)
+		{
+			this.duration = duration;
+			this.tick = tick;
+			delay = new Delay ((uint)interval.TotalMilliseconds, HandleTimeout);
+		}
+		
+		public Animator (int duration_milli, int interval_milli, EventHandler tick) 
+			: this (new TimeSpan (0, 0, 0, 0, duration_milli),
+				new TimeSpan (0, 0, 0, 0, interval_milli),
+				tick)
+		{
+		}
+		
+		public bool HandleTimeout ()
+		{
+			percent = (DateTime.Now - start).Ticks / (float) duration.Ticks;
+			if (tick != null)
+				tick (this, EventArgs.Empty);
+
+			return delay.IsPending;
+		}
+
+		public void Start ()
+		{
+			Start (run_first);
+		}
+
+		public void Start (bool run_now)
+		{
+			start = DateTime.Now;
+
+			if (run_now)
+				HandleTimeout ();
+
+			delay.Start ();
+		}
+		
+		public void Stop ()
+		{
+			delay.Stop ();
+		}
+	}
+}

Copied: trunk/src/Core/Delay.cs (from r3945, /trunk/src/Delay.cs)
==============================================================================
--- /trunk/src/Delay.cs	(original)
+++ trunk/src/Core/Delay.cs	Tue May 20 09:36:51 2008
@@ -12,69 +12,10 @@
 
 using System;
 
-namespace FSpot {
-	public class Animator {
-		Delay delay;
-		DateTime start;
-		TimeSpan duration;
-		float percent;
-		EventHandler tick;
-		bool run_first;
-
-		public float Percent {
-			get { return percent; }
-		}
-
-		public bool RunWhenStarted {
-			get { return run_first; }
-			set { run_first = value; }
-		}
-
-		public Animator (TimeSpan duration, TimeSpan interval, EventHandler tick)
-		{
-			this.duration = duration;
-			this.tick = tick;
-			delay = new Delay ((uint)interval.TotalMilliseconds, HandleTimeout);
-		}
-		
-		public Animator (int duration_milli, int interval_milli, EventHandler tick) 
-			: this (new TimeSpan (0, 0, 0, 0, duration_milli),
-				new TimeSpan (0, 0, 0, 0, interval_milli),
-				tick)
-		{
-		}
-		
-		public bool HandleTimeout ()
-		{
-			percent = (DateTime.Now - start).Ticks / (float) duration.Ticks;
-			if (tick != null)
-				tick (this, EventArgs.Empty);
-
-			return delay.IsPending;
-		}
-
-		public void Start ()
-		{
-			Start (run_first);
-		}
-
-		public void Start (bool run_now)
-		{
-			start = DateTime.Now;
-
-			if (run_now)
-				HandleTimeout ();
-
-			delay.Start ();
-		}
-		
-		public void Stop ()
-		{
-			delay.Stop ();
-		}
-	}
-
-	public class Delay {
+namespace FSpot
+{
+	public class Delay
+	{
 		public Delay (uint interval, GLib.IdleHandler op)
 		{
 			this.op += op;

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue May 20 09:36:51 2008
@@ -56,7 +56,8 @@
 	$(srcdir)/DateCommands.cs		\
 	$(srcdir)/Db.cs				\
 	$(srcdir)/DBusProxy.cs			\
-	$(srcdir)/Delay.cs			\
+	$(srcdir)/Core/Animator.cs		\
+	$(srcdir)/Core/Delay.cs			\
 	$(srcdir)/DependentListStore.cs		\
 	$(srcdir)/DirectoryAdaptor.cs		\
 	$(srcdir)/DirectoryCollection.cs	\