X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/17a1f8f913d38e8a6192123e3dbe6f1d506b4e66..93dd774414b1ebd932126f6a2e68d17e92cf7254:/src/menu.xml.h?ds=sidebyside

diff --git a/src/menu.xml.h b/src/menu.xml.h
index 66f63f64..3c7fbdb2 100644
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -7,23 +7,42 @@ 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'/>"
+	"      <menuitem action='FileProperties'/>"
 	"      <separator/>"
+	"      <menu action='Export'>"
+	"        <menuitem action='ExportGPX'/>"
+	"      </menu>"
 	"      <menu action='Acquire'>"
-	"        <menuitem action='AcquireGPS'/>"
-	"        <menuitem action='AcquireGoogle'/>"
+	"        <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>"
+#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'/>"
@@ -35,41 +54,47 @@ 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'/>"
 #ifdef VIK_CONFIG_EXPEDIA
 	"      <menuitem action='ModeExpedia'/>"
 #endif
-#ifdef VIK_CONFIG_OLD_GOOGLE
-	"      <menuitem action='ModeGoogle'/>"
-	"      <menuitem action='ModeKH'/>"
-#endif
+	"      <menuitem action='ModeLatLon'/>"
 	"      <menuitem action='ModeMercator'/>"
 	"      <separator/>"
-	"      <menuitem action='GoogleMapsSearch'/>"
+	"      <menuitem action='GotoDefaultLocation'/>"
+	"      <menuitem action='GotoSearch'/>"
 	"      <menuitem action='GotoLL'/>"
 	"      <menuitem action='GotoUTM'/>"
+	"      <menuitem action='GoBack'/>"
+	"      <menuitem action='GoForward'/>"
+	"      <separator/>"
+	"      <menuitem action='Refresh'/>"
 	"      <separator/>"
-	"      <menuitem action='ShowScale'/>"
-	"      <menuitem action='ShowCenterMark'/>"
 	"      <menuitem action='SetBGColor'/>"
+	"      <menuitem action='SetHLColor'/>"
+	"      <menuitem action='FullScreen'/>"
+	"      <menu action='SetShow'>"
+	"          <menuitem action='ShowScale'/>"
+	"          <menuitem action='ShowCenterMark'/>"
+	"          <menuitem action='ShowHighlight'/>"
+	"          <menuitem action='ViewSidePanel'/>"
+	"          <menuitem action='ViewStatusBar'/>"
+	"          <menuitem action='ViewToolbar'/>"
+	"          <menuitem action='ViewMainMenu'/>"
+	"      </menu>"
 	"      <separator/>"
 	"      <menuitem action='ZoomIn'/>"
 	"      <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'/>"
+	"        <placeholder name='ZoomLevels'/>"
 	"      </menu>"
         "      <menu action='SetPan'>"
         "          <menuitem action='PanNorth'/>"
@@ -85,40 +110,17 @@ static const char *menu_xml =
 	"      <separator/>"
 	"    </menu>"
 	"    <menu action='Tools'>"
+	"      <menu action='Exttools'/>"
+	"      <menuitem action='Pan'/>"
 	"      <menuitem action='Zoom'/>"
 	"      <menuitem action='Ruler'/>"
+	"      <menuitem action='Select'/>"
 	"    </menu>"
 	"    <menu action='Help'>"
+	"      <menuitem action='HelpEntry'/>"
 	"      <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='EditToolItems'>"
-	"      <toolitem name='Cut' action='Cut'/>"
-	"      <toolitem name='Copy' action='Copy'/>"
-	"      <toolitem name='Paste' action='Paste'/>"
-	"      <toolitem name='Delete' action='Delete'/>"
-	"      <separator/>"
-	"    </placeholder>"
-	"    <placeholder name='ViewToolItems'>"
-	"      <toolitem action='GoogleMapsSearch'/>"
-	"      <separator/>"
-	"    </placeholder>"
-	"    <placeholder name='ToolItems'>"
-	"    <toolitem action='Zoom'/>"
-	"    <toolitem action='Ruler'/>"
-	"    </placeholder>"
-	"  </toolbar>"
 	"</ui>"
 ;