More cosmetic stuff. Getting used to the new tool_options ... ;-)

--Sven
1999-04-20 19:23:38 +00:00
parent 63a37c32fc
commit ff2c915a40
7 changed files with 90 additions and 56 deletions
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+Tue Apr 20 21:18:10 MEST 1999 Sven Neumann <sven@gimp.org>
+
+	* app/blend.c: moved the "Adaptive supersampling" option into
+	the frame
+	* app/transform_tool.c: sensitive setting for the "Grid density"
+
 Tue Apr 20 10:05:07 PDT 1999 Manish Singh <yosh@gimp.org>

 	* app/tools_cmds.c: doh, I'm dumb. s/rotate_invoker/rotate/g
--- a/app/blend.c
+++ b/app/blend.c
@ -277,9 +277,9 @@ blend_options_new ()

  static MenuItem blend_option_items[] =
  {
-    { N_("FG to BG RGB"), 0, 0, blend_mode_callback,
+    { N_("FG to BG (RGB)"), 0, 0, blend_mode_callback,
      (gpointer) FG_BG_RGB_MODE, NULL, NULL },
-    { N_("FG to BG HSV"), 0, 0, blend_mode_callback,
+    { N_("FG to BG (HSV)"), 0, 0, blend_mode_callback,
      (gpointer) FG_BG_HSV_MODE, NULL, NULL },
    { N_("FG to Transparent"), 0, 0, blend_mode_callback,
      (gpointer) FG_TRANS_MODE, NULL, NULL },
@ -472,6 +472,17 @@ blend_options_new ()
  /*  show the table  */
  gtk_widget_show (table);

+  /*  frame for supersampling options  */
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  /* vbox for the supersampling stuff */
+  vbox = gtk_vbox_new (FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
  /*  supersampling toggle  */
  options->supersample_w =
    gtk_check_button_new_with_label (_("Adaptive supersampling"));
@ -483,23 +494,17 @@ blend_options_new ()
  gtk_box_pack_start (GTK_BOX (vbox), options->supersample_w, FALSE, FALSE, 0);
  gtk_widget_show (options->supersample_w);

-  /*  frame for supersampling options  */
-  frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-  gtk_widget_show (frame);
-
-  /*  automatically set the sensitive state of the frame  */
-  gtk_widget_set_sensitive (frame, options->supersample_d);
-  gtk_object_set_data (GTK_OBJECT (options->supersample_w), "set_sensitive",
-		       frame);
-
  /*  table for supersampling options  */
  table = gtk_table_new (2, 2, FALSE);
  gtk_container_set_border_width (GTK_CONTAINER (table), 2);
  gtk_table_set_col_spacing (GTK_TABLE (table), 0, 6);
  gtk_table_set_row_spacings (GTK_TABLE (table), 1);
-  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
+
+  /*  automatically set the sensitive state of the table  */
+  gtk_widget_set_sensitive (table, options->supersample_d);
+  gtk_object_set_data (GTK_OBJECT (options->supersample_w), "set_sensitive",
+		       table);

  /*  max depth scale  */
  label = gtk_label_new (_("Max depth:"));
--- a/app/core/gimpdrawable-blend.c
+++ b/app/core/gimpdrawable-blend.c
@ -277,9 +277,9 @@ blend_options_new ()

  static MenuItem blend_option_items[] =
  {
-    { N_("FG to BG RGB"), 0, 0, blend_mode_callback,
+    { N_("FG to BG (RGB)"), 0, 0, blend_mode_callback,
      (gpointer) FG_BG_RGB_MODE, NULL, NULL },
-    { N_("FG to BG HSV"), 0, 0, blend_mode_callback,
+    { N_("FG to BG (HSV)"), 0, 0, blend_mode_callback,
      (gpointer) FG_BG_HSV_MODE, NULL, NULL },
    { N_("FG to Transparent"), 0, 0, blend_mode_callback,
      (gpointer) FG_TRANS_MODE, NULL, NULL },
@ -472,6 +472,17 @@ blend_options_new ()
  /*  show the table  */
  gtk_widget_show (table);

+  /*  frame for supersampling options  */
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  /* vbox for the supersampling stuff */
+  vbox = gtk_vbox_new (FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
  /*  supersampling toggle  */
  options->supersample_w =
    gtk_check_button_new_with_label (_("Adaptive supersampling"));
@ -483,23 +494,17 @@ blend_options_new ()
  gtk_box_pack_start (GTK_BOX (vbox), options->supersample_w, FALSE, FALSE, 0);
  gtk_widget_show (options->supersample_w);

-  /*  frame for supersampling options  */
-  frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-  gtk_widget_show (frame);
-
-  /*  automatically set the sensitive state of the frame  */
-  gtk_widget_set_sensitive (frame, options->supersample_d);
-  gtk_object_set_data (GTK_OBJECT (options->supersample_w), "set_sensitive",
-		       frame);
-
  /*  table for supersampling options  */
  table = gtk_table_new (2, 2, FALSE);
  gtk_container_set_border_width (GTK_CONTAINER (table), 2);
  gtk_table_set_col_spacing (GTK_TABLE (table), 0, 6);
  gtk_table_set_row_spacings (GTK_TABLE (table), 1);
-  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
+
+  /*  automatically set the sensitive state of the table  */
+  gtk_widget_set_sensitive (table, options->supersample_d);
+  gtk_object_set_data (GTK_OBJECT (options->supersample_w), "set_sensitive",
+		       table);

  /*  max depth scale  */
  label = gtk_label_new (_("Max depth:"));
--- a/app/tools/blend.c
+++ b/app/tools/blend.c
@ -277,9 +277,9 @@ blend_options_new ()

  static MenuItem blend_option_items[] =
  {
-    { N_("FG to BG RGB"), 0, 0, blend_mode_callback,
+    { N_("FG to BG (RGB)"), 0, 0, blend_mode_callback,
      (gpointer) FG_BG_RGB_MODE, NULL, NULL },
-    { N_("FG to BG HSV"), 0, 0, blend_mode_callback,
+    { N_("FG to BG (HSV)"), 0, 0, blend_mode_callback,
      (gpointer) FG_BG_HSV_MODE, NULL, NULL },
    { N_("FG to Transparent"), 0, 0, blend_mode_callback,
      (gpointer) FG_TRANS_MODE, NULL, NULL },
@ -472,6 +472,17 @@ blend_options_new ()
  /*  show the table  */
  gtk_widget_show (table);

+  /*  frame for supersampling options  */
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  /* vbox for the supersampling stuff */
+  vbox = gtk_vbox_new (FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
  /*  supersampling toggle  */
  options->supersample_w =
    gtk_check_button_new_with_label (_("Adaptive supersampling"));
@ -483,23 +494,17 @@ blend_options_new ()
  gtk_box_pack_start (GTK_BOX (vbox), options->supersample_w, FALSE, FALSE, 0);
  gtk_widget_show (options->supersample_w);

-  /*  frame for supersampling options  */
-  frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-  gtk_widget_show (frame);
-
-  /*  automatically set the sensitive state of the frame  */
-  gtk_widget_set_sensitive (frame, options->supersample_d);
-  gtk_object_set_data (GTK_OBJECT (options->supersample_w), "set_sensitive",
-		       frame);
-
  /*  table for supersampling options  */
  table = gtk_table_new (2, 2, FALSE);
  gtk_container_set_border_width (GTK_CONTAINER (table), 2);
  gtk_table_set_col_spacing (GTK_TABLE (table), 0, 6);
  gtk_table_set_row_spacings (GTK_TABLE (table), 1);
-  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
+
+  /*  automatically set the sensitive state of the table  */
+  gtk_widget_set_sensitive (table, options->supersample_d);
+  gtk_object_set_data (GTK_OBJECT (options->supersample_w), "set_sensitive",
+		       table);

  /*  max depth scale  */
  label = gtk_label_new (_("Max depth:"));
--- a/app/tools/gimpblendtool.c
+++ b/app/tools/gimpblendtool.c
@ -277,9 +277,9 @@ blend_options_new ()

  static MenuItem blend_option_items[] =
  {
-    { N_("FG to BG RGB"), 0, 0, blend_mode_callback,
+    { N_("FG to BG (RGB)"), 0, 0, blend_mode_callback,
      (gpointer) FG_BG_RGB_MODE, NULL, NULL },
-    { N_("FG to BG HSV"), 0, 0, blend_mode_callback,
+    { N_("FG to BG (HSV)"), 0, 0, blend_mode_callback,
      (gpointer) FG_BG_HSV_MODE, NULL, NULL },
    { N_("FG to Transparent"), 0, 0, blend_mode_callback,
      (gpointer) FG_TRANS_MODE, NULL, NULL },
@ -472,6 +472,17 @@ blend_options_new ()
  /*  show the table  */
  gtk_widget_show (table);

+  /*  frame for supersampling options  */
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  /* vbox for the supersampling stuff */
+  vbox = gtk_vbox_new (FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (frame), vbox);
+  gtk_widget_show (vbox);
+
  /*  supersampling toggle  */
  options->supersample_w =
    gtk_check_button_new_with_label (_("Adaptive supersampling"));
@ -483,23 +494,17 @@ blend_options_new ()
  gtk_box_pack_start (GTK_BOX (vbox), options->supersample_w, FALSE, FALSE, 0);
  gtk_widget_show (options->supersample_w);

-  /*  frame for supersampling options  */
-  frame = gtk_frame_new (NULL);
-  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-  gtk_widget_show (frame);
-
-  /*  automatically set the sensitive state of the frame  */
-  gtk_widget_set_sensitive (frame, options->supersample_d);
-  gtk_object_set_data (GTK_OBJECT (options->supersample_w), "set_sensitive",
-		       frame);
-
  /*  table for supersampling options  */
  table = gtk_table_new (2, 2, FALSE);
  gtk_container_set_border_width (GTK_CONTAINER (table), 2);
  gtk_table_set_col_spacing (GTK_TABLE (table), 0, 6);
  gtk_table_set_row_spacings (GTK_TABLE (table), 1);
-  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
+
+  /*  automatically set the sensitive state of the table  */
+  gtk_widget_set_sensitive (table, options->supersample_d);
+  gtk_object_set_data (GTK_OBJECT (options->supersample_w), "set_sensitive",
+		       table);

  /*  max depth scale  */
  label = gtk_label_new (_("Max depth:"));
--- a/app/tools/transform_tool.c
+++ b/app/tools/transform_tool.c
@ -290,6 +290,10 @@ transform_options_new (void)
 		      &options->grid_size);
  gtk_box_pack_start (GTK_BOX (hbox), grid_density, FALSE, FALSE, 0);
  gtk_widget_show (grid_density);
+  gtk_widget_set_sensitive (label, options->show_grid_d);
+  gtk_widget_set_sensitive (grid_density, options->show_grid_d);
+  gtk_object_set_data (GTK_OBJECT (options->show_grid_w), "set_sensitive", grid_density);
+  gtk_object_set_data (GTK_OBJECT (grid_density), "set_sensitive", label);  

  /*  the clip resulting image toggle button  */
  options->clip_w = gtk_check_button_new_with_label (_("Clip result"));
--- a/app/transform_tool.c
+++ b/app/transform_tool.c
@ -290,6 +290,10 @@ transform_options_new (void)
 		      &options->grid_size);
  gtk_box_pack_start (GTK_BOX (hbox), grid_density, FALSE, FALSE, 0);
  gtk_widget_show (grid_density);
+  gtk_widget_set_sensitive (label, options->show_grid_d);
+  gtk_widget_set_sensitive (grid_density, options->show_grid_d);
+  gtk_object_set_data (GTK_OBJECT (options->show_grid_w), "set_sensitive", grid_density);
+  gtk_object_set_data (GTK_OBJECT (grid_density), "set_sensitive", label);  

  /*  the clip resulting image toggle button  */
  options->clip_w = gtk_check_button_new_with_label (_("Clip result"));