diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-12-08 11:05:08 +0000 |
|---|---|---|
| committer | jabiertxof <jabier.arraiza@marker.es> | 2015-12-08 11:05:08 +0000 |
| commit | d79bd642b3214f1c44d7c1268e8adcb7bd55fffc (patch) | |
| tree | 74a8529da5f23996ba4b358c045a7588f8c27f24 /src/menus-skeleton.h | |
| parent | minor changes (diff) | |
| parent | merge lp:~inkscape.dev/inkscape/lock_guides (diff) | |
| download | inkscape-d79bd642b3214f1c44d7c1268e8adcb7bd55fffc.tar.gz inkscape-d79bd642b3214f1c44d7c1268e8adcb7bd55fffc.zip | |
update to trunk
(bzr r14272.1.11)
Diffstat (limited to 'src/menus-skeleton.h')
| -rw-r--r-- | src/menus-skeleton.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h index f5e815bf6..11070d390 100644 --- a/src/menus-skeleton.h +++ b/src/menus-skeleton.h @@ -1,7 +1,9 @@ #ifndef SEEN_MENUS_SKELETON_H #define SEEN_MENUS_SKELETON_H -#include "config.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #ifdef __cplusplus #undef N_ @@ -84,6 +86,7 @@ static char const menus_skeleton[] = " <verb verb-id=\"EditInvert\" />\n" " <verb verb-id=\"EditDeselect\" />\n" " <separator/>\n" +" <verb verb-id=\"EditGuidesToggleLock\" check=\"yes\" />\n" " <verb verb-id=\"EditGuidesAroundPage\" />\n" " <verb verb-id=\"EditRemoveAllGuides\" />\n" " <separator/>\n" @@ -221,7 +224,11 @@ static char const menus_skeleton[] = " <submenu name=\"" N_("_Path") "\">\n" " <verb verb-id=\"ObjectToPath\" />\n" " <verb verb-id=\"StrokeToPath\" />\n" + +#if HAVE_POTRACE " <verb verb-id=\"SelectionTrace\" />\n" +#endif + " <verb verb-id=\"SelectionPixelArt\" />\n" " <separator/>\n" " <verb verb-id=\"SelectionUnion\" />\n" @@ -284,7 +291,9 @@ static char const menus_skeleton[] = " <verb verb-id=\"TutorialsBasic\" />\n" " <verb verb-id=\"TutorialsShapes\" />\n" " <verb verb-id=\"TutorialsAdvanced\" />\n" +#if HAVE_POTRACE " <verb verb-id=\"TutorialsTracing\" />\n" +#endif " <verb verb-id=\"TutorialsTracingPixelArt\" />\n" " <verb verb-id=\"TutorialsCalligraphy\" />\n" " <verb verb-id=\"TutorialsInterpolate\" />\n" |