[f-spot] move ImageView and PhotoImageView in the FSpot.Widgets namespace



commit a6e76ac463fea6f27f0050b893f0a56792fdbc15
Author: Stephane Delcroix <stephane delcroix org>
Date:   Sat Jun 6 09:10:27 2009 +0200

    move ImageView and PhotoImageView in the FSpot.Widgets namespace
---
 src/Core/ColorManagement.cs  |    4 ++--
 src/Editors/Editor.cs        |    1 +
 src/Editors/Old/OldEditor.cs |    1 +
 src/ImageView.cs             |   13 ++++++++++++-
 src/ImportCommand.cs         |    5 +++--
 src/PhotoImageView.cs        |    2 +-
 src/PhotoView.cs             |    8 ++++----
 src/TagCommands.cs           |    7 ++++---
 8 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/Core/ColorManagement.cs b/src/Core/ColorManagement.cs
index 4a00084..c44f6b0 100644
--- a/src/Core/ColorManagement.cs
+++ b/src/Core/ColorManagement.cs
@@ -22,12 +22,12 @@ public class ColorManagement {
 		private static Cms.Profile destination_profile;
 		private static Cms.Transform standart_transform;
 		
-		private static FSpot.PhotoImageView photo_image_view;
+		private static FSpot.Widgets.PhotoImageView photo_image_view;
 
 		private static string [] search_dir = { "/usr/share/color/icc", "~/.color/icc", "/usr/local/share/color/icc " }; //the main directory list to find a profiles
 		public static ArrayList Profiles = new ArrayList();
 		
-		public static FSpot.PhotoImageView PhotoImageView {
+		public static FSpot.Widgets.PhotoImageView PhotoImageView {
 			set {
 				if (photo_image_view == null)
 					photo_image_view = value;
diff --git a/src/Editors/Editor.cs b/src/Editors/Editor.cs
index 55f8287..47a13c3 100644
--- a/src/Editors/Editor.cs
+++ b/src/Editors/Editor.cs
@@ -9,6 +9,7 @@
 
 using FSpot;
 using FSpot.Utils;
+using FSpot.Widgets;
 
 using Gdk;
 using Gtk;
diff --git a/src/Editors/Old/OldEditor.cs b/src/Editors/Old/OldEditor.cs
index 34a6d59..78c3592 100644
--- a/src/Editors/Old/OldEditor.cs
+++ b/src/Editors/Old/OldEditor.cs
@@ -4,6 +4,7 @@ using Gtk;
 using Cairo;
 using Tao.OpenGl;
 using FSpot.Utils;
+using FSpot.Widgets;
 
 namespace FSpot.Editors {
 	public abstract class OldEditor {
diff --git a/src/ImageView.cs b/src/ImageView.cs
index bca2187..3236dd8 100644
--- a/src/ImageView.cs
+++ b/src/ImageView.cs
@@ -1,10 +1,21 @@
+//
+// FSpot.Widgets.ImageView.cs
+//
+// Author(s):
+//	Ettore Perazzoli
+//	Larry Ewing  <lewing novell com>
+//	Stephane Delcrxoi  <stephane delcroix org>
+//
+// This is free software. See COPYING for details
+//
+
 using Gdk;
 using Gtk;
 using System;
 using System.Collections;
 using System.Runtime.InteropServices;
 
-namespace FSpot {
+namespace FSpot.Widgets {
 public class ImageView : Layout {
 	private Cms.Transform transform;
 
diff --git a/src/ImportCommand.cs b/src/ImportCommand.cs
index 7180978..bcd58b2 100644
--- a/src/ImportCommand.cs
+++ b/src/ImportCommand.cs
@@ -23,6 +23,7 @@ using FSpot.Widgets;
 using FSpot;
 using FSpot.Utils;
 using FSpot.UI.Dialog;
+using FSpot.Widgets;
 
 public class ImportCommand : GladeDialog
 {
@@ -342,7 +343,7 @@ public class ImportCommand : GladeDialog
 	PhotoStore store;
 	FSpot.Delay step;
 	
-	FSpot.PhotoImageView photo_view;
+	PhotoImageView photo_view;
 	ImportBackend importer;
 	FSpot.Widgets.IconView tray;
 
@@ -615,7 +616,7 @@ public class ImportCommand : GladeDialog
 		tray.DisplayTags = false;
 		tray.Show ();
 
-		photo_view = new FSpot.PhotoImageView (collection);
+		photo_view = new PhotoImageView (collection);
 		photo_scrolled.Add (photo_view);
 		photo_scrolled.SetSizeRequest (200, 200);
 		photo_view.Show ();
diff --git a/src/PhotoImageView.cs b/src/PhotoImageView.cs
index f9b5317..9075166 100644
--- a/src/PhotoImageView.cs
+++ b/src/PhotoImageView.cs
@@ -2,7 +2,7 @@ using System;
 using FSpot.Editors;
 using FSpot.Utils;
 
-namespace FSpot {
+namespace FSpot.Widgets {
 	public enum ProgressType {
 		None,
 		Async,
diff --git a/src/PhotoView.cs b/src/PhotoView.cs
index bc157d6..43453a8 100644
--- a/src/PhotoView.cs
+++ b/src/PhotoView.cs
@@ -28,7 +28,7 @@ namespace FSpot {
 		FSpot.Delay commit_delay; 
 	
 		private bool has_selection = false;
-		private FSpot.PhotoImageView photo_view;
+		private PhotoImageView photo_view;
 		private ScrolledWindow photo_view_scrolled;
 		private EventBox background;
 		
@@ -54,7 +54,7 @@ namespace FSpot {
 
 		public event EventHandler<BrowsableEventArgs> DoubleClicked;
 	
-		public FSpot.PhotoImageView View {
+		public PhotoImageView View {
 			get { return photo_view; }
 		}
 	
@@ -221,7 +221,7 @@ namespace FSpot {
 			tag_view.QueueDraw ();
 		}
 	
-		private void HandlePhotoChanged (FSpot.PhotoImageView view)
+		private void HandlePhotoChanged (PhotoImageView view)
 		{
 			if (query is PhotoQuery) {
 				CommitPendingChanges ();
@@ -271,7 +271,7 @@ namespace FSpot {
 			frame.Add (inner_vbox);
 			
 			BrowsablePointer bp = new BrowsablePointer (query, -1);
-			photo_view = new FSpot.PhotoImageView (bp);
+			photo_view = new PhotoImageView (bp);
 	
 			filmstrip = new Filmstrip (bp);
 			Gdk.Pixbuf bg = new Gdk.Pixbuf (Gdk.Colorspace.Rgb, true, 8, 1, 69);
diff --git a/src/TagCommands.cs b/src/TagCommands.cs
index 98b1b9b..d7fab11 100644
--- a/src/TagCommands.cs
+++ b/src/TagCommands.cs
@@ -17,6 +17,7 @@ using Mono.Unix;
 using FSpot;
 using FSpot.Utils;
 using FSpot.UI.Dialog;
+using FSpot.Widgets;
 
 public class TagCommands {
 
@@ -332,7 +333,7 @@ public class TagCommands {
 		Db db;
 		Gtk.Window parent_window;
 		FSpot.PhotoQuery query;
-		FSpot.PhotoImageView image_view;
+		PhotoImageView image_view;
 		Gtk.IconView icon_view;
 		ListStore icon_store;
 		string icon_name = null;
@@ -441,7 +442,7 @@ public class TagCommands {
 			}
 		}
 
-		public void HandlePhotoChanged (FSpot.PhotoImageView sender)
+		public void HandlePhotoChanged (PhotoImageView sender)
 		{
 			int item = image_view.Item.Index;
 			photo_label.Text = String.Format (Catalog.GetString ("Photo {0} of {1}"), 
@@ -485,7 +486,7 @@ public class TagCommands {
 			else 
 				query.Terms = new FSpot.Literal (t);
 
-			image_view = new FSpot.PhotoImageView (query);
+			image_view = new PhotoImageView (query);
 			image_view.SelectionXyRatio = 1.0;
 			image_view.SelectionChanged += HandleSelectionChanged;
 			image_view.PhotoChanged += HandlePhotoChanged;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]