X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fmenus-skeleton.h;h=581b8b39c2d1b77f92f0fe8c11320c800070cb15;hb=725a0babbf83444a957de29831c3fd818ed59338;hp=7d97967d662c43051b5cd07b2b6585695bbabfb9;hpb=305941d63be322f6f571a29b5845485fe6de4219;p=inkscape.git

diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h
index 7d97967d6..581b8b39c 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,17 +27,11 @@ static char const menus_skeleton[] =
 "       <separator/>\n"
 "       <verb verb-id=\"FileImport\" />\n"
 "       <verb verb-id=\"FileExport\" />\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"
@@ -48,6 +40,7 @@ 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"
@@ -78,7 +71,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"
@@ -89,13 +83,15 @@ 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"
 "     <submenu name=\"" N_("_Zoom") "\">\n"
 "       <verb verb-id=\"ZoomIn\" />\n"
 "       <verb verb-id=\"ZoomOut\" />\n"
-"       <seperator/>\n"
+"       <separator/>\n"
 "       <verb verb-id=\"Zoom1:0\" />\n"
 "       <verb verb-id=\"Zoom1:2\" />\n"
 "       <verb verb-id=\"Zoom2:1\" />\n"
@@ -108,34 +104,42 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"ZoomPrev\" />\n"
 "       <verb verb-id=\"ZoomNext\" />\n"
 "     </submenu>\n"
-"       <separator/>\n"
-"       <submenu name=\"" N_("Show/Hide") "\">\n"
-"           <objects-checkboxes/>\n"
+"       <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"
+"         <verb verb-id=\"ViewModePrintColorsPreview\" radio=\"yes\"/>\n"
+"         <verb verb-id=\"DialogPrintColorsPreview\" />\n"
 "       </submenu>\n"
-"       <verb verb-id=\"DialogsToggle\" />\n"
 "       <separator/>\n"
-"   <submenu name=\"" N_("_Display mode") "\">\n"
-"       <verb verb-id=\"ViewModeNormal\" radio=\"yes\" default=\"yes\"/>\n"
-"       <verb verb-id=\"ViewModeOutline\" radio=\"yes\"/>\n"
-"       </submenu>\n"
-"       <seperator/>\n"
 "       <verb verb-id=\"ToggleGrid\" />\n"
 "       <verb verb-id=\"ToggleGuides\" />\n"
+"       <verb verb-id=\"ToggleSnapGlobal\" />\n"
+"       <verb verb-id=\"ViewCmsToggle\" />\n"
 "       <separator/>\n"
-"       <verb verb-id=\"FullScreen\" />\n"
+"       <submenu name=\"" N_("Show/Hide") "\">\n"
+"           <objects-checkboxes/>\n"
+"       </submenu>\n"
+"       <verb verb-id=\"DialogsToggle\" />\n"
 "       <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"
 "       <separator/>\n"
-"       <verb verb-id=\"ViewNew\" />\n"
 "       <verb verb-id=\"ViewIconPreview\" />\n"
+"       <verb verb-id=\"ViewNew\" />\n"
 "       <separator/>\n"
+"       <verb verb-id=\"FullScreen\" />\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"
@@ -155,7 +159,6 @@ static char const menus_skeleton[] =
 "   </submenu>\n"
 "   <submenu name=\"" N_("_Object") "\">\n"
 "       <verb verb-id=\"DialogFillStroke\" />\n"
-"       <verb verb-id=\"DialogSwatches\" />\n"
 "       <verb verb-id=\"DialogObjectProperties\" />\n"
 "       <separator/>\n"
 "       <verb verb-id=\"SelectionGroup\" />\n"
@@ -173,6 +176,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"
@@ -184,6 +189,9 @@ static char const menus_skeleton[] =
 "       <verb verb-id=\"ObjectFlipHorizontally\" />\n"
 "       <verb verb-id=\"ObjectFlipVertically\" />\n"
 "       <separator/>\n"
+"       <verb verb-id=\"UnhideAll\" />\n"
+"       <verb verb-id=\"UnlockAll\" />\n"
+"       <separator/>\n"
 "       <verb verb-id=\"DialogTransform\" />\n"
 "       <verb verb-id=\"DialogAlignDistribute\" />\n"
 "       <verb verb-id=\"DialogGridArrange\" />\n"
@@ -210,20 +218,37 @@ 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
 "       <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_("Effe_cts") "\">\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_("Exte_nsions") "\">\n"
 "       <verb verb-id=\"EffectLast\" />\n"
 "       <verb verb-id=\"EffectLastPref\" />\n"
 "       <separator/>\n"
@@ -235,17 +260,26 @@ static char const menus_skeleton[] =
 "	</submenu>\n"
 #endif
 "   <submenu name=\"" N_("_Help") "\">\n"
-"       <verb verb-id=\"HelpKeys\" />\n"
+"       <verb verb-id=\"org.inkscape.help.manual\" />\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"
 //"       <verb verb-id=\"org.inkscape.dialogs.extensioneditor\" />\n"
+"       <verb verb-id=\"org.inkscape.help.commandline\" />\n"
+"       <verb verb-id=\"org.inkscape.help.faq\" />\n"
+"       <verb verb-id=\"org.inkscape.help.relnotes\" />\n"
+"       <verb verb-id=\"org.inkscape.help.reportabug\" />\n"
+"       <verb verb-id=\"org.inkscape.help.svgspec\" />\n"
+"       <separator/>\n"
 "       <verb verb-id=\"HelpAboutMemory\" />\n"
 "       <verb verb-id=\"HelpAbout\" />\n"
 //"       <verb verb-id=\"ShowLicense\" />\n"