Fix CPU usage going to 100% when statusbar items update is called.

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

diff --git a/src/menu.xml.h b/src/menu.xml.h
index 622c26d013e66c9802f5e748c9c75fa8a7e7106d..53f90120e5cfb9299be8e67b73092fad51fc35d2 100644 (file)
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -14,9 +14,18 @@ static const char *menu_xml =
        "      <separator/>"
        "      <menu action='Acquire'>"
        "        <menuitem action='AcquireGPS'/>"
+       "        <menuitem action='AcquireGPSBabel'/>"
+#ifdef VIK_CONFIG_GOOGLE_DIRECTIONS
        "        <menuitem action='AcquireGoogle'/>"
+#endif
+#ifdef VIK_CONFIG_OPENSTREETMAP
+       "        <menuitem action='AcquireOSM'/>"
+#endif
 #ifdef VIK_CONFIG_GEOCACHES
        "        <menuitem action='AcquireGC'/>"
+#endif
+#ifdef VIK_CONFIG_GEOTAG
+       "        <menuitem action='AcquireGeotag'/>"
 #endif
        "      </menu>"
        "      <separator/>"
@@ -45,6 +54,7 @@ static const char *menu_xml =
 #ifdef VIK_CONFIG_EXPEDIA
        "      <menuitem action='ModeExpedia'/>"
 #endif
+       "      <menuitem action='ModeLatLon'/>"
        "      <menuitem action='ModeMercator'/>"
        "      <separator/>"
        "      <menuitem action='GotoDefaultLocation'/>"
@@ -52,13 +62,18 @@ static const char *menu_xml =
        "      <menuitem action='GotoLL'/>"
        "      <menuitem action='GotoUTM'/>"
        "      <separator/>"
-       "      <menuitem action='ShowScale'/>"
-       "      <menuitem action='ShowCenterMark'/>"
        "      <menuitem action='SetBGColor'/>"
+       "      <menuitem action='SetHLColor'/>"
        "      <menuitem action='FullScreen'/>"
-       "      <menuitem action='ViewSidePanel'/>"
-       "      <menuitem action='ViewStatusBar'/>"
-       "      <menuitem action='ViewToolbar'/>"
+       "      <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'/>"
@@ -101,6 +116,7 @@ static const char *menu_xml =
        "      <menuitem action='Pan'/>"
        "      <menuitem action='Zoom'/>"
        "      <menuitem action='Ruler'/>"
+       "      <menuitem action='Select'/>"
        "    </menu>"
        "    <menu action='Help'>"
        "      <menuitem action='HelpEntry'/>"
@@ -132,6 +148,7 @@ static const char *menu_xml =
        "    <toolitem action='Pan'/>"
        "    <toolitem action='Zoom'/>"
        "    <toolitem action='Ruler'/>"
+       "    <toolitem action='Select'/>"
        "    </placeholder>"
        "  </toolbar>"
        "</ui>"