minor typo fix

* acinclude.m4: minor typo fix

* configure.in: remove waterselect plugin

* gtkrc: yellow tooltips

* tools/pdbgen/*: minor cleanups (no functional changes)

-Yosh

ChangeLog

@@ -1,3 +1,13 @@
+Wed May 12 12:13:57 PDT 1999 Manish Singh <yosh@gimp.org>
+
+	* acinclude.m4: minor typo fix
+
+	* configure.in: remove waterselect plugin
+
+	* gtkrc: yellow tooltips
+
+	* tools/pdbgen/*: minor cleanups (no functional changes)
+
 Wed May 12 15:14:25 EEST 1999 Lauri Alanko <nether@gimp.org>
 
 	* plug-ins/gfig/gfig.c: Updated calls to gimp_paintbrush to its

acinclude.m4

@@ -421,4 +421,4 @@ AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
 AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
 
 dnl This is just to quiet aclocal about the macro not being used
-if(a,b,[AC_DISABLE_FAST_INSTALL])dnl
+ifelse(a,b,[AC_DISABLE_FAST_INSTALL])dnl

configure.in

@@ -784,7 +784,6 @@ plug-ins/url/Makefile
 plug-ins/video/Makefile
 plug-ins/vinvert/Makefile
 plug-ins/vpropagate/Makefile
-plug-ins/waterselect/Makefile
 plug-ins/waves/Makefile
 plug-ins/whirlpinch/Makefile
 plug-ins/wind/Makefile

gtkrc

@@ -16,5 +16,10 @@ style "default"
   font = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*"
 }
 
+style "tooltips"
+{
+  bg[NORMAL] = { 0.94, 0.90, 0.54 }
+}
+
 widget_class "*Ruler*" style "ruler"
 widget_class "*" style "default"

tools/pdbgen/lib.pl

@@ -391,7 +391,7 @@ LGPL
 
 	open HFILE, "> $hfile" or die "Can't open $cfile: $!\n";
 	print HFILE $lgpl;
-	my $guard = "__GIMP_@{[uc $group]}_H__";
+	my $guard = "__GIMP_\U$group\E_H__";
 	print HFILE <<HEADER;
 #ifndef $guard
 #define $guard

tools/pdbgen/pdb/color.pdb

@@ -44,7 +44,7 @@ HELP
     @inargs = ( &drawable_arg );
     foreach (qw( brightness contrast)) {
 	push @inargs, { name => $_, type => '-127 <= int32 <= 127',
-			desc => "@{[ ucfirst $_ ]} adjustment: (%%desc%%)" }
+			desc => "\u$_ adjustment: (%%desc%%)" }
     }
 
     %invoke = (
@@ -562,8 +562,7 @@ HELP
 
     foreach (qw(start end)) {
 	push @inargs, { name => "${_}_range", type => '0 <= int32 < 256',
-			desc => ucfirst $_ . ' of the intensity measurement
+			desc => "\u$_ of the intensity measurement range" }
-					       range' }
     }
 
     @outargs = (

tools/pdbgen/pdb/gimage.pdb

@@ -86,7 +86,7 @@ sub type_move {
     my $layer = "";
     $layer = ', or the layer has no alpha channel' if $type eq 'layer';
 
-    $blurb = ucfirst($op) . " the specified $type in the image's $type stack";
+    $blurb = "\u$op the specified $type in the image's $type stack";
     $blurb .= " $extra of stack" if $extra;
 
     $help = <<HELP;

tools/pdbgen/pdb/gimage_mask.pdb

@@ -38,7 +38,7 @@ sub selection_simple_proc {
 sub selection_change_proc {
     my ($op, $arg, $type, $edge_lock) = @_;
 
-    $blurb = ucfirst($op) . " the image's selection";
+    $blurb = "\u$op the image's selection";
 
     $help = "This procedure ${op}s the selection. ";
 
@@ -47,7 +47,7 @@ sub selection_change_proc {
     @inargs = (
 	&std_image_arg,
 	{ name => $arg, type => "0 < $type",
-	  desc => ucfirst($arg) . " of $op (in pixels)" }
+	  desc => "\u$arg of $op (in pixels)" }
     );
 
     %invoke = ( code => "gimage_mask_$op (gimage, $arg, $arg$edge_lock);" );

tools/pdbgen/pdb/image.pdb

@@ -86,7 +86,7 @@ sub type_move {
     my $layer = "";
     $layer = ', or the layer has no alpha channel' if $type eq 'layer';
 
-    $blurb = ucfirst($op) . " the specified $type in the image's $type stack";
+    $blurb = "\u$op the specified $type in the image's $type stack";
     $blurb .= " $extra of stack" if $extra;
 
     $help = <<HELP;

tools/pdbgen/pdb/layer.pdb

@@ -71,7 +71,7 @@ CODE
 sub layer_dim_proc {
     my ($op, $morehelp, @args) = @_;
 
-    $blurb = ucfirst($op) . ' the layer to the specified extents.';
+    $blurb = "\u$op the layer to the specified extents.";
 
     my $ops = $op =~ /e$/ ? "${op}s" : "${op}es";
     $help = <<HELP;
@@ -97,7 +97,7 @@ HELP
 	$args .= $_->{name};
     }
 
-    &layer_change_invoke("LAYER_@{[ uc($op) ]}",
+    &layer_change_invoke("LAYER_\U$op\E",
 			 "layer_$op (layer, new_width, new_height, $args);");
 }
 

tools/pdbgen/pdb/misc_tools.pdb

@@ -790,7 +790,7 @@ HELP
 	    	 { name => "$_$pos", type => 'float',
 		   desc => "The new $_ coordinate of $where corner of original
 			    bounding box",
-		   alias => "trans_info[@{[ uc ]}$pos]", no_declare => 1 }
+		   alias => "trans_info[\U$_\E$pos]", no_declare => 1 }
 	}
 	$pos++;
     }
@@ -996,7 +996,7 @@ HELP
 	    	 { name => "$_$pos", type => 'float',
 		   desc => "The new $_ coordinate of $where corner of newly
 			    scaled region",
-		   alias => "trans_info[@{[ uc ]}$pos]", no_declare => 1 }
+		   alias => "trans_info[\U$_\E$pos]", no_declare => 1 }
 	}
 	$pos++;
     }

tools/pdbgen/pdb/paint_tools.pdb

@@ -790,7 +790,7 @@ HELP
 	    	 { name => "$_$pos", type => 'float',
 		   desc => "The new $_ coordinate of $where corner of original
 			    bounding box",
-		   alias => "trans_info[@{[ uc ]}$pos]", no_declare => 1 }
+		   alias => "trans_info[\U$_\E$pos]", no_declare => 1 }
 	}
 	$pos++;
     }
@@ -996,7 +996,7 @@ HELP
 	    	 { name => "$_$pos", type => 'float',
 		   desc => "The new $_ coordinate of $where corner of newly
 			    scaled region",
-		   alias => "trans_info[@{[ uc ]}$pos]", no_declare => 1 }
+		   alias => "trans_info[\U$_\E$pos]", no_declare => 1 }
 	}
 	$pos++;
     }

tools/pdbgen/pdb/selection.pdb

@@ -38,7 +38,7 @@ sub selection_simple_proc {
 sub selection_change_proc {
     my ($op, $arg, $type, $edge_lock) = @_;
 
-    $blurb = ucfirst($op) . " the image's selection";
+    $blurb = "\u$op the image's selection";
 
     $help = "This procedure ${op}s the selection. ";
 
@@ -47,7 +47,7 @@ sub selection_change_proc {
     @inargs = (
 	&std_image_arg,
 	{ name => $arg, type => "0 < $type",
-	  desc => ucfirst($arg) . " of $op (in pixels)" }
+	  desc => "\u$arg of $op (in pixels)" }
     );
 
     %invoke = ( code => "gimage_mask_$op (gimage, $arg, $arg$edge_lock);" );

tools/pdbgen/pdb/tools.pdb

@@ -790,7 +790,7 @@ HELP
 	    	 { name => "$_$pos", type => 'float',
 		   desc => "The new $_ coordinate of $where corner of original
 			    bounding box",
-		   alias => "trans_info[@{[ uc ]}$pos]", no_declare => 1 }
+		   alias => "trans_info[\U$_\E$pos]", no_declare => 1 }
 	}
 	$pos++;
     }
@@ -996,7 +996,7 @@ HELP
 	    	 { name => "$_$pos", type => 'float',
 		   desc => "The new $_ coordinate of $where corner of newly
 			    scaled region",
-		   alias => "trans_info[@{[ uc ]}$pos]", no_declare => 1 }
+		   alias => "trans_info[\U$_\E$pos]", no_declare => 1 }
 	}
 	$pos++;
     }

tools/pdbgen/pdb/transform_tools.pdb

@@ -790,7 +790,7 @@ HELP
 	    	 { name => "$_$pos", type => 'float',
 		   desc => "The new $_ coordinate of $where corner of original
 			    bounding box",
-		   alias => "trans_info[@{[ uc ]}$pos]", no_declare => 1 }
+		   alias => "trans_info[\U$_\E$pos]", no_declare => 1 }
 	}
 	$pos++;
     }
@@ -996,7 +996,7 @@ HELP
 	    	 { name => "$_$pos", type => 'float',
 		   desc => "The new $_ coordinate of $where corner of newly
 			    scaled region",
-		   alias => "trans_info[@{[ uc ]}$pos]", no_declare => 1 }
+		   alias => "trans_info[\U$_\E$pos]", no_declare => 1 }
 	}
 	$pos++;
     }