From 04566959fd1230e0e2072ca870a58d72308a0f14 Mon Sep 17 00:00:00 2001 From: Alexia Death Date: Thu, 15 Oct 2009 22:54:06 +0300 Subject: [PATCH] Added some more dynamics presets and set the default dynamics value --- app/config/gimpcoreconfig.c | 2 +- data/dynamics/Dynamics-Off.gdyn | 61 +++++++++++++++++++++++++++ data/dynamics/Fade-Tappering.gdyn | 61 +++++++++++++++++++++++++++ data/dynamics/Makefile | 37 ++++++++-------- data/dynamics/Makefile.am | 9 +++- data/dynamics/Random-Color.gdyn | 61 +++++++++++++++++++++++++++ data/dynamics/Tilt-Angle.gdyn | 61 +++++++++++++++++++++++++++ data/dynamics/Track-Direction.gdyn | 61 +++++++++++++++++++++++++++ data/dynamics/Velocity-Tappering.gdyn | 61 +++++++++++++++++++++++++++ 9 files changed, 395 insertions(+), 19 deletions(-) create mode 100644 data/dynamics/Dynamics-Off.gdyn create mode 100644 data/dynamics/Fade-Tappering.gdyn create mode 100644 data/dynamics/Random-Color.gdyn create mode 100644 data/dynamics/Tilt-Angle.gdyn create mode 100644 data/dynamics/Track-Direction.gdyn create mode 100644 data/dynamics/Velocity-Tappering.gdyn diff --git a/app/config/gimpcoreconfig.c b/app/config/gimpcoreconfig.c index 74f2c62506..694f56cd37 100644 --- a/app/config/gimpcoreconfig.c +++ b/app/config/gimpcoreconfig.c @@ -38,7 +38,7 @@ #define DEFAULT_BRUSH "Round Fuzzy" -#define DEFAULT_DYNAMICS "Foo" /* alexia, fix me */ +#define DEFAULT_DYNAMICS "Basic Dynamics" #define DEFAULT_PATTERN "Pine" #define DEFAULT_PALETTE "Default" #define DEFAULT_GRADIENT "FG to BG (RGB)" diff --git a/data/dynamics/Dynamics-Off.gdyn b/data/dynamics/Dynamics-Off.gdyn new file mode 100644 index 0000000000..024f5fb4ad --- /dev/null +++ b/data/dynamics/Dynamics-Off.gdyn @@ -0,0 +1,61 @@ +# GIMP dynamics file + +(name "Dynamics Off") +(opacity-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(hardness-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(rate-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(size-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(aspect-ratio-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(color-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(angle-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(jitter-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) + +# end of GIMP dynamics file diff --git a/data/dynamics/Fade-Tappering.gdyn b/data/dynamics/Fade-Tappering.gdyn new file mode 100644 index 0000000000..d4296d0e67 --- /dev/null +++ b/data/dynamics/Fade-Tappering.gdyn @@ -0,0 +1,61 @@ +# GIMP dynamics file + +(name "Fade Tappering") +(opacity-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade yes)) +(hardness-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(rate-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(size-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade yes)) +(aspect-ratio-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(color-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(angle-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(jitter-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) + +# end of GIMP dynamics file diff --git a/data/dynamics/Makefile b/data/dynamics/Makefile index fe8b4fb8e8..6e04d0ede3 100644 --- a/data/dynamics/Makefile +++ b/data/dynamics/Makefile @@ -36,7 +36,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = i686-pc-linux-gnu host_triplet = i686-pc-linux-gnu -subdir = data/brushes +subdir = data/dynamics DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -59,11 +59,9 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(dynamicsdatadir)" \ - "$(DESTDIR)$(obsoletedynamicsdatadir)" +am__installdirs = "$(DESTDIR)$(dynamicsdatadir)" dynamicsdataDATA_INSTALL = $(INSTALL_DATA) -obsoletedynamicsdataDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dynamicsdata_DATA) $(obsoletedynamicsdata_DATA) +DATA = $(dynamicsdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = -laa ACLOCAL = ${SHELL} /home/alexiade/build/gimp_build/gimp/missing --run aclocal-1.9 @@ -442,7 +440,13 @@ sysconfdir = ${prefix}/etc target_alias = dynamicsdatadir = $(gimpdatadir)/dynamics dynamicsdata_DATA = \ - Basic-Dynamics.gdyn + Basic-Dynamics.gdyn \ + Dynamics-Off.gdyn \ + Fade-Tappering.gdyn \ + Random-Color.gdyn \ + Tilt-Angle.gdyn \ + Track-Direction.gdyn \ + Velocity-Tappering.gdyn EXTRA_DIST = $(dynamicsdata_DATA) all: all-am @@ -457,9 +461,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/brushes/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/dynamics/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/brushes/Makefile + $(AUTOMAKE) --gnu data/dynamics/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -504,7 +508,6 @@ uninstall-dynamicsdataDATA: echo " rm -f '$(DESTDIR)$(dynamicsdatadir)/$$f'"; \ rm -f "$(DESTDIR)$(dynamicsdatadir)/$$f"; \ done - tags: TAGS TAGS: @@ -543,7 +546,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(dynamicsdatadir)" "$(DESTDIR)$(obsoletedynamicsdatadir)"; do \ + for dir in "$(DESTDIR)$(dynamicsdatadir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -588,7 +591,7 @@ info: info-am info-am: -install-data-am: install-dynamicsdataDATA install-obsoletedynamicsdataDATA +install-data-am: install-dynamicsdataDATA install-exec-am: @@ -619,13 +622,13 @@ uninstall-am: uninstall-dynamicsdataDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-dynamicsdataDATA install-data install-data-am \ + install-data install-data-am install-dynamicsdataDATA \ install-exec install-exec-am install-info install-info-am \ - install-man install-obsoletedynamicsdataDATA install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dynamicsdataDATA uninstall-info-am + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-dynamicsdataDATA \ + uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/data/dynamics/Makefile.am b/data/dynamics/Makefile.am index 0725f748b0..d27b29655d 100644 --- a/data/dynamics/Makefile.am +++ b/data/dynamics/Makefile.am @@ -3,5 +3,12 @@ dynamicsdatadir = $(gimpdatadir)/dynamics dynamicsdata_DATA = \ - Basic-Dynamics.gdyn + Basic-Dynamics.gdyn \ + Dynamics-Off.gdyn \ + Fade-Tappering.gdyn \ + Random-Color.gdyn \ + Tilt-Angle.gdyn \ + Track-Direction.gdyn \ + Velocity-Tappering.gdyn + EXTRA_DIST = $(dynamicsdata_DATA) diff --git a/data/dynamics/Random-Color.gdyn b/data/dynamics/Random-Color.gdyn new file mode 100644 index 0000000000..4a64069be1 --- /dev/null +++ b/data/dynamics/Random-Color.gdyn @@ -0,0 +1,61 @@ +# GIMP dynamics file + +(name "Random Color") +(opacity-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(hardness-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(rate-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(size-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(aspect-ratio-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(color-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random yes) + (use-fade no)) +(angle-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(jitter-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) + +# end of GIMP dynamics file diff --git a/data/dynamics/Tilt-Angle.gdyn b/data/dynamics/Tilt-Angle.gdyn new file mode 100644 index 0000000000..65549bd3cc --- /dev/null +++ b/data/dynamics/Tilt-Angle.gdyn @@ -0,0 +1,61 @@ +# GIMP dynamics file + +(name "Tilt Angle") +(opacity-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(hardness-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(rate-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(size-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(aspect-ratio-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(color-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(angle-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt yes) + (use-random no) + (use-fade no)) +(jitter-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) + +# end of GIMP dynamics file diff --git a/data/dynamics/Track-Direction.gdyn b/data/dynamics/Track-Direction.gdyn new file mode 100644 index 0000000000..c3233c8566 --- /dev/null +++ b/data/dynamics/Track-Direction.gdyn @@ -0,0 +1,61 @@ +# GIMP dynamics file + +(name "Track Direction") +(opacity-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(hardness-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(rate-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(size-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(aspect-ratio-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(color-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(angle-output + (use-pressure no) + (use-velocity no) + (use-direction yes) + (use-tilt no) + (use-random no) + (use-fade no)) +(jitter-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) + +# end of GIMP dynamics file diff --git a/data/dynamics/Velocity-Tappering.gdyn b/data/dynamics/Velocity-Tappering.gdyn new file mode 100644 index 0000000000..49e06274bc --- /dev/null +++ b/data/dynamics/Velocity-Tappering.gdyn @@ -0,0 +1,61 @@ +# GIMP dynamics file + +(name "Velocity Tappering") +(opacity-output + (use-pressure no) + (use-velocity yes) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(hardness-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(rate-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(size-output + (use-pressure no) + (use-velocity yes) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(aspect-ratio-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(color-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(angle-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) +(jitter-output + (use-pressure no) + (use-velocity no) + (use-direction no) + (use-tilt no) + (use-random no) + (use-fade no)) + +# end of GIMP dynamics file