Fix spelling in gpsd retry warning print out

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

diff --git a/src/menu.xml.h b/src/menu.xml.h
index 31117fde018e55eb6a1b3cff6a8c28a571c1d273..3c7fbdb23f994bcdeab74a4f8186174f25b3282c 100644 (file)
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -11,13 +11,13 @@ 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'/>"
@@ -28,16 +28,21 @@ static const char *menu_xml =
 #ifdef VIK_CONFIG_GEOTAG
        "        <menuitem action='AcquireGeotag'/>"
 #endif
+       "        <menuitem action='AcquireURL'/>"
 #ifdef VIK_CONFIG_GEONAMES
        "        <menuitem action='AcquireWikipedia'/>"
 #endif
        "      </menu>"
+#ifdef HAVE_ZIP_H
+       "      <menuitem action='ImportKMZ'/>"
+#endif
        "      <separator/>"
+#ifdef HAVE_ZIP_H
+       "      <menuitem action='GenKMZ'/>"
+#endif
        "      <menuitem action='GenImg'/>"
        "      <menuitem action='GenImgDir'/>"
-#if GTK_CHECK_VERSION(2,10,0)
        "      <menuitem action='Print'/>"
-#endif
        "      <separator/>"
        "      <menuitem action='SaveExit'/>"
        "      <menuitem action='Exit'/>"
@@ -49,9 +54,11 @@ static const char *menu_xml =
        "      <menuitem action='Delete'/>"
        "      <menuitem action='DeleteAll'/>"
        "      <separator/>"
+       "      <menuitem action='CopyCentre'/>"
        "      <menuitem action='MapCacheFlush'/>"
        "      <menuitem action='SetDefaultLocation'/>"
        "      <menuitem action='Preferences'/>"
+       "      <menu action='LayerDefaults'/>"
        "    </menu>"
        "    <menu action='View'>"
        "      <menuitem action='ModeUTM'/>"
@@ -65,6 +72,8 @@ static const char *menu_xml =
        "      <menuitem action='GotoSearch'/>"
        "      <menuitem action='GotoLL'/>"
        "      <menuitem action='GotoUTM'/>"
+       "      <menuitem action='GoBack'/>"
+       "      <menuitem action='GoForward'/>"
        "      <separator/>"
        "      <menuitem action='Refresh'/>"
        "      <separator/>"
@@ -112,34 +121,6 @@ static const char *menu_xml =
        "      <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'/>"
-       "    <toolitem action='Select'/>"
-       "    </placeholder>"
-       "  </toolbar>"
        "</ui>"
 ;