X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmenus-skeleton.h;h=924cc19894bac7133113a6c55cf81f65d4a68bdd;hb=c7cf14ac71346f76ae219ce67fb88c1bd34832e2;hp=9002323033b3d12812fefaaaec1d9fa7ba5da702;hpb=1c8797563cc134190fe424f8fdb6b2f8ed7d9275;p=inkscape.git

diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index 900232303..924cc1989 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"
@@ -19,9 +19,7 @@ static char const menus_skeleton[] =
 "           <template-list/>\n"
 "       </submenu>\n"
 "       <verb verb-id=\"FileOpen\" />\n"
-"       <submenu name=\"" N_("Open _Recent") "\">\n"
-"           <recent-file-list/>\n"
-"       </submenu>\n"
+"       <recent-file-list/>\n"
 "       <verb verb-id=\"FileRevert\" />\n"
 "       <verb verb-id=\"FileSave\" />\n"
 "       <verb verb-id=\"FileSaveAs\" />\n"
@@ -29,18 +27,11 @@ static char const menus_skeleton[] =
 "       <separator/>\n"
 "       <verb verb-id=\"FileImport\" />\n"
 "       <verb verb-id=\"FileExport\" />\n"
-"       <verb verb-id=\"FileExportToOCAL\" />\n"
-"       <separator/>\n"
-/* These are ugly, but what needs to happen here is allowing users
-   to use the native PS support if they are using another print driver.
-   This is done through the "Print Direct" command.  Which is inserted
-   here based on if those other drivers are being built. */
-#ifdef WITH_GNOME_PRINT
-"       <verb verb-id=\"FilePrintDirect\" />\n"
-#endif
-#ifdef WIN32
-"       <verb verb-id=\"FilePrintDirect\" />\n"
+#ifdef WITH_GNOME_VFS
+"       <verb verb-id=\"FileImportFromOCAL\" />\n"
+//"       <verb verb-id=\"FileExportToOCAL\" />\n"
 #endif
+"       <separator/>\n"
 "       <verb verb-id=\"FilePrint\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"FileVacuum\" />\n"
@@ -79,7 +70,8 @@ static char const menus_skeleton[] =
 "           <verb verb-id=\"EditClone\" />\n"
 "           <verb verb-id=\"DialogClonetiler\" />\n"
 "           <verb verb-id=\"EditUnlinkClone\" />\n"
-"           <verb verb-id=\"EditCloneOriginal\" />\n"
+"           <verb verb-id=\"EditRelinkClone\" />\n"
+"           <verb verb-id=\"EditCloneSelectOriginal\" />\n"
 "       </submenu>\n"
 "       <verb verb-id=\"SelectionCreateBitmap\" />\n"
 "       <separator/>\n"
@@ -90,6 +82,8 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"EditInvert\" />\n"
 "       <verb verb-id=\"EditDeselect\" />\n"
 "       <separator/>\n"
+"       <verb verb-id=\"EditGuidesAroundPage\" />\n"
+"       <separator/>\n"
 "       <verb verb-id=\"DialogXMLEditor\" />\n"
 "   </submenu>\n"
 "   <submenu name=\"" N_("_View") "\">\n"
@@ -112,11 +106,17 @@ static char const menus_skeleton[] =
 "       <submenu name=\"" N_("_Display mode") "\">\n"
 "         <verb verb-id=\"ViewModeToggle\"/>\n"
 "         <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=\"ToggleSnapGlobal\" />\n"
+"       <verb verb-id=\"ViewCmsToggle\" />\n"
 "       <separator/>\n"
 "       <submenu name=\"" N_("Show/Hide") "\">\n"
 "           <objects-checkboxes/>\n"
@@ -125,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"
@@ -134,9 +134,14 @@ 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"
 "   <submenu name=\"" N_("_Layer") "\">\n"
 "       <verb verb-id=\"LayerNew\" />\n"
+"       <verb verb-id=\"LayerDuplicate\" />\n"
 "       <verb verb-id=\"LayerRename\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"LayerNext\" />\n"
@@ -156,7 +161,6 @@ static char const menus_skeleton[] =
 "   </submenu>\n"
 "   <submenu name=\"" N_("_Object") "\">\n"
 "       <verb verb-id=\"DialogFillStroke\" />\n"
-"       <verb verb-id=\"DialogFilterEffects\" />\n"
 "       <verb verb-id=\"DialogObjectProperties\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"SelectionGroup\" />\n"
@@ -174,6 +178,8 @@ static char const menus_skeleton[] =
 "           <verb verb-id=\"ObjectsToPattern\" />\n"
 "           <verb verb-id=\"ObjectsFromPattern\" />\n"
 "       </submenu>\n"
+"       <verb verb-id=\"ObjectsToMarker\" />\n"
+"       <verb verb-id=\"ObjectsToGuides\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"SelectionRaise\" />\n"
 "       <verb verb-id=\"SelectionLower\" />\n"
@@ -214,20 +220,38 @@ static char const menus_skeleton[] =
 "       <separator/>\n"
 "       <verb verb-id=\"SelectionSimplify\" />\n"
 "       <verb verb-id=\"SelectionReverse\" />\n"
+"       <separator/>\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=\"SelectionTextFromPath\" />\n"
 "       <verb verb-id=\"SelectionTextToPath\" />\n"
+"       <verb verb-id=\"SelectionTextFromPath\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"ObjectFlowText\" />\n"
 "       <verb verb-id=\"ObjectUnFlowText\" />\n"
 "       <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"
@@ -240,13 +264,15 @@ static char const menus_skeleton[] =
 #endif
 "   <submenu name=\"" N_("_Help") "\">\n"
 "       <verb verb-id=\"org.inkscape.help.manual\" />\n"
-"       <verb verb-id=\"HelpKeys\" />\n"
+"       <verb verb-id=\"org.inkscape.help.keys\" />\n"
+"       <verb verb-id=\"org.inkscape.help.askaquestion\" />\n"
 "       <submenu name=\"" N_("Tutorials") "\">\n"
 "           <verb verb-id=\"TutorialsBasic\" />\n"
 "           <verb verb-id=\"TutorialsShapes\" />\n"
 "           <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"
@@ -277,4 +303,4 @@ static char const menus_skeleton[] =
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :