diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-11-08 10:16:51 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-11-08 10:16:51 +0000 |
| commit | c3d0ff86bfe2a9aefbdfb07ee456775c73770822 (patch) | |
| tree | e79bd7f5050e90ff9c353d098b68ea81a8e66342 /src/widgets/toolbox.cpp | |
| parent | static code analysis (diff) | |
| parent | Fix a typo (diff) | |
| download | inkscape-c3d0ff86bfe2a9aefbdfb07ee456775c73770822.tar.gz inkscape-c3d0ff86bfe2a9aefbdfb07ee456775c73770822.zip | |
merge of branch lp:~inkscape.dev/inkscape/spraytool-no-overlap
(bzr r14452)
Diffstat (limited to 'src/widgets/toolbox.cpp')
| -rw-r--r-- | src/widgets/toolbox.cpp | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 90103325a..cdb9e0d20 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -16,10 +16,11 @@ * Tavmjong Bah <tavmjong@free.fr> * Abhishek Sharma * Kris De Gussem <Kris.DeGussem@gmail.com> + * Jabiertxo Arraiza <jabier.arraiza@marker.es> * * Copyright (C) 2004 David Turner * Copyright (C) 2003 MenTaLguY - * Copyright (C) 1999-2011 authors + * Copyright (C) 1999-2015 authors * Copyright (C) 2001-2002 Ximian, Inc. * * Released under GNU GPL, read the file 'COPYING' for more information @@ -309,14 +310,26 @@ static gchar const * ui_descr = " <toolitem action='SprayModeAction' />" " <separator />" " <toolitem action='SprayWidthAction' />" + " <toolitem action='SprayPressureWidthAction' />" " <toolitem action='SprayPopulationAction' />" - " <toolitem action='SprayPressureAction' />" + " <toolitem action='SprayPressurePopulationAction' />" " <separator />" " <toolitem action='SprayRotationAction' />" " <toolitem action='SprayScaleAction' />" + " <toolitem action='SprayPressureScaleAction' />" " <separator />" " <toolitem action='SprayStandard_deviationAction' />" " <toolitem action='SprayMeanAction' />" + " <separator />" + " <toolitem action='SprayOverVisibleAction' />" + " <toolitem action='SprayNoOverlapAction' />" + " <toolitem action='SprayToolOffsetAction' />" + " <separator />" + " <toolitem action='SprayPickColorAction' />" + " <toolitem action='SprayOverPickInverseValueAction' />" + " <toolitem action='SprayOverPickFillAction' />" + " <toolitem action='SprayOverPickStrokeAction' />" + " </toolbar>" " <toolbar name='ZoomToolbar'>" |