f-spot r4037 - in trunk: . src

[rubenv svn gnome org]

Author: rubenv
Date: Wed Jun  4 17:16:57 2008
New Revision: 4037
URL: http://svn.gnome.org/viewvc/f-spot?rev=4037&view=rev

Log:
2008-06-04  Ruben Vermeersch  <ruben savanne be>

	* src/InfoOverlay.cs: Switch back to the old overlay.

	* src/MainWindow.cs: Show tags.


Modified:
   trunk/ChangeLog
   trunk/src/InfoOverlay.cs
   trunk/src/MainWindow.cs
   trunk/src/SingleView.cs

Modified: trunk/src/InfoOverlay.cs
==============================================================================
--- trunk/src/InfoOverlay.cs	(original)
+++ trunk/src/InfoOverlay.cs	Wed Jun  4 17:16:57 2008
@@ -11,33 +11,24 @@
 using FSpot.Widgets;
 
 namespace FSpot {
-	public class InfoItem : InfoVBox {
+	public class InfoItem : InfoBox {
 		BrowsablePointer item;
-		Delay update_delay;
 		
 		public InfoItem (BrowsablePointer item)
 		{
-			update_delay = new Delay (Update);
 			this.item = item;
 			item.Changed += HandleItemChanged;
 			HandleItemChanged (item, null);
 			VersionIdChanged += HandleVersionIdChanged;
-			//ShowTags = true;
+			ShowTags = true;
 		}
 		
-		public bool Update () {
-			UpdateSingleSelection (item.Current);
-			return false;
-		}
-
 		private void HandleItemChanged (BrowsablePointer sender, BrowsablePointerChangedArgs args)
 		{
-			update_delay.Start ();
-			//this.UpdateSingleSelection (item.Current);
-			//Photo = item.Current;
+			Photo = item.Current;
 		}
 
-		private void HandleVersionIdChanged (InfoVBox box, uint version_id)
+		private void HandleVersionIdChanged (InfoBox box, uint version_id)
 		{
 			Photo p = item.Current as Photo;
 			PhotoQuery q = item.Collection as PhotoQuery;

Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs	(original)
+++ trunk/src/MainWindow.cs	Wed Jun  4 17:16:57 2008
@@ -317,6 +317,7 @@
 
 		info_box = new InfoBox ();
 		info_box.VersionIdChanged += HandleInfoBoxVersionIdChange;
+		info_box.ShowTags = true;
 		tag_vbox.PackEnd (info_box, false, false, 0);
 		info_box.Show ();
 		

Modified: trunk/src/SingleView.cs
==============================================================================
--- trunk/src/SingleView.cs	(original)
+++ trunk/src/SingleView.cs	Wed Jun  4 17:16:57 2008
@@ -37,7 +37,6 @@
 		FSpot.Widgets.IconView directory_view;
 		private Uri uri;
 		
-		InfoBox info_box;
 		MetadataDisplay info_display;
 		
 		UriCollection collection;