X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/1d1bc3c1f9e862a76235bb69a4e419136b0f54a3..4e53f3dcd47d9208cff59bdacefdacf554b37962:/src/menu.xml.h

diff --git a/src/menu.xml.h b/src/menu.xml.h
index 832e7103..d9cf08fc 100644
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -8,27 +8,51 @@ static const char *menu_xml =
 	"      <menuitem action='New'/>"
 	"      <menuitem action='Open'/>"
 	"      <menuitem action='Append'/>"
-	"      <menuitem action='Acquire'/>"
 	"      <menuitem action='Save'/>"
 	"      <menuitem action='SaveAs'/>"
 	"      <separator/>"
+	"      <menu action='Acquire'>"
+	"        <menuitem action='AcquireGPS'/>"
+	"        <menuitem action='AcquireGoogle'/>"
+#ifdef VIK_CONFIG_GEOCACHES
+	"        <menuitem action='AcquireGC'/>"
+#endif
+	"      </menu>"
+	"      <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'/>"
 	"    </menu>"
+	"    <menu action='Edit'>"
+	"      <menuitem action='Cut'/>"
+	"      <menuitem action='Copy'/>"
+	"      <menuitem action='Paste'/>"
+	"      <menuitem action='Delete'/>"
+	"      <menuitem action='DeleteAll'/>"
+	"      <separator/>"
+	"      <menuitem action='Preferences'/>"
+	"    </menu>"
 	"    <menu action='View'>"
 	"      <menuitem action='ModeUTM'/>"
+#ifdef VIK_CONFIG_EXPEDIA
 	"      <menuitem action='ModeExpedia'/>"
-	"      <menuitem action='ModeGoogle'/>"
-	"      <menuitem action='ModeKH'/>"
+#endif
 	"      <menuitem action='ModeMercator'/>"
 	"      <separator/>"
+	"      <menuitem action='GotoSearch'/>"
 	"      <menuitem action='GotoLL'/>"
 	"      <menuitem action='GotoUTM'/>"
 	"      <separator/>"
 	"      <menuitem action='ShowScale'/>"
+	"      <menuitem action='ShowCenterMark'/>"
 	"      <menuitem action='SetBGColor'/>"
+	"      <menuitem action='FullScreen'/>"
+	"      <menuitem action='ViewSidePanel'/>"
 	"      <separator/>"
 	"      <menuitem action='ZoomIn'/>"
 	"      <menuitem action='ZoomOut'/>"
@@ -45,33 +69,51 @@ static const char *menu_xml =
 	"        <menuitem action='Zoom64'/>"
 	"        <menuitem action='Zoom128'/>"
 	"      </menu>"
+        "      <menu action='SetPan'>"
+        "          <menuitem action='PanNorth'/>"
+        "          <menuitem action='PanEast'/>"
+        "          <menuitem action='PanWest'/>"
+        "          <menuitem action='PanSouth'/>"
+	"      </menu>"
 	"      <separator/>"
 	"      <menuitem action='BGJobs'/>"
 	"    </menu>"
 	"    <menu action='Layers'>"
-	"      <menuitem action='Cut'/>"
-	"      <menuitem action='Copy'/>"
-	"      <menuitem action='Paste'/>"
-	"      <menuitem action='Delete'/>"
-	"      <menuitem action='DeleteAll'/>"
-	"      <separator/>"
 	"      <menuitem action='Properties'/>"
 	"      <separator/>"
 	"    </menu>"
 	"    <menu action='Tools'>"
+	"      <menu action='Exttools'/>"
+	"      <menuitem action='Pan'/>"
 	"      <menuitem action='Zoom'/>"
 	"      <menuitem action='Ruler'/>"
 	"    </menu>"
+	"    <menu action='Help'>"
+	"      <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='GotoSearch'/>"
+	"      <separator/>"
+	"    </placeholder>"
 	"    <placeholder name='ToolItems'>"
+	"    <toolitem action='Pan'/>"
 	"    <toolitem action='Zoom'/>"
 	"    <toolitem action='Ruler'/>"
 	"    </placeholder>"