gnome-scan r739 - in trunk: . modules/gsane

[bersace svn gnome org]

Author: bersace
Date: Tue Dec 23 22:17:44 2008
New Revision: 739
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=739&view=rev

Log:
Parametize option hint.

Modified:
   trunk/ChangeLog
   trunk/modules/gsane/gsane-option-handler-generic.c
   trunk/modules/gsane/gsane-option-handler-generic.h

Modified: trunk/modules/gsane/gsane-option-handler-generic.c
==============================================================================
--- trunk/modules/gsane/gsane-option-handler-generic.c	(original)
+++ trunk/modules/gsane/gsane-option-handler-generic.c	Tue Dec 23 22:17:44 2008
@@ -129,7 +129,8 @@
 {
 	GSaneOptionHandlerGeneric* self = GSANE_OPTION_HANDLER_GENERIC(handler);
 	gboolean value = gsane_option_handler_get_bool(handler, desc, n, NULL);
-	self->priv->option = GNOME_SCAN_OPTION(gnome_scan_option_bool_new(desc->name, S_(desc->title), S_(desc->desc), group, SANE_GETTEXT_PACKAGE, value, GNOME_SCAN_OPTION_HINT_SECONDARY));
+	self->priv->option = GNOME_SCAN_OPTION(gnome_scan_option_bool_new(desc->name, S_(desc->title), S_(desc->desc), group, SANE_GETTEXT_PACKAGE, value,
+									  GSANE_OPTION_HANDLER_GENERIC_GET_CLASS(handler)->option_hint));
 	self->priv->get_value = gsane_option_handler_generic_bool_get_value;
 	g_signal_connect_swapped(self->priv->option, "notify::value", G_CALLBACK(gsane_option_handler_generic_bool_option_value_changed), self);
 	g_debug("\toption %d : boolean %s = %s", n, desc->name, GSANE_BOOLEAN_TO_STRING(value));
@@ -154,7 +155,8 @@
 	}
 	self->priv->option = GNOME_SCAN_OPTION(gnome_scan_option_int_new(desc->name, S_(desc->title), S_(desc->desc), group, SANE_GETTEXT_PACKAGE,
 									 value, min, step, max,
-									 gsane_option_unit(desc), GNOME_SCAN_OPTION_HINT_SECONDARY));
+									 gsane_option_unit(desc),
+									 GSANE_OPTION_HANDLER_GENERIC_GET_CLASS(handler)->option_hint));
 	self->priv->get_value = gsane_option_handler_generic_int_get_value;
 	g_signal_connect_swapped(self->priv->option, "notify::value", G_CALLBACK(gsane_option_handler_generic_int_option_value_changed), self);
 	g_debug("\toption %d : int %s = %d, range = [%d;%d;%d]", n, desc->name, value, min, step, max);
@@ -178,8 +180,9 @@
 		max = G_MAXDOUBLE;
 	}
 	self->priv->option = GNOME_SCAN_OPTION(gnome_scan_option_double_new(desc->name, S_(desc->title), S_(desc->desc), group, SANE_GETTEXT_PACKAGE,
-									 value, min, step, max,
-									 gsane_option_unit(desc), GNOME_SCAN_OPTION_HINT_SECONDARY));
+									    value, min, step, max,
+									    gsane_option_unit(desc),
+									    GSANE_OPTION_HANDLER_GENERIC_GET_CLASS(handler)->option_hint));
 	self->priv->get_value = gsane_option_handler_generic_double_get_value;
 	g_signal_connect_swapped(self->priv->option, "notify::value", G_CALLBACK(gsane_option_handler_generic_double_option_value_changed), self);
 	g_debug("\toption %d : double %s = %.2g, range = [%.2e;%.2e;%.2e]", n, desc->name, value, min, step, max);
@@ -191,7 +194,8 @@
 	GSaneOptionHandlerGeneric* self = GSANE_OPTION_HANDLER_GENERIC(handler);
 	gchar* value = gsane_option_handler_get_string(handler, desc, n, NULL);
 	self->priv->option = GNOME_SCAN_OPTION(gnome_scan_option_string_new(desc->name, S_(desc->title), S_(desc->desc), group, SANE_GETTEXT_PACKAGE,
-									    value, GNOME_SCAN_OPTION_HINT_SECONDARY));
+									    value,
+									    GSANE_OPTION_HANDLER_GENERIC_GET_CLASS(handler)->option_hint));
 	self->priv->get_value = gsane_option_handler_generic_string_get_value;
 	g_signal_connect_swapped(self->priv->option, "notify::value", G_CALLBACK(gsane_option_handler_generic_string_option_value_changed), self);
 	g_debug("\toption  %d : string %s = \"%s\"", n, desc->name, value);
@@ -268,7 +272,10 @@
 
 	default_value = gsane_option_handler_get_enum(handler, desc, n, values, NULL);
 	self->priv->option = GNOME_SCAN_OPTION(gnome_scan_option_enum_new(desc->name, S_(desc->title), S_(desc->desc), group, SANE_GETTEXT_PACKAGE,
-									  default_value, values, GNOME_SCAN_OPTION_HINT_SECONDARY));
+									  default_value, values,
+									  GSANE_OPTION_HANDLER_GENERIC_GET_CLASS(self)->option_hint));
+	g_debug("%s is %s",
+		desc->name, gnome_scan_enum_get_nick(GNOME_SCAN_TYPE_OPTION_HINT, GSANE_OPTION_HANDLER_GENERIC_GET_CLASS(self)->option_hint));
 	self->priv->get_value = gsane_option_handler_generic_enum_get_value;
 	g_signal_connect_swapped(self->priv->option, "changed", G_CALLBACK(gsane_option_handler_generic_enum_option_changed), self);
 }
@@ -325,7 +332,9 @@
 {
 	gsane_option_handler_generic_parent_class = g_type_class_peek_parent(g_class);
 	g_type_class_add_private(g_class, sizeof(GSaneOptionHandlerGenericPrivate));
-	GSaneOptionHandlerClass* oh_class = GSANE_OPTION_HANDLER_CLASS(g_class);
+	GSaneOptionHandlerGenericClass *klass = g_class;
+	klass->option_hint		= GNOME_SCAN_OPTION_HINT_SECONDARY;
+	GSaneOptionHandlerClass* oh_class = g_class;
 	oh_class->handle_option 	= gsane_option_handler_generic_handle_option;
 	oh_class->reload_options	= gsane_option_handler_generic_reload_options;
 }

Modified: trunk/modules/gsane/gsane-option-handler-generic.h
==============================================================================
--- trunk/modules/gsane/gsane-option-handler-generic.h	(original)
+++ trunk/modules/gsane/gsane-option-handler-generic.h	Tue Dec 23 22:17:44 2008
@@ -26,8 +26,10 @@
 
 G_BEGIN_DECLS
 
-#define	GSANE_TYPE_OPTION_HANDLER_GENERIC	(gsane_option_handler_generic_get_type())
-#define	GSANE_OPTION_HANDLER_GENERIC(o)		(G_TYPE_CHECK_INSTANCE_CAST((o), GSANE_TYPE_OPTION_HANDLER_GENERIC, GSaneOptionHandlerGeneric))
+#define	GSANE_TYPE_OPTION_HANDLER_GENERIC		(gsane_option_handler_generic_get_type())
+#define	GSANE_OPTION_HANDLER_GENERIC(o)			(G_TYPE_CHECK_INSTANCE_CAST((o), GSANE_TYPE_OPTION_HANDLER_GENERIC, GSaneOptionHandlerGeneric))
+#define GSANE_OPTION_HANDLER_GENERIC_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST((k), GSANE_TYPE_OPTION_HANDLER_GENERIC, GSaneOptionHandlerGenericClass))
+#define	GSANE_OPTION_HANDLER_GENERIC_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS((o), GSANE_TYPE_OPTION_HANDLER_GENERIC, GSaneOptionHandlerGenericClass))
 
 typedef struct _GSaneOptionHandlerGenericClass GSaneOptionHandlerGenericClass;
 typedef struct _GSaneOptionHandlerGeneric GSaneOptionHandlerGeneric;
@@ -42,6 +44,7 @@
 struct _GSaneOptionHandlerGenericClass
 {
 	GSaneOptionHandlerClass parent_class;
+	GnomeScanOptionHint option_hint;
 };
 
 GType gsane_option_handler_generic_get_type(void) G_GNUC_CONST;