X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/ab961dc380db6ae83a8a6c7a09a7903972d57cb8..87819e206fb0d9f10a5656c459d20a6d668d620e:/src/menu.xml.h

diff --git a/src/menu.xml.h b/src/menu.xml.h
index 944974b0..0086a8fe 100644
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -11,15 +11,18 @@ 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'/>"
@@ -27,6 +30,7 @@ static const char *menu_xml =
 #ifdef VIK_CONFIG_GEOTAG
 	"        <menuitem action='AcquireGeotag'/>"
 #endif
+	"        <menuitem action='AcquireURL'/>"
 #ifdef VIK_CONFIG_GEONAMES
 	"        <menuitem action='AcquireWikipedia'/>"
 #endif
@@ -34,9 +38,7 @@ static const char *menu_xml =
 	"      <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'/>"
@@ -51,6 +53,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'/>"
@@ -64,6 +67,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/>"
@@ -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'/>"
@@ -133,9 +121,7 @@ static const char *menu_xml =
 	"      <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>"
@@ -146,6 +132,8 @@ static const char *menu_xml =
 	"    </placeholder>"
 	"    <placeholder name='ViewToolItems'>"
 	"      <toolitem action='GotoDefaultLocation'/>"
+	"      <toolitem action='GoBack'/>"
+	"      <toolitem action='GoForward'/>"
 	"      <toolitem action='GotoSearch'/>"
 	"      <separator/>"
 	"    </placeholder>"