[UFRaw-CVS] ufraw ufraw_icons.c,1.1,1.2 ufraw_preview.c,1.75,1.76

[Udi F. <udi...@us...>]

Update of /cvsroot/ufraw/ufraw
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5578

Modified Files:
	ufraw_icons.c ufraw_preview.c 
Log Message:
Move interpolation options to the WB page.

Make Green adjustment steps larger.


Index: ufraw_icons.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_icons.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ufraw_icons.c	13 Nov 2006 00:30:40 -0000	1.1
--- ufraw_icons.c	25 Feb 2007 19:48:14 -0000	1.2
***************
*** 50,52 ****
--- 50,56 ----
      iconset = gtk_icon_set_new_from_pixbuf(pixbuf);
      gtk_icon_factory_add(factory, "ufraw-restore-hsv", iconset);
+ 
+     pixbuf = gdk_pixbuf_new_from_inline(-1, ufraw_interpolation_24, FALSE, NULL);
+     iconset = gtk_icon_set_new_from_pixbuf(pixbuf);
+     gtk_icon_factory_add(factory, "ufraw-interpolation", iconset);
  }

Index: ufraw_preview.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_preview.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** ufraw_preview.c	28 Jan 2007 21:11:44 -0000	1.75
--- ufraw_preview.c	25 Feb 2007 19:48:14 -0000	1.76
***************
*** 2238,2242 ****
              _("White balance color temperature (K)"));
      data->GreenAdjustment = adjustment_scale(subTable, 0, 2, _("Green"),
!             CFG->green, &CFG->green, 0.2, 2.5, 0.001, 0.005, 3,
              _("Green component"));
      // Spot WB button:
--- 2238,2242 ----
              _("White balance color temperature (K)"));
      data->GreenAdjustment = adjustment_scale(subTable, 0, 2, _("Green"),
!             CFG->green, &CFG->green, 0.2, 2.5, 0.010, 0.050, 3,
              _("Green component"));
      // Spot WB button:
***************
*** 2270,2273 ****
--- 2270,2299 ----
  		G_CALLBACK(adjustment_update), &CFG->chanMul[i]);
      }
+     /* Interpolation is temporeraly in the WB page */
+     table = GTK_TABLE(table_with_frame(page, NULL, TRUE));
+ //    box = GTK_BOX(gtk_hbox_new(FALSE, 6));
+ //    gtk_table_attach(table, GTK_WIDGET(box), 0, 1, 0, 1,
+ //	    GTK_EXPAND|GTK_FILL, 0, 0, 0);
+     event_box = gtk_event_box_new();
+     GtkWidget *icon = gtk_image_new_from_stock("ufraw-interpolation",
+ 	    GTK_ICON_SIZE_LARGE_TOOLBAR);
+     gtk_container_add(GTK_CONTAINER(event_box), icon);
+     gtk_tooltips_set_tip(data->ToolTips, event_box,
+ 	    _("Bayer pattern interpolation"), NULL);
+     gtk_table_attach(table, event_box, 0, 1, 0, 1, 0, 0, 0, 0);
+     combo = GTK_COMBO_BOX(gtk_combo_box_new_text());
+     gtk_combo_box_append_text(combo, _("AHD interpolation"));
+     gtk_combo_box_append_text(combo, _("VNG interpolation"));
+     gtk_combo_box_append_text(combo, _("VNG four color interpolation"));
+     gtk_combo_box_append_text(combo, _("Bilinear interpolation"));
+     if (plugin) {
+         gtk_combo_box_append_text(combo, _("Half-size interpolation"));
+     }
+     gtk_combo_box_set_active(combo, CFG->interpolation);
+     g_signal_connect(G_OBJECT(combo), "changed",
+             G_CALLBACK(combo_update), &CFG->interpolation);
+     gtk_table_attach(table, GTK_WIDGET(combo), 1, 2, 0, 1,
+ 	    GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ //    gtk_box_pack_start(box, GTK_WIDGET(combo), FALSE, FALSE, 0);
      /* End of White Balance setting page */
  
***************
*** 2792,2810 ****
      gtk_box_pack_start(box, GTK_WIDGET(data->ProgressBar), FALSE, FALSE, 0);
  
-     box = GTK_BOX(gtk_hbox_new(FALSE, 6));
-     gtk_box_pack_start(GTK_BOX(vBox), GTK_WIDGET(box), FALSE, FALSE, 6);
-     combo = GTK_COMBO_BOX(gtk_combo_box_new_text());
-     gtk_combo_box_append_text(combo, _("AHD interpolation"));
-     gtk_combo_box_append_text(combo, _("VNG interpolation"));
-     gtk_combo_box_append_text(combo, _("VNG four color interpolation"));
-     gtk_combo_box_append_text(combo, _("Bilinear interpolation"));
-     if (plugin) {
-         gtk_combo_box_append_text(combo, _("Half-size interpolation"));
-     }
-     gtk_combo_box_set_active(combo, CFG->interpolation);
-     g_signal_connect(G_OBJECT(combo), "changed",
-             G_CALLBACK(combo_update), &CFG->interpolation);
-     gtk_box_pack_start(box, GTK_WIDGET(combo), FALSE, FALSE, 0);
- 
      /* Options button */
      align = gtk_alignment_new(0.99, 0.5, 0, 1);
--- 2818,2821 ----