GNOME.org
 

[f-spot] Remove deprecated GtkTooltips, replace by newer API.

commit 1af062d004236822a2c95591bcdb1e01b727687d
Author: Ruben Vermeersch <ruben savanne be>
Date:   Fri Jun 11 21:16:50 2010 +0200

    Remove deprecated GtkTooltips, replace by newer API.

 src/GroupSelector.cs          |    8 ++++----
 src/MainWindow.cs             |   31 +++++++++++--------------------
 src/PhotoView.cs              |    2 +-
 src/QueryWidget.cs            |    7 ++-----
 src/SingleView.cs             |   10 ++++------
 src/TagQueryWidget.cs         |    5 -----
 src/Term.cs                   |   13 +++----------
 src/UI.Dialog/ImportDialog.cs |    2 +-
 src/Widgets/InfoBox.cs        |    2 +-
 src/Widgets/TagView.cs        |   10 ++--------
 10 files changed, 29 insertions(+), 61 deletions(-)
---
diff --git a/src/GroupSelector.cs b/src/GroupSelector.cs
index 7cc52ae..c5494ff 100644
--- a/src/GroupSelector.cs
+++ b/src/GroupSelector.cs
@@ -54,11 +54,11 @@ namespace FSpot {
 				}
 			
 				if (adaptor is TimeAdaptor) {
-					MainWindow.ToolTips.SetTip (left, Catalog.GetString ("More dates"), null);
-					MainWindow.ToolTips.SetTip (right, Catalog.GetString ("More dates"), null);
+					left.TooltipText = Catalog.GetString ("More dates");
+					right.TooltipText = Catalog.GetString ("More dates");
 				} else {
-					MainWindow.ToolTips.SetTip (left, Catalog.GetString ("More"), null);
-					MainWindow.ToolTips.SetTip (right, Catalog.GetString ("More"), null);
+					left.TooltipText = Catalog.GetString ("More");
+					right.TooltipText = Catalog.GetString ("More");
 				}
 				
 				adaptor.Changed += HandleAdaptorChanged;
diff --git a/src/MainWindow.cs b/src/MainWindow.cs
index e78c35f..5651d33 100644
--- a/src/MainWindow.cs
+++ b/src/MainWindow.cs
@@ -193,15 +193,6 @@ namespace FSpot
 		
 		const int PHOTO_IDX_NONE = -1;
 	
-		private static Gtk.Tooltips toolTips;
-		public static Gtk.Tooltips ToolTips {
-			get {
-				if (toolTips == null)
-					toolTips = new Gtk.Tooltips ();
-				return toolTips;
-			}
-		}
-	
 		public Db Database { get; private set; }
 		public ModeType ViewMode { get; private set; }
 		public MainSelection Selection { get; private set; }
@@ -281,7 +272,7 @@ namespace FSpot
 	
 			ToolButton import_button = GtkUtil.ToolButtonFromTheme ("gtk-add", Catalog.GetString ("Import"), true);
 			import_button.Clicked += (o, args) => StartImport (null);
-			import_button.SetTooltip (ToolTips, Catalog.GetString ("Import new images"), null);
+			import_button.TooltipText = Catalog.GetString ("Import new images");
 			toolbar.Insert (import_button, -1);
 		
 			toolbar.Insert (new SeparatorToolItem (), -1);
@@ -301,7 +292,7 @@ namespace FSpot
 			browse_button.IconName = "mode-browse";
 			browse_button.IsImportant = true;
 			browse_button.Toggled += HandleToggleViewBrowse;
-			browse_button.SetTooltip (ToolTips, Catalog.GetString ("Browse many photos simultaneously"), null);
+			browse_button.TooltipText = Catalog.GetString ("Browse many photos simultaneously");
 			toolbar.Insert (browse_button, -1);
 	
 			edit_button = new ToggleToolButton ();
@@ -309,19 +300,19 @@ namespace FSpot
 			edit_button.IconName = "mode-image-edit";
 			edit_button.IsImportant = true;
 			edit_button.Toggled += HandleToggleViewPhoto;
-			edit_button.SetTooltip (ToolTips, Catalog.GetString ("View and edit a photo"), null);
+			edit_button.TooltipText = Catalog.GetString ("View and edit a photo");
 			toolbar.Insert (edit_button, -1);
 	
 			toolbar.Insert (new SeparatorToolItem (), -1);
 	
 			ToolButton fs_button = GtkUtil.ToolButtonFromTheme ("view-fullscreen", Catalog.GetString ("Fullscreen"), false);
 			fs_button.Clicked += HandleViewFullscreen;
-			fs_button.SetTooltip (ToolTips, Catalog.GetString ("View photos fullscreen"), null);
+			fs_button.TooltipText = Catalog.GetString ("View photos fullscreen");
 			toolbar.Insert (fs_button, -1);
 	
 			ToolButton ss_button = GtkUtil.ToolButtonFromTheme ("media-playback-start", Catalog.GetString ("Slideshow"), false);
 			ss_button.Clicked += HandleViewSlideShow;
-			ss_button.SetTooltip (ToolTips, Catalog.GetString ("View photos in a slideshow"), null);
+			ss_button.TooltipText = Catalog.GetString ("View photos in a slideshow");
 			toolbar.Insert (ss_button, -1);
 	
 			SeparatorToolItem white_space = new SeparatorToolItem ();
@@ -336,12 +327,12 @@ namespace FSpot
 	
 			display_previous_button = new ToolButton (Stock.GoBack);
 			toolbar.Insert (display_previous_button, -1);
-			display_previous_button.SetTooltip (ToolTips, Catalog.GetString ("Previous photo"), String.Empty);
+			display_previous_button.TooltipText = Catalog.GetString ("Previous photo");
 			display_previous_button.Clicked += new EventHandler (HandleDisplayPreviousButtonClicked);
 	
 			display_next_button = new ToolButton (Stock.GoForward);
 			toolbar.Insert (display_next_button, -1);
-			display_next_button.SetTooltip (ToolTips, Catalog.GetString ("Next photo"), String.Empty);
+			display_next_button.TooltipText = Catalog.GetString ("Next photo");
 			display_next_button.Clicked += new EventHandler (HandleDisplayNextButtonClicked);
 	
 			Sidebar = new Sidebar ();
@@ -2659,26 +2650,26 @@ namespace FSpot
 			if (rl_button != null) {
 				if (Selection.Count == 0) {
 					rl_button.Sensitive = false;
-					rl_button.SetTooltip (ToolTips, Catalog.GetString (String.Empty), null);
+					rl_button.TooltipText = String.Empty;
 				} else {
 					rl_button.Sensitive = true;
 	
 					string msg = Catalog.GetPluralString ("Rotate selected photo left",
 									      "Rotate selected photos left", Selection.Count);
-					rl_button.SetTooltip (ToolTips, String.Format (msg, Selection.Count), null);
+					rl_button.TooltipText = String.Format (msg, Selection.Count);
 				}
 			}
 			
 			if (rr_button != null) {
 				if (Selection.Count == 0) {
 					rr_button.Sensitive = false;
-					rr_button.SetTooltip (ToolTips, Catalog.GetString (String.Empty), null);
+					rr_button.TooltipText = String.Empty;
 				} else {
 					rr_button.Sensitive = true;
 	
 					string msg = Catalog.GetPluralString ("Rotate selected photo right",
 									      "Rotate selected photos right", Selection.Count);
-					rr_button.SetTooltip (ToolTips, String.Format (msg, Selection.Count), null);
+					rr_button.TooltipText = String.Format (msg, Selection.Count);
 				}
 			}
 	
diff --git a/src/PhotoView.cs b/src/PhotoView.cs
index 85401f4..fdbebdc 100644
--- a/src/PhotoView.cs
+++ b/src/PhotoView.cs
@@ -333,7 +333,7 @@ namespace FSpot {
 			HBox lower_hbox = new HBox (false, 2);
 			//inner_hbox.BorderWidth = 6;
 	
-			tag_view = new Widgets.TagView (MainWindow.ToolTips);
+			tag_view = new Widgets.TagView ();
 			lower_hbox.PackStart (tag_view, false, true, 0);
 	
 			Label comment = new Label (Catalog.GetString ("Comment:"));
diff --git a/src/QueryWidget.cs b/src/QueryWidget.cs
index a346061..fd7fc49 100644
--- a/src/QueryWidget.cs
+++ b/src/QueryWidget.cs
@@ -38,7 +38,6 @@ namespace FSpot {
 		Gtk.HBox warning_box;
 		Gtk.Button clear_button;
 		Gtk.Button refresh_button;
-		Gtk.Tooltips tips = new Gtk.Tooltips ();
 
 		public LogicWidget Logic {
 			get { return logic_widget; }
@@ -50,8 +49,6 @@ namespace FSpot {
 			box.Spacing = 6;
 			box.BorderWidth = 2;
 
-			tips.Enable ();
-
 			this.query = query;
 			query.Changed += HandleChanged;
 
@@ -100,15 +97,15 @@ namespace FSpot {
 			clear_button.Add (new Gtk.Image ("gtk-close", Gtk.IconSize.Button));
 			clear_button.Clicked += HandleClearButtonClicked;
 			clear_button.Relief = Gtk.ReliefStyle.None;
+			clear_button.TooltipText = Catalog.GetString("Clear search");
 			box.PackEnd (clear_button, false, false, 0);
-			tips.SetTip (clear_button, Catalog.GetString("Clear search"), null);
 			
 			refresh_button = new Gtk.Button ();
 			refresh_button.Add (new Gtk.Image ("gtk-refresh", Gtk.IconSize.Button));
 			refresh_button.Clicked += HandleRefreshButtonClicked;
 			refresh_button.Relief = Gtk.ReliefStyle.None;
+			refresh_button.TooltipText = Catalog.GetString("Refresh search");
 			box.PackEnd (refresh_button, false, false, 0);
-			tips.SetTip (refresh_button, Catalog.GetString("Refresh search"), null);
 
 			Gtk.Label warning = new Gtk.Label (Catalog.GetString ("No matching photos found"));
 			warning_box.PackStart (warning, false, false, 0);
diff --git a/src/SingleView.cs b/src/SingleView.cs
index d62cfe6..5af506b 100644
--- a/src/SingleView.cs
+++ b/src/SingleView.cs
@@ -52,8 +52,6 @@ namespace FSpot {
 		
 		FullScreenView fsview;
 
-		private static Gtk.Tooltips toolTips = new Gtk.Tooltips ();
-
 		public SingleView (SafeUri [] uris)
 		{
 			string glade_name = "single_view";
@@ -71,24 +69,24 @@ namespace FSpot {
 		
 			rl_button = GtkUtil.ToolButtonFromTheme ("object-rotate-left", Catalog.GetString ("Rotate Left"), true);
 			rl_button.Clicked += HandleRotate270Command;
-			rl_button.SetTooltip (toolTips, Catalog.GetString ("Rotate photo left"), null);
+			rl_button.TooltipText = Catalog.GetString ("Rotate photo left");
 			toolbar.Insert (rl_button, -1);
 
 			rr_button = GtkUtil.ToolButtonFromTheme ("object-rotate-right", Catalog.GetString ("Rotate Right"), true);
 			rr_button.Clicked += HandleRotate90Command;
-			rr_button.SetTooltip (toolTips, Catalog.GetString ("Rotate photo right"), null);
+			rr_button.TooltipText = Catalog.GetString ("Rotate photo right");
 			toolbar.Insert (rr_button, -1);
 
 			toolbar.Insert (new SeparatorToolItem (), -1);
 
 			ToolButton fs_button = GtkUtil.ToolButtonFromTheme ("view-fullscreen", Catalog.GetString ("Fullscreen"), true);
 			fs_button.Clicked += HandleViewFullscreen;
-			fs_button.SetTooltip (toolTips, Catalog.GetString ("View photos fullscreen"), null);
+			fs_button.TooltipText = Catalog.GetString ("View photos fullscreen");
 			toolbar.Insert (fs_button, -1);
 
 			ToolButton ss_button = GtkUtil.ToolButtonFromTheme ("media-playback-start", Catalog.GetString ("Slideshow"), true);
 			ss_button.Clicked += HandleViewSlideshow;
-			ss_button.SetTooltip (toolTips, Catalog.GetString ("View photos in a slideshow"), null);
+			ss_button.TooltipText = Catalog.GetString ("View photos in a slideshow");
 			toolbar.Insert (ss_button, -1);
 
 			collection = new UriCollection (uris);
diff --git a/src/TagQueryWidget.cs b/src/TagQueryWidget.cs
index ba1c10a..a7ccc08 100644
--- a/src/TagQueryWidget.cs
+++ b/src/TagQueryWidget.cs
@@ -209,7 +209,6 @@ namespace FSpot
 	public class LogicWidget : HBox {
 		private PhotoQuery query;
 
-		private static Tooltips tips = new Tooltips ();
 
 		private static Term rootTerm;
 		private EventBox rootAdd;
@@ -249,10 +248,6 @@ namespace FSpot
 			CanFocus = true;
 			Sensitive = true;
 
-			Literal.Tips = tips;
-
-			tips.Enable ();
-
 			Init ();
 
 			tag_store.ItemsChanged += HandleTagChanged;
diff --git a/src/Term.cs b/src/Term.cs
index 64f4fff..7c0174d 100644
--- a/src/Term.cs
+++ b/src/Term.cs
@@ -433,12 +433,6 @@ namespace FSpot {
 			}
 		}
 
-		public static Tooltips Tips {
-			set {
-				tips = value;
-			}
-		}
-
 		public Tag Tag {
 			get {
 				return tag;
@@ -529,7 +523,7 @@ namespace FSpot {
 				Gtk.Drag.DestSet (container, DestDefaults.All, tag_dest_target_table,
 						  DragAction.Copy | DragAction.Move );
 
-				tips.SetTip (container, tag.Name, null);
+				container.TooltipText = tag.Name;
 
 				label.Show ();
 				image.Show ();
@@ -589,11 +583,11 @@ namespace FSpot {
 			normal_icon = null;
 			negated_icon = null;
 			if (IsNegated) {
-				tips.SetTip (widget, String.Format (Catalog.GetString ("Not {0}"), tag.Name), null);
+				widget.TooltipText = String.Format (Catalog.GetString ("Not {0}"), tag.Name);
 				label.Text = "<s>" + System.Web.HttpUtility.HtmlEncode (tag.Name) + "</s>";
 				image.Pixbuf = NegatedIcon;
 			} else {
-				tips.SetTip (widget, tag.Name, null);
+				widget.TooltipText = tag.Name;
 				label.Text = System.Web.HttpUtility.HtmlEncode (tag.Name);
 				image.Pixbuf = NormalIcon;
 			}
@@ -901,7 +895,6 @@ namespace FSpot {
 		private Widget widget;
 		private Pixbuf negated_icon;
 		private static Pixbuf negated_overlay;
-		private static Tooltips tips;
 		private bool isHoveredOver = false;
 
 		public delegate void NegatedToggleHandler (Literal group);
diff --git a/src/UI.Dialog/ImportDialog.cs b/src/UI.Dialog/ImportDialog.cs
index bf58cb1..056dff3 100644
--- a/src/UI.Dialog/ImportDialog.cs
+++ b/src/UI.Dialog/ImportDialog.cs
@@ -101,7 +101,7 @@ namespace FSpot.UI.Dialog
             // Populates the source combo box
             Sources = new TreeStore (typeof(ImportSource), typeof(string), typeof(string), typeof(bool));
             sources_combo.Model = Sources;
-            sources_combo.RowSeparatorFunc = (m, i) => m.GetValue (i, 1) == String.Empty;
+            sources_combo.RowSeparatorFunc = (m, i) => ((string) m.GetValue (i, 1)) == String.Empty;
             var render = new CellRendererPixbuf ();
             sources_combo.PackStart (render, false);
             sources_combo.SetAttributes (render, "icon-name", 2, "sensitive", 3);
diff --git a/src/Widgets/InfoBox.cs b/src/Widgets/InfoBox.cs
index d3042d4..a8084ea 100644
--- a/src/Widgets/InfoBox.cs
+++ b/src/Widgets/InfoBox.cs
@@ -276,7 +276,7 @@ namespace FSpot.Widgets
 			rating_view.Changed += HandleRatingChanged;
 			rating_align.Add (rating_view);
 
-			tag_view = new TagView (MainWindow.ToolTips);
+			tag_view = new TagView ();
 			info_table.Attach (tag_view, 0, 2, 9, 10, AttachOptions.Fill, AttachOptions.Fill, TABLE_XPADDING, TABLE_YPADDING);
 
 			info_table.ShowAll ();
diff --git a/src/Widgets/TagView.cs b/src/Widgets/TagView.cs
index d97f7a9..0c63c24 100644
--- a/src/Widgets/TagView.cs
+++ b/src/Widgets/TagView.cs
@@ -18,7 +18,6 @@ public class TagView : EventBox {
 	private IBrowsableItem photo;
 	private Tag [] tags;
 	private static int TAG_ICON_VSPACING = 5;
-	Tooltips parent_tips = null;
 	
 
 	public TagView ()
@@ -26,11 +25,6 @@ public class TagView : EventBox {
 		VisibleWindow = false;
 	}
 
-	public TagView (Tooltips tips) : this ()
-	{
-		parent_tips = tips;
-	}
-
 	protected TagView (IntPtr raw) : base (raw)
 	{
 		VisibleWindow = false;	
@@ -104,8 +98,8 @@ public class TagView : EventBox {
 						      RgbDither.None, tag_x, tag_y);
 			tag_x += thumbnail_size + TAG_ICON_VSPACING;
 		}
-		if (parent_tips != null)
-			parent_tips.SetTip (this, String.Join (", ", names), null);
+
+        this.TooltipText =  String.Join (", ", names);
 
 		return base.OnExposeEvent (args);
 	}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]