f-spot r3940 - in trunk/src: . UI.Dialog

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Mon May 19 18:11:54 2008
New Revision: 3940
URL: http://svn.gnome.org/viewvc/f-spot?rev=3940&view=rev

Log:
some ns changes

Added:
   trunk/src/UI.Dialog/GladeDialog.cs
      - copied, changed from r3938, /trunk/src/GladeDialog.cs
Removed:
   trunk/src/GladeDialog.cs
Modified:
   trunk/src/CameraFileSelectionDialog.cs
   trunk/src/CameraSelectionDialog.cs
   trunk/src/DateCommands.cs
   trunk/src/ImportCommand.cs
   trunk/src/LastRollDialog.cs
   trunk/src/PhotoVersionCommands.cs
   trunk/src/RatingFilter.cs
   trunk/src/SendEmail.cs
   trunk/src/SingleView.cs
   trunk/src/TagCommands.cs
   trunk/src/TagSelectionDialog.cs
   trunk/src/TimeDialog.cs
   trunk/src/UI.Dialog/AboutDialog.cs

Modified: trunk/src/CameraFileSelectionDialog.cs
==============================================================================
--- trunk/src/CameraFileSelectionDialog.cs	(original)
+++ trunk/src/CameraFileSelectionDialog.cs	Mon May 19 18:11:54 2008
@@ -15,6 +15,7 @@
 using Glade;
 using LibGPhoto2;
 using Mono.Unix;
+using FSpot.UI.Dialog;
 
 namespace FSpot {
 	public class CameraFileSelectionDialog : GladeDialog

Modified: trunk/src/CameraSelectionDialog.cs
==============================================================================
--- trunk/src/CameraSelectionDialog.cs	(original)
+++ trunk/src/CameraSelectionDialog.cs	Mon May 19 18:11:54 2008
@@ -3,6 +3,7 @@
 using Glade;
 using LibGPhoto2;
 using Mono.Unix;
+using FSpot.UI.Dialog;
 
 namespace FSpot {
 	public class CameraSelectionDialog : GladeDialog

Modified: trunk/src/DateCommands.cs
==============================================================================
--- trunk/src/DateCommands.cs	(original)
+++ trunk/src/DateCommands.cs	Mon May 19 18:11:54 2008
@@ -15,9 +15,10 @@
 using Mono.Unix;
 using FSpot;
 using FSpot.Query;
+using FSpot.UI.Dialog;
 
 public class DateCommands {
-	public class Set : FSpot.GladeDialog {
+	public class Set : GladeDialog {
 		FSpot.PhotoQuery query;
 		Gtk.Window parent_window;
 

Modified: trunk/src/ImportCommand.cs
==============================================================================
--- trunk/src/ImportCommand.cs	(original)
+++ trunk/src/ImportCommand.cs	Mon May 19 18:11:54 2008
@@ -26,7 +26,7 @@
 using FSpot.Utils;
 using FSpot.UI.Dialog;
 
-public class ImportCommand : FSpot.GladeDialog
+public class ImportCommand : GladeDialog
 {
 	internal class SourceItem : ImageMenuItem
 	{

Modified: trunk/src/LastRollDialog.cs
==============================================================================
--- trunk/src/LastRollDialog.cs	(original)
+++ trunk/src/LastRollDialog.cs	Mon May 19 18:11:54 2008
@@ -13,9 +13,10 @@
 using Gtk;
 using Gnome;
 using FSpot.Query;
+using FSpot.UI.Dialog;
 
 namespace FSpot {
-	public class LastRolls : FSpot.GladeDialog {
+	public class LastRolls : GladeDialog {
 		FSpot.PhotoQuery query;
 		RollStore rollstore;
 		Gtk.Window parent_window;

Modified: trunk/src/PhotoVersionCommands.cs
==============================================================================
--- trunk/src/PhotoVersionCommands.cs	(original)
+++ trunk/src/PhotoVersionCommands.cs	Mon May 19 18:11:54 2008
@@ -5,9 +5,9 @@
 using FSpot;
 using FSpot.UI.Dialog;
 
-public class PhotoVersionCommands {
-
-	private class VersionNameRequest : FSpot.GladeDialog {
+public class PhotoVersionCommands
+{
+	private class VersionNameRequest : GladeDialog {
 		private Photo photo;
 
 		[Glade.Widget] private Button ok_button;

Modified: trunk/src/RatingFilter.cs
==============================================================================
--- trunk/src/RatingFilter.cs	(original)
+++ trunk/src/RatingFilter.cs	Mon May 19 18:11:54 2008
@@ -13,9 +13,10 @@
 using FSpot;
 using FSpot.Query;
 using FSpot.Widgets;
+using FSpot.UI.Dialog;
 
 public class RatingFilter {
-	public class Set : FSpot.GladeDialog {
+	public class Set : GladeDialog {
 		FSpot.PhotoQuery query;
 		Gtk.Window parent_window;
 

Modified: trunk/src/SendEmail.cs
==============================================================================
--- trunk/src/SendEmail.cs	(original)
+++ trunk/src/SendEmail.cs	Mon May 19 18:11:54 2008
@@ -20,7 +20,7 @@
 using Mono.Unix;
 
 namespace FSpot {
-	public class SendEmail : FSpot.GladeDialog {
+	public class SendEmail : GladeDialog {
 		PhotoQuery query;
 		Gtk.Window parent_window;
 

Modified: trunk/src/SingleView.cs
==============================================================================
--- trunk/src/SingleView.cs	(original)
+++ trunk/src/SingleView.cs	Mon May 19 18:11:54 2008
@@ -4,6 +4,7 @@
 using Mono.Unix;
 
 using FSpot.Utils;
+using FSpot.UI.Dialog;
 
 namespace FSpot {
 	public class SingleView {

Modified: trunk/src/TagCommands.cs
==============================================================================
--- trunk/src/TagCommands.cs	(original)
+++ trunk/src/TagCommands.cs	Mon May 19 18:11:54 2008
@@ -26,7 +26,7 @@
 		Category
 	}
 
-	public class Create : FSpot.GladeDialog {
+	public class Create : GladeDialog {
 		TagStore tag_store;
 
 
@@ -172,7 +172,7 @@
 		}
 	}
 
-	public class Edit : FSpot.GladeDialog {
+	public class Edit : GladeDialog {
 		Db db;
 		Gtk.Window parent_window;
 		Tag tag;
@@ -318,7 +318,7 @@
 		}
 	}
 
-	public class EditIcon : FSpot.GladeDialog {
+	public class EditIcon : GladeDialog {
 		Db db;
 		Gtk.Window parent_window;
 		FSpot.PhotoQuery query;

Modified: trunk/src/TagSelectionDialog.cs
==============================================================================
--- trunk/src/TagSelectionDialog.cs	(original)
+++ trunk/src/TagSelectionDialog.cs	Mon May 19 18:11:54 2008
@@ -3,7 +3,7 @@
 using Gtk;
 using Glade;
 
-namespace FSpot {
+namespace FSpot.UI.Dialog {
 	public class TagSelectionDialog : GladeDialog 
 	{
 		[Widget] Gtk.ScrolledWindow tag_selection_scrolled;

Modified: trunk/src/TimeDialog.cs
==============================================================================
--- trunk/src/TimeDialog.cs	(original)
+++ trunk/src/TimeDialog.cs	Mon May 19 18:11:54 2008
@@ -4,6 +4,7 @@
 using System.Collections;
 using Mono.Unix;
 using FSpot.Widgets;
+using FSpot.UI.Dialog;
 
 namespace FSpot {
 	public class TimeChangedEventArgs : DbItemEventArgs {

Modified: trunk/src/UI.Dialog/AboutDialog.cs
==============================================================================
--- trunk/src/UI.Dialog/AboutDialog.cs	(original)
+++ trunk/src/UI.Dialog/AboutDialog.cs	Mon May 19 18:11:54 2008
@@ -86,7 +86,7 @@
 				Console.WriteLine (e);
 				License = "GPL v2";
 			}
-			Logo = PixbufUtils.LoadFromAssembly ("f-spot-logo.svg");
+			Logo = new Gdk.Pixbuf (System.Reflection.Assembly.GetEntryAssembly (), "f-spot-logo.svg");
 	#if !GTK_2_11
 			Name = "F-Spot";
 	#endif

Copied: trunk/src/UI.Dialog/GladeDialog.cs (from r3938, /trunk/src/GladeDialog.cs)
==============================================================================
--- /trunk/src/GladeDialog.cs	(original)
+++ trunk/src/UI.Dialog/GladeDialog.cs	Mon May 19 18:11:54 2008
@@ -1,12 +1,23 @@
-namespace FSpot {
-	public class GladeDialog {
+/*
+ * FSpot.UI.Dialog.GladeDialog
+ *
+ * Author(s):
+ *	Larry Ewing  <lewing novell com>
+ *
+ * This is free software. See COPYING for details.
+ *
+ */
+
+namespace FSpot.UI.Dialog 
+{
+	public class GladeDialog
+	{
 		protected string dialog_name;
 		protected Glade.XML xml;
 		private Gtk.Dialog dialog;
 		
 		protected GladeDialog ()
 		{
-
 		}
 
 		public GladeDialog (string name)