f-spot r3557 - in trunk: . src src/Query

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Wed Jan 16 20:47:17 2008
New Revision: 3557
URL: http://svn.gnome.org/viewvc/f-spot?rev=3557&view=rev

Log:
2008-01-16  Stephane Delcroix  <sdelcroix novell con>

	* src/Query/LogicalTerm.cs: stub

	* src/Query/RatingRange.cs:
	* src/Query/RollSet.cs:
	* src/Query/UntaggedCondition.cs:
	* src/Query/DateRange.cs: moved to the FSpot.Query namespace

	* src/PhotoStore.cs:
	* src/TimeAdaptor.cs:
	* src/RatingFilter.cs:
	* src/LastRollDialog.cs:
	* src/SimpleCalendar.cs:
	* src/DateCommands.cs:
	* src/MainWindow.cs: include the F.Q ns	


Modified:
   trunk/ChangeLog
   trunk/src/DateCommands.cs
   trunk/src/LastRollDialog.cs
   trunk/src/MainWindow.cs
   trunk/src/PhotoStore.cs
   trunk/src/Query/IQueryCondition.cs
   trunk/src/Query/RatingRange.cs
   trunk/src/Query/RollSet.cs
   trunk/src/Query/UntaggedCondition.cs
   trunk/src/RatingFilter.cs
   trunk/src/SimpleCalendar.cs
   trunk/src/TimeAdaptor.cs

Modified: trunk/src/DateCommands.cs
==============================================================================
--- trunk/src/DateCommands.cs	(original)
+++ trunk/src/DateCommands.cs	Wed Jan 16 20:47:17 2008
@@ -14,6 +14,7 @@
 using System;
 using Mono.Unix;
 using FSpot;
+using FSpot.Query;
 
 public class DateCommands {
 	public class Set : FSpot.GladeDialog {

Modified: trunk/src/LastRollDialog.cs
==============================================================================
--- trunk/src/LastRollDialog.cs	(original)
+++ trunk/src/LastRollDialog.cs	Wed Jan 16 20:47:17 2008
@@ -12,6 +12,7 @@
 using System;
 using Gtk;
 using Gnome;
+using FSpot.Query;
 
 namespace FSpot {
 	public class LastRolls : FSpot.GladeDialog {
@@ -52,7 +53,7 @@
 				Roll [] selected_rolls = SelectedRolls ();
 				
 				if (selected_rolls.Length > 0 )
-					query.RollSet = new FSpot.RollSet (selected_rolls);
+					query.RollSet = new RollSet (selected_rolls);
 			}
 			Dialog.Destroy ();
 		}

Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs	(original)
+++ trunk/src/MainWindow.cs	Wed Jan 16 20:47:17 2008
@@ -16,6 +16,7 @@
 using Banshee.Kernel;
 
 using FSpot;
+using FSpot.Query;
 using FSpot.Widgets;
 using LibGPhoto2;
 

Modified: trunk/src/PhotoStore.cs
==============================================================================
--- trunk/src/PhotoStore.cs	(original)
+++ trunk/src/PhotoStore.cs	Wed Jan 16 20:47:17 2008
@@ -1170,16 +1170,6 @@
 
 
 	// Queries.
-
-	[Obsolete ("drop this, use IQueryCondition correctly instead")]
-	private string AddLastImportFilter (RollSet roll_set, bool added_where)
-	{
-		if (roll_set == null)
-			return null;
-
-		return  String.Format (" {0}{1}", added_where ? " AND " : " WHERE ", roll_set.SqlClause () );
-	}
-	
 	[Obsolete ("drop this, use IQueryCondition correctly instead")]
 	public Photo [] Query (Tag [] tags) {
 		return Query (tags, null, null, null, null);

Modified: trunk/src/Query/IQueryCondition.cs
==============================================================================
--- trunk/src/Query/IQueryCondition.cs	(original)
+++ trunk/src/Query/IQueryCondition.cs	Wed Jan 16 20:47:17 2008
@@ -7,7 +7,7 @@
  * This is free software. See COPYING for details.
  */
 
-namespace FSpot
+namespace FSpot.Query
 {
 	public interface IQueryCondition
 	{

Modified: trunk/src/Query/RatingRange.cs
==============================================================================
--- trunk/src/Query/RatingRange.cs	(original)
+++ trunk/src/Query/RatingRange.cs	Wed Jan 16 20:47:17 2008
@@ -10,7 +10,8 @@
 
 using System;
 
-namespace FSpot {
+namespace FSpot.Query
+{
 	public class RatingRange : IQueryCondition
 	{
 		public enum RatingType {

Modified: trunk/src/Query/RollSet.cs
==============================================================================
--- trunk/src/Query/RollSet.cs	(original)
+++ trunk/src/Query/RollSet.cs	Wed Jan 16 20:47:17 2008
@@ -8,7 +8,8 @@
  * This is frees software. See COPYING for details.
  */
 
-namespace FSpot {
+namespace FSpot.Query
+{
 	public class RollSet : IQueryCondition
 	{
 		private Roll [] rolls;

Modified: trunk/src/Query/UntaggedCondition.cs
==============================================================================
--- trunk/src/Query/UntaggedCondition.cs	(original)
+++ trunk/src/Query/UntaggedCondition.cs	Wed Jan 16 20:47:17 2008
@@ -7,7 +7,7 @@
  * This is free software. See COPYING for details.
  */
 
-namespace FSpot
+namespace FSpot.Query
 {
 	public class UntaggedCondition : IQueryCondition
 	{

Modified: trunk/src/RatingFilter.cs
==============================================================================
--- trunk/src/RatingFilter.cs	(original)
+++ trunk/src/RatingFilter.cs	Wed Jan 16 20:47:17 2008
@@ -11,6 +11,7 @@
 using Gtk;
 using Gnome;
 using FSpot;
+using FSpot.Query;
 
 public class RatingFilter {
 	public class Set : FSpot.GladeDialog {

Modified: trunk/src/SimpleCalendar.cs
==============================================================================
--- trunk/src/SimpleCalendar.cs	(original)
+++ trunk/src/SimpleCalendar.cs	Wed Jan 16 20:47:17 2008
@@ -1,3 +1,5 @@
+using FSpot.Query;
+
 namespace FSpot {
 	public class SimpleCalendar : Gtk.Calendar {
 		private PhotoQuery parent_query;

Modified: trunk/src/TimeAdaptor.cs
==============================================================================
--- trunk/src/TimeAdaptor.cs	(original)
+++ trunk/src/TimeAdaptor.cs	Wed Jan 16 20:47:17 2008
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using FSpot.Query;
 
 namespace FSpot {
 	public class TimeAdaptor : GroupAdaptor, FSpot.ILimitable {