fixed the order of the fill-mode radio buttons in 'new image' and 'new layer'

dialogs - Foreground and Background modes are now besides each other which
makes more sense.

Tigert

ChangeLog

@@ -1,3 +1,10 @@
+1998-07-28  Tuomas Kuosmanen  <tigert@gimp.org>
+
+	* app/file_new_dialog.c
+	* app/layers_dialog.c: change the order of the different 
+	fill-types (Foreground and Background are nicer to sit besides
+	each other)
+
 Tue Jul 28 19:46:53 BST 1998  Adam D. Moss <adam@gimp.org>
 
 	* plug-ins/gee/gee.c

app/dialogs/image-new-dialog.c

@@ -709,7 +709,18 @@ file_new_cmd_callback (GtkWidget           *widget,
   gtk_container_add (GTK_CONTAINER (frame), radio_box);
   gtk_widget_show (radio_box);
 
-  button = gtk_radio_button_new_with_label (NULL, "Background");
+  button = gtk_radio_button_new_with_label (NULL, "Foreground");
+  group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
+  gtk_box_pack_start (GTK_BOX (radio_box), button, TRUE, TRUE, 0);
+  gtk_object_set_user_data (GTK_OBJECT (button), (gpointer) FOREGROUND_FILL);
+  gtk_signal_connect (GTK_OBJECT (button), "toggled",
+		      (GtkSignalFunc) file_new_toggle_callback,
+		      &vals->fill_type);
+  if (vals->fill_type == FOREGROUND_FILL)
+    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
+  gtk_widget_show (button);
+
+  button = gtk_radio_button_new_with_label (group, "Background");
   group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
   gtk_box_pack_start (GTK_BOX (radio_box), button, TRUE, TRUE, 0);
   gtk_object_set_user_data (GTK_OBJECT (button), (gpointer) BACKGROUND_FILL);
@@ -742,19 +753,6 @@ file_new_cmd_callback (GtkWidget           *widget,
     gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
   gtk_widget_show (button);
 
-  button = gtk_radio_button_new_with_label (group, "Foreground");
-  group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
-  gtk_box_pack_start (GTK_BOX (radio_box), button, TRUE, TRUE, 0);
-  gtk_object_set_user_data (GTK_OBJECT (button), (gpointer) FOREGROUND_FILL);
-  gtk_signal_connect (GTK_OBJECT (button), "toggled",
-		      (GtkSignalFunc) file_new_toggle_callback,
-		      &vals->fill_type);
-  if (vals->fill_type == FOREGROUND_FILL)
-    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
-  gtk_widget_show (button);
-
-
-
   gtk_widget_show (vals->dlg);
 }
 

app/file_new_dialog.c

@@ -709,7 +709,18 @@ file_new_cmd_callback (GtkWidget           *widget,
   gtk_container_add (GTK_CONTAINER (frame), radio_box);
   gtk_widget_show (radio_box);
 
-  button = gtk_radio_button_new_with_label (NULL, "Background");
+  button = gtk_radio_button_new_with_label (NULL, "Foreground");
+  group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
+  gtk_box_pack_start (GTK_BOX (radio_box), button, TRUE, TRUE, 0);
+  gtk_object_set_user_data (GTK_OBJECT (button), (gpointer) FOREGROUND_FILL);
+  gtk_signal_connect (GTK_OBJECT (button), "toggled",
+		      (GtkSignalFunc) file_new_toggle_callback,
+		      &vals->fill_type);
+  if (vals->fill_type == FOREGROUND_FILL)
+    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
+  gtk_widget_show (button);
+
+  button = gtk_radio_button_new_with_label (group, "Background");
   group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
   gtk_box_pack_start (GTK_BOX (radio_box), button, TRUE, TRUE, 0);
   gtk_object_set_user_data (GTK_OBJECT (button), (gpointer) BACKGROUND_FILL);
@@ -742,19 +753,6 @@ file_new_cmd_callback (GtkWidget           *widget,
     gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
   gtk_widget_show (button);
 
-  button = gtk_radio_button_new_with_label (group, "Foreground");
-  group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
-  gtk_box_pack_start (GTK_BOX (radio_box), button, TRUE, TRUE, 0);
-  gtk_object_set_user_data (GTK_OBJECT (button), (gpointer) FOREGROUND_FILL);
-  gtk_signal_connect (GTK_OBJECT (button), "toggled",
-		      (GtkSignalFunc) file_new_toggle_callback,
-		      &vals->fill_type);
-  if (vals->fill_type == FOREGROUND_FILL)
-    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
-  gtk_widget_show (button);
-
-
-
   gtk_widget_show (vals->dlg);
 }
 

app/gui/file-new-dialog.c

@@ -709,7 +709,18 @@ file_new_cmd_callback (GtkWidget           *widget,
   gtk_container_add (GTK_CONTAINER (frame), radio_box);
   gtk_widget_show (radio_box);
 
-  button = gtk_radio_button_new_with_label (NULL, "Background");
+  button = gtk_radio_button_new_with_label (NULL, "Foreground");
+  group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
+  gtk_box_pack_start (GTK_BOX (radio_box), button, TRUE, TRUE, 0);
+  gtk_object_set_user_data (GTK_OBJECT (button), (gpointer) FOREGROUND_FILL);
+  gtk_signal_connect (GTK_OBJECT (button), "toggled",
+		      (GtkSignalFunc) file_new_toggle_callback,
+		      &vals->fill_type);
+  if (vals->fill_type == FOREGROUND_FILL)
+    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
+  gtk_widget_show (button);
+
+  button = gtk_radio_button_new_with_label (group, "Background");
   group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
   gtk_box_pack_start (GTK_BOX (radio_box), button, TRUE, TRUE, 0);
   gtk_object_set_user_data (GTK_OBJECT (button), (gpointer) BACKGROUND_FILL);
@@ -742,19 +753,6 @@ file_new_cmd_callback (GtkWidget           *widget,
     gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
   gtk_widget_show (button);
 
-  button = gtk_radio_button_new_with_label (group, "Foreground");
-  group = gtk_radio_button_group (GTK_RADIO_BUTTON (button));
-  gtk_box_pack_start (GTK_BOX (radio_box), button, TRUE, TRUE, 0);
-  gtk_object_set_user_data (GTK_OBJECT (button), (gpointer) FOREGROUND_FILL);
-  gtk_signal_connect (GTK_OBJECT (button), "toggled",
-		      (GtkSignalFunc) file_new_toggle_callback,
-		      &vals->fill_type);
-  if (vals->fill_type == FOREGROUND_FILL)
-    gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (button), TRUE);
-  gtk_widget_show (button);
-
-
-
   gtk_widget_show (vals->dlg);
 }
 

app/gui/layers-dialog.c

@@ -3060,17 +3060,17 @@ layers_dialog_new_layer_query (GimpImage* gimage)
   char size[12];
   char *button_names[4] =
   {
+    "Foreground",
     "Background",
     "White",
-    "Transparent",
+    "Transparent"
-    "Foreground"
   };
   ActionCallback button_callbacks[4] =
   {
+    new_layer_foreground_callback,
     new_layer_background_callback,
     new_layer_white_callback,
-    new_layer_transparent_callback,
+    new_layer_transparent_callback
-    new_layer_foreground_callback
   };
 
   /*  the new options structure  */

app/layers_dialog.c

@@ -3060,17 +3060,17 @@ layers_dialog_new_layer_query (GimpImage* gimage)
   char size[12];
   char *button_names[4] =
   {
+    "Foreground",
     "Background",
     "White",
-    "Transparent",
+    "Transparent"
-    "Foreground"
   };
   ActionCallback button_callbacks[4] =
   {
+    new_layer_foreground_callback,
     new_layer_background_callback,
     new_layer_white_callback,
-    new_layer_transparent_callback,
+    new_layer_transparent_callback
-    new_layer_foreground_callback
   };
 
   /*  the new options structure  */