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

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue May 20 09:29:05 2008
New Revision: 3945
URL: http://svn.gnome.org/viewvc/f-spot?rev=3945&view=rev

Log:
removing mainwindow reference from TagView

Modified:
   trunk/src/PhotoView.cs
   trunk/src/Widgets/InfoBox.cs
   trunk/src/Widgets/TagView.cs

Modified: trunk/src/PhotoView.cs
==============================================================================
--- trunk/src/PhotoView.cs	(original)
+++ trunk/src/PhotoView.cs	Tue May 20 09:29:05 2008
@@ -490,7 +490,7 @@
 			HBox inner_hbox = new HBox (false, 2);
 			//inner_hbox.BorderWidth = 6;
 	
-			tag_view = new Widgets.TagView ();
+			tag_view = new Widgets.TagView (MainWindow.ToolTips);
 			inner_hbox.PackStart (tag_view, false, true, 0);
 	
 			Label comment = new Label (Catalog.GetString ("Comment:"));

Modified: trunk/src/Widgets/InfoBox.cs
==============================================================================
--- trunk/src/Widgets/InfoBox.cs	(original)
+++ trunk/src/Widgets/InfoBox.cs	Tue May 20 09:29:05 2008
@@ -133,7 +133,7 @@
 			date_label.Text = Environment.NewLine;
 			exposure_info_label.Text = Environment.NewLine;
 	
-			tag_view = new TagView ();
+			tag_view = new TagView (MainWindow.ToolTips);
 			table.Attach (tag_view, 0, 2, 5, 6, AttachOptions.Fill, AttachOptions.Fill, TABLE_XPADDING, TABLE_YPADDING);
 			tag_view.Show ();
 			table.ShowAll ();

Modified: trunk/src/Widgets/TagView.cs
==============================================================================
--- trunk/src/Widgets/TagView.cs	(original)
+++ trunk/src/Widgets/TagView.cs	Tue May 20 09:29:05 2008
@@ -18,13 +18,19 @@
 	private IBrowsableItem photo;
 	private Tag [] tags;
 	private static int TAG_ICON_VSPACING = 5;
-	bool parent_tip;
+	Tooltips parent_tips = null;
+	
 
 	public TagView ()
 	{
 		VisibleWindow = false;
 	}
 
+	public TagView (Tooltips tips) : this ()
+	{
+		parent_tips = tips;
+	}
+
 	public IBrowsableItem Current {
 		set {
 			photo = value;
@@ -90,7 +96,8 @@
 						      RgbDither.None, tag_x, tag_y);
 			tag_x += thumbnail_size + TAG_ICON_VSPACING;
 		}
-		MainWindow.ToolTips.SetTip (this, String.Join (", ", names), null);
+		if (parent_tips != null)
+			parent_tips.SetTip (this, String.Join (", ", names), null);
 
 		return base.OnExposeEvent (args);
 	}