diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-15 21:57:03 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-15 21:57:03 +0000 |
| commit | 6bd1c2a30b66e15fe055b22bd47dadb771f7fae2 (patch) | |
| tree | 1b991cc2736f84fb069666802d485bd29cff6394 /src/ui/tools-switch.cpp | |
| parent | Update to limit options to radius = 0, radious > 0 or both (diff) | |
| parent | fix-bug-1557192. paint-order crash with multiple items (diff) | |
| download | inkscape-6bd1c2a30b66e15fe055b22bd47dadb771f7fae2.tar.gz inkscape-6bd1c2a30b66e15fe055b22bd47dadb771f7fae2.zip | |
Update to trunk
(bzr r13645.1.119)
Diffstat (limited to 'src/ui/tools-switch.cpp')
| -rw-r--r-- | src/ui/tools-switch.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ui/tools-switch.cpp b/src/ui/tools-switch.cpp index 11313f550..ea0431b0a 100644 --- a/src/ui/tools-switch.cpp +++ b/src/ui/tools-switch.cpp @@ -42,7 +42,11 @@ #include "ui/tools/connector-tool.h" #include "ui/tools/dropper-tool.h" #include "ui/tools/eraser-tool.h" + +#if HAVE_POTRACE #include "ui/tools/flood-tool.h" +#endif + #include "ui/tools/gradient-tool.h" #include "ui/tools/lpe-tool.h" #include "ui/tools/measure-tool.h" @@ -83,7 +87,9 @@ static char const *const tool_names[] = { "/tools/measure", "/tools/dropper", "/tools/connector", +#if HAVE_POTRACE "/tools/paintbucket", +#endif "/tools/eraser", "/tools/lpetool", NULL @@ -111,7 +117,9 @@ static char const *const tool_msg[] = { N_("<b>Drag</b> to measure the dimensions of objects."), N_("<b>Click</b> to set fill, <b>Shift+click</b> to set stroke; <b>drag</b> to average color in area; with <b>Alt</b> to pick inverse color; <b>Ctrl+C</b> to copy the color under mouse to clipboard"), N_("<b>Click and drag</b> between shapes to create a connector."), +#if HAVE_POTRACE N_("<b>Click</b> to paint a bounded area, <b>Shift+click</b> to union the new fill with the current selection, <b>Ctrl+click</b> to change the clicked object's fill and stroke to the current setting."), +#endif N_("<b>Drag</b> to erase."), N_("Choose a subtool from the toolbar"), }; |