--- saturate.c 2011-05-06 12:10:17.000000000 +0200
+++ saturate_p.c 2011-05-08 05:44:41.659615352 +0200
@@ -281,13 +281,15 @@ static gboolean
sat_dialog (GimpDrawable *drawable)
{
GtkWidget *dialog;
- GtkWidget *main_vbox;
+ GtkWidget *main_box;
+ GtkWidget *vbox1;
+ GtkWidget *vbox2;
GtkWidget *sat_hbox;
GtkWidget *br_hbox,*tmpr_hbox,*formula_hbox;
GtkWidget *preview;
GtkWidget *combo;
GtkWidget *frame,*frame2,*frame3,*frame4;
- GtkWidget *alignment,*alignment2,*alignment3,*alignment4;
+ GtkWidget *alignment,*alignment2,*alignment3,*alignment4,*alignment_vb1,*alignment_vb2;
GtkWidget *slider0,*slider,*slider2,*slider3,*slider4,*slider5,*spin_dark, *spin_light,*slider_tmpr;
GtkObject *slider0_adj,*slider_adj,*slider2_adj,*slider3_adj,*slider4_adj,*slider5_adj; //?
GtkObject *spin_dark_adj, *spin_light_adj, *slider_tmpr_adj;
@@ -308,17 +310,27 @@ sat_dialog (GimpDrawable *drawable)
NULL);
- main_vbox = gtk_vbox_new (FALSE, 6);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
- gtk_widget_show (main_vbox);
+ main_box = gtk_hbox_new (FALSE, 6);
+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_box);
+ gtk_widget_show (main_box);
+
+ alignment_vb1 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alignment_vb1);
+ gtk_container_add (GTK_CONTAINER (main_box), alignment_vb1);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment_vb1), 6, 6, 6, 6);
+
+ vbox1 = gtk_vbox_new (FALSE, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox1), 3);
+ gtk_widget_show (vbox1);
+ gtk_container_add (GTK_CONTAINER (alignment_vb1), vbox1);
preview = gimp_drawable_preview_new (drawable, &satvals.preview);
- gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), preview, TRUE, TRUE, 0);
gtk_widget_show (preview);
//saturation hbox
frame = gimp_frame_new ("Saturation");
- gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
@@ -332,9 +344,19 @@ sat_dialog (GimpDrawable *drawable)
gtk_widget_show (sat_hbox);
gtk_container_add (GTK_CONTAINER (alignment), sat_hbox);
+ alignment_vb2 = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_widget_show (alignment_vb2);
+ gtk_container_add (GTK_CONTAINER (main_box), alignment_vb2);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment_vb2), 6, 6, 6, 6);
+
+ vbox2 = gtk_vbox_new (TRUE, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), 3);
+ gtk_widget_show (vbox2);
+ gtk_container_add (GTK_CONTAINER (alignment_vb2), vbox2);
+
//brightness hbox
frame2 = gimp_frame_new ("Brightness");
- gtk_box_pack_start (GTK_BOX (main_vbox), frame2, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), frame2, FALSE, FALSE, 0);
gtk_widget_show (frame2);
alignment2 = gtk_alignment_new (0.5, 0.5, 1, 1);
@@ -353,7 +375,7 @@ sat_dialog (GimpDrawable *drawable)
//color temperature hbox
frame3 = gimp_frame_new ("Temperature");
- gtk_box_pack_start (GTK_BOX (main_vbox), frame3, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), frame3, FALSE, FALSE, 0);
gtk_widget_show (frame3);
alignment3 = gtk_alignment_new (0.5, 0.5, 1, 1);
@@ -465,7 +487,7 @@ sat_dialog (GimpDrawable *drawable)
//brightness_formula_hbox
frame4 = gimp_frame_new (" Brightness formula:");
- gtk_box_pack_start (GTK_BOX (main_vbox), frame4, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), frame4, FALSE, FALSE, 0);
gtk_widget_show (frame4);