X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmenus-skeleton.h;h=9c0ca1767e6ef405c424f313b92546456a6a863b;hb=686091cb06570f2df1ace39a37e459ede3b59c97;hp=86ffa8e2119ede06294195d4a9498151f99068b2;hpb=e9b6af083e34e2397a8ddbe9781920733d09d151;p=inkscape.git

diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index 86ffa8e21..9c0ca1767 100644
--- a/src/menus-skeleton.h
+++ b/src/menus-skeleton.h
@@ -1,7 +1,7 @@
 #ifndef SEEN_MENUS_SKELETON_H
 #define SEEN_MENUS_SKELETON_H
 
-#include <inkscape_version.h>
+#include "config.h"
 
 #ifdef __cplusplus
 #undef N_
@@ -9,7 +9,7 @@
 #endif
 
 static char const menus_skeleton[] =
-"<inkscape version=\"" INKSCAPE_VERSION "\"\n"
+"<inkscape version=\"" VERSION "\"\n"
 "  xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\"\n"
 "  xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\">\n"
 "\n"
@@ -29,7 +29,7 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"FileExport\" />\n"
 #ifdef WITH_GNOME_VFS
 "       <verb verb-id=\"FileImportFromOCAL\" />\n"
-"       <verb verb-id=\"FileExportToOCAL\" />\n"
+//"       <verb verb-id=\"FileExportToOCAL\" />\n"
 #endif
 "       <separator/>\n"
 "       <verb verb-id=\"FilePrint\" />\n"
@@ -40,7 +40,6 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"DialogMetadata\" />\n"
 "       <verb verb-id=\"DialogPreferences\" />\n"
 "       <verb verb-id=\"DialogInput\" />\n"
-"       <verb verb-id=\"DialogInput2\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"FileClose\" />\n"
 "       <verb verb-id=\"FileQuit\" />\n"
@@ -109,11 +108,14 @@ static char const menus_skeleton[] =
 "         <verb verb-id=\"ViewModeNormal\" radio=\"yes\" default=\"yes\"/>\n"
 "         <verb verb-id=\"ViewModeNoFilters\" radio=\"yes\"/>\n"
 "         <verb verb-id=\"ViewModeOutline\" radio=\"yes\"/>\n"
+// Better location in menu needs to be found
+//"         <verb verb-id=\"ViewModePrintColorsPreview\" radio=\"yes\"/>\n"
+//"         <verb verb-id=\"DialogPrintColorsPreview\" />\n"
 "       </submenu>\n"
 "       <separator/>\n"
 "       <verb verb-id=\"ToggleGrid\" />\n"
 "       <verb verb-id=\"ToggleGuides\" />\n"
-"       <verb verb-id=\"ToggleSnapping\" />\n"
+"       <verb verb-id=\"ToggleSnapGlobal\" />\n"
 "       <verb verb-id=\"ViewCmsToggle\" />\n"
 "       <separator/>\n"
 "       <submenu name=\"" N_("Show/Hide") "\">\n"
@@ -123,7 +125,7 @@ static char const menus_skeleton[] =
 "       <separator/>\n"
 "       <verb verb-id=\"DialogSwatches\" />\n"
 "       <verb verb-id=\"DialogDebug\" />\n"
-"       <verb verb-id=\"DialogScript\" />\n"
+//"       <verb verb-id=\"DialogScript\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"PrevWindow\" />\n"
 "       <verb verb-id=\"NextWindow\" />\n"
@@ -132,6 +134,8 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"ViewNew\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"FullScreen\" />\n"
+"       <separator/>\n"
+"       <task-checkboxes/>\n"
 // Not quite ready to be in the menus.
 // "       <verb verb-id=\"FocusToggle\" />\n"
 "   </submenu>\n"
@@ -159,9 +163,6 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"DialogFillStroke\" />\n"
 "       <verb verb-id=\"DialogObjectProperties\" />\n"
 "       <separator/>\n"
-"       <verb verb-id=\"DialogFilterEffects\" />\n"
-"       <verb verb-id=\"RemoveFilter\" />\n"
-"       <separator/>\n"
 "       <verb verb-id=\"SelectionGroup\" />\n"
 "       <verb verb-id=\"SelectionUnGroup\" />\n"
 "       <separator/>\n"
@@ -220,17 +221,16 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"SelectionSimplify\" />\n"
 "       <verb verb-id=\"SelectionReverse\" />\n"
 "       <separator/>\n"
-"       <submenu name=\"" N_("Path Effects") "\">\n"
-"           <verb verb-id=\"DialogLivePathEffect\" />\n"
-"           <verb verb-id=\"PasteLivePathEffect\" />\n"
-"           <verb verb-id=\"RemoveLivePathEffect\" />\n"
-"       </submenu>\n"
+"       <verb verb-id=\"DialogLivePathEffect\" />\n"
+"       <verb verb-id=\"PasteLivePathEffect\" />\n"
+"       <verb verb-id=\"RemoveLivePathEffect\" />\n"
 "   </submenu>\n"
 "   <submenu name=\"" N_("_Text") "\">\n"
 "       <verb verb-id=\"DialogText\" />\n"
 #ifdef ENABLE_SVG_FONTS
 "       <verb verb-id=\"DialogSVGFonts\" />\n"
 #endif // ENABLE_SVG_FONTS
+"       <verb verb-id=\"DialogGlyphs\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"SelectionTextToPath\" />\n"
 "       <verb verb-id=\"SelectionTextFromPath\" />\n"
@@ -240,8 +240,18 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"ObjectFlowtextToText\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"SelectionTextRemoveKerns\" />\n"
+#ifdef HAVE_ASPELL
+"       <separator/>\n"
+"       <verb verb-id=\"DialogSpellcheck\" />\n"
+#endif
+"   </submenu>\n"
+"   <submenu name=\"" N_("Filter_s") "\">\n"
+"       <filters-list/>\n"
+"       <separator/>\n"
+"       <verb verb-id=\"DialogFilterEffects\" />\n"
+"       <verb verb-id=\"RemoveFilter\" />\n"
 "   </submenu>\n"
-"   <submenu name=\"" N_("Effe_cts") "\">\n"
+"   <submenu name=\"" N_("Exte_nsions") "\">\n"
 "       <verb verb-id=\"EffectLast\" />\n"
 "       <verb verb-id=\"EffectLastPref\" />\n"
 "       <separator/>\n"
@@ -262,6 +272,7 @@ static char const menus_skeleton[] =
 "           <verb verb-id=\"TutorialsAdvanced\" />\n"
 "           <verb verb-id=\"TutorialsTracing\" />\n"
 "           <verb verb-id=\"TutorialsCalligraphy\" />\n"
+"           <verb verb-id=\"TutorialsInterpolate\" />\n"
 "           <verb verb-id=\"TutorialsDesign\" />\n"
 "           <verb verb-id=\"TutorialsTips\" />\n"
 "       </submenu>\n"