[f-spot] Get rid of PhotoArray.



commit 06facde52b78dcc0eeddef0c6597d1456d34ed51
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sun May 23 12:03:21 2010 +0200

    Get rid of PhotoArray.

 src/Extensions/ExportMenuItemNode.cs |    2 +-
 src/MainWindow.cs                    |   13 +-----
 src/Makefile.am                      |    1 -
 src/PhotoArray.cs                    |   71 ----------------------------------
 src/SingleView.cs                    |    5 +-
 5 files changed, 5 insertions(+), 87 deletions(-)
---
diff --git a/src/Extensions/ExportMenuItemNode.cs b/src/Extensions/ExportMenuItemNode.cs
index af33b56..f6981c6 100644
--- a/src/Extensions/ExportMenuItemNode.cs
+++ b/src/Extensions/ExportMenuItemNode.cs
@@ -13,7 +13,7 @@ using System;
 
 namespace FSpot.Extensions
 {
-	public delegate FSpot.PhotoArray SelectedImages ();
+	public delegate PhotoList SelectedImages ();
 
 	[ExtensionNode ("ExportMenuItem")]
 	public class ExportMenuItemNode : MenuItemNode
diff --git a/src/MainWindow.cs b/src/MainWindow.cs
index c990495..6cb1808 100644
--- a/src/MainWindow.cs
+++ b/src/MainWindow.cs
@@ -672,7 +672,7 @@ namespace FSpot
 	
 		private void HandleExportActivated (object o, EventArgs e)
 		{
-			FSpot.Extensions.ExportMenuItemNode.SelectedImages = delegate () {return new FSpot.PhotoArray (SelectedPhotos ()); };
+			FSpot.Extensions.ExportMenuItemNode.SelectedImages = delegate () {return new PhotoList (SelectedPhotos ()); };
 		}
 	
 		private void HandleDbItemsChanged (object sender, DbItemEventArgs<Photo> args)
@@ -1565,19 +1565,10 @@ namespace FSpot
 			Mono.Addins.Gui.AddinManagerWindow.Run (main_window);
 		}
 	
-		private void TestDisplay ()
-		{
-			Gtk.Window win = new Gtk.Window ("hello");
-			VBox box = new VBox ();
-			box.PackStart (new FSpot.Widgets.ImageDisplay (new BrowsablePointer (new FSpot.PhotoArray (SelectedPhotos ()), 0)));
-			win.Add (box);
-			win.ShowAll ();
-		}
-	
 		void HandleSendMailCommand (object sender, EventArgs args)
 		{
 			//TestDisplay ();
-			new FSpot.SendEmail (new FSpot.PhotoArray (SelectedPhotos ()), Window);
+			new FSpot.SendEmail (new PhotoList (SelectedPhotos ()), Window);
 		}
 	
 		public static void HandleHelp (object sender, EventArgs args)
diff --git a/src/Makefile.am b/src/Makefile.am
index 7ac493c..c269614 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -128,7 +128,6 @@ NULL_PLATFORM_CSDISTFILES =				\
 F_SPOT_CSDISTFILES =				\
 	$(srcdir)/BlockProcessor.cs		\
 	$(srcdir)/BitConverter.cs		\
-	$(srcdir)/PhotoArray.cs 		\
 	$(srcdir)/PhotoList.cs 		\
 	$(srcdir)/ColorAdjustment/Adjustment.cs		\
 	$(srcdir)/ColorAdjustment/AutoStretch.cs		\
diff --git a/src/SingleView.cs b/src/SingleView.cs
index 9c7d628..63652e5 100644
--- a/src/SingleView.cs
+++ b/src/SingleView.cs
@@ -158,8 +158,7 @@ namespace FSpot {
 					if (pointer == null)
 						return;
 					IBrowsableItem [] item = {pointer.Current};
-					PhotoArray item_array = new PhotoArray (item);
-					sidebar.HandleSelectionChanged (item_array);
+					sidebar.HandleSelectionChanged (new PhotoList (item));
 			};
 			
 			image_view.Item.Collection.ItemsChanged += sidebar.HandleSelectionItemsChanged;
@@ -182,7 +181,7 @@ namespace FSpot {
 
 		void HandleExportActivated (object o, EventArgs e)
 		{
-			FSpot.Extensions.ExportMenuItemNode.SelectedImages = delegate () {return new FSpot.PhotoArray (directory_view.Selection.Items); };
+			FSpot.Extensions.ExportMenuItemNode.SelectedImages = delegate () {return new PhotoList (directory_view.Selection.Items); };
 		}
 
 		public void HandleCollectionChanged (IBrowsableCollection collection)



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