[QA] Improve create zoom menu to use G_N_ELEMENTS to know array bounds.

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

diff --git a/src/menu.xml.h b/src/menu.xml.h
index 944974b07194f2952f7954720630419208b53a8d..56405c904d88ffcc412c2eff911cc237afdb3748 100644 (file)
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -12,6 +12,9 @@ static const char *menu_xml =
        "      <menuitem action='Save'/>"
        "      <menuitem action='SaveAs'/>"
        "      <separator/>"
+       "      <menu action='Export'>"
+       "        <menuitem action='ExportGPX'/>"
+       "      </menu>"
        "      <menu action='Acquire'>"
        "        <menuitem action='AcquireGPS'/>"
        "        <menuitem action='AcquireGPSBabel'/>"
@@ -20,6 +23,7 @@ static const char *menu_xml =
 #endif
 #ifdef VIK_CONFIG_OPENSTREETMAP
        "        <menuitem action='AcquireOSM'/>"
+       "        <menuitem action='AcquireMyOSM'/>"
 #endif
 #ifdef VIK_CONFIG_GEOCACHES
        "        <menuitem action='AcquireGC'/>"
@@ -51,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'/>"
@@ -84,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'/>"