From 54b28a5b6015cc54793695035ff2a0112b76de5b Mon Sep 17 00:00:00 2001 From: Sven Claussner Date: Mon, 8 Apr 2013 21:48:40 +0200 Subject: [PATCH] Bug 692956 - Bring back 'Color from gradient' option to Paint tools This patch adds a Dynamic for the 'Color From Gradient' option and three Paint tool presets (Airbrush, Paintbrush, Pencil), which use this preset. new file: data/dynamics/Color-From-Gradient.gdyn new file: data/tool-presets/Paint/Airbrush-Color-From-Gradient.gtp new file: data/tool-presets/Paint/Paintbrush-Color-From-Gradient.gtp new file: data/tool-presets/Paint/Pencil-Color-From-Gradient.gtp modified: data/dynamics/Makefile.am modified: data/tool-presets/Paint/Makefile.am modified: AUTHORS modified: authors.xml --- AUTHORS | 2 + authors.xml | 1 + data/dynamics/Color-From-Gradient.gdyn | 93 +++++++++++++++++++ data/dynamics/Makefile.am | 1 + .../Paint/Airbrush-Color-From-Gradient.gtp | 24 +++++ data/tool-presets/Paint/Makefile.am | 3 + .../Paint/Paintbrush-Color-From-Gradient.gtp | 24 +++++ .../Paint/Pencil-Color-From-Gradient.gtp | 23 +++++ 8 files changed, 171 insertions(+) create mode 100644 data/dynamics/Color-From-Gradient.gdyn create mode 100644 data/tool-presets/Paint/Airbrush-Color-From-Gradient.gtp create mode 100644 data/tool-presets/Paint/Paintbrush-Color-From-Gradient.gtp create mode 100644 data/tool-presets/Paint/Pencil-Color-From-Gradient.gtp diff --git a/AUTHORS b/AUTHORS index b3f583ff69..e08ee42e72 100644 --- a/AUTHORS +++ b/AUTHORS @@ -49,6 +49,7 @@ The following people have contributed code to GIMP: Stephane Chauveau Zbigniew Chyla Lars-Peter Clausen + Sven Claussner Branko Collin Ed Connel Piers Cornwell @@ -311,6 +312,7 @@ The following people have helped to document GIMP: Žygimantas Beručka Carey Bunks Marco Ciampa + Sven Claussner Dust Ulf-D. Ehlert Alessandro Falappa diff --git a/authors.xml b/authors.xml index 77164de258..3d2a06b602 100644 --- a/authors.xml +++ b/authors.xml @@ -53,6 +53,7 @@ Stephane Chauveau Zbigniew Chyla Lars-Peter Clausen + Sven Claussner Branko Collin Ed Connel Piers Cornwell diff --git a/data/dynamics/Color-From-Gradient.gdyn b/data/dynamics/Color-From-Gradient.gdyn new file mode 100644 index 0000000000..ddd97e9652 --- /dev/null +++ b/data/dynamics/Color-From-Gradient.gdyn @@ -0,0 +1,93 @@ +# GIMP dynamics file + +(name "Color From Gradient") +(opacity-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-wheel no) + (use-random no) + (use-fade no)) +(size-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-wheel no) + (use-random no) + (use-fade no)) +(angle-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-wheel no) + (use-random no) + (use-fade no)) +(color-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-wheel no) + (use-random no) + (use-fade yes)) +(force-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-wheel no) + (use-random no) + (use-fade no)) +(hardness-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-wheel no) + (use-random no) + (use-fade no)) +(aspect-ratio-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-wheel no) + (use-random no) + (use-fade no)) +(spacing-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-wheel no) + (use-random no) + (use-fade no)) +(rate-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-wheel no) + (use-random no) + (use-fade no)) +(flow-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-wheel no) + (use-random no) + (use-fade no)) +(jitter-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-wheel no) + (use-random no) + (use-fade no)) + +# end of GIMP dynamics file diff --git a/data/dynamics/Makefile.am b/data/dynamics/Makefile.am index 6ca5888fc1..e42ac19844 100644 --- a/data/dynamics/Makefile.am +++ b/data/dynamics/Makefile.am @@ -8,6 +8,7 @@ dynamicsdatadir = $(gimpdatadir)/dynamics dynamicsdata_DATA = \ Basic-Dynamics.gdyn \ + Color-From-Gradient.gdyn \ Dynamics-Off.gdyn \ Fade-Tapering.gdyn \ Random-Color.gdyn \ diff --git a/data/tool-presets/Paint/Airbrush-Color-From-Gradient.gtp b/data/tool-presets/Paint/Airbrush-Color-From-Gradient.gtp new file mode 100644 index 0000000000..df807eda08 --- /dev/null +++ b/data/tool-presets/Paint/Airbrush-Color-From-Gradient.gtp @@ -0,0 +1,24 @@ +# GIMP tool preset file + +(stock-id "gimp-tool-airbrush") +(name "Airbrush (Color From Gradient)") +(tool-options "GimpAirbrushOptions" + (tool "gimp-airbrush-tool") + (foreground (color-rgb 0.572549 0.363737 0.363737)) + (brush "2. Hardness 050") + (dynamics "Color From Gradient") + (gradient "Default") + (palette "Default") + (brush-size 500.000000) + (dynamics-expanded yes) + (fade-repeat triangular) + (rate 30.000000)) +(use-fg-bg no) +(use-brush no) +(use-dynamics yes) +(use-gradient no) +(use-pattern no) +(use-palette no) +(use-font no) + +# end of GIMP tool preset file diff --git a/data/tool-presets/Paint/Makefile.am b/data/tool-presets/Paint/Makefile.am index ab6c0ab422..8022d327de 100644 --- a/data/tool-presets/Paint/Makefile.am +++ b/data/tool-presets/Paint/Makefile.am @@ -4,12 +4,15 @@ toolpresetspaintdatadir = $(gimpdatadir)/tool-presets/Paint toolpresetspaintdata_DATA = \ Airbrush.gtp \ + Airbrush-Color-From-Gradient.gtp \ Basic-Knife.gtp \ Basic-Round.gtp \ Basic-Round-Detail.gtp \ Bristles.gtp \ Eraser-Hard.gtp \ Noise.gtp \ + Paintbrush-Color-From-Gradient.gtp \ + Pencil-Color-From-Gradient.gtp \ Smudge-Rough.gtp \ Smudge-Soft.gtp \ Soft-Oil.gtp \ diff --git a/data/tool-presets/Paint/Paintbrush-Color-From-Gradient.gtp b/data/tool-presets/Paint/Paintbrush-Color-From-Gradient.gtp new file mode 100644 index 0000000000..f298ac5f28 --- /dev/null +++ b/data/tool-presets/Paint/Paintbrush-Color-From-Gradient.gtp @@ -0,0 +1,24 @@ +# GIMP tool preset file + +(stock-id "gimp-tool-paintbrush") +(name "Paintbrush (Color From Gradient)") +(tool-options "GimpPaintOptions" + (tool "gimp-paintbrush-tool") + (foreground (color-rgb 0.572549 0.363737 0.363737)) + (brush "2. Hardness 050") + (dynamics "Color From Gradient") + (gradient "Default") + (palette "Default") + (brush-size 500.000000) + (jitter-amount 9.170000) + (dynamics-expanded yes) + (fade-repeat triangular)) +(use-fg-bg no) +(use-brush no) +(use-dynamics yes) +(use-gradient no) +(use-pattern no) +(use-palette no) +(use-font no) + +# end of GIMP tool preset file diff --git a/data/tool-presets/Paint/Pencil-Color-From-Gradient.gtp b/data/tool-presets/Paint/Pencil-Color-From-Gradient.gtp new file mode 100644 index 0000000000..78316d1a77 --- /dev/null +++ b/data/tool-presets/Paint/Pencil-Color-From-Gradient.gtp @@ -0,0 +1,23 @@ +# GIMP tool preset file + +(stock-id "gimp-tool-pencil") +(name "Pencil (Color From Gradient)") +(tool-options "GimpPencilOptions" + (tool "gimp-pencil-tool") + (foreground (color-rgb 0.572549 0.363737 0.363737)) + (brush "2. Hardness 050") + (dynamics "Color From Gradient") + (gradient "Default") + (palette "Default") + (brush-size 500.000000) + (dynamics-expanded yes) + (fade-repeat triangular)) +(use-fg-bg no) +(use-brush no) +(use-dynamics yes) +(use-gradient no) +(use-pattern no) +(use-palette no) +(use-font no) + +# end of GIMP tool preset file