gnome-scan r546 - in trunk: . lib src

[bersace svn gnome org]

Author: bersace
Date: Wed Feb 27 22:51:30 2008
New Revision: 546
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=546&view=rev

Log:
Update tooltip to GTK+ 2.12 tooltip API.


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/THANKS
   trunk/configure.ac
   trunk/lib/gnome-scan-dialog.c
   trunk/src/flegita-sink.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Wed Feb 27 22:51:30 2008
@@ -6,6 +6,15 @@
 Gnome Scan aim to provide a sane scan infrastructure. Flegita provide
 app and plugin on top of Gnome Scan for the desktop.
 
+Changes in version 0.5.94
+=========================
+
+ * Migrate to new GTK+ tooltip API. Depens on GTK+ 2.12
+
+ * Added blurb for PNG compression level option in flegita.
+
+ * Translate application name in about flegita dialog.
+
 Changes in version 0.5.93
 =========================
 

Modified: trunk/THANKS
==============================================================================
--- trunk/THANKS	(original)
+++ trunk/THANKS	Wed Feb 27 22:51:30 2008
@@ -5,7 +5,7 @@
 
  * Philip Sadleder, the earliest gnome-scan tester and translator.
  * Donald Straney, for his work on imcapd.
- * Olaf Leidinger, for his disable-gnome patch.
+ * Olaf Leidinger, for his disable-gnome patch (0.4 series).
 
 Very huge thanks to early translators :
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Feb 27 22:51:30 2008
@@ -60,7 +60,7 @@
 AC_SUBST(API_VERSION)
 
 
-PKG_CHECK_MODULES(GNOME_SCAN, [gmodule-2.0 gthread-2.0 glib-2.0 gdk-2.0 >= 2.11 gdk-pixbuf-2.0 gtk+-2.0 gegl >= 0.0.16 gconf-2.0 ])
+PKG_CHECK_MODULES(GNOME_SCAN, [gmodule-2.0 gthread-2.0 glib-2.0 gdk-2.0 >= 2.11 gdk-pixbuf-2.0 gtk+-2.0 >= 2.12 gegl >= 0.0.16 gconf-2.0 ])
 AC_SUBST(GNOME_SCAN_CFLAGS)
 AC_SUBST(GNOME_SCAN_LIBS)
 

Modified: trunk/lib/gnome-scan-dialog.c
==============================================================================
--- trunk/lib/gnome-scan-dialog.c	(original)
+++ trunk/lib/gnome-scan-dialog.c	Wed Feb 27 22:51:30 2008
@@ -82,7 +82,6 @@
 	gboolean		run;
 	
 	/* 	Widgets  */
-	GtkTooltips*		tooltips;
 	GtkWidget*		notebook;
 	
 	/* General */
@@ -256,9 +255,6 @@
 						   GS_STOCK_SCAN,
 						   GTK_RESPONSE_APPLY);
 	
-	priv->tooltips = gtk_tooltips_new();
-	gtk_tooltips_enable (priv->tooltips);
-	
 	/* 	Notebook  */
 	priv->notebook = gtk_notebook_new ();
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (widget)->vbox), priv->notebook,
@@ -632,18 +628,9 @@
 		shows_label = gnome_scan_param_widget_shows_label (GNOME_SCAN_PARAM_WIDGET (widget));
 		box_expands = box_expands || expands;
 		
-		/* if widget does not have it's own GdkWindow, pack it in a GtkEventBox
-		 in order to enable tooltips */
-		if (GTK_WIDGET_NO_WINDOW (widget)) {
-			eventbox = gtk_event_box_new ();
-			gtk_container_add (GTK_CONTAINER (eventbox), widget);
-			widget = eventbox;
-		}
-		
-		gtk_tooltips_set_tip (priv->tooltips, widget,
-							  dgettext (gs_param_spec_get_domain (node->data),
-										g_param_spec_get_blurb (node->data)),
-							  NULL);
+		gtk_widget_set_tooltip_text (widget,
+									 dgettext (gs_param_spec_get_domain (node->data),
+											   g_param_spec_get_blurb (node->data)));
 		
 		gtk_widget_set_no_show_all (widget, FALSE);
 		gsd_add_to_box_show (group_box, 1);
@@ -667,15 +654,9 @@
 															  g_param_spec_get_nick (node->data))));
 			gtk_misc_set_alignment (GTK_MISC (label), 0., .5);
 			
-			/* pack label in an eventbox */
-			eventbox = gtk_event_box_new ();
-			gtk_container_add (GTK_CONTAINER (eventbox), label);
-			label = eventbox; /* substitute eventbox to label in the following code */
-			
-			gtk_tooltips_set_tip (priv->tooltips, label,
-								  dgettext (gs_param_spec_get_domain (node->data),
-											g_param_spec_get_blurb (node->data)),
-								  NULL);
+			gtk_widget_set_tooltip_text (label,
+										 dgettext (gs_param_spec_get_domain (node->data),
+												   g_param_spec_get_blurb (node->data)));
 			gtk_table_attach (GTK_TABLE (table), label,
 							  0, 1,
 							  count, count+1,

Modified: trunk/src/flegita-sink.c
==============================================================================
--- trunk/src/flegita-sink.c	(original)
+++ trunk/src/flegita-sink.c	Wed Feb 27 22:51:30 2008
@@ -144,7 +144,8 @@
 #undef flegita_g_value_new_int
 	
   pspec = priv->png_compression_spec = 
-    gs_param_spec_range("png-compression-level", N_("PNG Compression Level"), NULL,
+    gs_param_spec_range("png-compression-level", N_("PNG Compression Level"),
+						N_("Higher level mean lower file size, but take more time to save"),
 			FLEGITA_PARAM_GROUP_PNG_OPTIONS,
 			min, max, step, val, G_PARAM_WRITABLE);
   gs_param_spec_set_domain (pspec, GETTEXT_PACKAGE);