X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/c933487f83cac2eddfcf14fed44cc8524b9b387e..4e53f3dcd47d9208cff59bdacefdacf554b37962:/src/menu.xml.h?ds=sidebyside

diff --git a/src/menu.xml.h b/src/menu.xml.h
index a2e355e4..d9cf08fc 100644
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -14,11 +14,16 @@ static const char *menu_xml =
 	"      <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'/>"
@@ -29,21 +34,25 @@ static const char *menu_xml =
 	"      <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='GoogleMapsSearch'/>"
+	"      <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'/>"
@@ -60,6 +69,12 @@ 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>"
@@ -68,6 +83,8 @@ static const char *menu_xml =
 	"      <separator/>"
 	"    </menu>"
 	"    <menu action='Tools'>"
+	"      <menu action='Exttools'/>"
+	"      <menuitem action='Pan'/>"
 	"      <menuitem action='Zoom'/>"
 	"      <menuitem action='Ruler'/>"
 	"    </menu>"
@@ -80,21 +97,23 @@ 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='GotoSearch'/>"
 	"      <separator/>"
 	"    </placeholder>"
 	"    <placeholder name='ToolItems'>"
+	"    <toolitem action='Pan'/>"
 	"    <toolitem action='Zoom'/>"
 	"    <toolitem action='Ruler'/>"
 	"    </placeholder>"