Clarify text on map layer menu

[andy/viking.git] / src / menu.xml.h

diff --git a/src/menu.xml.h b/src/menu.xml.h
index 3ee3a7174f2ea6d2c898a08712763b110363f394..429b6b5532fe277ddca0290b7d28216585942c3d 100644 (file)
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -7,6 +7,7 @@ static const char *menu_xml =
        "    <menu action='File'>"
        "      <menuitem action='New'/>"
        "      <menuitem action='Open'/>"
+       "      <menuitem action='OpenRecentFile'/>"
        "      <menuitem action='Append'/>"
        "      <menuitem action='Save'/>"
        "      <menuitem action='SaveAs'/>"
@@ -14,26 +15,48 @@ static const char *menu_xml =
        "      <menu action='Acquire'>"
        "        <menuitem action='AcquireGPS'/>"
        "        <menuitem action='AcquireGoogle'/>"
+#ifdef VIK_CONFIG_GEOCACHES
        "        <menuitem action='AcquireGC'/>"
+#endif
        "      </menu>"
        "      <separator/>"
        "      <menuitem action='GenImg'/>"
        "      <menuitem action='GenImgDir'/>"
+#if GTK_CHECK_VERSION(2,10,0)
+       "      <menuitem action='Print'/>"
+#endif
        "      <separator/>"
+       "      <menuitem action='SaveExit'/>"
        "      <menuitem action='Exit'/>"
        "    </menu>"
+       "    <menu action='Edit'>"
+       "      <menuitem action='Cut'/>"
+       "      <menuitem action='Copy'/>"
+       "      <menuitem action='Paste'/>"
+       "      <menuitem action='Delete'/>"
+       "      <menuitem action='DeleteAll'/>"
+       "      <separator/>"
+       "      <menuitem action='MapCacheFlush'/>"
+       "      <menuitem action='SetDefaultLocation'/>"
+       "      <menuitem action='Preferences'/>"
+       "    </menu>"
        "    <menu action='View'>"
        "      <menuitem action='ModeUTM'/>"
+#ifdef VIK_CONFIG_EXPEDIA
        "      <menuitem action='ModeExpedia'/>"
-       "      <menuitem action='ModeGoogle'/>"
-       "      <menuitem action='ModeKH'/>"
+#endif
        "      <menuitem action='ModeMercator'/>"
        "      <separator/>"
+       "      <menuitem action='GotoDefaultLocation'/>"
+       "      <menuitem action='GotoSearch'/>"
        "      <menuitem action='GotoLL'/>"
        "      <menuitem action='GotoUTM'/>"
        "      <separator/>"
        "      <menuitem action='ShowScale'/>"
+       "      <menuitem action='ShowCenterMark'/>"
        "      <menuitem action='SetBGColor'/>"
+       "      <menuitem action='FullScreen'/>"
+       "      <menuitem action='ViewSidePanel'/>"
        "      <separator/>"
        "      <menuitem action='ZoomIn'/>"
        "      <menuitem action='ZoomOut'/>"
@@ -49,34 +72,62 @@ static const char *menu_xml =
        "        <menuitem action='Zoom32'/>"
        "        <menuitem action='Zoom64'/>"
        "        <menuitem action='Zoom128'/>"
+       "        <menuitem action='Zoom256'/>"
+       "        <menuitem action='Zoom512'/>"
+       "        <menuitem action='Zoom1024'/>"
+       "        <menuitem action='Zoom2048'/>"
+       "        <menuitem action='Zoom4096'/>"
+       "        <menuitem action='Zoom8192'/>"
+       "        <menuitem action='Zoom16384'/>"
+       "        <menuitem action='Zoom32768'/>"
+       "      </menu>"
+        "      <menu action='SetPan'>"
+        "          <menuitem action='PanNorth'/>"
+        "          <menuitem action='PanEast'/>"
+        "          <menuitem action='PanWest'/>"
+        "          <menuitem action='PanSouth'/>"
        "      </menu>"
        "      <separator/>"
        "      <menuitem action='BGJobs'/>"
        "    </menu>"
        "    <menu action='Layers'>"
-       "      <menuitem action='Cut'/>"
-       "      <menuitem action='Copy'/>"
-       "      <menuitem action='Paste'/>"
-       "      <menuitem action='Delete'/>"
-       "      <menuitem action='DeleteAll'/>"
-       "      <separator/>"
        "      <menuitem action='Properties'/>"
        "      <separator/>"
        "    </menu>"
        "    <menu action='Tools'>"
+       "      <menu action='Exttools'/>"
+       "      <menuitem action='Pan'/>"
        "      <menuitem action='Zoom'/>"
        "      <menuitem action='Ruler'/>"
        "    </menu>"
+       "    <menu action='Help'>"
+       "      <menuitem action='HelpEntry'/>"
+       "      <menuitem action='About'/>"
+       "    </menu>"
        "  </menubar>"
        "  <toolbar name='MainToolbar'>"
        "    <placeholder name='FileToolItems'>"
        "      <toolitem name='New' action='New'/>"
        "      <toolitem name='Open' action='Open'/>"
        "      <toolitem name='Save' action='Save'/>"
+#if GTK_CHECK_VERSION(2,10,0)
+       "      <toolitem name='Print' action='Print'/>"
+#endif
        "      <toolitem name='Exit' action='Exit'/>"
        "      <separator/>"
        "    </placeholder>"
+       "    <placeholder name='UIToolItems'>"
+       "      <toolitem action='FullScreen'/>"
+       "      <toolitem action='ViewSidePanel'/>"
+       "      <separator/>"
+       "    </placeholder>"
+       "    <placeholder name='ViewToolItems'>"
+       "      <toolitem action='GotoDefaultLocation'/>"
+       "      <toolitem action='GotoSearch'/>"
+       "      <separator/>"
+       "    </placeholder>"
        "    <placeholder name='ToolItems'>"
+       "    <toolitem action='Pan'/>"
        "    <toolitem action='Zoom'/>"
        "    <toolitem action='Ruler'/>"
        "    </placeholder>"