wave two of the changes

Fri Aug 14 19:58:13 EDT 1998 Adrian Likins <adrian@gimp.org> * plugins/script-fu/scripts/select_to_brush.scm, selection-round.scm,slide.scm,sota-chrome-logo.scm, spinning_globe.scm,starburst-logo.scm,starscape-logo.scm, swirltile.scm, swirly-pattern.scm, t-o-p-logo.scm, textured-logo.scm: wave two of the changes -adrian
2024-10-21 03:52:33 +00:00 · 1998-08-15 01:13:41 +00:00 · 1998-08-15 01:13:41 +00:00 · e6568759d8
parent e9363dbcac
commit e6568759d8
14 changed files with 73 additions and 56 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+Fri Aug 14 19:58:13 EDT 1998 Adrian Likins <adrian@gimp.org>
+
+	* plugins/script-fu/scripts/select_to_brush.scm,
+	selection-round.scm,slide.scm,sota-chrome-logo.scm,
+	spinning_globe.scm,starburst-logo.scm,starscape-logo.scm,
+	swirltile.scm, swirly-pattern.scm, t-o-p-logo.scm,
+	textured-logo.scm: wave two of the changes
+
 Fri Aug 14 16:40:30 MEST 1998 Sven Neumann <sven@gimp.org>

 	* app/transform_tool.c
--- a/plug-ins/script-fu/scripts/select-to-brush.scm
+++ b/plug-ins/script-fu/scripts/select-to-brush.scm
@ -103,7 +103,7 @@
 ;		    SF-STRING "Home directory" "/home/aklikins/"
 		    SF-STRING "Description" "Brush"
 		    SF-STRING "Filename" "SlothBrush"
-		    SF-VALUE "Spacing" "25")
-
+;		    SF-VALUE "Spacing" "25")
+		    SF-ADJUSTMENT "Spacing" '(25 0 1000 1 1 1 0))


--- a/plug-ins/script-fu/scripts/select_to_brush.scm
+++ b/plug-ins/script-fu/scripts/select_to_brush.scm
@ -103,7 +103,7 @@
 ;		    SF-STRING "Home directory" "/home/aklikins/"
 		    SF-STRING "Description" "Brush"
 		    SF-STRING "Filename" "SlothBrush"
-		    SF-VALUE "Spacing" "25")
-
+;		    SF-VALUE "Spacing" "25")
+		    SF-ADJUSTMENT "Spacing" '(25 0 1000 1 1 1 0))


--- a/plug-ins/script-fu/scripts/selection-round.scm
+++ b/plug-ins/script-fu/scripts/selection-round.scm
@ -132,8 +132,7 @@
 		    "RGB RGBA GRAY GRAYA INDEXED INDEXEDA"
 		    SF-IMAGE "Image" 0
 		    SF-DRAWABLE "Drawable" 0
-		    SF-VALUE "Relative Radius" "1.0") 
-
+		    SF-ADJUSTMENT "Relative Radius" '(1 0 128 .1 1 1 1))



--- a/plug-ins/script-fu/scripts/slide.scm
+++ b/plug-ins/script-fu/scripts/slide.scm
@ -49,7 +49,7 @@
 			 drawable
 			 text
 			 number
-			 font-family
+			 fontname
 			 font-color
 			 work-on-copy)
  (let* ((type (car (gimp-drawable-type-with-alpha drawable)))
@ -122,16 +122,15 @@

 ; add the text
  (gimp-palette-set-foreground font-color)
-  (gimp-floating-sel-anchor (car (gimp-text image
+  (gimp-floating-sel-anchor (car (gimp-text-fontname image
 					    film-layer
 					    (+ hole-start (* -0.25 width))
 					    (* 0.01 height)
 					    text
 					    0
 					    TRUE
-					    (* 0.040 height) PIXELS
-					    "*" font-family "*" "*" "*" "*" )))
-  (gimp-floating-sel-anchor (car (gimp-text image
+					    (* 0.040 height) PIXELS fontname)))
+  (gimp-floating-sel-anchor (car (gimp-text-fontname image
 					    film-layer
 					    (+ hole-start (* 0.75 width))
 					    (* 0.01 height)
@ -139,8 +138,8 @@
 					    0
 					    TRUE
 					    (* 0.040 height) PIXELS
-					    "*" font-family "*" "*" "*" "*" )))
-  (gimp-floating-sel-anchor (car (gimp-text image
+					    fontname )))
+  (gimp-floating-sel-anchor (car (gimp-text-fontname image
 					    film-layer		  
 					    (+ hole-start (* 0.35 width))
 					    (* 0.01 height)
@ -148,8 +147,8 @@
 					    0
 					    TRUE
 					    (* 0.050 height) PIXELS
-					    "*" font-family "*" "*" "*" "*" )))
-  (gimp-floating-sel-anchor (car (gimp-text image
+					    fontname )))
+  (gimp-floating-sel-anchor (car (gimp-text-fontname image
 					    film-layer		  
 					    (+ hole-start (* 0.35 width))
 					    (* 0.95 height)
@ -157,8 +156,8 @@
 					    0
 					    TRUE
 					    (* 0.050 height) PIXELS
-					    "*" font-family "*" "*" "*" "*" )))
-  (gimp-floating-sel-anchor (car (gimp-text image
+					    fontname )))
+  (gimp-floating-sel-anchor (car (gimp-text-fontname image
 					      film-layer		  
 					      (+ hole-start (* 0.85 width))
 					      (* 0.95 height)
@ -166,7 +165,7 @@
 					      0
 					      TRUE
 					      (* 0.045 height) PIXELS
-					      "*" font-family "*" "*" "*" "*" )))
+					      fontname )))

 ; create a mask for the holes and cut them out
  (let* ((film-mask (car (gimp-layer-create-mask film-layer WHITE-MASK)))
@ -225,7 +224,7 @@
 		    SF-DRAWABLE "Drawable" 0
 		    SF-STRING "Text" "The GIMP"
 		    SF-STRING "Number" "32"
-		    SF-STRING "Font" "Utopia"
+		    SF-FONT "Font" "-*-utopia-*-r-*-*-24-*-*-*-p-*-*-*"
 		    SF-COLOR "Font Color" '(255 180 0)
 		    SF-TOGGLE "Work on copy" TRUE) 

--- a/plug-ins/script-fu/scripts/sota-chrome-logo.scm
+++ b/plug-ins/script-fu/scripts/sota-chrome-logo.scm
@ -62,7 +62,7 @@
 	(gimp-floating-sel-anchor floating-sel)))

 (define (script-fu-sota-chrome-logo chrome-saturation chrome-lightness chrome-factor
-				    text size font env-map hc cc)
+				    text size fontname env-map hc cc)
  (let* ((img (car (gimp-image-new 256 256 GRAY)))
 	 (banding-img (car (gimp-file-load 1 env-map env-map)))
 	 (banding-layer (car (gimp-image-active-drawable banding-img)))
@ -76,7 +76,7 @@
 	 (offy2 (sota-scale size (- 0.25) chrome-factor))
 	 (feather (sota-scale size 0.5 chrome-factor))
 	 (brush-size (sota-scale size 0.5 chrome-factor))
-	 (text-layer (car (gimp-text img -1 0 0 text (* b-size 2) TRUE size PIXELS "*" font "*" "*" "*" "*")))
+	 (text-layer (car (gimp-text-fontname img -1 0 0 text (* b-size 2) TRUE size PIXELS fontname)))
 	 (width (car (gimp-drawable-width text-layer)))
 	 (height (car (gimp-drawable-height text-layer)))
 	 (layer1 (car (gimp-layer-new img banding-width banding-height banding-type "Layer1" 100 NORMAL)))
@ -188,12 +188,17 @@
 		    "Spencer Kimball"
 		    "1997"
 		    ""
-		    SF-VALUE "Chrome Saturation" "-80"
-		    SF-VALUE "Chrome Lightness" "-47"
-		    SF-VALUE "Chrome Factor" "0.75"
+;		    SF-VALUE "Chrome Saturation" "-80"
+		    SF-ADJUSTMENT "Chrome Saturation" '(-80 -100 100 1 10 0 0)
+;		    SF-VALUE "Chrome Lightness" "-47"
+		    SF-ADJUSTMENT "Chrome Lightness" '(-47 -100 100 1 10 0 0)
+;		    SF-VALUE "Chrome Factor" "0.75"
+		    SF-ADJUSTMENT  "Chrome Factor" '(.75 0 1 .1 .01 2 0)
 		    SF-STRING "Text String" "The GIMP"
-		    SF-VALUE "Font Size (in pixels)" "150"
-		    SF-STRING "Font" "RoostHeavy"
+;		    SF-VALUE "Font Size (in pixels)" "150"
+		    SF-ADJUSTMENT "Font size (in pixels)" '(150 1 1000 1 10 0 1)
+;		    SF-STRING "Font" "RoostHeavy"
+		    SF-FONT "Font" "-*-roostheavy-*-r-*-*-24-*-*-*-p-*-*-*"
 		    SF-STRING "Environment Map" (string-append "" gimp-data-dir "/scripts/beavis.jpg")
 		    SF-COLOR "Highlight Balance" '(211 95 0)
 		    SF-COLOR "Chrome Balance" '(0 0 0))
--- a/plug-ins/script-fu/scripts/spinning-globe.scm
+++ b/plug-ins/script-fu/scripts/spinning-globe.scm
@ -92,8 +92,10 @@ TRUE FALSE FALSE inTransparent 0.25)
    SF-IMAGE "The Image" 0
    SF-DRAWABLE "The Layer" 0
    SF-VALUE "Frames:" "10"
+;    SF-ADJUSTMENT "Frames:" '(10 1 256 1 10 0 1)
    SF-TOGGLE "Turn from left to right?" FALSE
    SF-TOGGLE "Transparant Background?" TRUE
    SF-VALUE "Index of n Colors (0 = Remain RGB):" "63"
+;    SF-ADJUSTMENT "Index of n Colors (0 = Remain RGB):" '(63 2 256 1 10 0 1)
    SF-TOGGLE "Work on Copy?" TRUE
 )
--- a/plug-ins/script-fu/scripts/spinning_globe.scm
+++ b/plug-ins/script-fu/scripts/spinning_globe.scm
@ -92,8 +92,10 @@ TRUE FALSE FALSE inTransparent 0.25)
    SF-IMAGE "The Image" 0
    SF-DRAWABLE "The Layer" 0
    SF-VALUE "Frames:" "10"
+;    SF-ADJUSTMENT "Frames:" '(10 1 256 1 10 0 1)
    SF-TOGGLE "Turn from left to right?" FALSE
    SF-TOGGLE "Transparant Background?" TRUE
    SF-VALUE "Index of n Colors (0 = Remain RGB):" "63"
+;    SF-ADJUSTMENT "Index of n Colors (0 = Remain RGB):" '(63 2 256 1 10 0 1)
    SF-TOGGLE "Work on Copy?" TRUE
 )
--- a/plug-ins/script-fu/scripts/starburst-logo.scm
+++ b/plug-ins/script-fu/scripts/starburst-logo.scm
@ -2,13 +2,13 @@
 ;    Effect courtesy Xach Beane's web page


-(define (script-fu-starburst-logo text size font burst-color bg-color)
+(define (script-fu-starburst-logo text size fontname burst-color bg-color)
  (let* ((img (car (gimp-image-new 256 256 RGB)))
 	 (off (* size 0.03))
 	 (count -1)
 	 (feather (* size 0.04))
 	 (border (+ feather off))
-	 (text-layer (car (gimp-text img -1 0 0 text border TRUE size PIXELS "*" font "*" "*" "*" "*")))
+	 (text-layer (car (gimp-text-fontname img -1 0 0 text border TRUE size PIXELS fontname)))
 	 (width (car (gimp-drawable-width text-layer)))
 	 (height (car (gimp-drawable-height text-layer)))
 	 (burst-coords (cons (* width 0.5) (* height 0.5)))
@ -73,7 +73,9 @@
 		    "1997"
 		    ""
 		    SF-STRING "Text String" "GIMP"
-		    SF-VALUE "Font Size (in pixels)" "150"
-		    SF-STRING "Font" "Blippo"
+;		    SF-VALUE "Font Size (in pixels)" "150"
+		    SF-ADJUSTMENT "Font Size (pixels)" '(150 0 512 1 10 0 1)
+;		    SF-STRING "Font" "Blippo"
+		    SF-FONT "Font" "-*-blippo-*-r-*-*-24-*-*-*-p-*-*-*"
 		    SF-COLOR "Burst Color" '(60 196 33)
 		    SF-COLOR "BG Color" '(255 255 255))
--- a/plug-ins/script-fu/scripts/starscape-logo.scm
+++ b/plug-ins/script-fu/scripts/starscape-logo.scm
@ -31,7 +31,7 @@
 	       (set! clearance 1) (set! limit (- limit 1))))
    x))

-(define (script-fu-starscape-logo text size font glow-color)
+(define (script-fu-starscape-logo text size fontname glow-color)
  (let* ((img (car (gimp-image-new 256 256 RGB)))
 	 (border (/ size 4))
 	 (grow (/ size 30))
@ -39,7 +39,7 @@
 	 (offy (* size 0.02))
 	 (feather (/ size 4))
 	 (shadow-feather (/ size 25))
-	 (text-layer (car (gimp-text img -1 0 0 text border TRUE size PIXELS "*" font "*" "*" "*" "*")))
+	 (text-layer (car (gimp-text-fontname img -1 0 0 text border TRUE size PIXELS fontname)))
 	 (width (car (gimp-drawable-width text-layer)))
 	 (height (car (gimp-drawable-height text-layer)))
 	 (w (* (/ (- width (* border 2)) 2.0) 0.75))
@ -113,6 +113,6 @@
 		    "1997"
 		    ""
 		    SF-STRING "Text String" "Nova"
-		    SF-VALUE "Font Size (in pixels)" "150"
-		    SF-STRING "Font" "engraver"
+		    SF-ADJUSTMENT "Font Size (pixels)" '(150 1 1000 1 10 0 1)
+                    SF-FONT "Font" "-*-engraver-*-r-*-*-24-*-*-*-p-*-*-*"
 		    SF-COLOR "Glow Color" '(28 65 188))
--- a/plug-ins/script-fu/scripts/swirltile.scm
+++ b/plug-ins/script-fu/scripts/swirltile.scm
@ -44,12 +44,12 @@
 		    "Adrian Likins"
 		    "1997"
 		    ""
-		    SF-VALUE "Depth" "10"
-		    SF-VALUE "Azimuth" "135"
-		    SF-VALUE "Elevation" "45"
-		    SF-VALUE "Blur Radius" "3"
-		    SF-VALUE "Height" "256"
-		    SF-VALUE "Width" "256"
-		    SF-VALUE "Whirl Amount" "320"
-		    SF-VALUE "Roughness" ".5"
+		    SF-ADJUSTMENT "Depth" '(10 0 64 1 1 0 0)
+		    SF-ADJUSTMENT "Azimuth" '(135 0 360 1 10 0 0)
+		    SF-ADJUSTMENT "Elevation" '(45 0 90 1 10 0 0)
+		    SF-ADJUSTMENT "Blur Radius" '(3 0 128 1 10 0 0)
+		    SF-ADJUSTMENT "height" '(256 0 1024 1 10 0 1)
+		    SF-ADJUSTMENT "Width" '(256 0 1024 1 10 0 1)
+		    SF-ADJUSTMENT "Whirl Amount" '(320 0 360 1 10 0 0)
+		    SF-ADJUSTMENT "Roughness" '(.5 0 1 .1 .01 2 1)
 		    SF-COLOR "Backgound Color" '(255 255 255))
--- a/plug-ins/script-fu/scripts/swirly-pattern.scm
+++ b/plug-ins/script-fu/scripts/swirly-pattern.scm
@ -84,6 +84,6 @@
 		    "Federico Mena Quintero"
 		    "June 1997"
 		    ""
-		    SF-VALUE "Quarter size" "20"
-		    SF-VALUE "Whirl angle" "90"
-		    SF-VALUE "Number of times to whirl" "4")
+		    SF-ADJUSTMENT "Quarter size" '(20 0 2048 1 10 0 1)
+		    SF-ADJUSTMENT "Whirl Angle" '(90 0 360 1 1 0 0)
+		    SF-ADJUSTMENT "Numer of times to whirl" '(4 0 128 1 1 0 1))
--- a/plug-ins/script-fu/scripts/t-o-p-logo.scm
+++ b/plug-ins/script-fu/scripts/t-o-p-logo.scm
@ -3,10 +3,10 @@
 ;; Time-stamp: <97/03/15 17:27:33 narazaki@InetQ.or.jp>
 ;; Version 0.2

-(define (script-fu-t-o-p-logo text size font hit-rate edge-size edge-only base-color bg-color)
+(define (script-fu-t-o-p-logo text size fontname hit-rate edge-size edge-only base-color bg-color)
  (let* ((img (car (gimp-image-new 256 256 RGB)))
 	 (border (/ size 5))
-	 (text-layer (car (gimp-text img -1 0 0 text (* border 2) TRUE size PIXELS "*" font "*" "*" "*" "*")))
+	 (text-layer (car (gimp-text-fontname img -1 0 0 text (* border 2) TRUE size PIXELS fontname)))
 	 (width (car (gimp-drawable-width text-layer)))
 	 (height (car (gimp-drawable-height text-layer)))
 	 (text-layer-mask (car (gimp-layer-create-mask text-layer BLACK-MASK)))
@ -86,10 +86,10 @@
 		    "1997"
 		    ""
 		    SF-STRING "Text String" "The GIMP"
-		    SF-VALUE "Font Size (in pixels)" "100"
-		    SF-STRING "Font" "Becker"
-		    SF-VALUE "Hit Rate [0.0,1.0]" "0.2"
-		    SF-VALUE "Edge Width" "2"
+		    SF-ADJUSTMENT "Font size (in pixels)" '(100 1 1000 1 10 0 1)
+		    SF-FONT "Font" "-*-becker-*-r-*-*-24-*-*-*-p-*-*-*"
+                    SF-ADJUSTMENT  "Hit Rate [0.0,1.0]" '(0.2 0 1 .01 .01 2 0)
+                    SF-ADJUSTMENT "Edge Width" '(2 0 128 1 1 0 0)
 		    SF-VALUE "Edge Only [0/1]" "0"
 		    SF-COLOR "Base Color" '(0 40 0)
 		    SF-COLOR "Background Color" '(255 255 255))
--- a/plug-ins/script-fu/scripts/textured-logo.scm
+++ b/plug-ins/script-fu/scripts/textured-logo.scm
@ -7,14 +7,14 @@

 (define (scale size percent) (* size percent))

-(define (script-fu-textured-logo text-pattern tile-type text size font bg-color blend-fg blend-bg)
+(define (script-fu-textured-logo text-pattern tile-type text size fontname bg-color blend-fg blend-bg)
  (let* ((img (car (gimp-image-new 256 256 RGB)))
 	 (b-size (scale size 0.1))
 	 (b-size-2 (scale size 0.05))
 	 (f-size (scale size 0.075))
 	 (ds-size (scale size 0.05))
 	 (ts-size (- b-size-2 3))
-	 (text-layer (car (gimp-text img -1 0 0 text b-size TRUE size PIXELS "*" font "*" "*" "*" "*")))
+	 (text-layer (car (gimp-text-fontname img -1 0 0 text b-size TRUE size PIXELS fontname)))
 	 (width (car (gimp-drawable-width text-layer)))
 	 (height (car (gimp-drawable-height text-layer)))
 	 (blend-layer (car (gimp-layer-new img width height RGBA_IMAGE "Blend" 100 NORMAL)))
@ -83,10 +83,10 @@
 		    "1996"
 		    ""
 		    SF-STRING "Text Pattern" "Fibers"
-		    SF-VALUE "Mosaic Tile Type" "0"
+		    SF-ADJUSTMENT "Mosaic Tile Type\n Squares 0, HEX 1, Oct 2" '(0 0 2 1 1 0 1)
 		    SF-STRING "Text String" "The GIMP"
-		    SF-VALUE "Font Size (in pixels)" "200"
-		    SF-STRING "Font" "CuneiFontLight"
+		    SF-ADJUSTMENT "Font Size (pixels)" '(200 1 1000 1 10 0 1)
+		    SF-FONT "Font" "-*-cuneifontlight-*-r-*-*-24-*-*-*-p-*-*-*"
 		    SF-COLOR "Background Color" '(255 255 255)
 		    SF-COLOR "Starting Blend" '(32 106 0)
 		    SF-COLOR "Ending Blend" '(0 0 106))