mirror of https://github.com/GNOME/gimp.git
ScriptFu: scripts use v3 API for multilayer gimp_image_get_selected_drawables etc.
Commit a6aba929
deleted the old functions.
Misc drive-by fixes for gtk_adjustment step not < pages
Issue #8155 discusses alternative fixes, convenience functions for compatibility in ScriptFu.
There is one compat function defined already in ScriptFu, temporarily: gimp-image-get-active-drawable
which was written so that testing clothify-v3.scm could proceed.
This commit is contained in:
parent
c5e526f024
commit
974f694cd2
|
@ -63,7 +63,7 @@
|
|||
(thickness (abs thickness))
|
||||
(type (car (gimp-drawable-type-with-alpha drawable)))
|
||||
(image (if (= work-on-copy TRUE) (car (gimp-image-duplicate img)) img))
|
||||
(pic-layer (car (gimp-image-get-active-drawable image)))
|
||||
(pic-layer (aref (cadr (gimp-image-get-selected-drawables image)) 0))
|
||||
(offsets (gimp-drawable-get-offsets pic-layer))
|
||||
(width (car (gimp-drawable-get-width pic-layer)))
|
||||
(height (car (gimp-drawable-get-height pic-layer)))
|
||||
|
@ -168,7 +168,7 @@
|
|||
(gimp-image-remove-layer image bump-layer)
|
||||
)
|
||||
|
||||
(gimp-image-set-active-layer image pic-layer)
|
||||
(gimp-image-set-selected-layers image 1 (vector pic-layer))
|
||||
|
||||
; enable undo / end undo group
|
||||
(if (= work-on-copy TRUE)
|
||||
|
|
|
@ -76,7 +76,7 @@
|
|||
|
||||
(let* (
|
||||
(banding-img (car (gimp-file-load RUN-NONINTERACTIVE env-map)))
|
||||
(banding-layer (car (gimp-image-get-active-drawable banding-img)))
|
||||
(banding-layer (aref (cadr (gimp-image-get-selected-drawables banding-img)) 0))
|
||||
(banding-height (car (gimp-drawable-get-height banding-layer)))
|
||||
(banding-width (car (gimp-drawable-get-width banding-layer)))
|
||||
(banding-type (car (gimp-drawable-type banding-layer)))
|
||||
|
@ -248,7 +248,7 @@
|
|||
SF-DRAWABLE "Chrome mask" 0
|
||||
SF-ADJUSTMENT _"Chrome saturation" '(-80 -100 100 1 10 0 0)
|
||||
SF-ADJUSTMENT _"Chrome lightness" '(-47 -100 100 1 10 0 0)
|
||||
SF-ADJUSTMENT _"Chrome factor" '(0.75 0 1 0.1 0.01 2 0)
|
||||
SF-ADJUSTMENT _"Chrome factor" '(0.75 0 1 0.1 0.2 2 0)
|
||||
SF-FILENAME _"Environment map"
|
||||
(string-append gimp-data-directory
|
||||
"/scripts/images/beavis.jpg")
|
||||
|
|
|
@ -89,7 +89,7 @@
|
|||
)
|
||||
(gimp-floating-sel-anchor floating-sel)
|
||||
)
|
||||
(gimp-image-set-active-layer image effect-layer ))
|
||||
(gimp-image-set-selected-layers image 1 (vector effect-layer)))
|
||||
(set! effect-layer drawable)
|
||||
)
|
||||
(set! active-layer effect-layer)
|
||||
|
@ -117,7 +117,7 @@
|
|||
(gimp-selection-none image))
|
||||
|
||||
(gimp-image-remove-channel image active-selection)
|
||||
(gimp-image-set-active-layer image drawable)
|
||||
(gimp-image-set-selected-layers image 1 (vector drawable))
|
||||
|
||||
(gimp-image-undo-group-end image)
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
(plug-in-gauss-rle RUN-NONINTERACTIVE img layer-one bx TRUE FALSE)
|
||||
(plug-in-gauss-rle RUN-NONINTERACTIVE img layer-two by FALSE TRUE)
|
||||
(gimp-image-flatten img)
|
||||
(set! bump-layer (car (gimp-image-get-active-layer img)))
|
||||
(set! bump-layer (aref (cadr (gimp-image-get-selected-layers img)) 0))
|
||||
|
||||
(plug-in-c-astretch RUN-NONINTERACTIVE img bump-layer)
|
||||
(plug-in-noisify RUN-NONINTERACTIVE img bump-layer FALSE 0.2 0.2 0.2 0.2)
|
||||
|
|
|
@ -112,7 +112,7 @@
|
|||
(text-height 0)
|
||||
)
|
||||
(gimp-selection-all img)
|
||||
(gimp-drawable-fill (car (gimp-image-get-active-layer img))
|
||||
(gimp-drawable-fill (aref (cadr (gimp-image-get-selected-layers img)) 0)
|
||||
FILL-BACKGROUND)
|
||||
(gimp-selection-none img)
|
||||
(set! text-layer (car (gimp-text-fontname img -1 0 0
|
||||
|
@ -227,9 +227,10 @@
|
|||
(if (> (car (gimp-image-get-layers new-img)) 1)
|
||||
(gimp-image-flatten new-img)
|
||||
)
|
||||
(set! tmp-layer (car (gimp-layer-new-from-drawable
|
||||
(car (gimp-image-get-active-drawable new-img))
|
||||
sheet-img)))
|
||||
(set! tmp-layer
|
||||
(car (gimp-layer-new-from-drawable
|
||||
(aref (cadr (gimp-image-get-selected-drawables new-img)) 0)
|
||||
sheet-img)))
|
||||
|
||||
(gimp-image-insert-layer sheet-img tmp-layer 0 0)
|
||||
|
||||
|
|
|
@ -148,7 +148,7 @@
|
|||
(set! count (+ count 1))
|
||||
)
|
||||
|
||||
(gimp-image-set-active-layer img drawable)
|
||||
(gimp-image-set-selected-layers img 1 (vector drawable))
|
||||
|
||||
(gimp-image-undo-enable img)
|
||||
(gimp-display-new img)
|
||||
|
|
|
@ -92,8 +92,6 @@
|
|||
(if old-selection
|
||||
(begin
|
||||
(gimp-image-select-item img CHANNEL-OP-REPLACE old-selection)
|
||||
;; (gimp-image-set-active-layer img drw)
|
||||
;; delete extra channel by Sven Neumann <neumanns@uni-duesseldorf.de>
|
||||
(gimp-image-remove-channel img old-selection)
|
||||
)
|
||||
)
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
(if (= TRUE (car (gimp-image-is-valid brush-image)))
|
||||
(begin
|
||||
(set! brush-draw (car (gimp-image-get-active-drawable brush-image)))
|
||||
(set! brush-draw (aref (cadr (gimp-image-get-selected-drawables brush-image)) 0))
|
||||
(set! type (car (gimp-drawable-type brush-draw)))
|
||||
(set! path (string-append gimp-directory
|
||||
"/brushes/"
|
||||
|
@ -69,7 +69,7 @@
|
|||
""
|
||||
SF-STRING _"_Brush name" "My Brush"
|
||||
SF-STRING _"_File name" "mybrush"
|
||||
SF-ADJUSTMENT _"_Spacing" '(25 0 1000 1 1 1 0)
|
||||
SF-ADJUSTMENT _"_Spacing" '(25 0 1000 1 2 1 0)
|
||||
)
|
||||
|
||||
(script-fu-menu-register "script-fu-paste-as-brush"
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
(if (= TRUE (car (gimp-image-is-valid pattern-image)))
|
||||
(begin
|
||||
(set! pattern-draw (car (gimp-image-get-active-drawable pattern-image)))
|
||||
(set! pattern-draw (aref (cadr (gimp-image-get-selected-drawables pattern-image)) 0))
|
||||
(set! path (string-append gimp-directory
|
||||
"/patterns/"
|
||||
filename
|
||||
|
|
|
@ -185,7 +185,7 @@
|
|||
(= from-selection FALSE))
|
||||
(gimp-image-raise-item image drawable))
|
||||
|
||||
(gimp-image-set-active-layer image drawable)
|
||||
(gimp-image-set-selected-layers image 1 (vector drawable))
|
||||
(gimp-image-undo-group-end image)
|
||||
(gimp-displays-flush)
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
(gimp-floating-sel-anchor floating-sel)
|
||||
)
|
||||
|
||||
(gimp-image-set-active-layer image effect-layer)
|
||||
(gimp-image-set-selected-layers image 1 (vector effect-layer))
|
||||
)
|
||||
(set! effect-layer drawable)
|
||||
)
|
||||
|
@ -115,7 +115,7 @@
|
|||
(gimp-selection-none image)
|
||||
)
|
||||
|
||||
(gimp-image-set-active-layer image drawable)
|
||||
(gimp-image-set-selected-layers image 1 (vector drawable))
|
||||
(gimp-image-remove-channel image active-selection)
|
||||
(gimp-image-undo-group-end image)
|
||||
(gimp-displays-flush)
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
((= work-on-copy FALSE)
|
||||
img)))
|
||||
; active drawable is not necessarily the active layer
|
||||
(pic-layer (car (gimp-image-get-active-layer image)))
|
||||
(pic-layer (aref (cadr (gimp-image-get-selected-layers image)) 0))
|
||||
(type (car (gimp-drawable-type-with-alpha pic-layer)))
|
||||
)
|
||||
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
(let* ((filename (car ,filenames))
|
||||
(image (catch #f (car (gimp-file-load RUN-NONINTERACTIVE
|
||||
filename))))
|
||||
(layer (if image (car (gimp-image-get-active-layer image)) #f))
|
||||
(layer (if image (aref (cadr (gimp-image-get-selected-layers image)) 0) #f))
|
||||
(basename (unbreakupstr (butlast (strbreakup filename ".")) ".")))
|
||||
(when image
|
||||
,@body
|
||||
|
|
|
@ -73,7 +73,7 @@
|
|||
)
|
||||
|
||||
(gimp-image-undo-enable image)
|
||||
(gimp-image-set-active-layer image drawable)
|
||||
(gimp-image-set-selected-layers image 1 (vector drawable))
|
||||
(gimp-display-new new-image)
|
||||
(gimp-displays-flush)
|
||||
|
||||
|
|
|
@ -91,7 +91,7 @@
|
|||
"Background"
|
||||
100
|
||||
LAYER-MODE-NORMAL)))
|
||||
(pic-layer (car (gimp-image-get-active-drawable image)))
|
||||
(pic-layer (aref (cadr (gimp-image-get-selected-drawables image)) 0))
|
||||
(numbera (string-append number "A"))
|
||||
)
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
(theImage (if (= inCopy TRUE)
|
||||
(car (gimp-image-duplicate inImage))
|
||||
inImage))
|
||||
(theLayer (car (gimp-image-get-active-layer theImage)))
|
||||
(theLayer (aref (cadr (gimp-image-get-selected-layers theImage)) 0))
|
||||
(n 0)
|
||||
(ang (* (/ 360 inFrames)
|
||||
(if (= inFromLeft TRUE) 1 -1) ))
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
(phase 0)
|
||||
(phaseshift (/ 360 num-frames))
|
||||
(image (car (gimp-image-duplicate img)))
|
||||
(source-layer (car (gimp-image-get-active-layer image))))
|
||||
(source-layer (aref (cadr (gimp-image-get-selected-layers image)) 0)))
|
||||
|
||||
(gimp-image-undo-disable image)
|
||||
|
||||
|
|
|
@ -108,7 +108,7 @@
|
|||
(if (= keep-selection FALSE)
|
||||
(gimp-selection-none image))
|
||||
|
||||
(gimp-image-set-active-layer image drawable)
|
||||
(gimp-image-set-selected-layers image 1 (vector drawable))
|
||||
(gimp-image-remove-channel image active-selection)
|
||||
(gimp-image-undo-group-end image)
|
||||
(gimp-displays-flush)
|
||||
|
|
Loading…
Reference in New Issue