gnome-scan r487 - in trunk: . modules

[bersace svn gnome org]

Author: bersace
Date: Thu Feb 21 16:01:27 2008
New Revision: 487
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=487&view=rev

Log:
Fix options order.


Modified:
   trunk/ChangeLog
   trunk/modules/gsane-meta-param.c

Modified: trunk/modules/gsane-meta-param.c
==============================================================================
--- trunk/modules/gsane-meta-param.c	(original)
+++ trunk/modules/gsane-meta-param.c	Thu Feb 21 16:01:27 2008
@@ -251,6 +251,29 @@
 	deft.height-= deft.y;
 #undef set_int
 
+	/* note: decomposing area in three options orientation, origin and paper-size
+	 except these optoin to appear in this order. */
+	
+	/* ORIENTATION */
+	pspec = gs_param_spec_page_orientation ("page-orientation", N_("Page Orientation"), N_("Page orientation"),
+											GS_PARAM_GROUP_FORMAT,
+											GTK_PAGE_ORIENTATION_PORTRAIT,
+											G_PARAM_SPEC (mpps->tl_x)->flags);
+	gs_param_spec_set_index (pspec,
+							 gs_param_spec_get_index (G_PARAM_SPEC (mpps->tl_x))+2);
+	g_param_spec_set_qdata (pspec, GSANE_META_PARAM_QUARK, mp);
+	gnome_scan_plugin_params_add (GNOME_SCAN_PLUGIN (mp->gss), pspec);
+	
+	/* ORIG */
+	pspec = gs_param_spec_pointer ("origin", N_("Origin"), N_("Origin of scan window"),
+								   GS_PARAM_GROUP_PREVIEW,
+								   GNOME_TYPE_SCAN_PREVIEW_PLUGIN_AREA,
+								   G_PARAM_SPEC (mpps->tl_x)->flags);
+	gs_param_spec_set_index (pspec,
+							 gs_param_spec_get_index (G_PARAM_SPEC (mpps->tl_x))+1);
+	g_param_spec_set_qdata (pspec, GSANE_META_PARAM_QUARK, mp);
+	gnome_scan_plugin_params_add (GNOME_SCAN_PLUGIN (mp->gss), pspec);
+
 	/* PAPER SIZE */
 	static const gchar*names[] = {
 		GTK_PAPER_NAME_A5,
@@ -313,26 +336,7 @@
 	g_param_spec_set_qdata (pspec, GSANE_META_PARAM_QUARK, mp);
 	gnome_scan_plugin_params_add (GNOME_SCAN_PLUGIN (mp->gss), pspec);
 
-	/* ORIG */
-	pspec = gs_param_spec_pointer ("origin", N_("Origin"), N_("Origin of scan window"),
-								   GS_PARAM_GROUP_PREVIEW,
-								   GNOME_TYPE_SCAN_PREVIEW_PLUGIN_AREA,
-								   G_PARAM_SPEC (mpps->tl_x)->flags);
-	gs_param_spec_set_index (pspec,
-							 gs_param_spec_get_index (G_PARAM_SPEC (mpps->tl_x))+1);
-	g_param_spec_set_qdata (pspec, GSANE_META_PARAM_QUARK, mp);
-	gnome_scan_plugin_params_add (GNOME_SCAN_PLUGIN (mp->gss), pspec);
 
-	/* ORIENTATION */
-	pspec = gs_param_spec_page_orientation ("page-orientation", N_("Page Orientation"), N_("Page orientation"),
-											GS_PARAM_GROUP_FORMAT,
-											GTK_PAGE_ORIENTATION_PORTRAIT,
-											G_PARAM_SPEC (mpps->tl_x)->flags);
-	gs_param_spec_set_index (pspec,
-							 gs_param_spec_get_index (G_PARAM_SPEC (mpps->tl_x))+2);
-	g_param_spec_set_qdata (pspec, GSANE_META_PARAM_QUARK, mp);
-	gnome_scan_plugin_params_add (GNOME_SCAN_PLUGIN (mp->gss), pspec);
-	
 	return TRUE;
 }
 
@@ -397,7 +401,7 @@
 		}
 			
 		set_opt(br_x, x+w);
-		set_opt(br_y, x+h);
+		set_opt(br_y, y+h);
 	}
 	else if (g_str_equal (name, "origin")) {
 		mpps->origin = g_value_get_pointer (value);