X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/42f347434a7fac1d41fce3b4cc02ff9c9c9ab3bb..405b74ed000c226b3c8cde5709d8b2c55c0d787c:/src/menu.xml.h?ds=sidebyside

diff --git a/src/menu.xml.h b/src/menu.xml.h
index d385f1f4..2941eaac 100644
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -7,6 +7,7 @@ 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'/>"
@@ -21,7 +22,9 @@ 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'/>"
@@ -32,25 +35,34 @@ static const char *menu_xml =
 	"      <menuitem action='Paste'/>"
 	"      <menuitem action='Delete'/>"
 	"      <menuitem action='DeleteAll'/>"
+	"      <separator/>"
+	"      <menuitem action='MapCacheFlush'/>"
+	"      <menuitem action='SetDefaultLocation'/>"
+	"      <menuitem action='Preferences'/>"
 	"    </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'/>"
 	"      <separator/>"
-	"      <menuitem action='ShowScale'/>"
-	"      <menuitem action='ShowCenterMark'/>"
 	"      <menuitem action='SetBGColor'/>"
+	"      <menuitem action='FullScreen'/>"
+	"      <menu action='SetShow'>"
+	"          <menuitem action='ShowScale'/>"
+	"          <menuitem action='ShowCenterMark'/>"
+	"          <menuitem action='ViewSidePanel'/>"
+	"          <menuitem action='ViewStatusBar'/>"
+	"          <menuitem action='ViewToolbar'/>"
+	"          <menuitem action='ViewMainMenu'/>"
+	"      </menu>"
 	"      <separator/>"
 	"      <menuitem action='ZoomIn'/>"
 	"      <menuitem action='ZoomOut'/>"
@@ -66,6 +78,14 @@ static const char *menu_xml =
 	"        <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'/>"
 	"      </menu>"
         "      <menu action='SetPan'>"
         "          <menuitem action='PanNorth'/>"
@@ -81,10 +101,13 @@ static const char *menu_xml =
 	"      <separator/>"
 	"    </menu>"
 	"    <menu action='Tools'>"
+	"      <menu action='Exttools'/>"
+	"      <menuitem action='Pan'/>"
 	"      <menuitem action='Zoom'/>"
 	"      <menuitem action='Ruler'/>"
 	"    </menu>"
 	"    <menu action='Help'>"
+	"      <menuitem action='HelpEntry'/>"
 	"      <menuitem action='About'/>"
 	"    </menu>"
 	"  </menubar>"
@@ -93,22 +116,24 @@ 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>"
-	"    <placeholder name='EditToolItems'>"
-	"      <toolitem name='Cut' action='Cut'/>"
-	"      <toolitem name='Copy' action='Copy'/>"
-	"      <toolitem name='Paste' action='Paste'/>"
-	"      <toolitem name='Delete' action='Delete'/>"
+	"    <placeholder name='UIToolItems'>"
+	"      <toolitem action='FullScreen'/>"
+	"      <toolitem action='ViewSidePanel'/>"
 	"      <separator/>"
 	"    </placeholder>"
 	"    <placeholder name='ViewToolItems'>"
-	"      <toolitem action='GoogleMapsSearch'/>"
+	"      <toolitem action='GotoDefaultLocation'/>"
+	"      <toolitem action='GotoSearch'/>"
 	"      <separator/>"
 	"    </placeholder>"
 	"    <placeholder name='ToolItems'>"
+	"    <toolitem action='Pan'/>"
 	"    <toolitem action='Zoom'/>"
 	"    <toolitem action='Ruler'/>"
 	"    </placeholder>"