gtk+ r20730 - in trunk: . demos/gtk-demo gtk

[kristian svn gnome org]

Author: kristian
Date: Wed Jul  2 09:32:14 2008
New Revision: 20730
URL: http://svn.gnome.org/viewvc/gtk+?rev=20730&view=rev

Log:
2008-07-02  Kristian Rietveld  <kris imendio com>

	Bug 455268 - Add gtk-enable-tooltips GtkSetting

	* gtk/gtk.symbols:
	* gtk/gtktoolbar.[ch] (gtk_toolbar_[gs]et_tooltips): deprecated.

	* gtk/gtksettings.c: introduce gtk-enable-tooltips XSetting.

	* gtk/gtktooltip.c (_gtk_tooltip_handle_event): take the newly
	introduced XSetting into account.

	* demos/gtk-demo/appwindow.c: don't use the now deprecated
	gtk_toolbar_set_tooltips().



Modified:
   trunk/ChangeLog
   trunk/demos/gtk-demo/appwindow.c
   trunk/gtk/gtk.symbols
   trunk/gtk/gtksettings.c
   trunk/gtk/gtktoolbar.c
   trunk/gtk/gtktoolbar.h
   trunk/gtk/gtktooltip.c

Modified: trunk/demos/gtk-demo/appwindow.c
==============================================================================
--- trunk/demos/gtk-demo/appwindow.c	(original)
+++ trunk/demos/gtk-demo/appwindow.c	Wed Jul  2 09:32:14 2008
@@ -509,7 +509,6 @@
                         0,                         0);
 
       bar = gtk_ui_manager_get_widget (merge, "/ToolBar");
-      gtk_toolbar_set_tooltips (GTK_TOOLBAR (bar), TRUE);
       gtk_widget_show (bar);
       gtk_table_attach (GTK_TABLE (table),
 			bar, 

Modified: trunk/gtk/gtk.symbols
==============================================================================
--- trunk/gtk/gtk.symbols	(original)
+++ trunk/gtk/gtk.symbols	Wed Jul  2 09:32:14 2008
@@ -4028,7 +4028,9 @@
 gtk_toolbar_get_relief_style
 gtk_toolbar_get_show_arrow
 gtk_toolbar_get_style
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_toolbar_get_tooltips
+#endif
 gtk_toolbar_get_type G_GNUC_CONST
 gtk_toolbar_insert
 gtk_toolbar_new
@@ -4036,7 +4038,9 @@
 gtk_toolbar_set_orientation
 gtk_toolbar_set_show_arrow
 gtk_toolbar_set_style
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_toolbar_set_tooltips
+#endif
 gtk_toolbar_unset_style
 #endif
 #endif

Modified: trunk/gtk/gtksettings.c
==============================================================================
--- trunk/gtk/gtksettings.c	(original)
+++ trunk/gtk/gtksettings.c	Wed Jul  2 09:32:14 2008
@@ -115,7 +115,8 @@
   PROP_FONTCONFIG_TIMESTAMP,
   PROP_SOUND_THEME_NAME,
   PROP_ENABLE_INPUT_FEEDBACK_SOUNDS,
-  PROP_ENABLE_EVENT_SOUNDS
+  PROP_ENABLE_EVENT_SOUNDS,
+  PROP_ENABLE_TOOLTIPS
 };
 
 
@@ -859,7 +860,7 @@
 					     NULL);
   
   g_assert (result == PROP_FONTCONFIG_TIMESTAMP);
-  
+
   /**
    * GtkSettings:gtk-sound-theme-name:
    *
@@ -925,6 +926,22 @@
 								   GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_ENABLE_EVENT_SOUNDS);
+
+  /**
+   * GtkSettings:gtk-enable-tooltips:
+   *
+   * Whether tooltips should be shown on widgets.
+   *
+   * Since: 2.14
+   */
+  result = settings_install_property_parser (class,
+                                             g_param_spec_boolean ("gtk-enable-tooltips",
+                                                                   P_("Enable Tooltips"),
+                                                                   P_("Whether tooltips should be shown on widgets"),
+                                                                   TRUE,
+                                                                   GTK_PARAM_READWRITE),
+                                             NULL);
+  g_assert (result == PROP_ENABLE_TOOLTIPS);
 }
 
 static void

Modified: trunk/gtk/gtktoolbar.c
==============================================================================
--- trunk/gtk/gtktoolbar.c	(original)
+++ trunk/gtk/gtktoolbar.c	Wed Jul  2 09:32:14 2008
@@ -2933,6 +2933,9 @@
  * @enable: set to %FALSE to disable the tooltips, or %TRUE to enable them.
  * 
  * Sets if the tooltips of a toolbar should be active or not.
+ *
+ * Deprecated: 2.14: The toolkit-wide #GtkSettings:gtk-enable-tooltips property
+ * is now used instead.
  **/
 void
 gtk_toolbar_set_tooltips (GtkToolbar *toolbar,
@@ -2956,6 +2959,9 @@
  * gtk_toolbar_set_tooltips().
  *
  * Return value: %TRUE if tooltips are enabled
+ *
+ * Deprecated: 2.14: The toolkit-wide #GtkSettings:gtk-enable-tooltips property
+ * is now used instead.
  **/
 gboolean
 gtk_toolbar_get_tooltips (GtkToolbar *toolbar)

Modified: trunk/gtk/gtktoolbar.h
==============================================================================
--- trunk/gtk/gtktoolbar.h	(original)
+++ trunk/gtk/gtktoolbar.h	Wed Jul  2 09:32:14 2008
@@ -155,9 +155,11 @@
 GtkOrientation  gtk_toolbar_get_orientation         (GtkToolbar      *toolbar);
 void            gtk_toolbar_set_orientation         (GtkToolbar      *toolbar,
 						     GtkOrientation   orientation);
+#ifndef GTK_DISABLE_DEPRECATED
 gboolean        gtk_toolbar_get_tooltips            (GtkToolbar      *toolbar);
 void            gtk_toolbar_set_tooltips            (GtkToolbar      *toolbar,
 						     gboolean         enable);
+#endif /* GTK_DISABLE_DEPRECATED */
 GtkToolbarStyle gtk_toolbar_get_style               (GtkToolbar      *toolbar);
 void            gtk_toolbar_set_style               (GtkToolbar      *toolbar,
 						     GtkToolbarStyle  style);

Modified: trunk/gtk/gtktooltip.c
==============================================================================
--- trunk/gtk/gtktooltip.c	(original)
+++ trunk/gtk/gtktooltip.c	Wed Jul  2 09:32:14 2008
@@ -1201,24 +1201,35 @@
     gtk_tooltip_hide_tooltip (tooltip);
 }
 
+static gboolean
+tooltips_enabled (GdkWindow *window)
+{
+  gboolean enabled;
+  gboolean touchscreen;
+  GdkScreen *screen;
+  GtkSettings *settings;
+
+  screen = gdk_drawable_get_screen (window);
+  settings = gtk_settings_get_for_screen (screen);
+
+  g_object_get (settings,
+		"gtk-touchscreen-mode", &touchscreen,
+		"gtk-enable-tooltips", &enabled,
+		NULL);
+
+  return (!touchscreen && enabled);
+}
+
 void
 _gtk_tooltip_handle_event (GdkEvent *event)
 {
   gint x, y;
   gboolean return_value = FALSE;
-  gboolean touchscreen;
   GtkWidget *has_tooltip_widget = NULL;
-  GdkScreen *screen;
   GdkDisplay *display;
   GtkTooltip *current_tooltip;
-  GtkSettings *settings;
-
-  /* Disable tooltips in touchscreen mode */
-  screen = gdk_drawable_get_screen (event->any.window);
-  settings = gtk_settings_get_for_screen (screen);
-  g_object_get (settings, "gtk-touchscreen-mode", &touchscreen, NULL);
 
-  if (touchscreen)
+  if (!tooltips_enabled (event->any.window))
     return;
 
   /* Returns coordinates relative to has_tooltip_widget's allocation. */