applied gimp-kc-980707-1 from Kevin Cozens <kcozens@interlog.com>

Mon Jul 13 19:07:43 EDT 1998  Adrian Likins <adrian@gimp.org>

        * app/drawable.c app/commands.c app/gimpimage.h
          app/layers_dialog.c: applied gimp-kc-980707-1 from
          Kevin Cozens <kcozens@interlog.com>

        * Dialog boxes for creating a new image or a new layer now include
          as a fill type option.

-adrian

ChangeLog

@@ -1,3 +1,12 @@
+Mon Jul 13 19:07:43 EDT 1998  Adrian Likins <adrian@gimp.org>
+
+	* app/drawable.c app/commands.c app/gimpimage.h
+          app/layers_dialog.c: applied gimp-kc-980707-1 from
+	  Kevin Cozens <kcozens@interlog.com>
+
+	* Dialog boxes for creating a new image or a new layer now include
+          as a fill type option.
+
 Mon Jul 13 18:08:35 EDT 1998 Adrian Likins <adrian@gimp.org>
 
 	* plug-ins/script-fu/scripts/3dTruchet.scm

app/actions/help-commands.c

@@ -22,6 +22,7 @@
 #include "about_dialog.h"
 #include "actionarea.h"
 #include "app_procs.h"
+#include "batch_convert.h"
 #include "brightness_contrast.h"
 #include "gimpbrushlist.h"
 #include "by_color_select.h"
@@ -96,6 +97,8 @@ extern int    gimage_mask_grow_pixels;
 extern int    gimage_mask_shrink_pixels;
 
 
+
+
 void
 file_open_cmd_callback (GtkWidget *widget,
 			gpointer   client_data)

app/commands.c

@@ -22,6 +22,7 @@
 #include "about_dialog.h"
 #include "actionarea.h"
 #include "app_procs.h"
+#include "batch_convert.h"
 #include "brightness_contrast.h"
 #include "gimpbrushlist.h"
 #include "by_color_select.h"
@@ -96,6 +97,8 @@ extern int    gimage_mask_grow_pixels;
 extern int    gimage_mask_shrink_pixels;
 
 
+
+
 void
 file_open_cmd_callback (GtkWidget *widget,
 			gpointer   client_data)

app/gui/commands.c

@@ -22,6 +22,7 @@
 #include "about_dialog.h"
 #include "actionarea.h"
 #include "app_procs.h"
+#include "batch_convert.h"
 #include "brightness_contrast.h"
 #include "gimpbrushlist.h"
 #include "by_color_select.h"
@@ -96,6 +97,8 @@ extern int    gimage_mask_grow_pixels;
 extern int    gimage_mask_shrink_pixels;
 
 
+
+
 void
 file_open_cmd_callback (GtkWidget *widget,
 			gpointer   client_data)

app/gui/help-commands.c

@@ -22,6 +22,7 @@
 #include "about_dialog.h"
 #include "actionarea.h"
 #include "app_procs.h"
+#include "batch_convert.h"
 #include "brightness_contrast.h"
 #include "gimpbrushlist.h"
 #include "by_color_select.h"
@@ -96,6 +97,8 @@ extern int    gimage_mask_grow_pixels;
 extern int    gimage_mask_shrink_pixels;
 
 
+
+
 void
 file_open_cmd_callback (GtkWidget *widget,
 			gpointer   client_data)

app/gui/layers-dialog.c

@@ -3010,6 +3010,17 @@ new_layer_background_callback (GtkWidget *w,
   options->fill_type = BACKGROUND_FILL;
 }
 
+
+static void
+new_layer_foreground_callback (GtkWidget *w,
+			       gpointer   client_data)
+{
+  NewLayerOptions *options;
+
+  options = (NewLayerOptions *) client_data;
+  options->fill_type = FOREGROUND_FILL;
+}
+
 static void
 new_layer_white_callback (GtkWidget *w,
 			  gpointer   client_data)
@@ -3048,17 +3059,19 @@ layers_dialog_new_layer_query (GimpImage* gimage)
   GSList *group = NULL;
   int i;
   char size[12];
-  char *button_names[3] =
+  char *button_names[4] =
   {
     "Background",
     "White",
-    "Transparent"
+    "Transparent",
+    "Foreground"
   };
-  ActionCallback button_callbacks[3] =
+  ActionCallback button_callbacks[4] =
   {
     new_layer_background_callback,
     new_layer_white_callback,
-    new_layer_transparent_callback
+    new_layer_transparent_callback,
+    new_layer_foreground_callback
   };
 
   /*  the new options structure  */
@@ -3137,7 +3150,7 @@ layers_dialog_new_layer_query (GimpImage* gimage)
   gtk_container_add (GTK_CONTAINER (radio_frame), radio_box);
 
   /*  the radio buttons  */
-  for (i = 0; i < 3; i++)
+  for (i = 0; i < 4; i++)
     {
       radio_button = gtk_radio_button_new_with_label (group, button_names[i]);
       group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio_button));

app/layers_dialog.c

@@ -3010,6 +3010,17 @@ new_layer_background_callback (GtkWidget *w,
   options->fill_type = BACKGROUND_FILL;
 }
 
+
+static void
+new_layer_foreground_callback (GtkWidget *w,
+			       gpointer   client_data)
+{
+  NewLayerOptions *options;
+
+  options = (NewLayerOptions *) client_data;
+  options->fill_type = FOREGROUND_FILL;
+}
+
 static void
 new_layer_white_callback (GtkWidget *w,
 			  gpointer   client_data)
@@ -3048,17 +3059,19 @@ layers_dialog_new_layer_query (GimpImage* gimage)
   GSList *group = NULL;
   int i;
   char size[12];
-  char *button_names[3] =
+  char *button_names[4] =
   {
     "Background",
     "White",
-    "Transparent"
+    "Transparent",
+    "Foreground"
   };
-  ActionCallback button_callbacks[3] =
+  ActionCallback button_callbacks[4] =
   {
     new_layer_background_callback,
     new_layer_white_callback,
-    new_layer_transparent_callback
+    new_layer_transparent_callback,
+    new_layer_foreground_callback
   };
 
   /*  the new options structure  */
@@ -3137,7 +3150,7 @@ layers_dialog_new_layer_query (GimpImage* gimage)
   gtk_container_add (GTK_CONTAINER (radio_frame), radio_box);
 
   /*  the radio buttons  */
-  for (i = 0; i < 3; i++)
+  for (i = 0; i < 4; i++)
     {
       radio_button = gtk_radio_button_new_with_label (group, button_names[i]);
       group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio_button));