Add and use defines for conversion of speed units.

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

diff --git a/src/menu.xml.h b/src/menu.xml.h
index 914ff692cca4866166b4ecc524e92e319f24dd27..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'/>"
@@ -35,20 +36,19 @@ static const char *menu_xml =
        "      <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'/>"
-#endif
-#ifdef VIK_CONFIG_OLD_GOOGLE
-       "      <menuitem action='ModeGoogle'/>"
-       "      <menuitem action='ModeKH'/>"
 #endif
        "      <menuitem action='ModeMercator'/>"
        "      <separator/>"
-       "      <menuitem action='GoogleMapsSearch'/>"
+       "      <menuitem action='GotoDefaultLocation'/>"
+       "      <menuitem action='GotoSearch'/>"
        "      <menuitem action='GotoLL'/>"
        "      <menuitem action='GotoUTM'/>"
        "      <separator/>"
@@ -56,6 +56,7 @@ static const char *menu_xml =
        "      <menuitem action='ShowCenterMark'/>"
        "      <menuitem action='SetBGColor'/>"
        "      <menuitem action='FullScreen'/>"
+       "      <menuitem action='ViewSidePanel'/>"
        "      <separator/>"
        "      <menuitem action='ZoomIn'/>"
        "      <menuitem action='ZoomOut'/>"
@@ -71,6 +72,14 @@ 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'/>"
@@ -86,10 +95,13 @@ static const char *menu_xml =
        "      <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>"
@@ -104,18 +116,18 @@ static const char *menu_xml =
        "      <toolitem name='Exit' action='Exit'/>"
        "      <separator/>"
        "    </placeholder>"
-       "    <placeholder name='EditToolItems'>"
-       "      <toolitem name='Cut' action='Cut'/>"
-       "      <toolitem name='Copy' action='Copy'/>"
-       "      <toolitem name='Paste' action='Paste'/>"
-       "      <toolitem name='Delete' action='Delete'/>"
+       "    <placeholder name='UIToolItems'>"
+       "      <toolitem action='FullScreen'/>"
+       "      <toolitem action='ViewSidePanel'/>"
        "      <separator/>"
        "    </placeholder>"
        "    <placeholder name='ViewToolItems'>"
-       "      <toolitem action='GoogleMapsSearch'/>"
+       "      <toolitem action='GotoDefaultLocation'/>"
+       "      <toolitem action='GotoSearch'/>"
        "      <separator/>"
        "    </placeholder>"
        "    <placeholder name='ToolItems'>"
+       "    <toolitem action='Pan'/>"
        "    <toolitem action='Zoom'/>"
        "    <toolitem action='Ruler'/>"
        "    </placeholder>"