Merge branch 'MBTilesRead'

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

diff --git a/src/menu.xml.h b/src/menu.xml.h
index f06f773094b31d05c978ff54b5b8831b878dceaf..ea048916eac3769528267b3b2476c7acb9354a07 100644 (file)
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -11,21 +11,28 @@ static const char *menu_xml =
        "      <menuitem action='Append'/>"
        "      <menuitem action='Save'/>"
        "      <menuitem action='SaveAs'/>"
+       "      <menuitem action='FileProperties'/>"
        "      <separator/>"
+       "      <menu action='Export'>"
+       "        <menuitem action='ExportGPX'/>"
+       "      </menu>"
        "      <menu action='Acquire'>"
        "        <menuitem action='AcquireGPS'/>"
        "        <menuitem action='AcquireGPSBabel'/>"
-#ifdef VIK_CONFIG_GOOGLE
-       "        <menuitem action='AcquireGoogle'/>"
-#endif
+       "        <menuitem action='AcquireRouting'/>"
 #ifdef VIK_CONFIG_OPENSTREETMAP
        "        <menuitem action='AcquireOSM'/>"
+       "        <menuitem action='AcquireMyOSM'/>"
 #endif
 #ifdef VIK_CONFIG_GEOCACHES
        "        <menuitem action='AcquireGC'/>"
 #endif
 #ifdef VIK_CONFIG_GEOTAG
        "        <menuitem action='AcquireGeotag'/>"
+#endif
+       "        <menuitem action='AcquireURL'/>"
+#ifdef VIK_CONFIG_GEONAMES
+       "        <menuitem action='AcquireWikipedia'/>"
 #endif
        "      </menu>"
        "      <separator/>"
@@ -48,6 +55,7 @@ static const char *menu_xml =
        "      <menuitem action='MapCacheFlush'/>"
        "      <menuitem action='SetDefaultLocation'/>"
        "      <menuitem action='Preferences'/>"
+       "      <menu action='LayerDefaults'/>"
        "    </menu>"
        "    <menu action='View'>"
        "      <menuitem action='ModeUTM'/>"
@@ -81,24 +89,7 @@ static const char *menu_xml =
        "      <menuitem action='ZoomOut'/>"
        "      <menuitem action='ZoomTo'/>"
        "      <menu action='SetZoom'>"
-       "        <menuitem action='Zoom0.25'/>"
-       "        <menuitem action='Zoom0.5'/>"
-       "        <menuitem action='Zoom1'/>"
-       "        <menuitem action='Zoom2'/>"
-       "        <menuitem action='Zoom4'/>"
-       "        <menuitem action='Zoom8'/>"
-       "        <menuitem action='Zoom16'/>"
-       "        <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'/>"
+       "        <placeholder name='ZoomLevels'/>"
        "      </menu>"
         "      <menu action='SetPan'>"
         "          <menuitem action='PanNorth'/>"