Remove dependencies to gob2

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

diff --git a/src/menu.xml.h b/src/menu.xml.h
index 66f63f641aa14c814070755a74c8a644d6488298..e12fda744ddbae0a128f15ae845ddde3fc066b1d 100644 (file)
--- a/src/menu.xml.h
+++ b/src/menu.xml.h
@@ -41,10 +41,6 @@ static const char *menu_xml =
        "      <menuitem action='ModeUTM'/>"
 #ifdef VIK_CONFIG_EXPEDIA
        "      <menuitem action='ModeExpedia'/>"
        "      <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='ModeMercator'/>"
        "      <separator/>"
 #endif
        "      <menuitem action='ModeMercator'/>"
        "      <separator/>"


@@ -55,6 +51,8 @@ static const char *menu_xml =
        "      <menuitem action='ShowScale'/>"
        "      <menuitem action='ShowCenterMark'/>"
        "      <menuitem action='SetBGColor'/>"
        "      <menuitem action='ShowScale'/>"
        "      <menuitem action='ShowCenterMark'/>"
        "      <menuitem action='SetBGColor'/>"

+       "      <menuitem action='FullScreen'/>"
+       "      <menuitem action='ViewSidePanel'/>"

        "      <separator/>"
        "      <menuitem action='ZoomIn'/>"
        "      <menuitem action='ZoomOut'/>"
        "      <separator/>"
        "      <menuitem action='ZoomIn'/>"
        "      <menuitem action='ZoomOut'/>"


@@ -85,6 +83,7 @@ static const char *menu_xml =
        "      <separator/>"
        "    </menu>"
        "    <menu action='Tools'>"
        "      <separator/>"
        "    </menu>"
        "    <menu action='Tools'>"

+       "      <menuitem action='Pan'/>"

        "      <menuitem action='Zoom'/>"
        "      <menuitem action='Ruler'/>"
        "    </menu>"
        "      <menuitem action='Zoom'/>"
        "      <menuitem action='Ruler'/>"
        "    </menu>"


@@ -103,11 +102,9 @@ static const char *menu_xml =
        "      <toolitem name='Exit' action='Exit'/>"
        "      <separator/>"
        "    </placeholder>"
        "      <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'>"
        "      <separator/>"
        "    </placeholder>"
        "    <placeholder name='ViewToolItems'>"


@@ -115,6 +112,7 @@ static const char *menu_xml =
        "      <separator/>"
        "    </placeholder>"
        "    <placeholder name='ToolItems'>"
        "      <separator/>"
        "    </placeholder>"
        "    <placeholder name='ToolItems'>"

+       "    <toolitem action='Pan'/>"

        "    <toolitem action='Zoom'/>"
        "    <toolitem action='Ruler'/>"
        "    </placeholder>"
        "    <toolitem action='Zoom'/>"
        "    <toolitem action='Ruler'/>"
        "    </placeholder>"