GNOME.org
 

f-spot r4530 - in trunk: . src src/Core src/Extensions src/UI.Dialog src/Widgets

Author: sdelcroix
Date: Tue Oct 21 14:00:52 2008
New Revision: 4530
URL: http://svn.gnome.org/viewvc/f-spot?rev=4530&view=rev

Log:
2008-10-21  Stephane Delcroix  <sdelcroix novell com>

	* src/Core/Photo.cs:
	* src/DateCommands.cs:
	* src/ExportStore.cs:
	* src/Extensions/OpenWithMenu.cs:
	* src/FileImportBackend.cs:
	* src/ImportCommand.cs:
	* src/MainWindow.cs:
	* src/MetaStore.cs:
	* src/PhotoStore.cs:
	* src/PhotoVersionMenu.cs:
	* src/PhotoView.cs:
	* src/ProgressDialog.cs:
	* src/RatingFilter.cs:
	* src/SendEmail.cs:
	* src/SlideView.cs:
	* src/TagCommands.cs:
	* src/TagSelectionWidget.cs:
	* src/TagStore.cs:
	* src/TimeDialog.cs:
	* src/UI.Dialog/LastRollDialog.cs:
	* src/Widgets/IconView.cs:
	* src/main.cs: remove all the "usig Gnome*" header, replaced by fully
	specified class names.

Modified:
   trunk/ChangeLog
   trunk/src/Core/Photo.cs
   trunk/src/DateCommands.cs
   trunk/src/ExportStore.cs
   trunk/src/Extensions/OpenWithMenu.cs
   trunk/src/FileImportBackend.cs
   trunk/src/ImportCommand.cs
   trunk/src/MainWindow.cs
   trunk/src/MetaStore.cs
   trunk/src/PhotoStore.cs
   trunk/src/PhotoVersionMenu.cs
   trunk/src/PhotoView.cs
   trunk/src/ProgressDialog.cs
   trunk/src/RatingFilter.cs
   trunk/src/SendEmail.cs
   trunk/src/SlideView.cs
   trunk/src/TagCommands.cs
   trunk/src/TagSelectionWidget.cs
   trunk/src/TagStore.cs
   trunk/src/TimeDialog.cs
   trunk/src/UI.Dialog/LastRollDialog.cs
   trunk/src/Widgets/IconView.cs
   trunk/src/main.cs

Modified: trunk/src/Core/Photo.cs
==============================================================================
--- trunk/src/Core/Photo.cs	(original)
+++ trunk/src/Core/Photo.cs	Tue Oct 21 14:00:52 2008
@@ -15,7 +15,6 @@
 using System.Collections.Generic;
 
 using Mono.Unix;
-using Gnome.Vfs;
 
 using FSpot.Utils;
 
@@ -392,7 +391,7 @@
 	
 			if (!keep_file) {
 				if ((new Gnome.Vfs.Uri (uri.ToString ())).Exists) {
-					if ((new Gnome.Vfs.Uri (uri.ToString ()).Unlink()) != Result.Ok)
+					if ((new Gnome.Vfs.Uri (uri.ToString ()).Unlink()) != Gnome.Vfs.Result.Ok)
 						throw new System.UnauthorizedAccessException();
 				}
 	
@@ -439,11 +438,11 @@
 				if ((new Gnome.Vfs.Uri (new_uri.ToString ())).Exists)
 					throw new Exception (String.Format ("An object at this uri {0} already exists", new_uri.ToString ()));
 	
-				Xfer.XferUri (
+				Gnome.Vfs.Xfer.XferUri (
 					new Gnome.Vfs.Uri (original_uri.ToString ()), 
 					new Gnome.Vfs.Uri (new_uri.ToString ()),
-					XferOptions.Default, XferErrorMode.Abort, 
-					XferOverwriteMode.Abort, 
+					Gnome.Vfs.XferOptions.Default, Gnome.Vfs.XferErrorMode.Abort,
+					Gnome.Vfs.XferOverwriteMode.Abort,
 					delegate (Gnome.Vfs.XferProgressInfo info) {return 1;});
 	
 	//			Mono.Unix.Native.Stat stat;

Modified: trunk/src/DateCommands.cs
==============================================================================
--- trunk/src/DateCommands.cs	(original)
+++ trunk/src/DateCommands.cs	Tue Oct 21 14:00:52 2008
@@ -10,7 +10,6 @@
  */
 
 using Gtk;
-using Gnome;
 using System;
 using Mono.Unix;
 using FSpot;
@@ -23,8 +22,8 @@
 		Gtk.Window parent_window;
 
 		[Glade.Widget] private Button ok_button;
-		[Glade.Widget] private DateEdit start_dateedit;
-		[Glade.Widget] private DateEdit end_dateedit;
+		[Glade.Widget] private Gnome.DateEdit start_dateedit;
+		[Glade.Widget] private Gnome.DateEdit end_dateedit;
 		[Glade.Widget] private ComboBox period_combobox;
 
 		static string [] ranges = {

Modified: trunk/src/ExportStore.cs
==============================================================================
--- trunk/src/ExportStore.cs	(original)
+++ trunk/src/ExportStore.cs	Tue Oct 21 14:00:52 2008
@@ -1,5 +1,4 @@
 using Gdk;
-using Gnome;
 using Gtk;
 using Mono.Data.SqliteClient;
 using System.Collections;

Modified: trunk/src/Extensions/OpenWithMenu.cs
==============================================================================
--- trunk/src/Extensions/OpenWithMenu.cs	(original)
+++ trunk/src/Extensions/OpenWithMenu.cs	Tue Oct 21 14:00:52 2008
@@ -15,12 +15,11 @@
 using System.Runtime.InteropServices;
 using Gtk;
 using Gdk;
-using Gnome.Vfs;
 using Mono.Unix;
 
 namespace FSpot.Extensions {
 	public class OpenWithMenu: Gtk.Menu {
-		public delegate void OpenWithHandler (MimeApplication app);
+		public delegate void OpenWithHandler (Gnome.Vfs.MimeApplication app);
 		public event OpenWithHandler ApplicationActivated;
 	
 		public delegate string [] MimeFetcher ();
@@ -79,7 +78,7 @@
 	
 			ArrayList list = (HideInvalid) ? intersection : union;
 	
-			foreach (MimeApplication app in list) {
+			foreach (Gnome.Vfs.MimeApplication app in list) {
 				//System.Console.WriteLine ("Adding app {0} to open with menu (binary name = {1}", app.Name, app.BinaryName);
 				//System.Console.WriteLine ("Desktop file path: {0}, id : {1}", app.DesktopFilePath);
 				AppMenuItem i = new AppMenuItem (this, app);
@@ -114,12 +113,12 @@
 				if (mime_type == null)
 					continue;
 	
-				MimeApplication [] apps = Gnome.Vfs.Mime.GetAllApplications (mime_type);
+				Gnome.Vfs.MimeApplication [] apps = Gnome.Vfs.Mime.GetAllApplications (mime_type);
 				for (int i = 0; i < apps.Length; i++) {
 					apps [i] = apps [i].Copy ();
 				}
 	
-				foreach (MimeApplication app in apps) {
+				foreach (Gnome.Vfs.MimeApplication app in apps) {
 					// Skip apps that don't take URIs
 					if (! app.SupportsUris ())
 						continue;
@@ -138,7 +137,7 @@
 	
 				if (! first) {
 					for (int i = 0; i < intersection.Count; i++) {
-						MimeApplication app = intersection [i] as MimeApplication;
+						Gnome.Vfs.MimeApplication app = intersection [i] as Gnome.Vfs.MimeApplication;
 						if (System.Array.IndexOf (apps, app) == -1) {
 							intersection.Remove (app);
 							i--;
@@ -159,9 +158,9 @@
 		}
 		
 		private class AppMenuItem : ImageMenuItem {
-			public MimeApplication App;
+			public Gnome.Vfs.MimeApplication App;
 	
-			public AppMenuItem (OpenWithMenu menu, MimeApplication mime_application) : base (mime_application.Name)
+			public AppMenuItem (OpenWithMenu menu, Gnome.Vfs.MimeApplication mime_application) : base (mime_application.Name)
 			{
 				App = mime_application;
 				
@@ -187,3 +186,4 @@
 		}
 	}
 }
+

Modified: trunk/src/FileImportBackend.cs
==============================================================================
--- trunk/src/FileImportBackend.cs	(original)
+++ trunk/src/FileImportBackend.cs	Tue Oct 21 14:00:52 2008
@@ -1,6 +1,5 @@
 using Gdk;
 using Gtk;
-using Gnome;
 using System.Collections;
 using System.Collections.Generic;
 using System;

Modified: trunk/src/ImportCommand.cs
==============================================================================
--- trunk/src/ImportCommand.cs	(original)
+++ trunk/src/ImportCommand.cs	Tue Oct 21 14:00:52 2008
@@ -13,9 +13,7 @@
 
 using GLib;
 using Gdk;
-using Gnome;
 using Gtk;
-using GtkSharp;
 using System.Collections;
 using System.IO;
 using System;

Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs	(original)
+++ trunk/src/MainWindow.cs	Tue Oct 21 14:00:52 2008
@@ -1,6 +1,5 @@
 using Gdk;
 using Gtk;
-using GtkSharp;
 using Glade;
 using Mono.Addins;
 using Mono.Unix;

Modified: trunk/src/MetaStore.cs
==============================================================================
--- trunk/src/MetaStore.cs	(original)
+++ trunk/src/MetaStore.cs	Tue Oct 21 14:00:52 2008
@@ -1,5 +1,4 @@
 using Gdk;
-using Gnome;
 using Gtk;
 using Mono.Data.SqliteClient;
 using System.Collections;

Modified: trunk/src/PhotoStore.cs
==============================================================================
--- trunk/src/PhotoStore.cs	(original)
+++ trunk/src/PhotoStore.cs	Tue Oct 21 14:00:52 2008
@@ -9,8 +9,6 @@
  * This is free software. See COPYING for details.
  */
 
-using Gnome;
-using Gnome.Vfs;
 using Gdk;
 using Gtk;
 
@@ -41,14 +39,14 @@
 		}
 	}
 
-	public static ThumbnailFactory ThumbnailFactory = new ThumbnailFactory (ThumbnailSize.Large);
+	public static Gnome.ThumbnailFactory ThumbnailFactory = new Gnome.ThumbnailFactory (Gnome.ThumbnailSize.Large);
 
 	// FIXME this is a hack.  Since we don't have Gnome.ThumbnailFactory.SaveThumbnail() in
 	// GTK#, and generate them by ourselves directly with Gdk.Pixbuf, we have to make sure here
 	// that the "large" thumbnail directory exists.
 	private static void EnsureThumbnailDirectory ()
 	{
-		string large_thumbnail_file_name_template = Thumbnail.PathForUri ("file:///boo", ThumbnailSize.Large);
+		string large_thumbnail_file_name_template = Gnome.Thumbnail.PathForUri ("file:///boo", Gnome.ThumbnailSize.Large);
 		string large_thumbnail_directory_path = System.IO.Path.GetDirectoryName (large_thumbnail_file_name_template);
 
 		if (! System.IO.File.Exists (large_thumbnail_directory_path))
@@ -92,7 +90,7 @@
 
 	public static void DeleteThumbnail (System.Uri uri)
 	{
-		string path = Thumbnail.PathForUri (uri.ToString (), ThumbnailSize.Large);
+		string path = Gnome.Thumbnail.PathForUri (uri.ToString (), Gnome.ThumbnailSize.Large);
 		if (System.IO.File.Exists (path))
 			System.IO.File.Delete (path);
 	}
@@ -156,13 +154,13 @@
 		 	return found;
 
 		string md5 = Photo.GenerateMD5 (uri);			
-		Gnome.Vfs.FileInfo info = new Gnome.Vfs.FileInfo (uri.ToString (), FileInfoOptions.GetMimeType);
+		Gnome.Vfs.FileInfo info = new Gnome.Vfs.FileInfo (uri.ToString (), Gnome.Vfs.FileInfoOptions.GetMimeType);
 
 		Photo[] md5_matches = GetByMD5 (md5);
 
 		foreach (Photo match in md5_matches)
 		{
-		 	Gnome.Vfs.FileInfo match_info = new Gnome.Vfs.FileInfo (match.DefaultVersionUri.ToString (), FileInfoOptions.GetMimeType);
+			Gnome.Vfs.FileInfo match_info = new Gnome.Vfs.FileInfo (match.DefaultVersionUri.ToString (), Gnome.Vfs.FileInfoOptions.GetMimeType);
 
 			// same mimetype?
 			if (info.MimeType != match_info.MimeType)

Modified: trunk/src/PhotoVersionMenu.cs
==============================================================================
--- trunk/src/PhotoVersionMenu.cs	(original)
+++ trunk/src/PhotoVersionMenu.cs	Tue Oct 21 14:00:52 2008
@@ -1,5 +1,4 @@
 using Gtk;
-using GtkSharp;
 using System;
 using FSpot;
 public class PhotoVersionMenu : Menu {

Modified: trunk/src/PhotoView.cs
==============================================================================
--- trunk/src/PhotoView.cs	(original)
+++ trunk/src/PhotoView.cs	Tue Oct 21 14:00:52 2008
@@ -12,7 +12,6 @@
 using Gdk;
 using GLib;
 using Gtk;
-using GtkSharp;
 using System;
 using System.IO;
 using System.Collections.Generic;

Modified: trunk/src/ProgressDialog.cs
==============================================================================
--- trunk/src/ProgressDialog.cs	(original)
+++ trunk/src/ProgressDialog.cs	Tue Oct 21 14:00:52 2008
@@ -1,6 +1,5 @@
 using GLib;
 using Gtk;
-using GtkSharp;
 using System;
 
 using Mono.Unix;

Modified: trunk/src/RatingFilter.cs
==============================================================================
--- trunk/src/RatingFilter.cs	(original)
+++ trunk/src/RatingFilter.cs	Tue Oct 21 14:00:52 2008
@@ -9,7 +9,6 @@
  */
 
 using Gtk;
-using Gnome;
 using FSpot;
 using FSpot.Query;
 using FSpot.Widgets;

Modified: trunk/src/SendEmail.cs
==============================================================================
--- trunk/src/SendEmail.cs	(original)
+++ trunk/src/SendEmail.cs	Tue Oct 21 14:00:52 2008
@@ -9,7 +9,6 @@
  */
 
 using Gtk;
-using Gnome;
 using System;
 
 using FSpot.Widgets;

Modified: trunk/src/SlideView.cs
==============================================================================
--- trunk/src/SlideView.cs	(original)
+++ trunk/src/SlideView.cs	Tue Oct 21 14:00:52 2008
@@ -1,7 +1,5 @@
 using Gtk;
 using Gdk;
-using Gnome;
-using GtkSharp;
 using System;
 using GLib;
 using System.Runtime.InteropServices;

Modified: trunk/src/TagCommands.cs
==============================================================================
--- trunk/src/TagCommands.cs	(original)
+++ trunk/src/TagCommands.cs	Tue Oct 21 14:00:52 2008
@@ -9,7 +9,6 @@
  */
 
 using Gtk;
-using GtkSharp;
 using System;
 using System.Text;
 using System.Collections;

Modified: trunk/src/TagSelectionWidget.cs
==============================================================================
--- trunk/src/TagSelectionWidget.cs	(original)
+++ trunk/src/TagSelectionWidget.cs	Tue Oct 21 14:00:52 2008
@@ -27,7 +27,6 @@
 using GLib;
 using Gdk;
 using Gtk;
-using GtkSharp;
 using System.Collections;
 using System.IO;
 using System;

Modified: trunk/src/TagStore.cs
==============================================================================
--- trunk/src/TagStore.cs	(original)
+++ trunk/src/TagStore.cs	Tue Oct 21 14:00:52 2008
@@ -1,5 +1,4 @@
 using Gdk;
-using Gnome;
 using Gtk;
 using Mono.Unix;
 using Mono.Data.SqliteClient;

Modified: trunk/src/TimeDialog.cs
==============================================================================
--- trunk/src/TimeDialog.cs	(original)
+++ trunk/src/TimeDialog.cs	Tue Oct 21 14:00:52 2008
@@ -1,6 +1,5 @@
 using System;
 using Gtk;
-using Gnome;
 using System.Collections;
 using Mono.Unix;
 using FSpot.Widgets;
@@ -39,7 +38,7 @@
 		[Glade.Widget] Label old_label;
 		[Glade.Widget] Label count_label;
 
-		[Glade.Widget] DateEdit date_edit;
+		[Glade.Widget] Gnome.DateEdit date_edit;
 
 		[Glade.Widget] Frame tray_frame;
 		

Modified: trunk/src/UI.Dialog/LastRollDialog.cs
==============================================================================
--- trunk/src/UI.Dialog/LastRollDialog.cs	(original)
+++ trunk/src/UI.Dialog/LastRollDialog.cs	Tue Oct 21 14:00:52 2008
@@ -11,7 +11,6 @@
 
 using System;
 using Gtk;
-using Gnome;
 using FSpot.Query;
 using FSpot.UI.Dialog;
 

Modified: trunk/src/Widgets/IconView.cs
==============================================================================
--- trunk/src/Widgets/IconView.cs	(original)
+++ trunk/src/Widgets/IconView.cs	Tue Oct 21 14:00:52 2008
@@ -11,8 +11,6 @@
 
 using Gtk;
 using Gdk;
-using Gnome;
-using GtkSharp;
 using System;
 using System.Reflection;
 using System.Collections;

Modified: trunk/src/main.cs
==============================================================================
--- trunk/src/main.cs	(original)
+++ trunk/src/main.cs	Tue Oct 21 14:00:52 2008
@@ -1,5 +1,4 @@
 using Gtk;
-using Gnome;
 using System;
 using System.Reflection;
 using System.IO;
@@ -58,7 +57,7 @@
 	static int Main (string [] args)
 	{
 		bool empty = false;
-		Program program = null;
+		Gnome.Program program = null;
 		ICore control = null;
 		List<string> uris = new List<string> ();
 		Unix.SetProcessName (Defines.PACKAGE);
@@ -69,9 +68,9 @@
 		bool slideshow = false;
 		string import_uri = null;
 		
-		program = new Program (Defines.PACKAGE, 
+		program = new Gnome.Program (Defines.PACKAGE,
 				       Defines.VERSION, 
-				       Modules.UI, args);		
+				       Gnome.Modules.UI, args);
 		
 		FSpot.Global.PhotoDirectory = Preferences.Get<string> (Preferences.STORAGE_PATH);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]