f-spot r3872 - in trunk: . src src/Widgets

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue May  6 12:23:56 2008
New Revision: 3872
URL: http://svn.gnome.org/viewvc/f-spot?rev=3872&view=rev

Log:
2008-05-06  Stephane Delcroix  <sdelcroix novell com>

	* src/Widgets/InfoBox.cs: include an optional TagView
	* src/InfoOverlay.cs: use the TagView
	* src/FullScreenView.cs: no longer include a TagView in the main toolbar.


Modified:
   trunk/ChangeLog
   trunk/src/FullScreenView.cs
   trunk/src/InfoOverlay.cs
   trunk/src/Widgets/InfoBox.cs
   trunk/src/Widgets/TagView.cs

Modified: trunk/src/FullScreenView.cs
==============================================================================
--- trunk/src/FullScreenView.cs	(original)
+++ trunk/src/FullScreenView.cs	Tue May  6 12:23:56 2008
@@ -18,7 +18,6 @@
 	public class FullScreenView : Gtk.Window {
 		private ScrolledView scroll;
 		private PhotoImageView view;
-		private TagView tag_view;
 		private Notebook notebook;
 		private ControlOverlay controls;
 		//		private ImageDisplay display;
@@ -178,11 +177,6 @@
 				tbar.Insert (t_item, -1);
 #endif
 
-				tag_view = new TagView ();
-				t_item = new ToolItem ();
-				t_item.Child = tag_view;
-				tbar.Insert (t_item, -1);
-
 				tbar.Insert ((actions [Info]).CreateToolItem () as ToolItem, -1);
 
 				tbar.Insert ((actions [HideToolbar]).CreateToolItem () as ToolItem, -1);
@@ -213,7 +207,6 @@
 
 		private void HandleItemChanged (object sender, BrowsablePointerChangedArgs args)
 		{
-			tag_view.Current = view.Item.Current;
 			if (scroll.ControlBox.Visible)
 				scroll.ShowControls ();
 		}

Modified: trunk/src/InfoOverlay.cs
==============================================================================
--- trunk/src/InfoOverlay.cs	(original)
+++ trunk/src/InfoOverlay.cs	Tue May  6 12:23:56 2008
@@ -20,6 +20,7 @@
 			item.Changed += HandleItemChanged;
 			HandleItemChanged (item, null);
 			VersionIdChanged += HandleVersionIdChanged;
+			ShowTags = true;
 		}
 
 		private void HandleItemChanged (BrowsablePointer sender, BrowsablePointerChangedArgs args)

Modified: trunk/src/Widgets/InfoBox.cs
==============================================================================
--- trunk/src/Widgets/InfoBox.cs	(original)
+++ trunk/src/Widgets/InfoBox.cs	Tue May  6 12:23:56 2008
@@ -35,6 +35,18 @@
 			}
 		}
 	
+		private bool show_tags = false;
+		public bool ShowTags {
+			get { return show_tags; }
+			set {
+				if (show_tags == value)
+					return;
+
+				show_tags = value;
+				tag_view.Visible = show_tags;
+			}
+		}
+
 		public delegate void VersionIdChangedHandler (InfoBox info_box, uint version_id);
 		public event VersionIdChangedHandler VersionIdChanged;
 	
@@ -45,7 +57,8 @@
 		private Label size_label;
 		private Label exposure_info_label;
 		private OptionMenu version_option_menu;
-	
+		private TagView tag_view;
+
 		private void HandleVersionIdChanged (PhotoVersionMenu menu)
 		{
 			if (VersionIdChanged != null)
@@ -83,7 +96,7 @@
 		private Label exposure_name_label;
 		private void SetupWidgets ()
 		{
-			Table table = new Table (5, 2, false);
+			Table table = new Table (6, 2, false);
 			table.BorderWidth = 0;
 	
 			string name_pre = "<b>";
@@ -120,6 +133,9 @@
 			date_label.Text = Environment.NewLine;
 			exposure_info_label.Text = Environment.NewLine;
 	
+			tag_view = new TagView ();
+			table.Attach (tag_view, 0, 2, 5, 6, AttachOptions.Fill, AttachOptions.Fill, TABLE_XPADDING, TABLE_YPADDING);
+			tag_view.Show ();
 			table.ShowAll ();
 	
 			Add (table);
@@ -327,6 +343,8 @@
 					}
 					i++;
 				}
+				if (show_tags)
+					tag_view.Current = p;
 			} else {
 				version_option_menu.Visible = false;
 				version_option_menu.Sensitive = false;

Modified: trunk/src/Widgets/TagView.cs
==============================================================================
--- trunk/src/Widgets/TagView.cs	(original)
+++ trunk/src/Widgets/TagView.cs	Tue May  6 12:23:56 2008
@@ -41,9 +41,7 @@
 	}
 
 	public Tag [] Tags {
-		get {
-			return tags;
-		}
+		get { return tags; }
 		set {
 			this.tags = value;
 			this.QueueDraw ();