Bug fix: View Mode displayed wrong setting on startup.

[andy/viking.git] / src / menu.xml.h

diff --git a/src/menu.xml.h b/src/menu.xml.h
index 832e7103308d7382c35e15ae3e82c78f4bf92328..a2e355e46d41d764cdc6b77b1d8d848b7d6d1eb0 100644 (file)
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -8,15 +8,28 @@ 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'/>"
+       "        <menuitem action='AcquireGC'/>"
+       "      </menu>"
+       "      <separator/>"
        "      <menuitem action='GenImg'/>"
        "      <menuitem action='GenImgDir'/>"
        "      <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'/>"
+       "    </menu>"
        "    <menu action='View'>"
        "      <menuitem action='ModeUTM'/>"
        "      <menuitem action='ModeExpedia'/>"
@@ -24,10 +37,12 @@ static const char *menu_xml =
        "      <menuitem action='ModeKH'/>"
        "      <menuitem action='ModeMercator'/>"
        "      <separator/>"
+       "      <menuitem action='GoogleMapsSearch'/>"
        "      <menuitem action='GotoLL'/>"
        "      <menuitem action='GotoUTM'/>"
        "      <separator/>"
        "      <menuitem action='ShowScale'/>"
+       "      <menuitem action='ShowCenterMark'/>"
        "      <menuitem action='SetBGColor'/>"
        "      <separator/>"
        "      <menuitem action='ZoomIn'/>"
@@ -49,12 +64,6 @@ static const char *menu_xml =
        "      <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>"
@@ -62,6 +71,9 @@ static const char *menu_xml =
        "      <menuitem action='Zoom'/>"
        "      <menuitem action='Ruler'/>"
        "    </menu>"
+       "    <menu action='Help'>"
+       "      <menuitem action='About'/>"
+       "    </menu>"
        "  </menubar>"
        "  <toolbar name='MainToolbar'>"
        "    <placeholder name='FileToolItems'>"
@@ -71,6 +83,17 @@ static const char *menu_xml =
        "      <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'/>"