summaryrefslogtreecommitdiffstats
path: root/src/widgets/toolbox.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-11-12 23:48:16 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-11-12 23:48:16 +0000
commitadef171f85a93a4db998d583246d5521a894b305 (patch)
treead091bca4aafa62f68ad905d691ecc0d328c1c57 /src/widgets/toolbox.cpp
parentupdate to trunk (diff)
parentFix crashes in erase mode of spray (diff)
downloadinkscape-adef171f85a93a4db998d583246d5521a894b305.tar.gz
inkscape-adef171f85a93a4db998d583246d5521a894b305.zip
update to trunk
(bzr r14422.3.4)
Diffstat (limited to 'src/widgets/toolbox.cpp')
-rw-r--r--src/widgets/toolbox.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index cdb9e0d20..3e79e038a 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -321,15 +321,17 @@ static gchar const * ui_descr =
" <toolitem action='SprayStandard_deviationAction' />"
" <toolitem action='SprayMeanAction' />"
" <separator />"
- " <toolitem action='SprayOverVisibleAction' />"
+ " <toolitem action='SprayOverNoTransparentAction' />"
+ " <toolitem action='SprayOverTransparentAction' />"
+ " <toolitem action='SprayPickNoOverlapAction' />"
" <toolitem action='SprayNoOverlapAction' />"
" <toolitem action='SprayToolOffsetAction' />"
" <separator />"
" <toolitem action='SprayPickColorAction' />"
- " <toolitem action='SprayOverPickInverseValueAction' />"
- " <toolitem action='SprayOverPickFillAction' />"
- " <toolitem action='SprayOverPickStrokeAction' />"
-
+ " <toolitem action='SprayPickFillAction' />"
+ " <toolitem action='SprayPickStrokeAction' />"
+ " <toolitem action='SprayPickInverseValueAction' />"
+ " <toolitem action='SprayPickCenterAction' />"
" </toolbar>"
" <toolbar name='ZoomToolbar'>"
@@ -368,7 +370,7 @@ static gchar const * ui_descr =
" <toolitem action='MeasureToGuides' />"
" <toolitem action='MeasureMarkDimension' />"
" <toolitem action='MeasureToItem' />"
- " </toolbar>"
+ " </toolbar>"
" <toolbar name='StarToolbar'>"
" <separator />"