added dots to all menu entries of interactive plug-ins and did the usual

action area fixes on lots of them



--Sven

ChangeLog

@@ -1,3 +1,68 @@
+Wed Nov 24 00:45:27 MET 1999  Sven Neumann <sven@gimp.org>
+
+	* plug-ins/AlienMap/AlienMap.c
+	* plug-ins/AlienMap2/AlienMap2.c
+	* plug-ins/FractalExplorer/FractalExplorer.c
+	* plug-ins/MapObject/mapobject_main.c
+	* plug-ins/common/blinds.c
+	* plug-ins/common/curve_bend.c
+	* plug-ins/common/deinterlace.c
+	* plug-ins/common/despeckle.c
+	* plug-ins/common/diffraction.c
+	* plug-ins/common/displace.c
+	* plug-ins/common/edge.c
+	* plug-ins/common/emboss.c
+	* plug-ins/common/engrave.c
+	* plug-ins/common/exchange.c
+	* plug-ins/common/flarefx.c
+	* plug-ins/common/fractaltrace.c
+	* plug-ins/common/gauss_iir.c
+	* plug-ins/common/gauss_rle.c
+	* plug-ins/common/gee.c
+	* plug-ins/common/glasstile.c
+	* plug-ins/common/gqbist.c
+	* plug-ins/common/hot.c
+	* plug-ins/common/illusion.c
+	* plug-ins/common/iwarp.c
+	* plug-ins/common/jigsaw.c
+	* plug-ins/common/max_rgb.c
+	* plug-ins/common/mblur.c
+	* plug-ins/common/newsprint.c
+	* plug-ins/common/nlfilt.c
+	* plug-ins/common/noisify.c
+	* plug-ins/common/pixelize.c
+	* plug-ins/common/plasma.c
+	* plug-ins/common/polar.c
+	* plug-ins/common/randomize.c
+	* plug-ins/common/ripple.c
+	* plug-ins/common/sample_colorize.c
+	* plug-ins/common/scatter_hsv.c
+	* plug-ins/common/sel_gauss.c
+	* plug-ins/common/sharpen.c
+	* plug-ins/common/shift.c
+	* plug-ins/common/smooth_palette.c
+	* plug-ins/common/snoise.c
+	* plug-ins/common/sobel.c
+	* plug-ins/common/sparkle.c
+	* plug-ins/common/spheredesigner.c
+	* plug-ins/common/spread.c
+	* plug-ins/common/tile.c
+	* plug-ins/common/tileit.c
+	* plug-ins/common/video.c
+	* plug-ins/common/vpropagate.c
+	* plug-ins/common/warp.c
+	* plug-ins/common/waves.c
+	* plug-ins/common/whirlpinch.c
+	* plug-ins/common/wind.c
+	* plug-ins/flame/flame.c
+	* plug-ins/gfig/gfig.c
+	* plug-ins/gflare/gflare.c
+	* plug-ins/maze/maze.c
+	* plug-ins/pagecurl/pagecurl.c
+	* plug-ins/unsharp/unsharp.c: added dots to all menu entries of 
+	interactive plug-ins and did the usual action area fixes on lots 
+	of them
+
 Tue Nov 23 22:57:13 MET 1999  Sven Neumann <sven@gimp.org>
 
 	* plug-ins/Lighting/lighting_main.c

plug-ins/AlienMap/AlienMap.c

@@ -191,7 +191,7 @@ query ()
         		  "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
         		  "Daniel Cotting (cotting@mygale.org, http://www.mygale.org/~cotting)",
         		  _("1th May 1997"),
-        		  N_("<Image>/Filters/Colors/Map/Alien Map"),
+        		  N_("<Image>/Filters/Colors/Map/Alien Map..."),
         		  "RGB*",
         		  PROC_PLUG_IN,
         		  nargs, nreturn_vals,

plug-ins/AlienMap2/AlienMap2.c

@@ -214,7 +214,7 @@ query ()
         		  "Martin Weber (martin.weber@usa.net, http://diverse.freepage.de/martin.weber)",
         		  "Martin Weber (martin.weber@usa.net, http://diverse.freepage.de/martin.weber",
         		  _("24th April 1998"),
-        		  N_("<Image>/Filters/Colors/Map/Alien Map 2"),
+        		  N_("<Image>/Filters/Colors/Map/Alien Map 2..."),
         		  "RGB_MODEL*",
         		  PROC_PLUG_IN,
         		  nargs, nreturn_vals,

plug-ins/FractalExplorer/FractalExplorer.c

@@ -132,7 +132,7 @@ query()
 	                   "Daniel Cotting (cotting@multimania.com, www.multimania.com/cotting)",
 			   "Daniel Cotting (cotting@multimania.com, www.multimania.com/cotting)",
 			   "December, 1998",
-			   "<Image>/Filters/Render/Pattern/Fractal Explorer",
+			   "<Image>/Filters/Render/Pattern/Fractal Explorer...",
 			   "RGB*",
 			   PROC_PLUG_IN,
 			   nargs, nreturn_vals,

plug-ins/MapObject/mapobject_main.c

@@ -186,7 +186,7 @@ static void query(void)
 			  "Tom Bech & Federico Mena Quintero",
 			  "Tom Bech & Federico Mena Quintero",
 			  "Version 1.2.0, July 16 1998",
-			  "<Image>/Filters/Map/Map Object",
+			  "<Image>/Filters/Map/Map Object...",
 			  "RGB*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/diffraction.c

@@ -174,7 +174,7 @@ query(void)
 			       "Federico Mena Quintero",
 			       "Federico Mena Quintero & David Bleecker",
 			       "April 1997, 0.5",
-			       "<Image>/Filters/Render/Pattern/Diffraction Patterns",
+			       "<Image>/Filters/Render/Pattern/Diffraction Patterns...",
 			       "RGB*",
 			       PROC_PLUG_IN,
 			       nargs,
@@ -514,6 +514,7 @@ diffraction_dialog(void)
 	GtkWidget  *vbox;
 	GtkWidget  *table;
 	GtkWidget  *label;
+	GtkWidget  *hbbox;
 	GtkWidget  *button;
 	gint        argc;
 	gchar     **argv;
@@ -670,27 +671,31 @@ diffraction_dialog(void)
 	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbox, label);
 	gtk_widget_show(vbox);
 
-	/* Buttons */
+	/*  Action area  */
-
+	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 2);
-	gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 6);
+	gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dialog)->action_area), FALSE);
-
+	hbbox = gtk_hbutton_box_new ();
-	button = gtk_button_new_with_label("OK");
+	gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), hbbox, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
+	gtk_widget_show (hbbox);
-			   (GtkSignalFunc) dialog_ok_callback,
+	
-			   dialog);
+	button = gtk_button_new_with_label ("OK");
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, TRUE, TRUE, 0);
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-	gtk_widget_grab_default(button);
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-	gtk_widget_show(button);
+			    (GtkSignalFunc) dialog_ok_callback,
-
+			    dialog);
-	button = gtk_button_new_with_label("Cancel");
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_widget_grab_default (button);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
+	gtk_widget_show (button);
-			   (GtkSignalFunc) dialog_cancel_callback,
+	
-			   dialog);
+	button = gtk_button_new_with_label ("Cancel");
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, TRUE, TRUE, 0);
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-	gtk_widget_show(button);
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-
+			    (GtkSignalFunc) dialog_cancel_callback,
+			    dialog);
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+	gtk_widget_show (button);
+	
 	/* Done */
 
 	gtk_widget_show(dialog);

plug-ins/common/displace.c

@@ -191,7 +191,7 @@ query ()
 			  "Stephen Robert Norris & (ported to 1.0 by) Spencer Kimball",
 			  "Stephen Robert Norris",
 			  "1996",
-			  "<Image>/Filters/Map/Displace",
+			  "<Image>/Filters/Map/Displace...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -285,6 +285,7 @@ displace_dialog (GDrawable *drawable)
 {
   GtkWidget *dlg;
   GtkWidget *label;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *toggle;
   GtkWidget *toggle_hbox;
@@ -320,12 +321,19 @@ displace_dialog (GDrawable *drawable)
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) displace_ok_callback,
+		      (GtkSignalFunc) displace_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -334,7 +342,7 @@ displace_dialog (GDrawable *drawable)
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  The main table  */

plug-ins/common/edge.c

@@ -164,7 +164,7 @@ query ()
 			  "Peter Mattis & (ported to 1.0 by) Eiichi Takamori",
 			  "Peter Mattis",
 			  "1996",
-			  "<Image>/Filters/Edge-Detect/Edge",
+			  "<Image>/Filters/Edge-Detect/Edge...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -617,6 +617,7 @@ edge_dialog(GDrawable *drawable)
   GtkWidget *frame;
   GtkWidget *table;
   GtkWidget *hbox;
+  GtkWidget *hbbox;  
   GtkWidget *button;
   GtkWidget *toggle;
   GtkWidget *label;
@@ -647,12 +648,19 @@ edge_dialog(GDrawable *drawable)
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) edge_ok_callback,
+		      (GtkSignalFunc) edge_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -661,7 +669,7 @@ edge_dialog(GDrawable *drawable)
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  parameter settings  */

plug-ins/common/emboss.c

@@ -121,7 +121,7 @@ query(void){
                          "Eric L. Hernes, John Schlag",
                          "Eric L. Hernes",
                          "1997",
-                         "<Image>/Filters/Distorts/Emboss",
+                         "<Image>/Filters/Distorts/Emboss...",
                          "RGB",
                          PROC_PLUG_IN,
                          nargs, nrets,

plug-ins/common/engrave.c

@@ -118,7 +118,7 @@ query()
     "Spencer Kimball & Peter Mattis, Eiichi Takamori, Torsten Martinsen",
     "Spencer Kimball & Peter Mattis, Eiichi Takamori, Torsten Martinsen",
 			   "1995,1996,1997",
-			   "<Image>/Filters/Distorts/Engrave",
+			   "<Image>/Filters/Distorts/Engrave...",
 			   "RGBA, GRAYA",
 			   PROC_PLUG_IN,
 			   nargs, nreturn_vals,
@@ -207,6 +207,7 @@ engrave_dialog()
     GtkWidget *dlg;
     GtkWidget *frame;
     GtkWidget *table;
+    GtkWidget *hbbox;
     GtkWidget *button;
     GtkWidget *toggle;
     gchar **argv;
@@ -227,23 +228,30 @@ engrave_dialog()
 		       NULL);
 
     /*  Action area  */
-    button = gtk_button_new_with_label("OK");
+    gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
-    GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+    gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
-    gtk_signal_connect(GTK_OBJECT(button), "clicked",
+    hbbox = gtk_hbutton_box_new ();
-		       (GtkSignalFunc) engrave_ok_callback,
+    gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
-		       dlg);
+    gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->action_area), button, TRUE, TRUE, 0);
+    gtk_widget_show (hbbox);
-    gtk_widget_grab_default(button);
+    
-    gtk_widget_show(button);
+    button = gtk_button_new_with_label ("OK");
-
+    GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-    button = gtk_button_new_with_label("Cancel");
+    gtk_signal_connect (GTK_OBJECT (button), "clicked",
-    GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+			(GtkSignalFunc) engrave_ok_callback,
-    gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
+			dlg);
-			      (GtkSignalFunc) gtk_widget_destroy,
+    gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-			      GTK_OBJECT(dlg));
+    gtk_widget_grab_default (button);
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->action_area), button, TRUE, TRUE, 0);
+    gtk_widget_show (button);
-    gtk_widget_show(button);
+    
-
+    button = gtk_button_new_with_label ("Cancel");
+    GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+    gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+			       (GtkSignalFunc) gtk_widget_destroy,
+			       GTK_OBJECT (dlg));
+    gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+    gtk_widget_show (button);
+    
     /*  parameter settings  */
     frame = gtk_frame_new("Parameter Settings");
     gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);

plug-ins/common/exchange.c

@@ -119,7 +119,7 @@ void	query()
 			       "robert@experimental.net",
 			       "robert@experimental.net",
 			       "June 17th, 1997",
-			       "<Image>/Filters/Colors/Map/Color Exchange",
+			       "<Image>/Filters/Colors/Map/Color Exchange...",
 			       "RGB*",
 			       PROC_PLUG_IN,
 			       nargs, nreturn_vals,
@@ -229,6 +229,7 @@ static
 int	doDialog()
 {
 	GtkWidget	*dialog;
+	GtkWidget	*hbbox;
 	GtkWidget	*button;
 	GtkWidget	*frame;
 	GtkWidget	*table;
@@ -267,26 +268,31 @@ int	doDialog()
 			   (GtkSignalFunc) gtk_main_quit,
 			   NULL);
 
-	/* lets create some buttons */
+	/*  Action area  */
-	button = gtk_button_new_with_label("Ok");
+	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 2);
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dialog)->action_area), FALSE);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
+	hbbox = gtk_hbutton_box_new ();
-			   (GtkSignalFunc) ok_callback,
+	gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
-			   dialog);
+	gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), hbbox, FALSE, FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
+	gtk_widget_show (hbbox);
-	                   button, TRUE, TRUE, 0);
+	
-	gtk_widget_grab_default(button);
+	button = gtk_button_new_with_label ("OK");
-	gtk_widget_show(button); 
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+			    (GtkSignalFunc) ok_callback,
+			    dialog);
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+	gtk_widget_grab_default (button);
+	gtk_widget_show (button);
+	
+	button = gtk_button_new_with_label ("Cancel");
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+	gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+				   (GtkSignalFunc) gtk_widget_destroy,
+				   GTK_OBJECT (dialog));
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+	gtk_widget_show (button);
 	
-	button = gtk_button_new_with_label("Cancel");
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-	gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
-			   (GtkSignalFunc) gtk_widget_destroy,
-			   GTK_OBJECT(dialog));
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
-	                   button, TRUE, TRUE, 0);
-	gtk_widget_show(button); 
-
 	/* do some boxes here */
 	mainbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_border_width(GTK_CONTAINER(mainbox), 10);

plug-ins/common/flarefx.c

@@ -188,7 +188,7 @@ static void query ()
 			  "Karl-Johan Andersson", /* Author */
 			  "Karl-Johan Andersson", /* Copyright */
 			  "1998",
-			  "<Image>/Filters/Light Effects/FlareFX",
+			  "<Image>/Filters/Light Effects/FlareFX...",
 			  "RGB*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -284,6 +284,7 @@ static gint flare_dialog( GDrawable *drawable )
 {
   GtkWidget *dlg;
   GtkWidget *frame;
+  GtkWidget *hbbox;
   GtkWidget *button;
   guchar *color_cube;
   gchar **argv;
@@ -319,12 +320,19 @@ static gint flare_dialog( GDrawable *drawable )
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) flare_ok_callback,
+		      (GtkSignalFunc) flare_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -333,7 +341,7 @@ static gint flare_dialog( GDrawable *drawable )
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  parameter settings  */

plug-ins/common/fractaltrace.c

@@ -24,7 +24,7 @@
 #define PLUG_IN_NAME     "plug_in_fractal_trace"
 #define PLUG_IN_TITLE    "Fractal Trace"
 #define PLUG_IN_VERSION  "v0.4 test version (Dec. 25 1997)"
-#define PLUG_IN_CATEGORY "<Image>/Filters/Map/Fractal Trace"
+#define PLUG_IN_CATEGORY "<Image>/Filters/Map/Fractal Trace..."
 
 /******************************************************************************/
 

plug-ins/common/gauss_iir.c

@@ -127,7 +127,7 @@ query ()
 			  "Spencer Kimball & Peter Mattis",
 			  "Spencer Kimball & Peter Mattis",
 			  "1995-1996",
-			  "<Image>/Filters/Blur/Gaussian Blur (IIR)",
+			  "<Image>/Filters/Blur/Gaussian Blur (IIR)...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -241,6 +241,7 @@ gauss_iir_dialog ()
   GtkWidget *dlg;
   GtkWidget *label;
   GtkWidget *entry;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *toggle;
   GtkWidget *frame;
@@ -265,12 +266,19 @@ gauss_iir_dialog ()
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) gauss_ok_callback,
+		      (GtkSignalFunc) gauss_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -279,7 +287,7 @@ gauss_iir_dialog ()
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  parameter settings  */

plug-ins/common/gauss_rle.c

@@ -119,7 +119,7 @@ query ()
 			  "Spencer Kimball & Peter Mattis",
 			  "Spencer Kimball & Peter Mattis",
 			  "1995-1996",
-			  "<Image>/Filters/Blur/Gaussian Blur (RLE)",
+			  "<Image>/Filters/Blur/Gaussian Blur (RLE)...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -235,6 +235,7 @@ gauss_rle_dialog ()
   GtkWidget *label;
   GtkWidget *entry;
   GtkWidget *button;
+  GtkWidget *hbbox;
   GtkWidget *toggle;
   GtkWidget *frame;
   GtkWidget *vbox;
@@ -258,12 +259,19 @@ gauss_rle_dialog ()
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) gauss_ok_callback,
+		      (GtkSignalFunc) gauss_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -272,7 +280,7 @@ gauss_rle_dialog ()
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  parameter settings  */

plug-ins/common/gee.c

@@ -132,7 +132,7 @@ static void query()
 			 "Adam D. Moss <adam@gimp.org>",
 			 "Adam D. Moss <adam@gimp.org>",
 			 "1998",
-			 "<Image>/Filters/Toys/The Egg",
+			 "<Image>/Filters/Toys/The Egg...",
 			 /*NULL,*/
 			 "RGB*, INDEXED*, GRAY*",
 			 PROC_PLUG_IN,

plug-ins/common/glasstile.c

@@ -100,7 +100,7 @@ static void query ()
 			  "Karl-Johan Andersson", /* Author */
 			  "Karl-Johan Andersson", /* Copyright */
 			  "1997",
-			  "<Image>/Filters/Glass Effects/Glass Tile",
+			  "<Image>/Filters/Glass Effects/Glass Tile...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -199,6 +199,7 @@ static gint glass_dialog ()
 {
   GtkWidget *dlg;
   GtkWidget *label;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *scale;
   GtkWidget *frame;
@@ -222,12 +223,19 @@ static gint glass_dialog ()
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) glass_ok_callback,
+		      (GtkSignalFunc) glass_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -236,7 +244,7 @@ static gint glass_dialog ()
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  Parameter settings  */

plug-ins/common/gqbist.c

@@ -291,7 +291,7 @@ void query(void)
                                "Jörn Loviscach, Jens Ch. Restemeier", 
                                "Jörn Loviscach, Jens Ch. Restemeier", 
                                PLUG_IN_VERSION, 
-                               "<Image>/Filters/Render/Pattern/Qbist", 
+                               "<Image>/Filters/Render/Pattern/Qbist...", 
                                "RGB*", 
                                PROC_PLUG_IN, 
                                nargs, 

plug-ins/common/hot.c

@@ -212,7 +212,7 @@ query(void){
                          "Eric L. Hernes, Alan Wm Paeth",
                          "Eric L. Hernes",
                          "1997",
-                         "<Image>/Filters/Colors/Hot",
+                         "<Image>/Filters/Colors/Hot...",
                          "RGB",
                          PROC_PLUG_IN,
                          nargs, nrets,

plug-ins/common/illusion.c

@@ -103,7 +103,7 @@ static void query( void )
 			 "Hirotsuna Mizuno <s1041150@u-aizu.ac.jp>",
 			 "Hirotsuna Mizuno",
 			 PLUG_IN_VERSION,
-			 "<Image>/Filters/Map/Illusion",
+			 "<Image>/Filters/Map/Illusion...",
 			 "RGB*, GRAY*",
 			 PROC_PLUG_IN,
 			 nargs,

plug-ins/common/iwarp.c

@@ -238,7 +238,7 @@ query ()
 			  "Norbert Schmitz",
 			  "Norbert Schmitz",
 			  "1997",
-			  "<Image>/Filters/Distorts/IWarp",
+			  "<Image>/Filters/Distorts/IWarp...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -1040,6 +1040,7 @@ iwarp_dialog()
  GtkWidget *pframe;
  GtkWidget *top_table;
  GtkWidget *notebook;
+ GtkWidget *hbbox;
  GtkWidget *button;
  guchar *color_cube; 
  gint argc;
@@ -1070,24 +1071,30 @@ iwarp_dialog()
 		      (GtkSignalFunc) iwarp_close_callback,
 		      NULL);
  
- button = gtk_button_new_with_label ("OK");
+  /*  Action area  */
- GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
- gtk_signal_connect (GTK_OBJECT (button), "clicked",
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
-                      (GtkSignalFunc) iwarp_ok_callback,
+  hbbox = gtk_hbutton_box_new ();
-                      dlg);
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
- gtk_widget_grab_default (button);
+  gtk_widget_show (hbbox);
- gtk_widget_show (button);
+ 
+  button = gtk_button_new_with_label ("OK");
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      (GtkSignalFunc) iwarp_ok_callback,
+		      dlg);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+  gtk_widget_grab_default (button);
+  gtk_widget_show (button);
 
- button = gtk_button_new_with_label ("Cancel");
+  button = gtk_button_new_with_label ("Cancel");
- GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
- gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+  gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_widget_show (button);
- gtk_widget_show (button);
-
   
  pframe = gtk_frame_new (NULL);
  gtk_frame_set_shadow_type (GTK_FRAME (pframe), GTK_SHADOW_IN);

plug-ins/common/jigsaw.c

@@ -335,7 +335,7 @@ query(void)
 			 "Nigel Wetten",
 			 "Nigel Wetten",
 			 "1998",
-			 "<Image>/Filters/Render/Jigsaw",
+			 "<Image>/Filters/Render/Jigsaw...",
 			 "RGB*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,
@@ -2264,6 +2264,7 @@ static void
 dialog_box(void)
 {
   GtkWidget *dlg;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *rbutton;
   GtkWidget *cbutton;
@@ -2298,25 +2299,30 @@ dialog_box(void)
   gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
 		     (GtkSignalFunc) dialog_close_callback, NULL);
 
-  /* Action Area */
+  /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
+  button = gtk_button_new_with_label ("OK");
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      (GtkSignalFunc) run_callback,
+		      dlg);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+  gtk_widget_grab_default (button);
+  gtk_widget_show (button);
 
-  button = gtk_button_new_with_label("OK");
+  button = gtk_button_new_with_label ("Cancel");
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+  gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
-		     (GtkSignalFunc) run_callback, dlg);
+			     (GtkSignalFunc) gtk_widget_destroy,
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->action_area), button,
+			     GTK_OBJECT (dlg));
-		     TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-  gtk_widget_grab_default(button);
+  gtk_widget_show (button);
-  gtk_widget_show(button);
-
-  button = gtk_button_new_with_label("Cancel");
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-  gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
-			    (GtkSignalFunc) gtk_widget_destroy,
-			    GTK_OBJECT(dlg));
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->action_area), button,
-		     TRUE, TRUE, 0);
-  gtk_widget_show(button);
 
   /* init tooltips */
   tooltips = gtk_tooltips_new();

plug-ins/common/max_rgb.c

@@ -31,7 +31,7 @@
 #define	PLUG_IN_NAME	"plug_in_max_rgb"
 #define SHORT_NAME	"max_rgb"
 #define PROGRESS_NAME	"max_rgb: scanning..."
-#define MENU_POSITION	"<Image>/Filters/Colors/Max RGB"
+#define MENU_POSITION	"<Image>/Filters/Colors/Max RGB..."
 #define	MAIN_FUNCTION	max_rgb
 /* you need not change the following names */
 #define INTERFACE	max_rgb_interface

plug-ins/common/mblur.c

@@ -101,7 +101,6 @@ static void 	        mblur_zoom(void);
 static void    dialog_close_callback(GtkWidget *, gpointer);
 static void    dialog_ok_callback(GtkWidget *, gpointer);
 static void    dialog_cancel_callback(GtkWidget *, gpointer);
-static void    dialog_help_callback(GtkWidget *, gpointer);
 static void    dialog_scale_update(GtkAdjustment *, gint32 *);
 static void    dialog_toggle_update(GtkWidget *, gint32);
 
@@ -163,7 +162,7 @@ query(void)
 			 "Torsten Martinsen, Federico Mena Quintero and Daniel Skarda",
 			 "Torsten Martinsen, Federico Mena Quintero and Daniel Skarda",			       
 			 PLUG_IN_VERSION,
-			 "<Image>/Filters/Blur/Motion Blur",
+			 "<Image>/Filters/Blur/Motion Blur...",
 			 "RGB*, GRAY*",
 			 PROC_PLUG_IN,
 			 nargs,
@@ -729,6 +728,7 @@ mblur_dialog(void)
   GtkWidget	*oframe, *iframe;
   GtkWidget	*evbox, *ovbox, *ivbox;
   GtkWidget	*button, *label;
+  GtkWidget     *hbbox;
 
   GtkWidget	*scale;
   GtkObject	*adjustment;
@@ -753,32 +753,30 @@ mblur_dialog(void)
 		     (GtkSignalFunc) dialog_close_callback,
 		     NULL);
 
-  button = gtk_button_new_with_label("OK");
+  /*  Action area  */
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 2);
-  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dialog)->action_area), FALSE);
-		     (GtkSignalFunc) dialog_ok_callback,
+  hbbox = gtk_hbutton_box_new ();
-		     dialog);
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), hbbox, FALSE, FALSE, 0);
-  gtk_widget_grab_default(button);
+  gtk_widget_show (hbbox);
-  gtk_widget_show(button);
+ 
+  button = gtk_button_new_with_label ("OK");
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      (GtkSignalFunc) dialog_ok_callback,
+		      dialog);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+  gtk_widget_grab_default (button);
+  gtk_widget_show (button);
 
-  button = gtk_button_new_with_label("Cancel");
+  button = gtk_button_new_with_label ("Cancel");
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
-		     (GtkSignalFunc) dialog_cancel_callback,
+		      (GtkSignalFunc) dialog_cancel_callback,
-		     dialog);
+		      dialog);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-  gtk_widget_show(button);
+  gtk_widget_show (button);
-
-  button = gtk_button_new_with_label("Help");
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-  gtk_signal_connect(GTK_OBJECT(button), "clicked",
-		     (GtkSignalFunc) dialog_help_callback,
-		     dialog);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area),
-		     button, TRUE, TRUE, 0);
-  gtk_widget_set_sensitive(button, FALSE);
-  gtk_widget_show(button);
 
   /********************/
 
@@ -904,10 +902,6 @@ dialog_cancel_callback(GtkWidget *widget, gpointer data)
   gtk_widget_destroy(GTK_WIDGET(data));
 }
 
-static void
-dialog_help_callback(GtkWidget *widget, gpointer data)
-{
-}
 
 /*****/
 

plug-ins/common/newsprint.c

@@ -563,7 +563,7 @@ query()
 			  "Austin Donnelly",
 			  "Austin Donnelly",
 			  "1998 (" VERSION ")",
-			  "<Image>/Filters/Distorts/Newsprint",
+			  "<Image>/Filters/Distorts/Newsprint...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -1180,6 +1180,7 @@ newsprint_dialog (GDrawable *drawable)
     GtkWidget	*table;
     GtkWidget	*align;
     GtkWidget	*button;
+    GtkWidget	*hbbox;
     GtkWidget	*hbox;
     GtkWidget	*toggle;
     GtkWidget	*label;
@@ -1239,25 +1240,30 @@ newsprint_dialog (GDrawable *drawable)
 			NULL);
 
     /*  Action area  */
+    gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (st.dlg)->action_area), 2);
+    gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (st.dlg)->action_area), FALSE);
+    hbbox = gtk_hbutton_box_new ();
+    gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+    gtk_box_pack_end (GTK_BOX (GTK_DIALOG (st.dlg)->action_area), hbbox, FALSE, FALSE, 0);
+    gtk_widget_show (hbbox);
+    
     button = gtk_button_new_with_label ("OK");
     GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
     gtk_signal_connect (GTK_OBJECT (button), "clicked",
 			(GtkSignalFunc) newsprint_ok_callback,
 			st.dlg);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (st.dlg)->action_area), button,
+    gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-			TRUE, TRUE, 0);
     gtk_widget_grab_default (button);
     gtk_widget_show (button);
-
+    
     button = gtk_button_new_with_label ("Cancel");
     GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
     gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			       (GtkSignalFunc) gtk_widget_destroy,
 			       GTK_OBJECT (st.dlg));
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (st.dlg)->action_area), button,
+    gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-			TRUE, TRUE, 0);
     gtk_widget_show (button);
-
+    
     /* resolution settings  */
     frame = gtk_frame_new ("Resolution");
     gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);

plug-ins/common/nlfilt.c

@@ -118,7 +118,7 @@ query(void){
                          "Graeme W. Gill, gimp 0.99 plugin by Eric L. Hernes",
                          "Graeme W. Gill, Eric L. Hernes",
                          "1997",
-                         "<Image>/Filters/Enhance/NL Filter",
+                         "<Image>/Filters/Enhance/NL Filter...",
                          "RGB,GRAY",
                          PROC_PLUG_IN,
                          nargs, nrets,

plug-ins/common/noisify.c

@@ -124,7 +124,7 @@ query ()
 			  "Torsten Martinsen",
 			  "Torsten Martinsen",
 			  "1996",
-			  "<Image>/Filters/Noise/Noisify",
+			  "<Image>/Filters/Noise/Noisify...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -299,6 +299,7 @@ noisify_dialog (gint channels)
 {
   GtkWidget *dlg;
   GtkWidget *button;
+  GtkWidget *hbbox;
   GtkWidget *toggle;
   GtkWidget *frame;
   GtkWidget *table;
@@ -322,12 +323,19 @@ noisify_dialog (gint channels)
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) noisify_ok_callback,
+		      (GtkSignalFunc) noisify_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -336,7 +344,7 @@ noisify_dialog (gint channels)
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  parameter settings  */

plug-ins/common/pixelize.c

@@ -178,7 +178,7 @@ query()
 			  "Spencer Kimball & Peter Mattis, Tracy Scott, (ported to 1.0 by) Eiichi Takamori",
 			  "Spencer Kimball & Peter Mattis, Tracy Scott",
 			  "1995",
-			  "<Image>/Filters/Blur/Pixelize",
+			  "<Image>/Filters/Blur/Pixelize...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -283,6 +283,7 @@ pixelize_dialog ()
   GtkWidget *dlg;
   GtkWidget *frame;
   GtkWidget *table;
+  GtkWidget *hbbox;
   GtkWidget *button;
   gchar **argv;
   gint	argc;
@@ -303,12 +304,19 @@ pixelize_dialog ()
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
 		      (GtkSignalFunc) pixelize_ok_callback,
 		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -317,7 +325,7 @@ pixelize_dialog ()
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  parameter settings  */

plug-ins/common/plasma.c

@@ -154,7 +154,7 @@ query()
 			  "Stephen Norris & (ported to 1.0 by) Eiichi Takamori",
 			  "Stephen Norris",
 			  "1995",
-			  "<Image>/Filters/Render/Clouds/Plasma",
+			  "<Image>/Filters/Render/Clouds/Plasma...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -257,6 +257,7 @@ plasma_dialog()
   GtkWidget *dlg;
   GtkWidget *frame;
   GtkWidget *table;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *label;
   GtkWidget *entry;
@@ -283,12 +284,19 @@ plasma_dialog()
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) plasma_ok_callback,
+		      (GtkSignalFunc) plasma_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -297,7 +305,7 @@ plasma_dialog()
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  parameter settings  */

plug-ins/common/polar.c

@@ -217,7 +217,7 @@ query(void)
 			       "Daniel Dunbar and Federico Mena Quintero",
 			       "Daniel Dunbar and Federico Mena Quintero",
 			       PLUG_IN_VERSION,
-			       "<Image>/Filters/Distorts/Polar Coords",
+			       "<Image>/Filters/Distorts/Polar Coords...",
 			       "RGB*, GRAY*",
 			       PROC_PLUG_IN,
 			       nargs,
@@ -866,6 +866,7 @@ polarize_dialog(void)
 	GtkWidget  *top_table;
 	GtkWidget  *frame;
 	GtkWidget  *table;
+	GtkWidget  *hbbox;
 	GtkWidget  *button;
 	GtkWidget  *toggle;
 	GtkWidget  *hbox;
@@ -984,27 +985,31 @@ polarize_dialog(void)
 
 	gtk_widget_show(hbox);
 
-	/* Buttons */
+	/*  Action area  */
-
+	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 2);
-	gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 6);
+	gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dialog)->action_area), FALSE);
-
+	hbbox = gtk_hbutton_box_new ();
-	button = gtk_button_new_with_label("OK");
+	gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), hbbox, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
+	gtk_widget_show (hbbox);
-			   (GtkSignalFunc) dialog_ok_callback,
+	
-			   dialog);
+	button = gtk_button_new_with_label ("OK");
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, TRUE, TRUE, 0);
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-	gtk_widget_grab_default(button);
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-	gtk_widget_show(button);
+			    (GtkSignalFunc) dialog_ok_callback,
-
+			    dialog);
-	button = gtk_button_new_with_label("Cancel");
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_widget_grab_default (button);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
+	gtk_widget_show (button);
-			   (GtkSignalFunc) dialog_cancel_callback,
+	
-			   dialog);
+	button = gtk_button_new_with_label ("Cancel");
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, TRUE, TRUE, 0);
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-	gtk_widget_show(button);
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-
+			    (GtkSignalFunc) dialog_cancel_callback,
+			    dialog);
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+	gtk_widget_show (button);
+	
 	/* Done */
 
 	gtk_widget_show(dialog);

plug-ins/common/randomize.c

@@ -235,7 +235,7 @@ query()
         (char *) author,
         (char *) copyrights,
         (char *) copyright_date,
-        "<Image>/Filters/Noise/Hurl",
+        "<Image>/Filters/Noise/Hurl...",
         "RGB*, GRAY*, INDEXED*",
         PROC_PLUG_IN,
         nargs, nreturn_vals,
@@ -247,7 +247,7 @@ query()
         (char *) author,
         (char *) copyrights,
         (char *) copyright_date,
-        "<Image>/Filters/Noise/Pick",
+        "<Image>/Filters/Noise/Pick...",
         "RGB*, GRAY*, INDEXED*",
         PROC_PLUG_IN,
         nargs, nreturn_vals,
@@ -259,7 +259,7 @@ query()
         (char *) author,
         (char *) copyrights,
         (char *) copyright_date,
-        "<Image>/Filters/Noise/Slur",
+        "<Image>/Filters/Noise/Slur...",
         "RGB*, GRAY*, INDEXED*",
         PROC_PLUG_IN,
         nargs, nreturn_vals,

plug-ins/common/ripple.c

@@ -161,7 +161,7 @@ query ()
 			  "Brian Degenhardt <bdegenha@ucsd.edu>",
 			  "Brian Degenhardt",
 			  "1997",
-			  "<Image>/Filters/Distorts/Ripple",
+			  "<Image>/Filters/Distorts/Ripple...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -529,6 +529,7 @@ ripple_dialog ()
 {
     GtkWidget *dlg;
     GtkWidget *label;
+    GtkWidget *hbbox;
     GtkWidget *button;
     GtkWidget *toggle;
     GtkWidget *scale;
@@ -579,24 +580,31 @@ ripple_dialog ()
                         (GtkSignalFunc) ripple_close_callback,
                         NULL);
 
-        /*  Action area  */
+    /*  Action area  */
+    gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+    gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+    hbbox = gtk_hbutton_box_new ();
+    gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+    gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+    gtk_widget_show (hbbox);
+    
     button = gtk_button_new_with_label ("OK");
     GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
     gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                        (GtkSignalFunc) ripple_ok_callback,
+			(GtkSignalFunc) ripple_ok_callback,
-                        dlg);
+			dlg);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
     gtk_widget_grab_default (button);
     gtk_widget_show (button);
-
+    
     button = gtk_button_new_with_label ("Cancel");
     GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
     gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
-                               (GtkSignalFunc) gtk_widget_destroy,
+			       (GtkSignalFunc) gtk_widget_destroy,
-                               GTK_OBJECT (dlg));
+			       GTK_OBJECT (dlg));
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
     gtk_widget_show (button);
-
+    
         /*  The main vbox  */
     main_vbox = gtk_vbox_new (FALSE, 5);
     gtk_container_border_width (GTK_CONTAINER (main_vbox), 10);

plug-ins/common/sample_colorize.c

@@ -303,7 +303,7 @@ query()
 			  "Wolfgang Hofer",
 			  "hof@hotbot.com",
 			  "07/1999",
-			  "<Image>/Filters/Colors/Map/Sample Colorize",
+			  "<Image>/Filters/Colors/Map/Sample Colorize...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/scatter_hsv.c

@@ -35,7 +35,7 @@
 #define	PLUG_IN_NAME	"plug_in_scatter_hsv"
 #define SHORT_NAME	"scatter_hsv"
 #define PROGRESS_NAME	"scatter_hsv: scattering..."
-#define MENU_POSITION	"<Image>/Filters/Noise/Scatter HSV"
+#define MENU_POSITION	"<Image>/Filters/Noise/Scatter HSV..."
 #define	MAIN_FUNCTION	scatter_hsv
 #define INTERFACE	scatter_hsv_interface
 #define	DIALOG		scatter_hsv_dialog

plug-ins/common/sel_gauss.c

@@ -126,7 +126,7 @@ static void query ()
 			  "Thom van Os",
 			  "Thom van Os",
 			  "1999",
-			  "<Image>/Filters/Blur/Selective Gaussian Blur",
+			  "<Image>/Filters/Blur/Selective Gaussian Blur...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -229,6 +229,7 @@ static gint sel_gauss_dialog ()
 	GtkWidget *dlg;
 	GtkWidget *label;
 	GtkWidget *entry;
+	GtkWidget *hbbox;
 	GtkWidget *button;
 	GtkWidget *frame;
 	GtkWidget *vbox;
@@ -250,22 +251,29 @@ static gint sel_gauss_dialog ()
 	gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
 		(GtkSignalFunc) sel_gauss_close_callback, NULL);
 
-	/* Action area */
+	/*  Action area  */
+	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+	gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+	hbbox = gtk_hbutton_box_new ();
+	gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+	gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+	gtk_widget_show (hbbox);
+	
 	button = gtk_button_new_with_label ("OK");
 	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
 	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-		(GtkSignalFunc) sel_gauss_ok_callback, dlg);
+			    (GtkSignalFunc) sel_gauss_ok_callback,
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area),
+			    dlg);
-		button, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
 	gtk_widget_grab_default (button);
 	gtk_widget_show (button);
-
+	
 	button = gtk_button_new_with_label ("Cancel");
 	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
 	gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
-		(GtkSignalFunc) gtk_widget_destroy, GTK_OBJECT (dlg));
+				   (GtkSignalFunc) gtk_widget_destroy,
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area),
+				   GTK_OBJECT (dlg));
-		button, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
 	gtk_widget_show (button);
 
 	/* parameter settings */

plug-ins/common/sharpen.c

@@ -44,6 +44,14 @@
  * Revision History:
  *
  *   $Log$
+ *   Revision 1.13  1999/11/23 23:49:42  neo
+ *   added dots to all menu entries of interactive plug-ins and did the usual
+ *   action area fixes on lots of them
+ *
+ *
+ *
+ *   --Sven
+ *
  *   Revision 1.12  1999/10/24 20:48:59  pcg
  *   api change #2, fix #1
  *
@@ -259,7 +267,8 @@ query(void)
       "Michael Sweet <mike@easysw.com>",
       "Copyright 1997-1998 by Michael Sweet",
       PLUG_IN_VERSION,
-      "<Image>/Filters/Enhance/Sharpen", "RGB*, GRAY*",
+      "<Image>/Filters/Enhance/Sharpen...",
+      "RGB*, GRAY*",
       PROC_PLUG_IN, nargs, nreturn_vals, args, return_vals);
 }
 
@@ -611,6 +620,7 @@ sharpen_dialog(void)
 		*ptable,	/* Preview table */
 		*frame,		/* Frame for preview */
 		*scrollbar,	/* Horizontal + vertical scroller */
+		*hbbox,	        /* Button_box for OK/Cancel buttons */
 		*button;	/* OK/Cancel buttons */
   gint		argc;		/* Fake argc for GUI */
   gchar		**argv;		/* Fake argv for GUI */
@@ -717,24 +727,29 @@ sharpen_dialog(void)
   * OK, cancel buttons...
   */
 
-  gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 6);
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dialog)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
+  button = gtk_button_new_with_label ("OK");
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      (GtkSignalFunc) dialog_ok_callback,
+		      dialog);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+  gtk_widget_grab_default (button);
+  gtk_widget_show (button);
 
-  button = gtk_button_new_with_label("OK");
+  button = gtk_button_new_with_label ("Cancel");
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
-		     (GtkSignalFunc) dialog_ok_callback,
+		      (GtkSignalFunc) dialog_cancel_callback,
-		     dialog);
+		      dialog);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-  gtk_widget_grab_default(button);
+  gtk_widget_show (button);
-  gtk_widget_show(button);
-
-  button = gtk_button_new_with_label("Cancel");
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-  gtk_signal_connect(GTK_OBJECT(button), "clicked",
-		     (GtkSignalFunc) dialog_cancel_callback,
-		     dialog);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, TRUE, TRUE, 0);
-  gtk_widget_show(button);
 
  /*
   * Show it and wait for the user to do something...

plug-ins/common/shift.c

@@ -131,7 +131,7 @@ query ()
 			  "Spencer Kimball and Peter Mattis, ported by Brian Degenhardt and Federico Mena Quintero",
 			  "Brian Degenhardt",
 			  "1997",
-			  "<Image>/Filters/Distorts/Shift",
+			  "<Image>/Filters/Distorts/Shift...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -360,6 +360,7 @@ shift_dialog ()
   GtkWidget *amount_label;
   GtkWidget *amount;
   GtkWidget *dlg;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *toggle;
   GtkWidget *frame;
@@ -389,12 +390,19 @@ shift_dialog ()
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) shift_ok_callback,
+		      (GtkSignalFunc) shift_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -403,7 +411,7 @@ shift_dialog ()
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  parameter settings  */

plug-ins/common/smooth_palette.c

@@ -76,7 +76,7 @@ static void query()
 			 "Scott Draves",
 			 "Scott Draves",
 			 "1997",
-			 "<Image>/Filters/Colors/SmoothPalette",
+			 "<Image>/Filters/Colors/SmoothPalette...",
 			 "RGB*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,
@@ -354,6 +354,7 @@ static void callback(GtkWidget * widget, gpointer data)
 static gint dialog()
 {
   GtkWidget *dlg;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *table;
   GtkWidget *w;
@@ -374,22 +375,30 @@ static gint dialog()
   gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
 		     (GtkSignalFunc) close_callback, NULL);
 
-  button = gtk_button_new_with_label("ok");
+  /*  Action area  */
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
-  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
-		     (GtkSignalFunc) ok_callback,
+  hbbox = gtk_hbutton_box_new ();
-		     dlg);
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
-  gtk_widget_grab_default(button);
+  gtk_widget_show (hbbox);
-  gtk_widget_show(button);
+ 
+  button = gtk_button_new_with_label ("OK");
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      (GtkSignalFunc) ok_callback,
+		      dlg);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+  gtk_widget_grab_default (button);
+  gtk_widget_show (button);
 
-  button = gtk_button_new_with_label("Cancel");
+  button = gtk_button_new_with_label ("Cancel");
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-  gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
+  gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
-			    (GtkSignalFunc) gtk_widget_destroy,
+			     (GtkSignalFunc) gtk_widget_destroy,
-			    GTK_OBJECT(dlg));
+			     GTK_OBJECT (dlg));
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-  gtk_widget_show(button);
+  gtk_widget_show (button);
 
   table = gtk_table_new(4, 4, FALSE);
   gtk_container_border_width(GTK_CONTAINER(table), 10);

plug-ins/common/snoise.c

@@ -185,7 +185,7 @@ query (void)
 			  "Marcelo de Gomensoro Malheiros",
 			  "Marcelo de Gomensoro Malheiros",
 			  "Apr 1998, v1.03",
-			  "<Image>/Filters/Render/Clouds/Solid Noise",
+			  "<Image>/Filters/Render/Clouds/Solid Noise...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs,
@@ -472,6 +472,7 @@ solid_noise_dialog (void)
   GtkWidget *dlg;
   GtkWidget *toggle;
   GtkWidget *table;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *label;
   GtkWidget *entry;
@@ -607,24 +608,29 @@ solid_noise_dialog (void)
 		      (GtkSignalFunc) dialog_scale_callback, &snvals.ysize);
   gtk_widget_show (scale);
 
-  /*  Button #1  */
+  /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) dialog_ok_callback, dlg);
+		      (GtkSignalFunc) dialog_ok_callback,
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button,
+		      dlg);
-                      TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
-  /*  Button #2  */
   button = gtk_button_new_with_label ("Cancel");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
-                             GTK_OBJECT (dlg));
+			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button,
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-                      TRUE, TRUE, 0);
   gtk_widget_show (button);
 
   gtk_widget_show (table);

plug-ins/common/sobel.c

@@ -137,7 +137,7 @@ query ()
 			  "Thorsten Schnier",
 			  "Thorsten Schnier",
 			  "1997",
-			  "<Image>/Filters/Edge-Detect/Sobel",
+			  "<Image>/Filters/Edge-Detect/Sobel...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -232,6 +232,7 @@ static gint
 sobel_dialog ()
 {
   GtkWidget *dlg;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *toggle;
   GtkWidget *frame;
@@ -256,12 +257,19 @@ sobel_dialog ()
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) sobel_ok_callback,
+		      (GtkSignalFunc) sobel_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -270,7 +278,7 @@ sobel_dialog ()
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  parameter settings  */

plug-ins/common/sparkle.c

@@ -201,7 +201,7 @@ query ()
                     "John Beale, & (ported to GIMP v0.54) Michael J. Hammel & ted to GIMP v1.0) Spencer Kimball",
 			  "John Beale",
 			  "Version 1.26, December 1998",
-			  "<Image>/Filters/Light Effects/Sparkle",
+			  "<Image>/Filters/Light Effects/Sparkle...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -346,6 +346,7 @@ sparkle_dialog ()
 {
   GtkWidget *dlg;
   GtkWidget *label;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *scale;
   GtkWidget *frame;
@@ -390,12 +391,19 @@ sparkle_dialog ()
   gtk_tooltips_set_colors (tips,&tips_bg,&tips_fg);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) sparkle_ok_callback,
+		      (GtkSignalFunc) sparkle_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
   set_tooltip(tips,button,"Accept settings and apply filter on image");
@@ -405,7 +413,7 @@ sparkle_dialog ()
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
   set_tooltip(tips,button,"Reject any changes and close plug-in");
 

plug-ins/common/spheredesigner.c

@@ -2845,7 +2845,7 @@ static void query (void)
 			  "Vidar Madsen",
                           "Vidar Madsen",
                           "1999",
-                          "<Image>/Filters/Render/SphereDesigner",
+                          "<Image>/Filters/Render/SphereDesigner...",
                           "RGB*, GRAY*",
                           PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/spread.c

@@ -123,7 +123,7 @@ query ()
 			  "Spencer Kimball and Peter Mattis, ported by Brian Degenhardt and Federico Mena Quintero",
 			  "Federico Mena Quintero and Brian Degenhardt",
 			  "1997",
-			  "<Image>/Filters/Noise/Spread",
+			  "<Image>/Filters/Noise/Spread...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -348,6 +348,7 @@ spread_dialog ()
 {
   GtkWidget *dlg;
   GtkWidget *label;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *scale;
   GtkWidget *frame;
@@ -375,12 +376,19 @@ spread_dialog ()
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) spread_ok_callback,
+		      (GtkSignalFunc) spread_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -389,7 +397,7 @@ spread_dialog ()
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  parameter settings  */

plug-ins/common/tile.c

@@ -124,7 +124,7 @@ query ()
 			  "Spencer Kimball & Peter Mattis",
 			  "Spencer Kimball & Peter Mattis",
 			  "1996-1997",
-			  "<Image>/Filters/Map/Tile",
+			  "<Image>/Filters/Map/Tile...",
 			  "RGB*, GRAY*, INDEXED*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -361,6 +361,7 @@ tile_dialog (gint width, gint height)
 {
   GtkWidget *dlg;
   GtkWidget *label;
+  GtkWidget *hbbox;  
   GtkWidget *button;
   GtkWidget *toggle;
   GtkWidget *frame;
@@ -389,12 +390,19 @@ tile_dialog (gint width, gint height)
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) tile_ok_callback,
+		      (GtkSignalFunc) tile_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -403,7 +411,7 @@ tile_dialog (gint width, gint height)
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  parameter settings  */

plug-ins/common/tileit.c

@@ -215,7 +215,7 @@ query ()
 			  "Andy Thomas",
 			  "Andy Thomas",
 			  "1997",
-			  "<Image>/Filters/Map/Small Tiles",
+			  "<Image>/Filters/Map/Small Tiles...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -329,6 +329,7 @@ static gint
 tileit_dialog ()
 {
   GtkWidget *dlg;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *frame;
   GtkWidget *xframe;
@@ -375,12 +376,19 @@ tileit_dialog ()
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) tileit_ok_callback,
+		      (GtkSignalFunc) tileit_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -389,10 +397,9 @@ tileit_dialog ()
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
-
   /* Start building the frame for the preview area */
 
   frame = gtk_frame_new ("preview");

plug-ins/common/unsharp.c

@@ -167,7 +167,7 @@ static void query () {
 	                        "Winston Chang <wchang3@students.wisc.edu>",
 	                        "Winston Chang",
 	                        "1999",
-	                        "<Image>/Filters/Enhance/Unsharp Mask",
+	                        "<Image>/Filters/Enhance/Unsharp Mask...",
 	                        "GRAY*, RGB*",
 	                        PROC_PLUG_IN,
 	                        nargs, nreturn_vals,
@@ -711,10 +711,11 @@ static gdouble* gen_lookup_table(gdouble* cmatrix, gint cmatrix_length) {
 
 
 /* ------------------------ unsharp_mask_dialog ----------------------- */
-static gint unsharp_mask_dialog() {
+static gint unsharp_mask_dialog() 
-
+{
 	GtkWidget *window;
 	GtkWidget *table;
+	GtkWidget *hbbox;
 	GtkWidget *button;
 
 
@@ -766,29 +767,30 @@ static gint unsharp_mask_dialog() {
 	gtk_widget_show(table);
 
 
-	/* OK and Cancel buttons */
+	/*  Action area  */
-	gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(window)->action_area),2);
+	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (window)->action_area), 2);
-
+	gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (window)->action_area), FALSE);
-		/* Make OK button */
+	hbbox = gtk_hbutton_box_new ();
-		button = gtk_button_new_with_label("OK");
+	gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
-		GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_box_pack_end (GTK_BOX (GTK_DIALOG (window)->action_area), hbbox, FALSE, FALSE, 0);
-		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), button,
+	gtk_widget_show (hbbox);
-		                    TRUE, TRUE, 0);
+	
-		gtk_signal_connect( GTK_OBJECT(button), "clicked",
+	button = gtk_button_new_with_label ("OK");
-		                    GTK_SIGNAL_FUNC(unsharp_ok_callback), window);
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-		gtk_widget_grab_default(button);
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-		gtk_widget_show(button);
+			    (GtkSignalFunc) unsharp_ok_callback,
-
+			    window);
-		/* Make Cancel button */
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-		button = gtk_button_new_with_label("Cancel");
+	gtk_widget_grab_default (button);
-		GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_widget_show (button);
-		
+	
-		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), button,
+	button = gtk_button_new_with_label ("Cancel");
-		                    TRUE, TRUE, 0);
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-		gtk_signal_connect ( GTK_OBJECT(button), "clicked",
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-		                    GTK_SIGNAL_FUNC(unsharp_cancel_callback), NULL);
+			    (GtkSignalFunc) unsharp_cancel_callback,
-		gtk_widget_show(button);
+			    NULL);
-
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+	gtk_widget_show (button);
 	
 	
 	/* show the window */

plug-ins/common/video.c

@@ -1833,7 +1833,7 @@ query ()
 			  "Adam D. Moss (adam@foxbox.org)",
 			  "Adam D. Moss (adam@foxbox.org)",
 			  "2nd March 1997",
-			  "<Image>/Filters/Misc/Video",
+			  "<Image>/Filters/Misc/Video...",
 			  "RGB*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -2157,6 +2157,7 @@ static gint
 video_dialog ()
 {
   GtkWidget *dlg;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *frame;
   GtkWidget *radioframe;
@@ -2200,12 +2201,19 @@ video_dialog ()
 		      NULL);
 
   /*  Action area  */
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
   button = gtk_button_new_with_label ("OK");
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) video_ok_callback,
+		      (GtkSignalFunc) video_ok_callback,
-                      dlg);
+		      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
@@ -2214,11 +2222,10 @@ video_dialog ()
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
 
-
   /*  main parameter frame  */
   frame = gtk_frame_new ("Parameter Settings");
   gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);

plug-ins/common/vpropagate.c

@@ -37,7 +37,7 @@
 #define	PLUG_IN_NAME	"plug_in_vpropagate"
 #define SHORT_NAME	"vpropagate"
 #define PROGRESS_NAME	"value propagating..."
-#define MENU_POSITION	"<Image>/Filters/Distorts/Value Propagate"
+#define MENU_POSITION	"<Image>/Filters/Distorts/Value Propagate..."
 
 typedef guchar CH;
 #define	VP_RGB	        (1 << 0)

plug-ins/common/warp.c

@@ -303,7 +303,7 @@ query ()
 			  "John P. Beale",
 			  "John P. Beale",
 			  "1997",
-			  N_("<Image>/Filters/Map/Warp"),
+			  N_("<Image>/Filters/Map/Warp..."),
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/common/waves.c

@@ -105,7 +105,7 @@ query(void){
                          "Eric L. Hernes, Stephen Norris",
                          "Stephen Norris",
                          "1997",
-                         "<Image>/Filters/Distorts/Waves",
+                         "<Image>/Filters/Distorts/Waves...",
                          "RGB*, GRAY*",
                          PROC_PLUG_IN,
                          nargs, nrets,

plug-ins/common/whirlpinch.c

@@ -205,7 +205,7 @@ query(void)
 			       "Federico Mena Quintero and Scott Goehring",
 			       "Federico Mena Quintero and Scott Goehring",
 			       PLUG_IN_VERSION,
-			       "<Image>/Filters/Distorts/Whirl and Pinch",
+			       "<Image>/Filters/Distorts/Whirl and Pinch...",
 			       "RGB*, GRAY*",
 			       PROC_PLUG_IN,
 			       nargs,
@@ -786,6 +786,7 @@ whirl_pinch_dialog(void)
 	GtkWidget  *top_table;
 	GtkWidget  *frame;
 	GtkWidget  *table;
+	GtkWidget  *hbbox;
 	GtkWidget  *button;
 	gint        argc;
 	gchar     **argv;
@@ -850,26 +851,30 @@ whirl_pinch_dialog(void)
 	dialog_create_value("Pinch amount", GTK_TABLE(table), 1, &wpvals.pinch, -1.0, 1.0, 0.01);
 	dialog_create_value("Radius", GTK_TABLE(table), 2, &wpvals.radius, 0.0, 2.0, 0.01);
 
-	/* Buttons */
+	  /*  Action area  */
-
+	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 2);
-	gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 6);
+	gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dialog)->action_area), FALSE);
-
+	hbbox = gtk_hbutton_box_new ();
-	button = gtk_button_new_with_label("OK");
+	gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), hbbox, FALSE, FALSE, 0);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
+	gtk_widget_show (hbbox);
-			   (GtkSignalFunc) dialog_ok_callback,
+	
-			   dialog);
+	button = gtk_button_new_with_label ("OK");
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, TRUE, TRUE, 0);
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-	gtk_widget_grab_default(button);
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-	gtk_widget_show(button);
+			    (GtkSignalFunc) dialog_ok_callback,
-
+			    dialog);
-	button = gtk_button_new_with_label("Cancel");
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_widget_grab_default (button);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
+	gtk_widget_show (button);
-			   (GtkSignalFunc) dialog_cancel_callback,
+	
-			   dialog);
+	button = gtk_button_new_with_label ("Cancel");
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, TRUE, TRUE, 0);
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-	gtk_widget_show(button);
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
+			    (GtkSignalFunc) dialog_cancel_callback,
+			    dialog);
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+	gtk_widget_show (button);
 
 	/* Done */
 

plug-ins/common/wind.c

@@ -148,7 +148,7 @@ query(void)
 			 "Nigel Wetten",
 			 "Nigel Wetten",
 			 "1998",
-			 "<Image>/Filters/Distorts/Wind",
+			 "<Image>/Filters/Distorts/Wind...",
 			 "RGB*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,
@@ -812,6 +812,7 @@ dialog_box(void)
   GtkWidget *frame;
   GtkWidget *outer_frame;
   GtkWidget *dlg;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *label;
   GtkWidget *entry;
@@ -835,23 +836,29 @@ dialog_box(void)
 		     "destroy", (GtkSignalFunc) close_callback, NULL);
 
   /*  Action area  */
-  button = gtk_button_new_with_label("OK");
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
-  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+  hbbox = gtk_hbutton_box_new ();
-		     (GtkSignalFunc) ok_callback, dlg);
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->action_area), button,
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
-		     TRUE, TRUE, 0);
+  gtk_widget_show (hbbox);
-  gtk_widget_grab_default(button);
+ 
-  gtk_widget_show(button);
+  button = gtk_button_new_with_label ("OK");
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      (GtkSignalFunc) ok_callback,
+		      dlg);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+  gtk_widget_grab_default (button);
+  gtk_widget_show (button);
 
-  button = gtk_button_new_with_label("Cancel");
+  button = gtk_button_new_with_label ("Cancel");
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-  gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
+  gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
-			    (GtkSignalFunc) gtk_widget_destroy,
+			     (GtkSignalFunc) gtk_widget_destroy,
-			    GTK_OBJECT(dlg));
+			     GTK_OBJECT (dlg));
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->action_area), button,
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-		     TRUE, TRUE, 0);
+  gtk_widget_show (button);
-  gtk_widget_show(button);
 
   /* init tooltips */
   tooltips = gtk_tooltips_new();

plug-ins/flame/flame.c

@@ -128,7 +128,7 @@ static void query()
 			 "Scott Draves",
 			 "Scott Draves",
 			 "1997",
-			 "<Image>/Filters/Render/Nature/Flame",
+			 "<Image>/Filters/Render/Nature/Flame...",
 			 "RGB*",
 			 PROC_PLUG_IN,
 			 nargs, nreturn_vals,
@@ -771,6 +771,7 @@ cmap_constrain (gint32 image_id, gint32 drawable_id, gpointer data) {
 
 
 static gint dialog() {
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *table;
   GtkWidget *box;
@@ -804,22 +805,30 @@ static gint dialog() {
   gtk_signal_connect(GTK_OBJECT(dlg), "destroy",
 		     (GtkSignalFunc) close_callback, NULL);
 
-  button = gtk_button_new_with_label("Ok");
+  /*  Action area  */
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
-  gtk_signal_connect(GTK_OBJECT(button), "clicked",
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
-		     (GtkSignalFunc) ok_callback,
+  hbbox = gtk_hbutton_box_new ();
-		     dlg);
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
-  gtk_widget_grab_default(button);
+  gtk_widget_show (hbbox);
-  gtk_widget_show(button);
+ 
+  button = gtk_button_new_with_label ("OK");
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+		      (GtkSignalFunc) ok_callback,
+		      dlg);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+  gtk_widget_grab_default (button);
+  gtk_widget_show (button);
 
-  button = gtk_button_new_with_label("Cancel");
+  button = gtk_button_new_with_label ("Cancel");
-  GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-  gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
+  gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
-			    (GtkSignalFunc) gtk_widget_destroy,
+			     (GtkSignalFunc) gtk_widget_destroy,
-			    GTK_OBJECT(dlg));
+			     GTK_OBJECT (dlg));
-  gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-  gtk_widget_show(button);
+  gtk_widget_show (button);
 
   frame = gtk_frame_new("Rendering");
   gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);

plug-ins/gfig/gfig.c

@@ -626,7 +626,7 @@ query ()
 			  "Andy Thomas",
 			  "Andy Thomas",
 			  "1997",
-			  "<Image>/Filters/Render/Gfig",
+			  "<Image>/Filters/Render/Gfig...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/gflare/gflare.c

@@ -724,7 +724,7 @@ plugin_query()
 			  "Eiichi Takamori",
 			  "Eiichi Takamori, and a lot of GIMP people",
 			  "1997",
-			  "<Image>/Filters/Light Effects/GFlare",
+			  "<Image>/Filters/Light Effects/GFlare...",
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/maze/maze.c

@@ -152,7 +152,7 @@ query ()
 			  "Kevin Turner <kevint@poboxes.com>",
 			  "Kevin Turner",
 			  "1997, 1998",
-			  "<Image>/Filters/Render/Pattern/Maze",
+			  "<Image>/Filters/Render/Pattern/Maze...",
 			  "RGB*, GRAY*, INDEXED*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,

plug-ins/pagecurl/pagecurl.c

@@ -296,7 +296,7 @@ static void query (void) {
 			   "Federico Mena Quintero and Simon Budig",
 			   "Federico Mena Quintero and Simon Budig",
 			   PLUG_IN_VERSION,
-			   "<Image>/Filters/Distorts/Pagecurl",
+			   "<Image>/Filters/Distorts/Pagecurl...",
 			   "RGBA*, GRAYA*",
 			   PROC_PLUG_IN,
 			   nargs,
@@ -499,14 +499,15 @@ static void dialog_toggle_update (GtkWidget * widget, gint32 value) {
 
 /*********/
 
-static int do_dialog (void) {
+static int do_dialog (void) 
-
+{
    /* Missing options: Color-dialogs? / own curl layer ? / transparency
       to original drawable / Warp-curl (unsupported yet) */
 
    GtkWidget *dialog;
    GtkWidget *orhbox1, *orhbox2, *vbox, *ivbox, *corner_frame, *orient_frame;
    GtkWidget *shade_button, *gradient_button, *button, *label, *scale;
+   GtkWidget *hbbox;
    GtkStyle *style;
    GtkObject *adjustment;
    gint pixmapindex;
@@ -530,23 +531,31 @@ static int do_dialog (void) {
 		       (GtkSignalFunc) dialog_close_callback,
 		       NULL);
 
+   /*  Action area  */
+   gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 2);
+   gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dialog)->action_area), FALSE);
+   hbbox = gtk_hbutton_box_new ();
+   gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+   gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->action_area), hbbox, FALSE, FALSE, 0);
+   gtk_widget_show (hbbox);
+   
    button = gtk_button_new_with_label ("OK");
    GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
    gtk_signal_connect (GTK_OBJECT (button), "clicked",
 		       (GtkSignalFunc) dialog_ok_callback,
 		       dialog);
-   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, TRUE, TRUE, 0);
+   gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
    gtk_widget_grab_default (button);
    gtk_widget_show (button);
-
+   
    button = gtk_button_new_with_label ("Cancel");
    GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
    gtk_signal_connect (GTK_OBJECT (button), "clicked",
 		       (GtkSignalFunc) dialog_cancel_callback,
 		       dialog);
-   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), button, TRUE, TRUE, 0);
+   gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
    gtk_widget_show (button);
-
+   
    vbox = gtk_vbox_new (FALSE, 5);
    gtk_container_border_width (GTK_CONTAINER (vbox), 5);
    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),

plug-ins/unsharp/unsharp.c

@@ -167,7 +167,7 @@ static void query () {
 	                        "Winston Chang <wchang3@students.wisc.edu>",
 	                        "Winston Chang",
 	                        "1999",
-	                        "<Image>/Filters/Enhance/Unsharp Mask",
+	                        "<Image>/Filters/Enhance/Unsharp Mask...",
 	                        "GRAY*, RGB*",
 	                        PROC_PLUG_IN,
 	                        nargs, nreturn_vals,
@@ -711,10 +711,11 @@ static gdouble* gen_lookup_table(gdouble* cmatrix, gint cmatrix_length) {
 
 
 /* ------------------------ unsharp_mask_dialog ----------------------- */
-static gint unsharp_mask_dialog() {
+static gint unsharp_mask_dialog() 
-
+{
 	GtkWidget *window;
 	GtkWidget *table;
+	GtkWidget *hbbox;
 	GtkWidget *button;
 
 
@@ -766,29 +767,30 @@ static gint unsharp_mask_dialog() {
 	gtk_widget_show(table);
 
 
-	/* OK and Cancel buttons */
+	/*  Action area  */
-	gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(window)->action_area),2);
+	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (window)->action_area), 2);
-
+	gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (window)->action_area), FALSE);
-		/* Make OK button */
+	hbbox = gtk_hbutton_box_new ();
-		button = gtk_button_new_with_label("OK");
+	gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
-		GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_box_pack_end (GTK_BOX (GTK_DIALOG (window)->action_area), hbbox, FALSE, FALSE, 0);
-		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), button,
+	gtk_widget_show (hbbox);
-		                    TRUE, TRUE, 0);
+	
-		gtk_signal_connect( GTK_OBJECT(button), "clicked",
+	button = gtk_button_new_with_label ("OK");
-		                    GTK_SIGNAL_FUNC(unsharp_ok_callback), window);
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-		gtk_widget_grab_default(button);
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-		gtk_widget_show(button);
+			    (GtkSignalFunc) unsharp_ok_callback,
-
+			    window);
-		/* Make Cancel button */
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
-		button = gtk_button_new_with_label("Cancel");
+	gtk_widget_grab_default (button);
-		GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_widget_show (button);
-		
+	
-		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->action_area), button,
+	button = gtk_button_new_with_label ("Cancel");
-		                    TRUE, TRUE, 0);
+	GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
-		gtk_signal_connect ( GTK_OBJECT(button), "clicked",
+	gtk_signal_connect (GTK_OBJECT (button), "clicked",
-		                    GTK_SIGNAL_FUNC(unsharp_cancel_callback), NULL);
+			    (GtkSignalFunc) unsharp_cancel_callback,
-		gtk_widget_show(button);
+			    NULL);
-
+	gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
+	gtk_widget_show (button);
 	
 	
 	/* show the window */